Ros-diffs February 2009

ros-diffs@reactos.org

29 participants
559 discussions

[dchapyshev] 39560: - Add olethk32 from Wine
by dchapyshev＠svn.reactos.org 12 Feb '09

12 Feb '09

Author: dchapyshev Date: Thu Feb 12 04:56:57 2009 New Revision: 39560 URL: http://svn.reactos.org/svn/reactos?rev=39560&view=rev Log: - Add olethk32 from Wine Added: trunk/reactos/dll/win32/olethk32/ (with props) trunk/reactos/dll/win32/olethk32/main.c (with props) trunk/reactos/dll/win32/olethk32/olethk32.rbuild (with props) trunk/reactos/dll/win32/olethk32/olethk32.spec (with props) trunk/reactos/dll/win32/olethk32/version.rc (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=395… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Thu Feb 12 04:56:57 2009 @@ -104,6 +104,7 @@ <property name="BASEADDRESS_NETAPI32" value="0x71c00000" /> <property name="BASEADDRESS_OLESVR32" value="0x71dd0000" /> <property name="BASEADDRESS_OLECLI32" value="0x71df0000" /> + <property name="BASEADDRESS_OLETHK32" value="0x71e10000" /> <property name="BASEADDRESS_DPLAY" value="0x71e80000" /> <property name="BASEADDRESS_SECURITY" value="0x71f10000" /> <property name="BASEADDRESS_CRYPTUI" value="0x720D0000" /> 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 [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Thu Feb 12 04:56:57 2009 @@ -331,6 +331,7 @@ dll\win32\oledlg\oledlg.dll 1 dll\win32\olepro32\olepro32.dll 1 dll\win32\olesvr32\olesvr32.dll 1 +dll\win32\olethk32\olethk32.dll 1 dll\win32\opengl32\opengl32.dll 1 dll\win32\pdh\pdh.dll 1 dll\win32\powrprof\powrprof.dll 1 Propchange: trunk/reactos/dll/win32/olethk32/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Feb 12 04:56:57 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/olethk32/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/olethk32/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/olethk32/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/olethk32/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olethk32/main.c?… ============================================================================== --- trunk/reactos/dll/win32/olethk32/main.c (added) +++ trunk/reactos/dll/win32/olethk32/main.c [iso-8859-1] Thu Feb 12 04:56:57 2009 @@ -1,0 +1,37 @@ +/* + * Copyright 2007 Stefan Leichter + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(olethk32); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); + + if (fdwReason == DLL_WINE_PREATTACH) + return FALSE; /* prefer native version */ + + if (fdwReason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls(hinstDLL); + + return TRUE; +} Propchange: trunk/reactos/dll/win32/olethk32/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/olethk32/olethk32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olethk32/olethk3… ============================================================================== --- trunk/reactos/dll/win32/olethk32/olethk32.rbuild (added) +++ trunk/reactos/dll/win32/olethk32/olethk32.rbuild [iso-8859-1] Thu Feb 12 04:56:57 2009 @@ -1,0 +1,11 @@ +<module name="olethk32" type="win32dll" baseaddress="${BASEADDRESS_OLETHK32}" installbase="system32" installname="olethk32.dll" allowwarnings="true"> + <importlibrary definition="olethk32.spec" /> + <include base="olethk32">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <file>main.c</file> + <file>version.rc</file> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> +</module> Propchange: trunk/reactos/dll/win32/olethk32/olethk32.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/olethk32/olethk32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olethk32/olethk3… ============================================================================== --- trunk/reactos/dll/win32/olethk32/olethk32.spec (added) +++ trunk/reactos/dll/win32/olethk32/olethk32.spec [iso-8859-1] Thu Feb 12 04:56:57 2009 @@ -1,0 +1,14 @@ + 3 stub InvokeOn32 + 4 stub IntOpInitialize + 5 stub CallbackProcessing_3216 + 6 stub IUnknownObj32 + 8 stub CSm16ReleaseHandler_Release32 + 9 stub ThkMgrInitialize +10 stub ThkMgrUninitialize +11 stub TransformHRESULT_1632 +12 stub TransformHRESULT_3216 +13 stub ConvertObjDescriptor +14 stub ConvertHr1632Thunk +15 stub ConvertHr3216Thunk +16 stub IntOpUninitialize +18 stub ThkAddAppCompatFlag Propchange: trunk/reactos/dll/win32/olethk32/olethk32.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/olethk32/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olethk32/version… ============================================================================== --- trunk/reactos/dll/win32/olethk32/version.rc (added) +++ trunk/reactos/dll/win32/olethk32/version.rc [iso-8859-1] Thu Feb 12 04:56:57 2009 @@ -1,0 +1,26 @@ +/* + * Copyright (c) 2007 Stefan Leichter + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine olethk32 dll" +#define WINE_FILENAME_STR "olethk32.dll" +#define WINE_FILEVERSION 5,1,2600,0 +#define WINE_FILEVERSION_STR "5.1.2600.0" +#define WINE_PRODUCTVERSION 5,1,2600,0 +#define WINE_PRODUCTVERSION_STR "5.1.2600.0" + +#include "wine/wine_common_ver.rc" Propchange: trunk/reactos/dll/win32/olethk32/version.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Thu Feb 12 04:56:57 2009 @@ -292,6 +292,9 @@ <directory name="olesvr32"> <xi:include href="olesvr32/olesvr32.rbuild" /> </directory> +<directory name="olethk32"> + <xi:include href="olethk32/olethk32.rbuild" /> +</directory> <directory name="opengl32"> <xi:include href="opengl32/opengl32.rbuild" /> </directory> Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Feb 12 04:56:57 2009 @@ -88,6 +88,7 @@ reactos/dll/win32/oledlg # Autosync reactos/dll/win32/olepro32 # Autosync reactos/dll/win32/olesvr32 # Autosync +reactos/dll/win32/olethk32 # Autosync reactos/dll/win32/pdh # Autosync reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Autosync

1 0

[dchapyshev] 39559: - Add more stubs
by dchapyshev＠svn.reactos.org 12 Feb '09

12 Feb '09

Author: dchapyshev Date: Thu Feb 12 04:51:29 2009 New Revision: 39559 URL: http://svn.reactos.org/svn/reactos?rev=39559&view=rev Log: - Add more stubs Modified: trunk/reactos/dll/win32/user32/misc/stubs.c trunk/reactos/dll/win32/user32/user32.pspec Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] Thu Feb 12 04:51:29 2009 @@ -569,13 +569,39 @@ return FALSE; } -/*********************************************************************** - * SetProcessDPIAware (USER32.@) - */ -BOOL WINAPI SetProcessDPIAware( VOID ) -{ - FIXME( "stub!\n"); - +/* + * @unimplemented + */ +BOOL WINAPI SetProcessDPIAware(VOID) +{ + UNIMPLEMENTED; return TRUE; } +/* + * @unimplemented + */ +BOOL WINAPI CliImmSetHotKey(DWORD dwID, UINT uModifiers, UINT uVirtualKey, HKL hKl) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + */ +DWORD WINAPI GetMenuIndex(HMENU hMenu, HMENU hSubMenu) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ +DWORD WINAPI UserRegisterWowHandlers(PVOID Unknown1, PVOID Unknown2) +{ + UNIMPLEMENTED; + return 0; +} + Modified: trunk/reactos/dll/win32/user32/user32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.ps… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.pspec [iso-8859-1] Thu Feb 12 04:51:29 2009 @@ -63,9 +63,9 @@ @ stdcall CheckRadioButton(long long long long) @ stdcall ChildWindowFromPoint(long double) @ stdcall ChildWindowFromPointEx(long double long) # Direct call NtUserChildWindowFromPointEx -@ stub CliImmSetHotKey -@ stub ClientThreadConnect -@ stub ClientThreadSetup +@ stdcall CliImmSetHotKey(long long long ptr) +@ stub ClientThreadConnect # missed in XP SP3 +@ stdcall ClientThreadSetup() @ stdcall ClientToScreen(long ptr) @ stdcall ClipCursor(ptr) NtUserClipCursor @ stdcall CloseClipboard() NtUserCloseClipboard @@ -182,7 +182,7 @@ @ stdcall DrawCaptionTempW(long long ptr long long wstr long) @ stdcall DrawEdge(long ptr long long) @ stdcall DrawFocusRect(long ptr) -@ stub DrawFrame +@ stdcall DrawFrame(long ptr long long) @ stdcall DrawFrameControl(long ptr long long) @ stdcall DrawIcon(long long long long) @ stdcall DrawIconEx(long long long long long long long long long) @@ -203,15 +203,15 @@ @ stdcall EndDialog(long long) @ stdcall EndMenu() @ stdcall EndPaint(long ptr) NtUserEndPaint -@ stub EndTask +@ stdcall EndTask(ptr long long) ; @ stub EnterReaderModeHelper @ stdcall EnumChildWindows(long ptr long) @ stdcall EnumClipboardFormats(long) @ stdcall EnumDesktopWindows(long ptr ptr) @ stdcall EnumDesktopsA(ptr ptr long) @ stdcall EnumDesktopsW(ptr ptr long) -@ stub EnumDisplayDeviceModesA ;(str long ptr long) -@ stub EnumDisplayDeviceModesW ;(wstr long ptr long) +@ stub EnumDisplayDeviceModesA ;(str long ptr long) # missed in XP SP3 +@ stub EnumDisplayDeviceModesW ;(wstr long ptr long) # missed in XP SP3 @ stdcall EnumDisplayDevicesA(ptr long ptr long) @ stdcall EnumDisplayDevicesW(ptr long ptr long) @ stdcall EnumDisplayMonitors(long ptr ptr long) # Direct call NtUserEnumDisplayMonitors @@ -313,7 +313,7 @@ @ stdcall GetMenuCheckMarkDimensions() @ stdcall GetMenuContextHelpId(long) @ stdcall GetMenuDefaultItem(long long long) -@ stub GetMenuIndex +@ stdcall GetMenuIndex(ptr ptr) @ stdcall GetMenuInfo(long ptr) @ stdcall GetMenuItemCount(long) @ stdcall GetMenuItemID(long long) @@ -473,16 +473,16 @@ @ stdcall LoadMenuIndirectA(ptr) @ stdcall LoadMenuIndirectW(ptr) @ stdcall LoadMenuW(long wstr) -@ stub LoadRemoteFonts +@ stdcall LoadRemoteFonts() @ stdcall LoadStringA(long long ptr long) @ stdcall LoadStringW(long long ptr long) @ stdcall LockSetForegroundWindow (long) -@ stub LockWindowStation +@ stdcall LockWindowStation(long) NtUserLockWindowStation @ stdcall LockWindowUpdate(long) NtUserLockWindowUpdate -@ stub LockWorkStation +@ stdcall LockWorkStation() NtUserLockWorkStation @ stdcall LookupIconIdFromDirectory(ptr long) @ stdcall LookupIconIdFromDirectoryEx(ptr long long long long) -@ stub MBToWCSEx +@ stdcall MBToWCSEx(long str long wstr long long) @ stdcall MB_GetString(ptr) @ stdcall MapDialogRect(long ptr) @ stdcall MapVirtualKeyA(long long) @@ -530,7 +530,7 @@ ; @ stub PaintMenuBar @ stdcall PeekMessageA(ptr long long long long) @ stdcall PeekMessageW(ptr long long long long) -@ stub PlaySoundEvent +@ stub PlaySoundEvent # missed in XP SP3 @ stdcall PostMessageA(long long long long) @ stdcall PostMessageW(long long long long) @ stdcall PostQuitMessage(long) @@ -544,7 +544,7 @@ ; @ stub PrivateSetDbgTag ; @ stub PrivateSetRipFlags @ stdcall PtInRect(ptr double) -@ stub QuerySendMessage +@ stdcall QuerySendMessage(ptr) NtUserQuerySendMessage ; @ stub QueryUserCounters # Direct call NtUserQueryUserCounters @ stdcall RealChildWindowFromPoint(long double) # Direct call NtUserRealChildWindowFromPoint @ stdcall RealGetWindowClass(long ptr long) RealGetWindowClassA @@ -565,7 +565,7 @@ @ stdcall RegisterHotKey(long long long long) NtUserRegisterHotKey @ stdcall RegisterLogonProcess(long long) ; @ stub RegisterMessagePumpHook -@ stub RegisterNetworkCapabilities +@ stub RegisterNetworkCapabilities # missed in XP SP3 @ stdcall RegisterRawInputDevices(ptr long long) @ stdcall RegisterServicesProcess(long) @ stdcall RegisterShellHookWindow(long) @@ -580,7 +580,7 @@ @ stdcall RemovePropA(long str) @ stdcall RemovePropW(long wstr) @ stdcall ReplyMessage(long) -@ stub ResetDisplay +@ stub ResetDisplay # missed in XP SP3 ; @ stub ResolveDesktopForWOW @ stdcall ReuseDDElParam(long long long long long) @ stdcall ScreenToClient(long ptr) @@ -601,7 +601,7 @@ @ stdcall SendMessageW(long long long long) @ stdcall SendNotifyMessageA(long long long long) @ stdcall SendNotifyMessageW(long long long long) -@ stub ServerSetFunctionPointers +@ stub ServerSetFunctionPointers # missed in XP SP3 @ stdcall SetActiveWindow(long) NtUserSetActiveWindow @ stdcall SetCapture(long) NtUserSetCapture @ stdcall SetCaretBlinkTime(long) @@ -617,7 +617,7 @@ @ stdcall SetClipboardViewer(long) NtUserSetClipboardViewer ; @ stub SetConsoleReserveKeys @ stdcall SetCursor(long) NtUserSetCursor -@ stub SetCursorContents +@ stdcall SetCursorContents(ptr ptr) NtUserSetCursorContents @ stdcall SetCursorPos(long long) @ stdcall SetDebugErrorLevel(long) @ stdcall SetDeskWallpaper(ptr) @@ -669,7 +669,7 @@ @ stdcall SetUserObjectSecurity(long ptr ptr) @ stdcall SetWinEventHook(long long long ptr long long long) @ stdcall SetWindowContextHelpId(long long) -@ stub SetWindowFullScreenState +@ stub SetWindowFullScreenState # missed in XP SP3 @ stdcall SetWindowLongA(long long long) #ifdef _WIN64 @ stdcall SetWindowLongPtrA(ptr long ptr) @@ -692,7 +692,7 @@ @ stdcall ShowCursor(long) @ stdcall ShowOwnedPopups(long long) @ stdcall ShowScrollBar(long long long) NtUserShowScrollBar -@ stub ShowStartGlass +@ stdcall ShowStartGlass(long) @ stdcall ShowWindow(long long) NtUserShowWindow @ stdcall ShowWindowAsync(long long) NtUserShowWindowAsync ; @ stub SoftModalMessageBox @@ -725,7 +725,7 @@ @ stdcall UnhookWindowsHookEx(long) NtUserUnhookWindowsHookEx @ stdcall UnionRect(ptr ptr ptr) @ stdcall UnloadKeyboardLayout(long) NtUserUnloadKeyboardLayout -@ stub UnlockWindowStation +@ stdcall UnlockWindowStation(long) NtUserUnlockWindowStation @ stdcall UnpackDDElParam(long long ptr ptr) @ stdcall UnregisterClassA(str long) @ stdcall UnregisterClassW(wstr long) @@ -738,12 +738,12 @@ @ stdcall UpdateWindow(long) @ stdcall User32InitializeImmEntryTable(ptr) @ stdcall UserClientDllInitialize(long long ptr) DllMain -@ stub UserHandleGrantAccess +@ stdcall UserHandleGrantAccess(ptr ptr long) NtUserUserHandleGrantAccess ; @ stub UserIsSystemResumeAutomatic ; @ stub UserLpkPSMTextOut ; @ stub UserLpkTabbedTextOut @ stdcall UserRealizePalette(long) -@ stub UserRegisterWowHandlers +@ stdcall UserRegisterWowHandlers(ptr ptr) ; @ stub UserSetDeviceHoldState ; @ stdcall UserSignalProc(long long long long) ; @ stub VRipOutput @@ -754,11 +754,11 @@ @ stdcall VkKeyScanExA(long long) @ stdcall VkKeyScanExW(long long) @ stdcall VkKeyScanW(long) -@ stub WCSToMBEx +@ stdcall WCSToMBEx(long wstr long str long long) @ stdcall WINNLSEnableIME(long long) @ stdcall WINNLSGetEnableStatus(long) @ stdcall WINNLSGetIMEHotkey(long) -@ stub WNDPROC_CALLBACK +@ stub WNDPROC_CALLBACK # missed in XP SP3 @ stdcall WaitForInputIdle(long long) @ stdcall WaitMessage() NtUserWaitMessage ; @ stub Win32PoolAllocationStats

1 0

[tkreuzer] 39558: Implement hpp - the header preprocessor It can parse headers and create new headers from them based on a simple prepreprocessing language that's compatible with the C preprocessor, so the source file stays a valid header. It works, but doesn't yet support different folders.
by tkreuzer＠svn.reactos.org 11 Feb '09

11 Feb '09

Author: tkreuzer Date: Wed Feb 11 14:37:25 2009 New Revision: 39558 URL: http://svn.reactos.org/svn/reactos?rev=39558&view=rev Log: Implement hpp - the header preprocessor It can parse headers and create new headers from them based on a simple prepreprocessing language that's compatible with the C preprocessor, so the source file stays a valid header. It works, but doesn't yet support different folders. Added: trunk/reactos/tools/hpp/ (with props) trunk/reactos/tools/hpp/hpp.c (with props) trunk/reactos/tools/hpp/hpp.rbuild (with props) Propchange: trunk/reactos/tools/hpp/ ------------------------------------------------------------------------------ svn:mergeinfo = Added: trunk/reactos/tools/hpp/hpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hpp/hpp.c?rev=39558&… ============================================================================== --- trunk/reactos/tools/hpp/hpp.c (added) +++ trunk/reactos/tools/hpp/hpp.c [iso-8859-1] Wed Feb 11 14:37:25 2009 @@ -1,0 +1,509 @@ +#include <stdio.h> +#include <stdlib.h> +#include <stdarg.h> +#include <string.h> +#include <ctype.h> + +#ifdef DBG +#define trace printf +#else +#define trace if (0) printf +#endif + +typedef struct _DEFINE +{ + struct _DEFINE *pNext; + int len; + int val; + char szName[1]; +} DEFINE, *PDEFINE; + +DEFINE *gpDefines = 0; +int iLine; +const char *gpszCurFile; + +char* +convert_path(const char* origpath) +{ + char* newpath; + int i; + + newpath = strdup(origpath); + + i = 0; + while (newpath[i] != 0) + { +#ifdef UNIX_PATHS + if (newpath[i] == '\\') + { + newpath[i] = '/'; + } +#else +#ifdef DOS_PATHS + if (newpath[i] == '/') + { + newpath[i] = '\\'; + } +#endif +#endif + i++; + } + return(newpath); +} + +char* +GetFolder(const char* pszFullPath) +{ + return "."; +} + +void* +LoadFile(const char* pszFileName, size_t* pFileSize) +{ + FILE* file; + void* pFileData = NULL; + + file = fopen(pszFileName, "rb"); + if (file != NULL) + { + fseek(file, 0L, SEEK_END); + *pFileSize = ftell(file); + fseek(file, 0L, SEEK_SET); + pFileData = malloc(*pFileSize); + if (pFileData != NULL) + { + if (*pFileSize != fread(pFileData, 1, *pFileSize, file)) + { + free(pFileData); + pFileData = NULL; + } + } + fclose(file); + } + return pFileData; +} + + +int +error(char *format, ...) +{ + va_list valist; + int res; + va_start(valist, format); + res = vfprintf(stderr, format, valist); + va_end(valist); + return res; +} + +char* +GetNextChar(const char *psz) +{ + while (*psz == ' ' || *psz == '\t') psz++; + return (char*)psz; +} + +char* +GetNextLine(char *pszLine) +{ + /* Walk to the end of the line */ + while (*pszLine != 13 && *pszLine != 10 && *pszLine != 0) pszLine++; + + /* Skip one CR/LF */ + if (pszLine[0] == 13 && pszLine[1] == 10) + pszLine += 2; + else if (pszLine[0] == 13 || pszLine[0] == 10) + pszLine++; + + if (*pszLine == 0) + { + return 0; + } + + return pszLine; +} + +int +strxlen(const char *psz) +{ + int len = 0; + while (isalnum(*psz) || *psz == '_') + { + psz++; + len++; + } + return len; +} + + +void +WriteLine(char *pszLine, FILE *fileOut) +{ + char * pszEnd; + + pszEnd = strchr(pszLine, '\n'); + if (pszEnd) + { + int len = pszEnd - pszLine + 1; + fwrite(pszLine, 1, len, fileOut); + } +} + +int +EvaluateConstant(const char *p, char **pNext) +{ + PDEFINE pDefine; + int len; + + len = strxlen(p); + if (pNext) + *pNext = (char*)p + len; + + /* search for the define in the global list */ + pDefine = gpDefines; + while (pDefine != 0) + { + trace("found a define: %s\n", pDefine->szName); + if (pDefine->len == len) + { + if (strncmp(p, pDefine->szName, len) == 0) + { + return pDefine->val; + } + } + pDefine = pDefine->pNext; + } + return 0; +} + +int +EvaluateExpression(char *pExpression, char **pNext) +{ + char *p, *pstart; + int inv, thisval, val = 0; + + trace("evaluating expression\n"); + + pstart = GetNextChar(pExpression); + if (*pstart != '(') + { + error("Parse error: expected '(' \n"); + return -1; + } + + while (1) + { + /* Get the start of the real expression */ + p = pstart; + if ((p[0] == '&' && p[1] == '&') || + (p[0] == '|' && p[1] == '|')) + { + p++; + } + p = GetNextChar(p + 1); + + /* Check for inversion modifier */ + if (*p == '!') + { + inv = 1; + p = GetNextChar(p + 1); + } + else + inv = 0; + + /* Beginning of a new subexpression? */ + if (*p == '(') + { + /* Evaluate subexpression */ + thisval = EvaluateExpression(p, &p); + } + else if (isdigit(*p)) + { + thisval = strtod(p, &p); + trace("found a num: %d\n", thisval); + } + else if (isalpha(*p) || *p == '_') + { + thisval = EvaluateConstant(p, &p); + } + else + { + error("..Parse error, expected '(' or constant in line %d\n", + iLine); + return -1; + } + + if (inv) + thisval = !thisval; + + /* Check how to combine the current value */ + if (pstart[0] == '(') + { + val = thisval; + } + else if (pstart[0] == '&' && pstart[1] == '&') + { + val = val && thisval; + } + else if (pstart[0] == '&' && pstart[1] != '&') + { + val = val & thisval; + } + else if (pstart[0] == '|' && pstart[1] == '|') + { + trace("found || val = %d, thisval = %d\n", val, thisval); + val = val || thisval; + } + else if (pstart[0] == '|' && pstart[1] != '|') + { + val = val | thisval; + } + else if (pstart[0] == '+') + { + val = val + thisval; + } + else + { + error("+Parse error: expected '(' or operator in Line %d, got %c\n", + iLine, pstart[0]); + return -1; + } + + p = GetNextChar(p); + + /* End of current subexpression? */ + if (*p == ')') + { + if (pNext) + { + *pNext = p + 1; + } + return val; + } + + /* Continue with a new start position */ + pstart = p; + } + + return val; +} + +int +ParseInputFile(const char *pszInFile, FILE *fileOut) +{ + char* pInputData, *pCurrentLine, *p1, *p2; + size_t cbInFileLenth, len; + int iIfLevel, iCopyLevel; + + trace("parsing input file: %s\n", pszInFile); + + /* Set the global file name */ + gpszCurFile = pszInFile; + + /* Load the input file into memory */ + pInputData = LoadFile(pszInFile, &cbInFileLenth); + if (!pInputData) + { + error("Could not load input file %s\n", pszInFile); + return -1; + } + + /* Zero terminate the file */ + pInputData[cbInFileLenth] = 0; + + pCurrentLine = pInputData; + iLine = 1; + iCopyLevel = iIfLevel = 0; + + /* The main processing loop */ + do + { + trace("line %d: ", iLine); + + /* If this is a normal line ... */ + if (pCurrentLine[0] != '$') + { + /* Check if we are to copy this line */ + if (iCopyLevel == iIfLevel) + { + trace("copying\n"); + WriteLine(pCurrentLine, fileOut); + } + else + trace("skipping\n"); + + /* Continue with next line */ + continue; + } + + /* Check for $endif */ + if (strncmp(pCurrentLine, "$endif", 6) == 0) + { + trace("found $endif\n"); + if (iIfLevel <= 0) + { + error("Parse error: $endif without $if in %s:%d\n", pszInFile, iLine); + return -1; + } + if (iCopyLevel == iIfLevel) + { + iCopyLevel--; + } + iIfLevel--; + + /* Continue with next line */ + continue; + } + + /* The rest is only parsed when we are in a true block */ + if (iCopyLevel < iIfLevel) + { + trace("skipping\n"); + + /* Continue with next line */ + continue; + } + + /* Check for $define */ + if (strncmp(pCurrentLine, "$define", 7) == 0) + { + PDEFINE pDefine; + + trace("found $define\n"); + p1 = GetNextChar(pCurrentLine + 7); + if (*p1 != '(') + { + error("Parse error: expected '(' at %s:%d\n", + pszInFile, iLine); + return -1; + } + p1 = GetNextChar(p1 + 1); + len = strxlen(p1); + p2 = p1 + len; + if (*p2 != ')') + { + error("Parse error: expected ')' at %s:%d\n", + pszInFile, iLine); + return -1; + } + + /* Insert the new define into the global list */ + pDefine = malloc(sizeof(DEFINE) + len); + strncpy(pDefine->szName, p1, len); + pDefine->szName[len] = 0; + pDefine->len = len; + pDefine->val = 1; + pDefine->pNext = gpDefines; + gpDefines = pDefine; + } + + /* Check for $if */ + else if (strncmp(pCurrentLine, "$if", 3) == 0) + { + int val; + + trace("found $if\n"); + /* Increase the if-level */ + iIfLevel++; + + /* Get beginning of the expression */ + p1 = GetNextChar(pCurrentLine + 3); + + /* evaluate the expression */ + val = EvaluateExpression(p1, 0); + + if (val) + { + iCopyLevel = iIfLevel; + } + else if (val == -1) + { + /* Parse error */ + return -1; + } + } + + /* Check for $include */ + else if (strncmp(pCurrentLine, "$include", 8) == 0) + { + int ret; + + trace("found $include\n"); + p1 = GetNextChar(pCurrentLine + 8); + if (*p1 != '(') + { + error("Parse error: expected '(' at %s:%d, found '%c'\n", + pszInFile, iLine, *p1); + return -1; + } + p1++; + p2 = strchr(p1, ')'); + *p2 = 0; + + /* Parse the included file */ + ret = ParseInputFile(p1, fileOut); + + /* Restore the global file name */ + gpszCurFile = pszInFile; + + if (ret == -1) + { + return -1; + } + } + + /* Check for $$ comment */ + else if (strncmp(pCurrentLine, "$$", 2) == 0) + { + trace("$$ ignored\n"); + /* continue with next line */ + continue; + } + + else + { + trace("wot:%s\n", pCurrentLine); + } + + /* Continue with next line */ + } + while (pCurrentLine = GetNextLine(pCurrentLine), + iLine++, + pCurrentLine != 0); + + /* Free the file data */ + free(pInputData); + + return 0; +} + + +int +main(int argc, char* argv[]) +{ + char *pszInFolder, *pszInFile, *pszOutFile; + FILE* fileOut; + int ret; + + if (argc != 3) + { + error("Usage: hc <inputfile> <outputfile>\n"); + exit(1); + } + + pszInFile = convert_path(argv[1]); + pszOutFile = convert_path(argv[2]); + pszInFolder = GetFolder(pszInFile); + + fileOut = fopen(pszOutFile, "wb"); + if (fileOut == NULL) + { + error("Cannot open output file %s", pszOutFile); + exit(1); + } + + ret = ParseInputFile(pszInFile, fileOut); + + fclose(fileOut); + + return ret; +} Propchange: trunk/reactos/tools/hpp/hpp.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/tools/hpp/hpp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hpp/hpp.rbuild?rev=3… ============================================================================== --- trunk/reactos/tools/hpp/hpp.rbuild (added) +++ trunk/reactos/tools/hpp/hpp.rbuild [iso-8859-1] Wed Feb 11 14:37:25 2009 @@ -1,0 +1,6 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<module name="hpp" type="buildtool"> + <include base="hpp">.</include> + <file>hpp.c</file> +</module> Propchange: trunk/reactos/tools/hpp/hpp.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gschneider] 39557: Do not reset the changed switch after applying a theme, bug #4148.
by gschneider＠svn.reactos.org 11 Feb '09

11 Feb '09

Author: gschneider Date: Wed Feb 11 13:21:25 2009 New Revision: 39557 URL: http://svn.reactos.org/svn/reactos?rev=39557&view=rev Log: Do not reset the changed switch after applying a theme, bug #4148. Modified: trunk/reactos/dll/cpl/desk/appearance.c Modified: trunk/reactos/dll/cpl/desk/appearance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] Wed Feb 11 13:21:25 2009 @@ -220,8 +220,6 @@ if (!g->Theme.bHasChanged) return; - g->Theme.bHasChanged = FALSE; - /* Update some globals */ g->crCOLOR_BTNFACE = g->Theme.crColor[COLOR_BTNFACE]; g->crCOLOR_BTNTEXT = g->Theme.crColor[COLOR_BTNTEXT];

1 0

[cfinck] 39556: - The secret of Colin's RosBE-Unix packaging is now in your hand! Add a script, which does 50% of the work for building a RosBE-Unix release out of the SVN sources. The only remaining stuff is creating the source packages, which is merely downloading build tools, applying patches and repackaging them. - Fix the return stuff in "RosBE-Builder.sh"
by cfinck＠svn.reactos.org 11 Feb '09

11 Feb '09

Author: cfinck Date: Wed Feb 11 12:16:09 2009 New Revision: 39556 URL: http://svn.reactos.org/svn/reactos?rev=39556&view=rev Log: - The secret of Colin's RosBE-Unix packaging is now in your hand! Add a script, which does 50% of the work for building a RosBE-Unix release out of the SVN sources. The only remaining stuff is creating the source packages, which is merely downloading build tools, applying patches and repackaging them. - Fix the return stuff in "RosBE-Builder.sh" Added: trunk/tools/RosBE/RosBE-Unix/makepackage.sh (with props) Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh [iso-8859-1] Wed Feb 11 12:16:09 2009 @@ -211,7 +211,7 @@ if $createdir; then if ! mkdir -p "$installdir"; then redmsg "Could not create \"$installdir\", aborted!" - return 1 + exit 1 fi fi fi @@ -219,7 +219,7 @@ # Test if the installation directory is writeable if [ ! -w "$installdir" ]; then redmsg "Installation directory \"$installdir\" is not writeable, aborted!" - return 1 + exit 1 fi # @@ -443,6 +443,3 @@ echo " $installdir/RosBE.sh [source directory] [color code] [architecture]" echo echo "All parameters for that script are optional." -echo - -return 0 Added: trunk/tools/RosBE/RosBE-Unix/makepackage.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/makepackage… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/makepackage.sh (added) +++ trunk/tools/RosBE/RosBE-Unix/makepackage.sh [iso-8859-1] Wed Feb 11 12:16:09 2009 @@ -1,0 +1,108 @@ +#!/bin/bash +# +# ReactOS Build Environment for Unix-based Operating Systems - Packaging tool for the Base package +# Copyright 2009 Colin Finck <mail(a)colinfinck.de> +# +# Released under GNU GPL v2 or any later version. + +# +# Functions +# +check_file() +{ + if ! [ -f "$1" ]; then + echo "File \"$1\" is required, but does not exist!" + exit 1 + fi +} + + +# The real entry point +cd `dirname $0` + +# +# Prerequisites +# +# Check the parameters +if [ "$2" = "" ]; then + echo "makepackage - Package a RosBE-Unix version" + echo "Syntax: ./makepackage.sh <package> <version>" + echo + echo " package - Package name (i.e. \"Base-i386\")" + echo " version - Version number of the Build Environment to package (i.e. \"1.4\")" + exit 1 +fi + +package_name="$1" +package_version="$2" + +# Set the full package name +full_package_name="RosBE-Unix-$package_version" + +case "$package_name" in + "Base-i386") + # Add no suffix + ;; + *) + # Add the package name as the suffix + full_package_name+="-$package_name" + ;; +esac + +# Check if the required directory structure exists +if ! [ -d "../Tools/.svn" ]; then + echo "This script needs to be run in a working copy of the whole \"RosBE\" tree!" + exit 1 +fi + +# Build the source file list +sources="binutils gcc " +tools="" + +case "$package_name" in + "Base-i386") + sources+="make mingw-runtime nasm w32api" + tools+="cpucount scut" +esac + +# Check if all required files exist +for source in $sources; do + check_file "$package_name/sources/$source.tar.bz2" +done + +# Check if all required tools exist +for tool in $tools; do + check_file "../Tools/$tool.c" +done + +# Check if other needed files exist +check_file "$package_name/README.pdf" + + +# +# The Process +# +# Copy the directory and delete some stuff +cp -R "$package_name" "$full_package_name" + +find "$full_package_name" -type d -name ".svn" | xargs rm -rf +rm "$full_package_name/README.odt" + +# Copy the source packages +for source in $sources; do + echo "Copying $source.tar.bz2..." + cp "$package_name/sources/$source.tar.bz2" "$full_package_name/sources/$source.tar.bz2" +done + +# Copy the shared tools +for tool in $tools; do + echo "Copying $tool.c..." + cp "../Tools/$tool.c" "$full_package_name/tools/$tool.c" +done + +# Finally create a package out of this +echo "Creating the package..." +tar cjf "$full_package_name.tar.bz2" "$full_package_name" + +echo +echo "Done!" Propchange: trunk/tools/RosBE/RosBE-Unix/makepackage.sh ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cfinck] 39555: Thinking more about this, the "Root" directory was actually not required. Move the stuff once more (hopefully the last time)
by cfinck＠svn.reactos.org 11 Feb '09

11 Feb '09

Author: cfinck Date: Wed Feb 11 11:49:49 2009 New Revision: 39555 URL: http://svn.reactos.org/svn/reactos?rev=39555&view=rev Log: Thinking more about this, the "Root" directory was actually not required. Move the stuff once more (hopefully the last time) Added: trunk/tools/RosBE/RosBE-Unix/Base-i386/README - copied unchanged from r39554, trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/README trunk/tools/RosBE/RosBE-Unix/Base-i386/README.odt - copied unchanged from r39554, trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/README.odt trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh - copied unchanged from r39554, trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/RosBE-Builder.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/ - copied from r39554, trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/ trunk/tools/RosBE/RosBE-Unix/Base-i386/sources/ - copied from r39554, trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/sources/ trunk/tools/RosBE/RosBE-Unix/Base-i386/tools/ - copied from r39554, trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/tools/ Removed: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/

1 0

[dgorbachev] 39554: Fix bug #4155 in Italian translation. Patch from Gabriel Ilardi.
by dgorbachev＠svn.reactos.org 11 Feb '09

11 Feb '09

Author: dgorbachev Date: Wed Feb 11 11:24:13 2009 New Revision: 39554 URL: http://svn.reactos.org/svn/reactos?rev=39554&view=rev Log: Fix bug #4155 in Italian translation. Patch from Gabriel Ilardi. Modified: trunk/reactos/dll/win32/userenv/lang/it-IT.rc Modified: trunk/reactos/dll/win32/userenv/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/it-IT.rc [iso-8859-1] Wed Feb 11 11:24:13 2009 @@ -5,13 +5,16 @@ * PURPOSE: Italian Translation of dll/win32/userenv/En.rc * PROGRAMMERS: Copyright (C) 2004 Eric Kohl * Copyright (C) 2007 Daniele Forsi (dforsi at gmail.com) Italian Translation +* +* UPDATE HISTORY: +* 11 Feb 2009: Gabriel Ilardi (gabrielilardi at hotmail.it) - compatibility fixes/update. */ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_PROFILEPATH "%SystemDrive%\\Documenti e impostazioni" + IDS_PROFILEPATH "%SystemDrive%\\Documents and settings" IDS_APPDATA "Dati applicazioni" IDS_DESKTOP "Desktop" IDS_FAVORITES "Preferiti" @@ -20,18 +23,18 @@ IDS_ADMINTOOLS "Menu Avvio\\Programmi\\Strumenti di amministrazione" IDS_STARTUP "Menu Avvio\\Programmi\\Esecuzione automatica" IDS_MYDOCUMENTS "Documenti" - IDS_MYPICTURES "Documenti\\Fotografie" + IDS_MYPICTURES "Documenti\\Immagini" IDS_MYMUSIC "Documenti\\Musica" - IDS_MYVIDEOS "Documenti\\Filmati" + IDS_MYVIDEOS "Documenti\\Video" IDS_TEMPLATES "Modelli" - IDS_RECENT "Recenti" + IDS_RECENT "Dati recenti" IDS_SENDTO "Invia a" IDS_PRINTHOOD "Stampanti" IDS_NETHOOD "Risorse di rete" IDS_LOCALSETTINGS "Impostazioni locali" IDS_LOCALAPPDATA "Impostazioni locali\\Dati applicazioni" IDS_TEMP "Impostazioni locali\\Temp" - IDS_CACHE "Impostazioni locali\\File temporanei Internet" + IDS_CACHE "Impostazioni locali\\Temporary Internet Files" IDS_HISTORY "Impostazioni locali\\Cronologia" IDS_COOKIES "Cookies" IDS_PROGRAMFILES "%SystemDrive%\\Programmi"

1 0

[hpoussin] 39553: Revert r39517, as there is no reason for such a change: files are consistently formatted, don't belong to ntoskrnl, use tabs only for indenting and not for formatting, and formatting revisions complicate svn blame feature usage.
by hpoussin＠svn.reactos.org 11 Feb '09

11 Feb '09

Author: hpoussin Date: Wed Feb 11 11:21:10 2009 New Revision: 39553 URL: http://svn.reactos.org/svn/reactos?rev=39553&view=rev Log: Revert r39517, as there is no reason for such a change: files are consistently formatted, don't belong to ntoskrnl, use tabs only for indenting and not for formatting, and formatting revisions complicate svn blame feature usage. Added: trunk/reactos/drivers/input/i8042prt/README.txt - copied unchanged from r39516, trunk/reactos/drivers/input/i8042prt/README.txt trunk/reactos/drivers/input/i8042prt/createclose.c - copied unchanged from r39516, trunk/reactos/drivers/input/i8042prt/createclose.c trunk/reactos/drivers/input/i8042prt/i8042prt.c - copied unchanged from r39516, trunk/reactos/drivers/input/i8042prt/i8042prt.c trunk/reactos/drivers/input/i8042prt/i8042prt.h - copied unchanged from r39516, trunk/reactos/drivers/input/i8042prt/i8042prt.h trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild - copied unchanged from r39516, trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild trunk/reactos/drivers/input/i8042prt/i8042prt.rc - copied unchanged from r39516, trunk/reactos/drivers/input/i8042prt/i8042prt.rc trunk/reactos/drivers/input/i8042prt/keyboard.c - copied unchanged from r39516, trunk/reactos/drivers/input/i8042prt/keyboard.c trunk/reactos/drivers/input/i8042prt/misc.c - copied unchanged from r39516, trunk/reactos/drivers/input/i8042prt/misc.c trunk/reactos/drivers/input/i8042prt/mouse.c - copied unchanged from r39516, trunk/reactos/drivers/input/i8042prt/mouse.c trunk/reactos/drivers/input/i8042prt/pnp.c - copied unchanged from r39516, trunk/reactos/drivers/input/i8042prt/pnp.c trunk/reactos/drivers/input/i8042prt/ps2pp.c - copied unchanged from r39516, trunk/reactos/drivers/input/i8042prt/ps2pp.c trunk/reactos/drivers/input/i8042prt/readwrite.c - copied unchanged from r39516, trunk/reactos/drivers/input/i8042prt/readwrite.c trunk/reactos/drivers/input/i8042prt/registry.c - copied unchanged from r39516, trunk/reactos/drivers/input/i8042prt/registry.c trunk/reactos/drivers/input/i8042prt/setup.c - copied unchanged from r39516, trunk/reactos/drivers/input/i8042prt/setup.c

1 0

[cwittich] 39552: define CSR_DEFAULT_CURSOR_SIZE instead of hardcoding the value in 3 different places
by cwittich＠svn.reactos.org 11 Feb '09

11 Feb '09

Author: cwittich Date: Wed Feb 11 10:39:33 2009 New Revision: 39552 URL: http://svn.reactos.org/svn/reactos?rev=39552&view=rev Log: define CSR_DEFAULT_CURSOR_SIZE instead of hardcoding the value in 3 different places Modified: trunk/reactos/subsystems/win32/csrss/include/conio.h trunk/reactos/subsystems/win32/csrss/win32csr/conio.c trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/include/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/conio.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/conio.h [iso-8859-1] Wed Feb 11 10:39:33 2009 @@ -11,6 +11,8 @@ #include "api.h" #include "win32csr.h" + +#define CSR_DEFAULT_CURSOR_SIZE 25 /* Object type magic numbers */ Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] Wed Feb 11 10:39:33 2009 @@ -184,7 +184,7 @@ } /* init screen buffer with defaults */ NewBuffer->CursorInfo.bVisible = TRUE; - NewBuffer->CursorInfo.dwSize = 5; + NewBuffer->CursorInfo.dwSize = CSR_DEFAULT_CURSOR_SIZE; /* make console active, and insert into console list */ Console->ActiveBuffer = (PCSRSS_SCREEN_BUFFER) NewBuffer; @@ -1995,7 +1995,7 @@ else { Buff->CursorInfo.bVisible = TRUE; - Buff->CursorInfo.dwSize = 5; + Buff->CursorInfo.dwSize = CSR_DEFAULT_CURSOR_SIZE; } if (Buff->MaxX == 0) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] Wed Feb 11 10:39:33 2009 @@ -627,7 +627,7 @@ Buffer->MaxX = 80; Buffer->MaxY = 25; Buffer->CursorInfo.bVisible = TRUE; - Buffer->CursorInfo.dwSize = 5; + Buffer->CursorInfo.dwSize = CSR_DEFAULT_CURSOR_SIZE; } }

1 0

[cfinck] 39551: - Move all current RosBE-Unix stuff into a "Base-i386/Root" directory for making other packages possible for real - Name the Builder script accordingly - Fix double line breaks at the end of scripts - Fix buildtime.c coding style
by cfinck＠svn.reactos.org 11 Feb '09

11 Feb '09

Author: cfinck Date: Wed Feb 11 08:57:00 2009 New Revision: 39551 URL: http://svn.reactos.org/svn/reactos?rev=39551&view=rev Log: - Move all current RosBE-Unix stuff into a "Base-i386/Root" directory for making other packages possible for real - Name the Builder script accordingly - Fix double line breaks at the end of scripts - Fix buildtime.c coding style Added: trunk/tools/RosBE/RosBE-Unix/Base-i386/ (with props) trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/ (with props) trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/README (props changed) - copied unchanged from r39550, trunk/tools/RosBE/RosBE-Unix/README trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/README.odt (props changed) - copied unchanged from r39550, trunk/tools/RosBE/RosBE-Unix/README.odt trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/RosBE-Builder.sh (contents, props changed) - copied, changed from r39550, trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/ (props changed) - copied from r39550, trunk/tools/RosBE/RosBE-Unix/scripts/ trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/sources/ (props changed) - copied from r39550, trunk/tools/RosBE/RosBE-Unix/sources/ trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/tools/ (props changed) - copied from r39550, trunk/tools/RosBE/RosBE-Unix/tools/ Removed: trunk/tools/RosBE/RosBE-Unix/README trunk/tools/RosBE/RosBE-Unix/README.odt trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh trunk/tools/RosBE/RosBE-Unix/scripts/ trunk/tools/RosBE/RosBE-Unix/sources/ trunk/tools/RosBE/RosBE-Unix/tools/ Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/RosBE-rc trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/RosBE.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/basedir.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/build-multi.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/build-shared.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/build.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/charch.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/chdefdir.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/clean.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/createshortcut.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/help.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/i386/clean.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/i386/version.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/rosbelibrary.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/scut.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/version.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/tools/buildtime.c Propchange: trunk/tools/RosBE/RosBE-Unix/Base-i386/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Feb 11 08:57:00 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/tools/RosBE/RosBE-Unix/Base-i386/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/tools/RosBE/RosBE-Unix/Base-i386/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Feb 11 08:57:00 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/README ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/README ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/README.odt ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/README.odt ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Copied: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/RosBE-Builder.sh (from r39550, trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh) URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/RosBE-Builder.sh [iso-8859-1] Wed Feb 11 08:57:00 2009 @@ -1,6 +1,6 @@ #!/bin/bash # -# ReactOS Build Environment for Unix-based Operating Systems - Basic Builder Tool +# ReactOS Build Environment for Unix-based Operating Systems - Builder Tool for the Base package # Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> # partially based on the BuildMingwCross script (http://www.mingw.org/MinGWiki/index.php/BuildMingwCross) # @@ -23,7 +23,7 @@ echo "*******************************************************************************" echo "* ReactOS Build Environment for Unix-based Operating Systems *" -echo "* Basic Builder Tool *" +echo "* Builder Tool for the Base package *" echo "* by Colin Finck <mail(a)colinfinck.de> *" echo "* *" echo "* Version $ROSBE_VERSION *" @@ -446,4 +446,3 @@ echo return 0 - Propchange: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/RosBE-Builder.sh ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/RosBE-Builder.sh ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/ ------------------------------------------------------------------------------ svn:mergeinfo = Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/RosBE-rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/RosBE-rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/RosBE-rc [iso-8859-1] Wed Feb 11 08:57:00 2009 @@ -15,4 +15,3 @@ # Change the current directory to the ReactOS source directory basedir - Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/RosBE.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/RosBE.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/RosBE.sh [iso-8859-1] Wed Feb 11 08:57:00 2009 @@ -61,4 +61,3 @@ echo bash --rcfile "$_ROSBE_ROSSCRIPTDIR/RosBE-rc" - Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/basedir.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/basedir.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/basedir.sh [iso-8859-1] Wed Feb 11 08:57:00 2009 @@ -8,4 +8,3 @@ # An alias just to "cd $_ROSBE_ROSSOURCEDIR" won't work as bash only expands when executing the shell and then never again cd "$_ROSBE_ROSSOURCEDIR" - Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/build-multi.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/build-multi.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/build-multi.sh [iso-8859-1] Wed Feb 11 08:57:00 2009 @@ -10,4 +10,3 @@ CPUCOUNT=`cpucount -x1` buildtime make -j $CPUCOUNT $* - Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/build-shared.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/build-shared.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/build-shared.sh [iso-8859-1] Wed Feb 11 08:57:00 2009 @@ -16,4 +16,3 @@ exit 1 fi fi - Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/build.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/build.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/build.sh [iso-8859-1] Wed Feb 11 08:57:00 2009 @@ -9,4 +9,3 @@ source "$_ROSBE_ROSSCRIPTDIR/build-shared.sh" buildtime make $* - Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/charch.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/charch.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/charch.sh [iso-8859-1] Wed Feb 11 08:57:00 2009 @@ -22,4 +22,3 @@ # Display tool versions source "$_ROSBE_ROSSCRIPTDIR/$_ROSBE_ARCH/version.sh" - Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/chdefdir.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/chdefdir.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/chdefdir.sh [iso-8859-1] Wed Feb 11 08:57:00 2009 @@ -15,4 +15,3 @@ export _ROSBE_ROSSOURCEDIR="$1" basedir - Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/clean.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/clean.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/clean.sh [iso-8859-1] Wed Feb 11 08:57:00 2009 @@ -9,4 +9,3 @@ pushd "$_ROSBE_ROSSOURCEDIR" >& /dev/null source "$_ROSBE_ROSSCRIPTDIR/$_ROSBE_ARCH/clean.sh" popd >& /dev/null - Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/createshortcut.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/createshortcut.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/createshortcut.sh [iso-8859-1] Wed Feb 11 08:57:00 2009 @@ -77,4 +77,3 @@ echo "Terminal=true" >> "$shortcut" greenmsg "OK" - Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/help.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/help.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/help.sh [iso-8859-1] Wed Feb 11 08:57:00 2009 @@ -26,4 +26,3 @@ echo " version - Show information about the tool versions." echo - Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/i386/clean.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/i386/clean.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/i386/clean.sh [iso-8859-1] Wed Feb 11 08:57:00 2009 @@ -16,4 +16,3 @@ else echo "ERROR: There is no i386 compiler output to clean." fi - Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/i386/version.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/i386/version.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/i386/version.sh [iso-8859-1] Wed Feb 11 08:57:00 2009 @@ -7,4 +7,3 @@ mingw32-gcc -v 2>&1 | grep "gcc version" nasm -v mingw32-ld -v - Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/rosbelibrary.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/rosbelibrary.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/rosbelibrary.sh [iso-8859-1] Wed Feb 11 08:57:00 2009 @@ -185,4 +185,3 @@ fi fi } - Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/scut.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/scut.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/scut.sh [iso-8859-1] Wed Feb 11 08:57:00 2009 @@ -23,4 +23,3 @@ ;; esac - Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/version.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/version.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/scripts/version.sh [iso-8859-1] Wed Feb 11 08:57:00 2009 @@ -13,4 +13,3 @@ # Display tool versions source "$_ROSBE_ROSSCRIPTDIR/$_ROSBE_ARCH/version.sh" - Propchange: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/sources/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Feb 11 08:57:00 2009 @@ -1,0 +1,1 @@ +*.tar.bz2 Propchange: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/sources/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/tools/ ------------------------------------------------------------------------------ svn:mergeinfo = Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/tools/buildtime.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/tools/buildtime.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/Root/tools/buildtime.c [iso-8859-1] Wed Feb 11 08:57:00 2009 @@ -11,8 +11,7 @@ #include <time.h> int -main(int argc, - char* argv[]) +main(int argc, char* argv[]) { char* CommandLine; double TotalTime; @@ -25,55 +24,57 @@ time_t StartTime; time_t FinishTime; - // Do we have command line arguments? - if( argc <= 1 ) + /* Do we have command line arguments? */ + if(argc <= 1) { - fprintf( stderr, "buildtime: No command line arguments!\n" ); + fprintf(stderr, "buildtime: No command line arguments!\n"); return 1; } - // First compute the memory size to allocate - for( i = 1; i < argc; i++ ) - // Every argument is enclosed between quotes and followed by a space. - // The last argument is followed by a terminating null character instead of a space. - CommandLineLength += 3 + strlen( argv[i] ); + /* First compute the memory size to allocate */ + for(i = 1; i < argc; i++) + { + /* Every argument is enclosed between quotes and followed by a space. + The last argument is followed by a terminating null character instead of a space. */ + CommandLineLength += 3 + strlen(argv[i]); + } - // Now allocate the needed memory - CommandLine = malloc( CommandLineLength + 1 ); - if( !CommandLine ) + /* Now allocate the needed memory */ + CommandLine = malloc(CommandLineLength + 1); + if(!CommandLine) { - fprintf( stderr, "buildtime: Unable to allocate memory!\n" ); + fprintf(stderr, "buildtime: Unable to allocate memory!\n"); return 1; } - memset( CommandLine, 0, CommandLineLength + 1 ); + memset(CommandLine, 0, CommandLineLength + 1); - // Put the command line into the variable - for( i = 1; i < argc; i++ ) + /* Put the command line into the variable */ + for(i = 1; i < argc; i++) { - strcat( CommandLine, "\"" ); - strcat( CommandLine, argv[i] ); - strcat( CommandLine, "\" " ); + strcat(CommandLine, "\""); + strcat(CommandLine, argv[i]); + strcat(CommandLine, "\" "); } CommandLine[CommandLineLength] = 0; - // Get the timestamps and execute the command line - time( &StartTime ); - Ret = system( CommandLine ); - time( &FinishTime ); + /* Get the timestamps and execute the command line */ + time(&StartTime); + Ret = system(CommandLine); + time(&FinishTime); - // Compute the needed time and print it - TotalTime = difftime( FinishTime, StartTime ); + /* Compute the needed time and print it */ + TotalTime = difftime(FinishTime, StartTime); Second = (int)TotalTime % 60; TotalTime = TotalTime / 60; Minute = (int)TotalTime % 60; Hour = TotalTime / 60; - printf( "\nTotal Build Time: %02d:%02d:%02d\n", Hour, Minute, Second ); + printf("\nTotal Build Time: %02d:%02d:%02d\n", Hour, Minute, Second); - // Final actions - free( CommandLine ); + /* Final actions */ + free(CommandLine); return Ret; } Removed: trunk/tools/RosBE/RosBE-Unix/README URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/README?rev=… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/README [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/README (removed) @@ -1,170 +1,0 @@ - ReactOS Build Environment - Version 1.4 for Unix-based operating systems - Base package and i386 build tools - by Colin Finck (mail(a)colinfinck.de) - -Introduction -------------- - The ReactOS Build Environment ("RosBE") is a Build Environment for building -ReactOS. This version is targeted at Unix-based operating systems such as -Linux or FreeBSD. - The Installation process of the Build Environment is divided into two parts. - First a script builds the needed compiler tools for your operating system -and installs them. Therefore the "gcc" compiler for your system and some -other build tools have to be installed. - Then another script creates a shortcut for you. This shortcut opens a -Terminal window and prepares all environment settings for building ReactOS. - - -Needed Applications --------------------- - Make sure that the following applications are installed on your system. -They are needed to build the compiler tools. The "RosBE-Builder.sh" script -automatically checks for them: - - * GNU Bash - The executable file and the package name are often called "bash". - All scripts are designed to work only under the Bash shell. Please also - make sure that the file "/bin/bash" exists. For example FreeBSD usually - installs Bash into another directory, so you have to create a symbolic - link "/bin/bash" to the executable file. - - * GNU Bison - The executable file and the package name are often called "bison". - - * Flex - The executable file and the package name are often called "flex". - - * GNU GCC - You need the GCC compiler, which is suitable for your system. The - executable file and the package name are often called "gcc". - Your GCC compiler needs to be able to compile both C and C++ sources. - Therefore the "g++" module also has to be installed. - - * Grep - The executable file and the package name are often called "grep". - - * GNU Make - Make sure that you have the GNU version of "make" installed. For example - FreeBSD uses another version. The executable file and the package name - are often called "make" or "gmake". - - * GNU Makeinfo - The executable file is often called "makeinfo". Usually this file is in a - package called "texinfo". - - -Preparing the installation ---------------------------- - Under some operating systems, you need to perform additional steps before -you can install the Build Environment. This section lists them. - - * FreeBSD - - You have to create a symbolic link "/bin/bash", because FreeBSD - installs Bash to "/usr/local/bin/bash". Simply execute the following - command for doing this: - - ln -s /usr/local/bin/bash /bin/bash - - -Installation -------------- - The Installation of RosBE is very simple, since there are scripts, which do -most of the work for you. Follow these steps to compile and install RosBE for -your used operating system: - - 1. Open a Terminal window and type "su" to become "root" user. - NOTE: Becoming a root user is only required for installing RosBE into the - default directory ("/usr/local/RosBE"). If you want to install it into a - personal directory, you don't need superuser privileges. - 2. Call the "RosBE-Builder.sh" script in the directory of the unpacked - RosBE files. - 3. Follow the directions on the screen until the script ends with "Finished - successfully!" - 4. Type "exit" to switch back to your normal user account. Then call the - "createshortcut.sh" script in the installation directory (usually this - is "/usr/local/RosBE"). - 5. Follow the directions on the screen to create a shortcut for the Build - Environment. - - After that you can easily open a Build Environment for ReactOS by opening -the shortcut. - - -Version Information --------------------- - This version of RosBE for Unix-based operating systems uses the following -components: - - * GNU Binutils v2.19.51-20090127 (snapshot) - compiled for i386-pc-mingw32 - patched with: - - binutils-2.18.50.10-15-2007-snapshot-hpoussin.patch - (http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Patches/binutils-2.18.…) - - * GCC, The GNU Compiler Collection v4.1.3-20071015 (snapshot) - compiled for i386-pc-mingw32 - patched with: - - GCC-v4.1-r129382-prerelease-w3seek.patch - (http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Patches/GCC-v4.1-r1293…) - - GCC-v4.1-r129382-virtual-stdcall-bug27067.patch - (http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Patches/GCC-v4.1-r1293…) - - GCC-v4.1-r129490-CreateFileMapping-Vista-bug30335.patch - (http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Patches/GCC-v4.1-r1294…) - - NOTE: This GCC version only supports C and C++ - - * Make 20071219 (CVS version) - * MinGW-Runtime 3.15.2 - * NASM, The Netwide assembler v2.05.01 - * W32api 3.10 - - -Tested Operating Systems -------------------------- - The Build Environment was designed to work on all Unix-based operating -systems. Nevertheless, it is impossible to test it on all possible systems out -there. - The current primary development and test system is Ubuntu 8.10. But users -also reported that it works well under other Linux systems such as Fedora or -openSUSE and Unix derivates like FreeBSD or Mac OS X. - You should be able to compile the build tools on both i386 (32-bit) and -x86_64 (64-bit) systems. - - -Websites ---------- -MinGW - Minimalist GNU for Windows -http://www.mingw.org - -Binutils, the Binary Tools Collection -http://www.gnu.org/software/binutils - -GCC, the GNU Compiler Collection -http://www.gcc.org - -Make, the Makefile processor -http://www.gnu.org/software/make - -NASM, the Netwide Assembler -http://nasm.sourceforge.net - - -Credits --------- -Colin Finck (mail(a)colinfinck.de) - -Thanks go also to the members of the RosBE-Windows team, namely: -Daniel Reimer (reimer.daniel(a)freenet.de) -Peter Ward (dralnix(a)gmail.com) -Pierre Schweitzer (heis_spiter(a)hotmail.com) - - Special thanks to ROSFan, who created the nice ReactOS Build Environment -Logo. - Special thanks also goes out to all those who provide so much help by -testing out new versions, you know who you are. Without them the RosBE -would not be what it is. - Credits go to Gregor Anich who created the original ReactOS Build -Environment v0.2-3.4.4. - -Inspired by Dazzle from TinyKRNL (http://tinykrnl.org/). Removed: trunk/tools/RosBE/RosBE-Unix/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/README.odt?… ============================================================================== Binary file - no diff available. Removed: trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/RosBE-Build… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh (removed) @@ -1,449 +1,0 @@ -#!/bin/bash -# -# ReactOS Build Environment for Unix-based Operating Systems - Basic Builder Tool -# Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> -# partially based on the BuildMingwCross script (http://www.mingw.org/MinGWiki/index.php/BuildMingwCross) -# -# Released under GNU GPL v2 or any later version. - -# Constants -ROSBE_VERSION="1.4" -TARGET_ARCH="i386" -KNOWN_ROSBE_VERSIONS="0.3.6 1.1 1.4" -DEFAULT_INSTALL_DIR="/usr/local/RosBE" -NEEDED_TOOLS="bison flex gcc g++ grep makeinfo" # GNU Make has a special check - -# Get the absolute path to the script directory -cd `dirname $0` -SCRIPTDIR="$PWD" -SOURCEDIR="$SCRIPTDIR/sources" - -source "$SCRIPTDIR/scripts/rosbelibrary.sh" - - -echo "*******************************************************************************" -echo "* ReactOS Build Environment for Unix-based Operating Systems *" -echo "* Basic Builder Tool *" -echo "* by Colin Finck <mail(a)colinfinck.de> *" -echo "* *" -echo "* Version $ROSBE_VERSION *" -echo "*******************************************************************************" - -echo -echo "This script compiles and installs a complete Build Environment for building ReactOS." -echo - -setup_check_requirements - -# Select the installation directory -boldmsg "Installation Directory" - -echo "In which directory do you want to install it?" -echo "Enter the path to the directory here or simply press ENTER to install it into the default directory." - -# RosBE-Unix 1.4 switched from /usr/RosBE to /usr/local/RosBE, show a message for the people who might want to update -if [ -f "/usr/RosBE/RosBE-Version" ]; then - echo - redmsg "Warning: " "-n" - echo "The default installation path /usr/RosBE was changed to /usr/local/RosBE starting with version 1.4." - echo "If you want to update a previous installation, enter /usr/RosBE here." -fi - -createdir=false -installdir="" -update=false - -while [ "$installdir" = "" ]; do - read -p "[$DEFAULT_INSTALL_DIR] " installdir - echo - - if [ "$installdir" = "" ]; then - installdir=$DEFAULT_INSTALL_DIR - fi - - # Make sure we have the absolute path to the installation directory - installdir=`eval echo $installdir` - - # Check if the installation directory already exists - if [ -f "$installdir" ]; then - echo "The directory \"$installdir\" is a file! Please enter another directory!" - echo - installdir="" - - elif [ -d "$installdir" ]; then - # Check if the directory is empty - if [ ! "`ls $installdir`" = "" ]; then - if [ -f "$installdir/RosBE-Version" ]; then - # Allow the user to update an already installed RosBE version - choice="" - installed_version=`cat "$installdir/RosBE-Version"` - - for known_version in $KNOWN_ROSBE_VERSIONS; do - if [ "$known_version" = "$installed_version" ]; then - if [ "$installed_version" = "$ROSBE_VERSION" ]; then - echo "The current version of the Build Environment is already installed in this directory." - echo "Please choose one of the following options:" - echo - echo " (R)einstall all components of the Build Environment" - echo " (C)hoose a different installation directory" - echo - - showchoice "R" "r R c C" - else - echo "An older version of the Build Environment has been found in this directory." - echo "Please choose one of the following options:" - echo - echo " (U)pdate the existing Build Environment" - echo " (R)einstall all new components of the Build Environment" - echo " (C)hoose a different installation directory" - echo - - showchoice "U" "u U r R c C" - fi - - echo - break - fi - done - - if [ "$choice" = "U" ] || [ "$choice" = "u" ]; then - update=true - elif [ "$choice" = "C" ] || [ "$choice" = "c" ]; then - echo "Please enter another directory!" - installdir="" - fi - else - echo "The directory \"$installdir\" is not empty. Do you really want to continue? (yes/no)" - read -p "[no] " answer - echo - - if [ "$answer" != "yes" ]; then - echo "Please enter another directory!" - installdir="" - fi - fi - fi - - else - createdir=true - echo "The directory \"$installdir\" does not exist. The installation script will create it for you." - echo - fi -done - -# Ready to start -boldmsg "Ready to start" - -echo "Ready to build and install the ReactOS Build Environment." -echo "Press any key to continue or Ctrl+C to exit." -read - -if $update; then - setvalues=false - - process_cpucount=false - process_mingwruntime=false - process_w32api=false - process_binutils=false - process_gcc=false - process_make=false - process_nasm=false - process_buildtime=false - process_scut=false - - # Logic behind this update part: - # - KNOWN_ROSBE_VERSIONS contains all versions from the oldest to the newest one (in this order!) - # - setvalues will be set to true, when the iterator reaches the installed version - # - Then the processing settings of the installed and the later versions will be applied. - # (i.e. if gcc changed from 0.3.7 to 0.3.8, but not from 0.3.6 to 0.3.7, the gcc build will correctly be reprocessed - # if the user has an installed RosBE 0.3.6 and wants to update to 0.3.8) - for known_version in $KNOWN_ROSBE_VERSIONS; do - if [ "$known_version" = "$installed_version" ]; then - setvalues=true - fi - - if $setvalues; then - case "$known_version" in - "0.3.6") - # Updated components from 0.3.6 to 1.1 - process_cpucount=true - process_mingwruntime=true - process_w32api=true - process_binutils=true - process_gcc=true - process_make=true - process_nasm=true - process_scut=true - ;; - - "1.1") - # Updated components from 1.1 to 1.4 - process_binutils=true - process_mingwruntime=true - process_nasm=true - - # Reorganize the existing files - mkdir -p "$installdir/$TARGET_ARCH/bin" - mv "$installdir/bin/mingw32-"* "$installdir/$TARGET_ARCH/bin" - mv "$installdir/$TARGET_ARCH/bin/mingw32-make" "$installdir/bin/make" - mv "$installdir/bin/nasm" "$installdir/$TARGET_ARCH/bin/nasm" - mv "$installdir/bin/ndisasm" "$installdir/$TARGET_ARCH/bin/ndisasm" - mv "$installdir/include" "$installdir/$TARGET_ARCH/include" - mv "$installdir/lib" "$installdir/$TARGET_ARCH/lib" - mv "$installdir/libexec" "$installdir/$TARGET_ARCH/libexec" - mv "$installdir/mingw32" "$installdir/$TARGET_ARCH/mingw32" - ;; - esac - fi - done -else - process_cpucount=true - process_mingwruntime=true - process_w32api=true - process_binutils=true - process_gcc=true - process_make=true - process_nasm=true - process_buildtime=true - process_scut=true - - # Create the directory if necessary - if $createdir; then - if ! mkdir -p "$installdir"; then - redmsg "Could not create \"$installdir\", aborted!" - return 1 - fi - fi -fi - -# Test if the installation directory is writeable -if [ ! -w "$installdir" ]; then - redmsg "Installation directory \"$installdir\" is not writeable, aborted!" - return 1 -fi - -# -# Build the tools -# -boldmsg "Building..." -mkdir "$installdir/bin" >& /dev/null -mkdir -p "$installdir/$TARGET_ARCH/mingw32" >& /dev/null - -# cpucount -if $process_cpucount; then - echo -n "Compiling cpucount... " - gcc -s -o "$installdir/bin/cpucount" "$SCRIPTDIR/tools/cpucount.c" - setup_check_run -fi - -CPUCOUNT=`$installdir/bin/cpucount -x1` -cd "$installdir/$TARGET_ARCH/mingw32" - -# mingw-runtime -if $process_mingwruntime; then - echo -n "Extracting mingw-runtime... " - tar -xjf "$SOURCEDIR/mingw-runtime.tar.bz2" >& "$SCRIPTDIR/tar.log" - setup_check_run "tar" -fi - -# w32api -if $process_w32api; then - echo -n "Extracting w32api... " - tar -xjf "$SOURCEDIR/w32api.tar.bz2" >& "$SCRIPTDIR/tar.log" - setup_check_run "tar" -fi - -cd "$SOURCEDIR" - -# binutils -if $process_binutils; then - rm -rf "binutils" - rm -rf "binutils-build" - - echo -n "Extracting binutils... " - tar -xjf "binutils.tar.bz2" >& "$SCRIPTDIR/tar.log" - setup_check_run "tar" - - echo -n "Configuring binutils... " - mkdir "binutils-build" - cd "binutils-build" - ../binutils/configure --prefix="$installdir/$TARGET_ARCH" --target=mingw32 --disable-nls --with-gcc \ - --with-gnu-as --with-gnu-ld --disable-shared >& "$SCRIPTDIR/configure.log" - setup_check_run "configure" - - echo -n "Building binutils... " - $makecmd -j $CPUCOUNT CFLAGS="-O2 -fno-exceptions" LDFLAGS="-s" >& "$SCRIPTDIR/make.log" - setup_check_run "make" - - echo -n "Installing binutils... " - $makecmd install >& "$SCRIPTDIR/make.log" - setup_check_run "make" - - echo -n "Cleaning up binutils... " - cd "$SOURCEDIR" - rm -rf "binutils-build" - rm -rf "binutils" - setup_check_run -fi - -# gcc -if $process_gcc; then - rm -rf "gcc" - rm -rf "gcc-build" - - echo -n "Extracting gcc... " - tar -xjf "gcc.tar.bz2" >& "$SCRIPTDIR/tar.log" - setup_check_run "tar" - - echo -n "Configuring gcc... " - mkdir "gcc-build" - cd "gcc-build" - ../gcc/configure --prefix="$installdir/$TARGET_ARCH" --target=mingw32 \ - --with-headers="$installdir/$TARGET_ARCH/mingw32/include"--with-gcc --with-gnu-ld \ - --with-gnu-as --enable-languages=c,c++ --enable-checking=release \ - --enable-threads=win32 --disable-win32-registry --disable-nls \ - --disable-shared >& "$SCRIPTDIR/configure.log" - setup_check_run "configure" - - echo -n "Building gcc... " - $makecmd -j $CPUCOUNT CFLAGS="-O2" CXXFLAGS="-O2" LDFLAGS="-s" >& "$SCRIPTDIR/make.log" - setup_check_run "make" - - echo -n "Installing gcc... " - $makecmd install >& "$SCRIPTDIR/make.log" - setup_check_run "make" - - echo -n "Cleaning up gcc... " - cd "$SOURCEDIR" - rm -rf "gcc-build" - rm -rf "gcc" - setup_check_run -fi - -# make -if $process_make; then - rm -rf "make" - rm -rf "make-build" - - echo -n "Extracting make... " - tar -xjf "make.tar.bz2" >& "$SCRIPTDIR/tar.log" - setup_check_run "tar" - - echo -n "Configuring make... " - mkdir "make-build" - cd "make-build" - ../make/configure --prefix="$installdir" --disable-dependency-tracking \ - --disable-nls --enable-case-insensitive-file-system - --disable-job-server --disable-rpath >& "$SCRIPTDIR/configure.log" - setup_check_run "configure" - - echo -n "Building make... " - $makecmd -j $CPUCOUNT CFLAGS="-s -O2 -mms-bitfields" >& "$SCRIPTDIR/make.log" - setup_check_run "make" - - echo -n "Installing make... " - $makecmd install >& "$SCRIPTDIR/make.log" - setup_check_run "make" - - echo -n "Cleaning up make... " - cd "$SOURCEDIR" - rm -rf "make-build" - rm -rf "make" - setup_check_run -fi - -# nasm -if $process_nasm; then - rm -rf "nasm" - - echo -n "Extracting nasm... " - tar -xjf "nasm.tar.bz2" >& "$SCRIPTDIR/tar.log" - setup_check_run "tar" - - echo -n "Configuring nasm... " - cd "nasm" - ./configure --prefix="$installdir/$TARGET_ARCH" >& "$SCRIPTDIR/configure.log" - setup_check_run "configure" - - echo -n "Building nasm... " - $makecmd -j $CPUCOUNT >& "$SCRIPTDIR/make.log" - setup_check_run "make" - - echo -n "Installing nasm... " - $makecmd install >& "$SCRIPTDIR/make.log" - setup_check_run "make" - - echo -n "Cleaning up nasm... " - cd "$SOURCEDIR" - rm -rf "nasm" - setup_check_run -fi - -# Final actions -echo -boldmsg "Final actions" - -if [ "$installdir" = "/usr/RosBE" ] && $update; then - # Changed default installation directory starting with RosBE-Unix 1.4 - echo "Do you want to move /usr/RosBE to /usr/local/RosBE? (yes/no)" - read -p "[yes] " answer - - if [ "$answer" = "" ] || [ "$answer" = "yes" ]; then - mv "/usr/RosBE" "/usr/local/RosBE" - installdir="/usr/local/RosBE" - fi -fi - -if $process_buildtime; then - echo -n "Compiling buildtime... " - gcc -s -o "$installdir/bin/buildtime" "$SCRIPTDIR/tools/buildtime.c" - setup_check_run -fi - -if $process_scut; then - echo -n "Compiling scut..." - gcc -s -o "$installdir/bin/scut" "$SCRIPTDIR/tools/scut.c" - setup_check_run -fi - -echo -n "Removing unneeded files... " -rm -rf "$installdir/$TARGET_ARCH/mingw32/sys-include" -rm -rf "$installdir/$TARGET_ARCH/info" -rm -rf "$installdir/$TARGET_ARCH/man" -rm -rf "$installdir/$TARGET_ARCH/share" -setup_check_run - -echo -n "Removing debugging symbols... " -ls "$installdir/$TARGET_ARCH/bin/"* "$installdir/$TARGET_ARCH/mingw32/bin/"* | grep -v "gccbug" | -while read file; do - strip "$file" -done -setup_check_run - -echo -n "Copying scripts... " -cp -R "$SCRIPTDIR/scripts/"* "$installdir" -setup_check_run - -echo -n "Writing version... " -echo "$ROSBE_VERSION" > "$installdir/RosBE-Version" -setup_check_run -echo - -# Finish -boldmsg "Finished successfully!" -echo "To create a shortcut to the Build Environment on the Desktop, please switch back to your" -echo "normal User Account (I assume you ran this script as \"root\")." -echo "Then execute the following command:" -echo -echo " $installdir/createshortcut.sh" -echo -echo "If you just want to start the Build Environment without using a shortcut, execute the" -echo "following command:" -echo -echo " $installdir/RosBE.sh [source directory] [color code] [architecture]" -echo -echo "All parameters for that script are optional." -echo - -return 0 -

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
56
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2009