Ros-diffs December 2009

ros-diffs@reactos.org

22 participants
501 discussions

[dreimer] 44599: Add ARM Support to RosBE. Not really tested yet.
by dreimer＠svn.reactos.org 15 Dec '09

15 Dec '09

Author: dreimer Date: Tue Dec 15 10:25:30 2009 New Revision: 44599 URL: http://svn.reactos.org/svn/reactos?rev=44599&view=rev Log: Add ARM Support to RosBE. Not really tested yet. Added: trunk/tools/RosBE/RosBE-Windows/RosBE-ARM.nsi (with props) Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/options.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/de-DE.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/en-US.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/es-ES.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/fr-FR.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/pl-PL.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/ru-RU.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/uk-UA.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/zh-TW.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.exe.Manifest trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.h trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/resources.h Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -25,6 +25,9 @@ } if ("$ENV:ROS_ARCH" -eq "amd64") { (Get-Host).UI.RawUI.ForegroundColor = 0xB + (Get-Host).UI.RawUI.BackgroundColor = 0x0 +} elseif ("$ENV:ROS_ARCH" -eq "arm") { + (Get-Host).UI.RawUI.ForegroundColor = 0xC (Get-Host).UI.RawUI.BackgroundColor = 0x0 } else { (Get-Host).UI.RawUI.ForegroundColor = 0xA Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -8,14 +8,12 @@ $host.ui.RawUI.WindowTitle = "Options" +$options="$_ROSBE_BASEDIR\Tools\options.exe" - -if ("$ENV:ROS_ARCH" -eq "amd64") { - $options="$_ROSBE_BASEDIR\Tools\options.exe" - $param = "amd64" - $cfgfile="$ENV:APPDATA\RosBE\rosbe-options-amd64.ps1" +if ("$ENV:ROS_ARCH" -ne "i386") { + $param = "$ENV:ROS_ARCH" + $cfgfile ="$ENV:APPDATA\RosBE\rosbe-options-$ENV:ROS_ARCH.ps1" } else { - $options="$_ROSBE_BASEDIR\Tools\options.exe" $param = $null $cfgfile="$ENV:APPDATA\RosBE\rosbe-options.ps1" } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -6,9 +6,11 @@ # COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> # -# Check if we're switching to the AMD64 architecture +# Check if we're switching to the AMD64 or AMR architecture. if ("$ENV:ROS_ARCH" -eq "amd64") { $ENV:ROS_PREFIX = "x86_64-w64-mingw32" +} elseif ("$ENV:ROS_ARCH" -eq "arm") { + $ENV:ROS_PREFIX = "i386-mingw32ce" } else { $ENV:ROS_PREFIX = $null } Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -55,6 +55,8 @@ if "%ROS_ARCH%" == "amd64" ( color 0B +) else if "%ROS_ARCH%" == "arm" ( + color 0C ) :: Load the user's options if any if "%ROS_ARCH%" == "i386" ( Modified: trunk/tools/RosBE/RosBE-Windows/Root/options.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/opt… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -14,12 +14,12 @@ title Options -if "%ROS_ARCH%" == "amd64" ( - set options=%_ROSBE_BASEDIR%\Tools\options.exe - set param=amd64 - set cfgfile=%APPDATA%\RosBE\rosbe-options-amd64.cmd +set options=%_ROSBE_BASEDIR%\Tools\options.exe + +if not "%ROS_ARCH%" == "i386" ( + set param=%ROS_ARCH% + set cfgfile=%APPDATA%\RosBE\rosbe-options-%ROS_ARCH%.cmd ) else ( - set options=%_ROSBE_BASEDIR%\Tools\options.exe set param= set cfgfile=%APPDATA%\RosBE\rosbe-options.cmd ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -14,9 +14,11 @@ @echo on ) -:: Check if we're switching to the AMD64 architecture +:: Check if we're switching to the AMD64 or ARM architecture. if "%ROS_ARCH%" == "amd64" ( set ROS_PREFIX=x86_64-w64-mingw32 +) else if "%ROS_ARCH%" == "arm" ( + set ROS_PREFIX=i386-mingw32ce ) else ( set ROS_PREFIX= ) Added: trunk/tools/RosBE/RosBE-Windows/RosBE-ARM.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE-AR… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE-ARM.nsi (added) +++ trunk/tools/RosBE/RosBE-Windows/RosBE-ARM.nsi [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -1,0 +1,274 @@ +!define PRODUCT_NAME "ReactOS Build Environment for Windows - ARM Target Compiler" +!define PRODUCT_VERSION "1.0" +!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosBE.cmd" +!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" +!define PRODUCT_UNINST_ROOT_KEY "HKCU" +!define PRODUCT_STARTMENU_REGVAL "NSIS:StartMenuDir" + +;; +;; Basic installer options +;; +Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" +OutFile "RosBE-ARM-${PRODUCT_VERSION}.exe" +InstallDirRegKey HKCU "${PRODUCT_DIR_REGKEY}" "" +ShowInstDetails show +ShowUnInstDetails show + +;; +;; Add version/product information metadata to the installation file. +;; +VIAddVersionKey /LANG=1033 "FileVersion" "1.0.0.0" +VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}" +VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" +VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)" +VIAddVersionKey /LANG=1033 "CompanyName" "ReactOS Team" +VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2009 ReactOS Team" +VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2009 ReactOS Team" +VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" +VIProductVersion "1.0.0.0" + +CRCCheck force +SetDatablockOptimize on +XPStyle on +SetCompressor /FINAL /SOLID lzma + +!include "MUI2.nsh" +!include "InstallOptions.nsh" +!include "RosSourceDir.nsh" +!include "LogicLib.nsh" +!include "x64.nsh" + +;; +;; Read our custom page ini, remove previous version and make sure only +;; one instance of the installer is running. +;; +Function .onInit + System::Call 'kernel32::CreateMutexA(i 0, i 0, t "RosBE-v${PRODUCT_VERSION}-Installer") i .r1 ?e' + Pop $R0 + StrCmp $R0 0 +3 + MessageBox MB_OK|MB_ICONEXCLAMATION "The ${PRODUCT_NAME} v${PRODUCT_VERSION} installer is already running." + Abort + ${If} ${RunningX64} + StrCpy $INSTDIR "$PROGRAMFILES64\RosBE" + ${Else} + StrCpy $INSTDIR "$PROGRAMFILES\RosBE" + ${Endif} + Call UninstallPrevious + !insertmacro INSTALLOPTIONS_EXTRACT "RosSourceDir.ini" +FunctionEnd + +;; +;; MUI Settings +;; +!define MUI_ABORTWARNING +!define MUI_ICON "Icons\rosbe.ico" +!define MUI_UNICON "Icons\uninstall.ico" +!define MUI_COMPONENTSPAGE_NODESC + +!define MUI_WELCOMEPAGE_TITLE_3LINES +!insertmacro MUI_PAGE_WELCOME +;!insertmacro MUI_PAGE_LICENSE "Root\License.txt" +!insertmacro MUI_PAGE_DIRECTORY + +;; +;; ReactOS Source Directory Pages +;; +var REACTOS_SOURCE_DIRECTORY +!insertmacro CUSTOM_PAGE_ROSDIRECTORY + +;; +;; Start menu page +;; +var ICONS_GROUP +!define MUI_STARTMENUPAGE_NODISABLE +!define MUI_STARTMENUPAGE_DEFAULTFOLDER "ReactOS Build Environment" +!define MUI_STARTMENUPAGE_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}" +!define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}" +!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${PRODUCT_STARTMENU_REGVAL}" +!insertmacro MUI_PAGE_STARTMENU Application $ICONS_GROUP + +!insertmacro MUI_PAGE_COMPONENTS + +!insertmacro MUI_PAGE_INSTFILES + +!define MUI_FINISHPAGE_TITLE_3LINES +!insertmacro MUI_PAGE_FINISH + +;; +;; Uninstaller pages +;; +!insertmacro MUI_UNPAGE_INSTFILES + +;; +;; Language and reserve files +;; +ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll" +!insertmacro MUI_LANGUAGE "English" + +Section -MinGWGCCNASM SEC01 + SetOutPath "$INSTDIR\arm" + SetOverwrite try + File /r Components\arm\*.* + SetOutPath "$INSTDIR" + SetOverwrite try + File /r Root\options.cmd + IfFileExists "$INSTDIR\RosBE.ps1" 0 +3 + File /r Components\Powershell\options.ps1 + SetOutPath "$INSTDIR\Tools" + SetOverwrite try + File /r Components\Tools\options.exe +SectionEnd + +Section -StartMenuShortcuts SEC02 + SetShellVarContext current + + ;; + ;; Add our start menu shortcuts. + ;; + !insertmacro MUI_STARTMENU_WRITE_BEGIN Application + CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" + SetOutPath $REACTOS_SOURCE_DIRECTORY + IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment - ARM.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" arm' "$INSTDIR\rosbe.ico" + IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment - ARM - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' arm" "$INSTDIR\rosbe.ico" + IfFileExists "$INSTDIR\Tools\options.exe" 0 +2 + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Options - ARM.lnk" "$INSTDIR\Tools\options.exe" arm + SetOutPath $INSTDIR + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall RosBE - ARM Target.lnk" \ + "$INSTDIR\Uninstall-ARM-${PRODUCT_VERSION}.exe" + !insertmacro MUI_STARTMENU_WRITE_END +SectionEnd + +Section /o "Desktop Shortcuts" SEC03 + SetShellVarContext current + + ;; + ;; Add our desktop shortcuts. + ;; + SetOutPath $REACTOS_SOURCE_DIRECTORY + IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 + CreateShortCut "$DESKTOP\ReactOS Build Environment - ARM.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" arm' "$INSTDIR\rosbe.ico" + IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 + CreateShortCut "$DESKTOP\ReactOS Build Environment - ARM - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' arm" "$INSTDIR\rosbe.ico" +SectionEnd + +Section /o "Quick Launch Shortcuts" SEC04 + SetShellVarContext current + + ;; + ;; Add our quick launch shortcuts. + ;; + SetOutPath $REACTOS_SOURCE_DIRECTORY + IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 + CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment - ARM.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" arm' "$INSTDIR\rosbe.ico" + IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 + CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment - ARM - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' arm" "$INSTDIR\rosbe.ico" +SectionEnd + +Section -Post SEC06 + WriteUninstaller "$INSTDIR\Uninstall-ARM-${PRODUCT_VERSION}.exe" + WriteRegStr HKCU "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\RosBE.cmd" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall-ARM-${PRODUCT_VERSION}.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" +SectionEnd + +Function un.onUninstSuccess + HideWindow + MessageBox MB_ICONINFORMATION|MB_OK \ + "ReactOS Build Environment - ARM Target was successfully removed from your computer." +FunctionEnd + +Function un.onInit + MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \ + "Are you sure you want to completely remove ReactOS Build Environment - ARM Target and all of its components?" \ + IDYES +2 + Abort +FunctionEnd + +Section Uninstall + !insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP + SetShellVarContext current + + ;; + ;; Clean up installed files. + ;; + RMDir /r /REBOOTOK "$INSTDIR\arm" + Delete /REBOOTOK "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" + ;; Whoever dares to change this back into: RMDir /r /REBOOTOK "$INSTDIR" will be KILLED!!! + RMDir /REBOOTOK "$INSTDIR" + Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment - ARM.lnk" + Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment - ARM.lnk" + Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment - ARM - Powershell.lnk" + Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment - ARM - Powershell.lnk" + + ;; + ;; Clean up the registry. + ;; + DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" + DeleteRegKey HKCU "${PRODUCT_DIR_REGKEY}" + SetAutoClose true +SectionEnd + +Function UninstallPrevious + ReadRegStr $R0 HKCU \ + "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \ + "UninstallString" + ReadRegStr $R1 HKCU \ + "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \ + "DisplayVersion" + ${If} $R1 == "${PRODUCT_VERSION}" + messageBox MB_OK|MB_ICONEXCLAMATION \ + "You already have the ${PRODUCT_NAME} v${PRODUCT_VERSION} installed. You should uninstall the ${PRODUCT_NAME} v${PRODUCT_VERSION} if you want to reinstall." + ${EndIf} + ${If} $R0 == "" + ReadRegStr $R0 HKLM \ + "Software\Microsoft\Windows\CurrentVersion\Uninstall\ReactOS Build Environment" \ + "UninstallString" + ReadRegStr $R1 HKLM \ + "Software\Microsoft\Windows\CurrentVersion\Uninstall\ReactOS Build Environment" \ + "DisplayVersion" + ${If} $R0 == "" + Return + ${EndIf} + ${EndIf} + MessageBox MB_YESNO|MB_ICONQUESTION \ + "A previous version of the ${PRODUCT_NAME} was found. You should uninstall it before installing this version.$\n$\nDo you want to do that now?" \ + IDNO UninstallPrevious_no \ + IDYES UninstallPrevious_yes + Abort + UninstallPrevious_yes: + Var /global PREVIOUSINSTDIR + Push $R0 + Call GetParent + Pop $PREVIOUSINSTDIR + Pop $R0 + ExecWait '$R0 _?=$PREVIOUSINSTDIR' + UninstallPrevious_no: +FunctionEnd + +Function GetParent + Exch $R0 + Push $R1 + Push $R2 + Push $R3 + + StrCpy $R1 0 + StrLen $R2 $R0 + + loop: + IntOp $R1 $R1 + 1 + IntCmp $R1 $R2 get 0 get + StrCpy $R3 $R0 1 -$R1 + StrCmp $R3 "\" get + Goto loop + + get: + StrCpy $R0 $R0 -$R1 + + Pop $R3 + Pop $R2 + Pop $R1 + Exch $R0 +FunctionEnd Propchange: trunk/tools/RosBE/RosBE-Windows/RosBE-ARM.nsi ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/de-DE.rc [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -35,6 +35,38 @@ ID_DIALOG64 DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "RosBE AMD64 Einstellungen" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Hintergrundfarbe", -1, 10, 10, 75, 12 + LTEXT "Schriftfarbe", 0x0, 10, 27, 75, 12 + COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "\n\nBeispieltext", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 50, 125, 36 + CONTROL "Kompilierdauer anzeigen", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12 + CONTROL "CCache benutzen", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 + CONTROL "Daten strippen", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 + CONTROL "Nostrip Dateien zum Debuggen erzeugen", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 145, 12 + CONTROL "Versions Header anzeigen", ID_SHOWVERSION, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 155, 90, 100, 12 + LTEXT "Pfad zu MinGW/GCC", -1, 10, 107, 100, 15 + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + CONTROL "Logs speichern", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Verzichnis für OBJ ändern", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Verzichnis für OUT ändern", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 + EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Speichern", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Abbrechen", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP + CONTROL "Willkommen!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 +END + +ID_DIALOGARM DIALOGEX DISCARDABLE 0, 0, 255, 290 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "RosBE ARM Einstellungen" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Hintergrundfarbe", -1, 10, 10, 75, 12 Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/en-US.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/en-US.rc [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -35,6 +35,38 @@ ID_DIALOG64 DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS AMD64 Build Environment Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Background Color", -1, 10, 10, 75, 12 + LTEXT "Font Color", 0x0, 10, 27, 75, 12 + COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "\n\nSample text", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 50, 125, 36 + CONTROL "Show Build Time", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12 + CONTROL "Use CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 + CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 + CONTROL "Create nostrip files for debugging", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 145, 12 + CONTROL "Show Versions Header", ID_SHOWVERSION, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 155, 90, 100, 12 + LTEXT "Path to MinGW/GCC", -1, 10, 107, 100, 15 + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + CONTROL "Save Logs", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Change Folder for OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Change Folder for OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 + EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Save", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Cancel", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP + CONTROL "Welcome!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 +END + +ID_DIALOGARM DIALOGEX DISCARDABLE 0, 0, 255, 290 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS ARM Build Environment Settings" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Background Color", -1, 10, 10, 75, 12 Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/es-ES.rc [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -35,6 +35,38 @@ ID_DIALOG64 DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Configuración de ReactOS AMD64 Build Environment" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Color de fondo", -1, 10, 10, 75, 12 + LTEXT "Color de fuente", 0x0, 10, 27, 75, 12 + COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "\n\nTexto ejemplo", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 50, 125, 36 + CONTROL "Mostrar tiempo de creación", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12 + CONTROL "Usar CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 + CONTROL "Limpiar salida", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 + CONTROL "Cree archivos no limpios para depuración", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 145, 12 + CONTROL "Show Versions Header", ID_SHOWVERSION, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 155, 90, 100, 12 + LTEXT "Ruta de MinGW/GCC", -1, 10, 107, 100, 15 + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + CONTROL "Guardar Logs (Registros)", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Cambiar carpeta parar OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Cambiar carpeta para OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 + EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Guardar", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Cancelar", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP + CONTROL "¡Bienvenido!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 +END + +ID_DIALOGARM DIALOGEX DISCARDABLE 0, 0, 255, 290 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Configuración de ReactOS ARM Build Environment" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Color de fondo", -1, 10, 10, 75, 12 Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/fr-FR.rc [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -35,6 +35,38 @@ ID_DIALOG64 DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Paramètres de AMD64 l'Environnement de Compilation de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Couleur d'arrière plan", -1, 10, 10, 75, 12 + LTEXT "Couleur de la police", 0x0, 10, 27, 75, 12 + COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "\n\nTexte d'exemple", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 125, 50, 120, 36 + CONTROL "Montrer le temps de compilation", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 110, 12 + CONTROL "Utiliser CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 + CONTROL "Optimiser les fichiers", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 + CONTROL "Create nostrip files for debugging", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 145, 12 + CONTROL "Show Versions Header", ID_SHOWVERSION, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 155, 90, 100, 12 + LTEXT "Chemin vers MinGW/GCC", -1, 10, 107, 110, 15 + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + CONTROL "Sauvegarder le journal", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Changer de répertoire pour OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 150, 12 + EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Changer de répertoire pour OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 150, 12 + EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Sauvegarder", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Annuler", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP + CONTROL "Bienvenue !", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 +END + +ID_DIALOGARM DIALOGEX DISCARDABLE 0, 0, 255, 290 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Paramètres de ARM l'Environnement de Compilation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Couleur d'arrière plan", -1, 10, 10, 75, 12 Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/pl-PL.rc [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -35,6 +35,38 @@ ID_DIALOG64 DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ustawienia ReactOS AMD64 Build Environment" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Kolor t³a", -1, 10, 10, 75, 12 + LTEXT "Kolor czcionki", 0x0, 10, 27, 75, 12 + COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "\n\nPrzyk³adowy tekst", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 50, 125, 36 + CONTROL "Poka¿ czas budowania", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12 + CONTROL "U¿yj CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 + CONTROL "Usuñ dane debugowania", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 + CONTROL "Utwórz pliki nostrip dla debugowania", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 145, 12 + CONTROL "Show Versions Header", ID_SHOWVERSION, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 155, 90, 100, 12 + LTEXT "cie¿ka do MinGW/GCC", -1, 10, 107, 100, 15 + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + CONTROL "Zapisuj logi", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Zmieñ folder plików OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Zmieñ folder plików OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 + EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Zapisz", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Anuluj", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP + CONTROL "Witamy!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 +END + +ID_DIALOGARM DIALOGEX DISCARDABLE 0, 0, 255, 290 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ustawienia ReactOS ARM Build Environment" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Kolor t³a", -1, 10, 10, 75, 12 Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/ru-RU.rc [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -37,6 +37,38 @@ ID_DIALOG64 DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Óñòàíîâêè ïåðåìåííûõ êîìïèëÿòîðà ReactOS - AMD64" +FONT 8,"MS Sans Serif",0,0 +BEGIN + LTEXT "Öâåò ôîíà", -1, 10, 10, 75, 12 + LTEXT "Öâåò øðèôòà", 0x0, 10, 27, 75, 12 + COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "\n\nÏðèìåð òåêñòà", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 50, 125, 36 + CONTROL "Îòîáðàæàòü âðåìÿ êîìïèëÿöèè", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12 + CONTROL "Èñïîëüçîâàòü êåøèðîâàíèå", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 + CONTROL "Âûðåçàòü ïóñòîé êîä ïðè êîìïèë.", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 + CONTROL "Îñòàâëÿòü â ôàéëàõ èíôîðìàöèþ äëÿ âîçìîæíîñòè ðàáîòû äåáàãåðà", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 145, 12 + CONTROL "Show Versions Header", ID_SHOWVERSION, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 155, 90, 100, 12 + LTEXT "Ïóòü ê êîìïèëÿòîðó GCC", -1, 10, 107, 100, 15 + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + CONTROL "Âåñòè ëîãè", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Ïóòü ê êàòàëîãó îáúåêòîâ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Ïóòü ê êàòàëîãó âûâîäà", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 + EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Ñîõðàíèòü", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Îòìåíà", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP + CONTROL "Ââåäåíèå", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 +END + +ID_DIALOGARM DIALOGEX DISCARDABLE 0, 0, 255, 290 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêè ïåðåìåííûõ êîìïèëÿòîðà ReactOS - ARM" FONT 8,"MS Sans Serif",0,0 BEGIN LTEXT "Öâåò ôîíà", -1, 10, 10, 75, 12 Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/uk-UA.rc [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -43,6 +43,38 @@ ID_DIALOG64 DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Óñòàíîâêè çì³ííèõ êîìï³ëÿòîðà ReactOS - AMD64" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Êîë³ð ôîíó", -1, 10, 10, 75, 12 + LTEXT "Êîë³ð øðèôòó", 0x0, 10, 27, 75, 12 + COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "\n\nÇðàçîê òåêñòó", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 50, 125, 36 + CONTROL "Â³äîáðàæàòè ÷àñ êîìï³ëÿö³¿", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12 + CONTROL "Âèêîðèñòîâóâàòè CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 + CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 + CONTROL "Create nostrip files for debugging", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 145, 12 + CONTROL "Show Versions Header", ID_SHOWVERSION, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 155, 90, 100, 12 + LTEXT "Øëÿõ äî MinGW/GCC", -1, 10, 107, 100, 15 + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + CONTROL "Âåñòè æóðíàë", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Çì³íèòè ïàïêó äëÿ OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Çì³íèòè ïàïêó äëÿ OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 + EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Çáåðåãòè", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Ñêàñóâàòè", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP + CONTROL "Ëàñêàâî ïðîñèìî!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 +END + +ID_DIALOGARM DIALOGEX DISCARDABLE 0, 0, 255, 290 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêè çì³ííèõ êîìï³ëÿòîðà ReactOS - ARM" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Êîë³ð ôîíó", -1, 10, 10, 75, 12 Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/zh-TW.rc [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -43,6 +43,38 @@ ID_DIALOG64 DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS «Ø¸mÀô¹Ò³]¸m - AMD64" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "I´ºÃC¦â", -1, 10, 10, 75, 12 + LTEXT "¦rÅéÃC¦â", 0x0, 10, 27, 75, 12 + COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "\n\n¥Ü¨Ò¤å¥»", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 50, 125, 36 + CONTROL "Åã¥Ü«Ø¸m®É¶¡", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12 + CONTROL "¨Ï¥Î CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 + CONTROL "µô´î¿é¥X", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 + CONTROL "«Ø¥ß½Õ¸Õ¥Îªº¥]¸ËÀÉ", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 145, 12 + CONTROL "Åã¥Üª©¥»¼ÐÀY", ID_SHOWVERSION, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 155, 90, 100, 12 + LTEXT "MinGW/GCC ªº¸ô®|", -1, 10, 107, 100, 15 + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + CONTROL "Àx¦s¤é»x", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "§ó§ï OBJ ªº¥Ø¿ý", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "§ó§ï OUT ªº¥Ø¿ý", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 + EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Àx¦s", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "¨ú®ø", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP + CONTROL "Åwªï¡I", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 +END + +ID_DIALOGARM DIALOGEX DISCARDABLE 0, 0, 255, 290 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS «Ø¸mÀô¹Ò³]¸m - ARM" FONT 8, "MS Shell Dlg" BEGIN LTEXT "I´ºÃC¦â", -1, 10, 10, 75, 12 Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -5,6 +5,7 @@ * PURPOSE: Configuring RosBE * COPYRIGHT: Copyright 2007 Maarten Bosma * Copyright 2007 Pierre Schweitzer + * Copyright 2009 Daniel Reimer * */ @@ -45,19 +46,40 @@ static WCHAR filename[MAX_PATH]; if (SHGetSpecialFolderPathW(NULL, filename, CSIDL_APPDATA, FALSE)) { - if (amd64) { + if (amd64) + { if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options-amd64.cmd")) < MAX_PATH) + { wcscat(filename, L"\\RosBE\\rosbe-options-amd64.cmd"); - } else { + } + } + else if (arm) + { + if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options-arm.cmd")) < MAX_PATH) + { + wcscat(filename, L"\\RosBE\\rosbe-options-arm.cmd"); + } + } + else + { if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options.cmd")) < MAX_PATH) + { wcscat(filename, L"\\RosBE\\rosbe-options.cmd"); + } } } else { - if (amd64) { + if (amd64) + { wcscpy(filename, L"rosbe-options-amd64.cmd"); - } else { + } + else if (arm) + { + wcscpy(filename, L"rosbe-options-arm.cmd"); + } + else + { wcscpy(filename, L"rosbe-options.cmd"); } } @@ -72,19 +94,40 @@ static WCHAR filename[MAX_PATH]; if (SHGetSpecialFolderPathW(NULL, filename, CSIDL_APPDATA, FALSE)) { - if (amd64) { + if (amd64) + { if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options-amd64.ps1")) < MAX_PATH) + { wcscat(filename, L"\\RosBE\\rosbe-options-amd64.ps1"); - } else { + } + } + else if (arm) + { + if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options-arm.ps1")) < MAX_PATH) + { + wcscat(filename, L"\\RosBE\\rosbe-options-arm.ps1"); + } + } + else + { if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options.ps1")) < MAX_PATH) + { wcscat(filename, L"\\RosBE\\rosbe-options.ps1"); + } } } else { - if (amd64) { + if (amd64) + { wcscpy(filename, L"rosbe-options-amd64.ps1"); - } else { + } + else if (arm) + { + wcscpy(filename, L"rosbe-options-arm.ps1"); + } + else + { wcscpy(filename, L"rosbe-options.ps1"); } } @@ -117,24 +160,50 @@ GetDlgItemTextW(infoPtr->hwndDlg, ID_OUTDIR, outdir, MAX_PATH); if (writelog && (logdir[0] != 0)) + { if (!CreateDir(infoPtr->hwndDlg, logdir)) + { return FALSE; + } + } if (objstate && (objdir[0] != 0)) + { if (!CreateDir(infoPtr->hwndDlg, objdir)) + { return FALSE; + } + } if (outstate && (outdir[0] != 0)) + { if (!CreateDir(infoPtr->hwndDlg, outdir)) + { return FALSE; + } + } wcscpy(checkmgw, mingwpath); - if (amd64) { + if (amd64) + { if ((wcslen(checkmgw) + wcslen(L"\\bin\\x86_64-w64-mingw32-gcc.exe")) < MAX_PATH) + { wcscat(checkmgw, L"\\bin\\x86_64-w64-mingw32-gcc.exe"); - } else { + } + } + else if (arm) + { + if ((wcslen(checkmgw) + wcslen(L"\\bin\\i386-mingw32ce-gcc.exe")) < MAX_PATH) + { + wcscat(checkmgw, L"\\bin\\i386-mingw32ce-gcc.exe"); + } + } + else + { if ((wcslen(checkmgw) + wcslen(L"\\bin\\gcc.exe")) < MAX_PATH) + { wcscat(checkmgw, L"\\bin\\gcc.exe"); + } } hFile = CreateFile(checkmgw, 0, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) @@ -157,32 +226,52 @@ fwprintf(pFilecmd, L"color %X%X\n", background, foreground); fwprintf(pFilecmd, L"set _ROSBE_SHOWTIME=%d\n", showtime); fwprintf(pFilecmd, L"set _ROSBE_USECCACHE=%d\n", useccache); - if (strip == 1) { + if (strip == 1) + { fwprintf(pFilecmd, L"set ROS_LEAN_AND_MEAN=yes\n"); - } else { + } + else + { fwprintf(pFilecmd, L"set ROS_LEAN_AND_MEAN=no\n"); } - if (nostrip == 1) { + if (nostrip == 1) + { fwprintf(pFilecmd, L"set ROS_BUILDNOSTRIP=yes\n"); - } else { + } + else + { fwprintf(pFilecmd, L"set ROS_BUILDNOSTRIP=no\n"); } fwprintf(pFilecmd, L"set _ROSBE_WRITELOG=%d\n", writelog); fwprintf(pFilecmd, L"set _ROSBE_SHOWVERSION=%d\n", showversion); - if (logdir[0] != 0) fwprintf(pFilecmd, L"set _ROSBE_LOGDIR=%s\n", logdir); - if (amd64) { - if (mingwpath[0] != 0) fwprintf(pFilecmd, L"set _ROSBE_TARGET_MINGWPATH=%s\n", mingwpath); - } else { - if (mingwpath[0] != 0) { + if (logdir[0] != 0) + { + fwprintf(pFilecmd, L"set _ROSBE_LOGDIR=%s\n", logdir); + } + if (amd64 || arm) + { + if (mingwpath[0] != 0) + { + fwprintf(pFilecmd, L"set _ROSBE_TARGET_MINGWPATH=%s\n", mingwpath); + } + } + else + { + if (mingwpath[0] != 0) + { fwprintf(pFilecmd, L"set _ROSBE_HOST_MINGWPATH=%s\n", mingwpath); fwprintf(pFilecmd, L"set _ROSBE_TARGET_MINGWPATH=%s\n", mingwpath); } } - if ((objdir[0] != 0) && objstate) { + if ((objdir[0] != 0) && objstate) + { fwprintf(pFilecmd, L"set ROS_INTERMEDIATE=%s\n", objdir); fwprintf(pFilecmd, L"set ROS_TEMPORARY=%s\n", objdir); } - if ((outdir[0] != 0) && outstate) fwprintf(pFilecmd, L"set ROS_OUTPUT=%s\n", outdir); + if ((outdir[0] != 0) && outstate) + { + fwprintf(pFilecmd, L"set ROS_OUTPUT=%s\n", outdir); + } } if (pFileps1) @@ -196,32 +285,52 @@ fwprintf(pFileps1, L"clear-host\n"); fwprintf(pFileps1, L"$global:_ROSBE_SHOWTIME = %d\n", showtime); fwprintf(pFileps1, L"$global:_ROSBE_USECCACHE = %d\n", useccache); - if (strip == 1) { + if (strip == 1) + { fwprintf(pFileps1, L"$ENV:ROS_LEAN_AND_MEAN = \"yes\"\n"); - } else { + } + else + { fwprintf(pFileps1, L"$ENV:ROS_LEAN_AND_MEAN = \"no\"\n"); } - if (nostrip == 1) { + if (nostrip == 1) + { fwprintf(pFileps1, L"$ENV:ROS_BUILDNOSTRIP = \"yes\"\n"); - } else { + } + else + { fwprintf(pFileps1, L"$ENV:ROS_BUILDNOSTRIP = \"no\"\n"); } fwprintf(pFileps1, L"$global:_ROSBE_WRITELOG = %d\n", writelog); fwprintf(pFileps1, L"$global:_ROSBE_SHOWVERSION = %d\n", showversion); - if (logdir[0] != 0) fwprintf(pFileps1, L"$global:_ROSBE_LOGDIR = \"%s\"\n", logdir); - if (amd64) { - if (mingwpath[0] != 0) fwprintf(pFileps1, L"$global:_ROSBE_TARGET_MINGWPATH = \"%s\"\n", mingwpath); - } else { - if (mingwpath[0] != 0) { + if (logdir[0] != 0) + { + fwprintf(pFileps1, L"$global:_ROSBE_LOGDIR = \"%s\"\n", logdir); + } + if (amd64 || arm) + { + if (mingwpath[0] != 0) + { + fwprintf(pFileps1, L"$global:_ROSBE_TARGET_MINGWPATH = \"%s\"\n", mingwpath); + } + } + else + { + if (mingwpath[0] != 0) + { fwprintf(pFileps1, L"$global:_ROSBE_HOST_MINGWPATH = \"%s\"\n", mingwpath); fwprintf(pFileps1, L"$global:_ROSBE_TARGET_MINGWPATH = \"%s\"\n", mingwpath); } } - if ((objdir[0] != 0) && objstate) { + if ((objdir[0] != 0) && objstate) + { fwprintf(pFileps1, L"$ENV:ROS_INTERMEDIATE = \"%s\"\n", objdir); fwprintf(pFileps1, L"$ENV:ROS_TEMPORARY = \"%s\"\n", objdir); } - if ((outdir[0] != 0) && outstate) fwprintf(pFileps1, L"$ENV:ROS_OUTPUT = \"%s\"\n", outdir); + if ((outdir[0] != 0) && outstate) + { + fwprintf(pFileps1, L"$ENV:ROS_OUTPUT = \"%s\"\n", outdir); + } } if (pFilecmd && pFileps1) @@ -277,27 +386,49 @@ ptr = wcstok(ptr, L"="); ptr2 = wcstok(NULL, L"="); if (wcscmp(ptr, L"_ROSBE_SHOWTIME") == 0) + { LoadedSettings->showtime = wcstol(ptr2, NULL, 2); + } else if (wcscmp(ptr, L"_ROSBE_USECCACHE") == 0) + { LoadedSettings->useccache = wcstol(ptr2, NULL, 2); + } else if (wcscmp(ptr, L"ROS_LEAN_AND_MEAN") == 0) + { wcsncpy(LoadedSettings->lstrip, ptr2, wcslen(ptr2)-1); + } else if (wcscmp(ptr, L"ROS_BUILDNOSTRIP") == 0) + { wcsncpy(LoadedSettings->lnostrip, ptr2, wcslen(ptr2)-1); + } else if (wcscmp(ptr, L"_ROSBE_WRITELOG") == 0) + { LoadedSettings->writelog = wcstol(ptr2, NULL, 2); + } else if (wcscmp(ptr, L"_ROSBE_SHOWVERSION") == 0) + { LoadedSettings->showversion = wcstol(ptr2, NULL, 2); + } else if (wcscmp(ptr, L"_ROSBE_LOGDIR") == 0) + { wcsncpy(LoadedSettings->logdir, ptr2, wcslen(ptr2)-1); - else if ((amd64) && (wcscmp(ptr, L"_ROSBE_TARGET_MINGWPATH") == 0)) + } + else if ((amd64 || arm) && (wcscmp(ptr, L"_ROSBE_TARGET_MINGWPATH") == 0)) + { wcsncpy(LoadedSettings->mingwpath, ptr2, wcslen(ptr2)-1); - else if ((!amd64) && (wcscmp(ptr, L"_ROSBE_HOST_MINGWPATH") == 0)) + } + else if ((!(amd64 || arm)) && (wcscmp(ptr, L"_ROSBE_HOST_MINGWPATH") == 0)) + { wcsncpy(LoadedSettings->mingwpath, ptr2, wcslen(ptr2)-1); + } else if (wcscmp(ptr, L"ROS_INTERMEDIATE") == 0) + { wcsncpy(LoadedSettings->objdir, ptr2, wcslen(ptr2)-1); + } else if (wcscmp(ptr, L"ROS_OUTPUT") == 0) + { wcsncpy(LoadedSettings->outdir, ptr2, wcslen(ptr2)-1); + } } } fclose(pFile); @@ -306,9 +437,16 @@ } else { - if (amd64) { + if (amd64) + { LoadedSettings->foreground = 0xb; - } else { + } + else if (arm) + { + LoadedSettings->foreground = 0xc; + } + else + { LoadedSettings->foreground = 0xa; } LoadedSettings->background = 0; @@ -316,26 +454,39 @@ LoadedSettings->writelog = 1; LoadedSettings->showversion = 0; GetCurrentDirectory(MAX_PATH, LoadedSettings->mingwpath); - if (amd64) { + if (amd64 || arm) + { if ((wcslen(LoadedSettings->mingwpath) + wcslen(MINGWVERSION64)) < MAX_PATH) + { wcscat(LoadedSettings->mingwpath, MINGWVERSION64); - } else { + } + } + else + { if ((wcslen(LoadedSettings->mingwpath) + wcslen(MINGWVERSION)) < MAX_PATH) + { wcscat(LoadedSettings->mingwpath, MINGWVERSION); + } } LoadString(hInstance, HLP_DEFAULTMSG, SBTitle, 256); SetDlgItemText(infoPtr->hwndDlg, ID_STATUSBAR, SBTitle); } - if (!wcscmp(LoadedSettings->lstrip, L"yes")) { + if (!wcscmp(LoadedSettings->lstrip, L"yes")) + { LoadedSettings->strip = 1; - } else { + } + else + { LoadedSettings->strip = 0; } - if (!wcscmp(LoadedSettings->lnostrip, L"yes")) { + if (!wcscmp(LoadedSettings->lnostrip, L"yes")) + { LoadedSettings->nostrip = 1; - } else { + } + else + { LoadedSettings->nostrip = 0; } SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_SETCURSEL, LoadedSettings->foreground, 0); @@ -379,14 +530,20 @@ BOOL StateObj = TRUE, StateOut = TRUE, StateLog = TRUE, State = TRUE; PSETTINGS DefaultSettings = &infoPtr->Settings; - if (!wcscmp(DefaultSettings->lstrip, L"yes")) { + if (!wcscmp(DefaultSettings->lstrip, L"yes")) + { DefaultSettings->strip = 1; - } else { + } + else + { DefaultSettings->strip = 0; } - if (!wcscmp(DefaultSettings->lnostrip, L"yes")) { + if (!wcscmp(DefaultSettings->lnostrip, L"yes")) + { DefaultSettings->nostrip = 1; - } else { + } + else + { DefaultSettings->nostrip = 0; } @@ -406,14 +563,26 @@ GetDlgItemTextW(infoPtr->hwndDlg, ID_OUTDIR, outdir, MAX_PATH); if (objstate) + { if ((wcscmp(objdir, DefaultSettings->objdir) != 0) && (wcslen(objdir) > 0)) + { StateObj = FALSE; + } + } if (outstate) + { if ((wcscmp(outdir, DefaultSettings->outdir) != 0) && (wcslen(outdir) > 0)) + { StateOut = FALSE; + } + } if (writelog) + { if ((wcscmp(logdir, DefaultSettings->logdir) != 0) && (wcslen(logdir) > 0)) + { StateLog = FALSE; + } + } State ^= ((foreground == DefaultSettings->foreground) && (background == DefaultSettings->background) && (showtime == DefaultSettings->showtime) && (writelog == DefaultSettings->writelog) && @@ -451,7 +620,9 @@ { PathLen = wcslen((LPWSTR)wParam); if (wcscmp((LPWSTR)wParam+PathLen, L"\\")) + { wcsset((LPWSTR)wParam+(PathLen-1), '\0'); + } if (CreateDirectory((LPWSTR)wParam, NULL) == 0) { LoadString(hInstance, MSG_DIREFAILED, BoxMsg, 256); @@ -499,7 +670,9 @@ { infoPtr = (POPTIONS_DLG)GetWindowLongPtr(Dlg, DWLP_USER); if (infoPtr == NULL) + { return FALSE; + } } switch (Msg) @@ -555,7 +728,9 @@ NULL); for (i = 0; i < sizeof(ToolTipAssociations) / sizeof(ToolTipAssociations[0]); i++) + { AssociateToolWithControl(infoPtr, ToolTipAssociations[i].ControlId, ToolTipAssociations[i].StringId); + } infoPtr->hIcon = LoadImage( hInstance, MAKEINTRESOURCE(ID_OPTICON), @@ -564,7 +739,9 @@ GetSystemMetrics(SM_CYSMICON), 0); if(infoPtr->hIcon) + { SendMessage(Dlg, WM_SETICON, ICON_SMALL, (LPARAM)infoPtr->hIcon); + } GetObject(GetStockObject(ANSI_FIXED_FONT), sizeof(LOGFONT), &lf); lf.lfWeight = FW_BOLD; @@ -595,7 +772,9 @@ case ID_OK: { if (!WriteSettings(infoPtr)) + { break; + } } case ID_CANCEL: { @@ -605,7 +784,9 @@ LoadString(hInstance, MSG_WARNINGBOX, BoxTitle, 128); LoadString(hInstance, MSG_EXITCHANGE, BoxMsg, 256); if (MessageBox(Dlg, BoxMsg, BoxTitle, MB_ICONWARNING | MB_YESNO) == IDNO) + { break; + } } PostMessage(Dlg, WM_CLOSE, 0, 0); break; @@ -652,7 +833,9 @@ if ((pidl = SHBrowseForFolder(&PathInfo)) != NULL) { if (SHGetPathFromIDList(pidl, path)) + { SetDlgItemText(Dlg, Control, path); + } pMalloc->lpVtbl->Free(pMalloc, pidl); } pMalloc->lpVtbl->Release(pMalloc); @@ -710,10 +893,13 @@ case WM_DESTROY: { if (infoPtr->hIcon) + { DestroyIcon(infoPtr->hIcon); + } if (infoPtr->hFont) + { DeleteObject(infoPtr->hFont); - + } } case WM_CLOSE: @@ -734,6 +920,13 @@ if (strcmp(cmdline,"amd64") == 0) { amd64 = TRUE; + arm = FALSE; + } + + if (strcmp(cmdline,"arm") == 0) + { + amd64 = FALSE; + arm = TRUE; } OptionsDlgInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*OptionsDlgInfo)); @@ -741,9 +934,17 @@ { ZeroMemory(OptionsDlgInfo, sizeof(OPTIONS_DLG)); if (amd64) - DialogBoxParam(hInst, MAKEINTRESOURCE(ID_DIALOG64), 0, DlgProc, (LPARAM)OptionsDlgInfo); - else - DialogBoxParam(hInst, MAKEINTRESOURCE(ID_DIALOG), 0, DlgProc, (LPARAM)OptionsDlgInfo); + { + DialogBoxParam(hInst, MAKEINTRESOURCE(ID_DIALOG64), 0, DlgProc, (LPARAM)OptionsDlgInfo); + } + else if (arm) + { + DialogBoxParam(hInst, MAKEINTRESOURCE(ID_DIALOGARM), 0, DlgProc, (LPARAM)OptionsDlgInfo); + } + else + { + DialogBoxParam(hInst, MAKEINTRESOURCE(ID_DIALOG), 0, DlgProc, (LPARAM)OptionsDlgInfo); + } HeapFree(GetProcessHeap(), 0, OptionsDlgInfo); } return 0; Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.exe.Manifest URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.exe.Manifest [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.exe.Manifest [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -3,7 +3,7 @@ <assemblyIdentity name="ReactOS.options" processorArchitecture="x86" - version="1.1.0.0" + version="1.5.0.0" type="win32"/> <description>Config Tool</description> <dependency> Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.h [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.h [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -5,6 +5,7 @@ * PURPOSE: Configuring RosBE * COPYRIGHT: Copyright 2007 Maarten Bosma * Copyright 2007 Pierre Schweitzer + * Copyright 2009 Daniel Reimer * */ @@ -15,6 +16,7 @@ #include "resources.h" #define MINGWVERSION64 L"\\amd64" +#define MINGWVERSIONARM L"\\arm" #define MINGWVERSION L"\\i386" typedef struct _SETTINGS @@ -40,3 +42,4 @@ wchar_t *wcsset(wchar_t *string, wchar_t c); BOOL amd64 = FALSE; +BOOL arm = FALSE; Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.rc [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -6,8 +6,8 @@ 1 24 "options.exe.Manifest" VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,1,0,0 - PRODUCTVERSION 1,1,0,0 + FILEVERSION 1,5,0,0 + PRODUCTVERSION 1,5,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -24,12 +24,12 @@ BEGIN VALUE "CompanyName", "Marteen Bosma / Daniel Reimer / Pierre Schweitzer\0" VALUE "FileDescription", "Config Tool for RosBE\0" - VALUE "FileVersion", "1.1.0.0\0" + VALUE "FileVersion", "1.5.0.0\0" VALUE "InternalName", "options\0" - VALUE "LegalCopyright", "Copyright © Daniel Reimer 2007\0" + VALUE "LegalCopyright", "Copyright © Daniel Reimer 2009\0" VALUE "OriginalFilename", "options.exe\0" VALUE "ProductName", "Config Tool for RosBE\0" - VALUE "ProductVersion", "1.1.0.0\0" + VALUE "ProductVersion", "1.5.0.0\0" END END BLOCK "VarFileInfo" Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/resources.h [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/resources.h [iso-8859-1] Tue Dec 15 10:25:30 2009 @@ -5,6 +5,7 @@ * PURPOSE: Configuring RosBE * COPYRIGHT: Copyright 2007 Maarten Bosma * Copyright 2007 Pierre Schweitzer + * Copyright 2009 Daniel Reimer * */ @@ -27,25 +28,26 @@ #define CLR15 0x0f /* Controls */ -#define ID_OK 0x11 -#define ID_CANCEL 0x12 -#define ID_OPTICON 0x13 -#define ID_SAVELOGS 0x14 -#define ID_SHOWBUILDTIME 0x15 -#define ID_USECCACHE 0x16 -#define ID_STRIP 0x17 -#define ID_OTHEROBJ 0x18 -#define ID_OTHEROUT 0x19 -#define ID_LOGDIR 0x1a -#define ID_MGWDIR 0x1b -#define ID_OBJDIR 0x1c -#define ID_OUTDIR 0x1d -#define ID_BROWSE 0x1e -#define ID_BROWSEMGW 0x1f -#define ID_BROWSEOBJ 0x20 -#define ID_BROWSEOUT 0x21 -#define ID_DIALOG 0x22 -#define ID_DIALOG64 0x23 +#define ID_OK 0x10 +#define ID_CANCEL 0x11 +#define ID_OPTICON 0x12 +#define ID_SAVELOGS 0x13 +#define ID_SHOWBUILDTIME 0x14 +#define ID_USECCACHE 0x15 +#define ID_STRIP 0x16 +#define ID_OTHEROBJ 0x17 +#define ID_OTHEROUT 0x18 +#define ID_LOGDIR 0x19 +#define ID_MGWDIR 0x1a +#define ID_OBJDIR 0x1b +#define ID_OUTDIR 0x1c +#define ID_BROWSE 0x1d +#define ID_BROWSEMGW 0x1e +#define ID_BROWSEOBJ 0x1f +#define ID_BROWSEOUT 0x20 +#define ID_DIALOG 0x21 +#define ID_DIALOG64 0x22 +#define ID_DIALOGARM 0x23 #define ID_EXAMPLE 0x24 #define IDC_FONT 0x25 #define IDC_BACK 0x26

1 0

[tkreuzer] 44598: [MSACM32] Copy from trunk
by tkreuzer＠svn.reactos.org 15 Dec '09

15 Dec '09

Author: tkreuzer Date: Tue Dec 15 05:25:05 2009 New Revision: 44598 URL: http://svn.reactos.org/svn/reactos?rev=44598&view=rev Log: [MSACM32] Copy from trunk Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Cs.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Da.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ja.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ko.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Lt.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Pl.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ro.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ru.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Si.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Tr.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Zh.rc Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Cs.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Cs.rc [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Cs.rc [iso-8859-1] Tue Dec 15 05:25:05 2009 @@ -19,6 +19,8 @@ * 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 "wineacm.h" LANGUAGE LANG_CZECH, SUBLANG_DEFAULT Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Da.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Da.rc [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Da.rc [iso-8859-1] Tue Dec 15 05:25:05 2009 @@ -17,6 +17,8 @@ * 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 "wineacm.h" LANGUAGE LANG_DANISH, SUBLANG_DEFAULT Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ja.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ja.rc [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ja.rc [iso-8859-1] Tue Dec 15 05:25:05 2009 @@ -27,24 +27,24 @@ DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "???????" +CAPTION "ãµã¦ã³ãã®é¸æ" FONT 9, "MS Shell Dlg" BEGIN - LTEXT "??(&N):", -1, 5, 5, 115, 8, NOT WS_GROUP + LTEXT "åå(&N):", -1, 5, 5, 115, 8, NOT WS_GROUP COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "????????(&S)...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "??(&R)", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "ååãä»ãã¦ä¿å(&S)...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 + PUSHBUTTON "åé¤(&R)", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - LTEXT "??????(&F):", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "ãã©ã¼ããã(&F):", -1, 5, 41, 44, 8, NOT WS_GROUP COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "??(&A):", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "å±æ§(&A):", -1, 5, 59, 44, 8, NOT WS_GROUP #if 0 COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, @@ -55,9 +55,7 @@ CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP #endif DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "?????", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "???(&H)", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 92, 80, 40, 14 + PUSHBUTTON "ãã«ã(&H)", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 END - -#pragma code_page(default) Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ko.rc [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ko.rc [iso-8859-1] Tue Dec 15 05:25:05 2009 @@ -17,6 +17,8 @@ * 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 "wineacm.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Lt.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Lt.rc [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Lt.rc [iso-8859-1] Tue Dec 15 05:25:05 2009 @@ -17,6 +17,8 @@ * 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 "wineacm.h" /* UTF-8 */ #pragma code_page(65001) @@ -57,5 +59,3 @@ PUSHBUTTON "&Å½inynas", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 END - -#pragma code_page(default) Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Pl.rc [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Pl.rc [iso-8859-1] Tue Dec 15 05:25:05 2009 @@ -18,6 +18,7 @@ * 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 "wineacm.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ro.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ro.rc [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ro.rc [iso-8859-1] Tue Dec 15 05:25:05 2009 @@ -16,6 +16,8 @@ * 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 "wineacm.h" LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -50,5 +52,3 @@ PUSHBUTTON "&Ajutor", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 END - -#pragma code_page(default) Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ru.rc [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ru.rc [iso-8859-1] Tue Dec 15 05:25:05 2009 @@ -27,24 +27,24 @@ DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "????? ?????" +CAPTION "ÐÑÐ±Ð¾Ñ Ð·Ð²ÑÐºÐ°" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&???:", -1, 5, 5, 115, 8, NOT WS_GROUP + LTEXT "&ÐÐ¼Ñ:", -1, 5, 5, 115, 8, NOT WS_GROUP COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&????????? ???...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&???????", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "&Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ ÐºÐ°Ðº...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 + PUSHBUTTON "&Ð£Ð´Ð°Ð»Ð¸ÑÑ", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 - LTEXT "&??????:", -1, 5, 41, 44, 8, NOT WS_GROUP + LTEXT "&Ð¤Ð¾ÑÐ¼Ð°Ñ:", -1, 5, 41, 44, 8, NOT WS_GROUP COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&????????:", -1, 5, 59, 44, 8, NOT WS_GROUP + LTEXT "&Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°:", -1, 5, 59, 44, 8, NOT WS_GROUP #if 0 COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, @@ -55,7 +55,7 @@ CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP #endif DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 - PUSHBUTTON "??????", IDCANCEL, 92, 80, 40, 14 - PUSHBUTTON "&??????", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 92, 80, 40, 14 + PUSHBUTTON "&ÐÐ¾Ð¼Ð¾ÑÑ", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 END Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Si.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Si.rc [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Si.rc [iso-8859-1] Tue Dec 15 05:25:05 2009 @@ -17,6 +17,8 @@ * 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 "wineacm.h" #pragma code_page(65001) @@ -56,5 +58,3 @@ PUSHBUTTON "&PomoÄ", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 END - -#pragma code_page(default) Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Tr.rc [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Tr.rc [iso-8859-1] Tue Dec 15 05:25:05 2009 @@ -17,6 +17,8 @@ * 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 "wineacm.h" LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Zh.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Zh.rc [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Zh.rc [iso-8859-1] Tue Dec 15 05:25:05 2009 @@ -17,6 +17,8 @@ * 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 "wineacm.h" /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -94,5 +96,3 @@ PUSHBUTTON "å¹«å©(&H)", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 END - -#pragma code_page(default)

1 0

[jimtabor] 44597: [Win32k] - Remove LastChild.
by jimtabor＠svn.reactos.org 15 Dec '09

15 Dec '09

Author: jimtabor Date: Tue Dec 15 02:11:46 2009 New Revision: 44597 URL: http://svn.reactos.org/svn/reactos?rev=44597&view=rev Log: [Win32k] - Remove LastChild. Modified: trunk/reactos/subsystems/win32/win32k/include/window.h Modified: trunk/reactos/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] Tue Dec 15 02:11:46 2009 @@ -42,7 +42,6 @@ /* Pointer to the owning thread's message queue. */ PUSER_MESSAGE_QUEUE MessageQueue; struct _WINDOW_OBJECT* spwndChild; - struct _WINDOW_OBJECT* LastChild; struct _WINDOW_OBJECT* spwndNext; struct _WINDOW_OBJECT* spwndPrev; /* Entry in the list of thread windows. */

1 0

[tkreuzer] 44596: [IMAGEHLP] Don't use explicit 32 bit version of IMAGE_OPTIONAL_HEADER
by tkreuzer＠svn.reactos.org 14 Dec '09

14 Dec '09

Author: tkreuzer Date: Tue Dec 15 00:35:40 2009 New Revision: 44596 URL: http://svn.reactos.org/svn/reactos?rev=44596&view=rev Log: [IMAGEHLP] Don't use explicit 32 bit version of IMAGE_OPTIONAL_HEADER Modified: trunk/reactos/dll/win32/imagehlp/modify.c Modified: trunk/reactos/dll/win32/imagehlp/modify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/modify.… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/modify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/modify.c [iso-8859-1] Tue Dec 15 00:35:40 2009 @@ -882,7 +882,7 @@ LOADED_IMAGE FileData; PLOADED_IMAGE File; PIMAGE_FILE_HEADER FileHeader; - PIMAGE_OPTIONAL_HEADER32 OptionalHeader; + PIMAGE_OPTIONAL_HEADER OptionalHeader; ULONG CheckSum, HeaderCheckSum, OldChecksum; SYSTEMTIME SystemTime; FILETIME LastWriteTime;

1 0

[dreimer] 44595: Fix makex in the PS Version of RosBE. (Where does this } come from???)
by dreimer＠svn.reactos.org 14 Dec '09

14 Dec '09

Author: dreimer Date: Tue Dec 15 00:20:59 2009 New Revision: 44595 URL: http://svn.reactos.org/svn/reactos?rev=44595&view=rev Log: Fix makex in the PS Version of RosBE. (Where does this } come from???) Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Tue Dec 15 00:20:59 2009 @@ -102,7 +102,7 @@ set-alias HELP "$_ROSBE_BASEDIR\Help.ps1" -scope Global set-alias MAKE "$_ROSBE_BASEDIR\Build.ps1" -scope Global - function global:MAKEX {IEX "&'$_ROSBE_BASEDIR\Build.ps1' multi $args}"} + function global:MAKEX {IEX "&'$_ROSBE_BASEDIR\Build.ps1' multi $args"} if (Test-Path "$_ROSBE_BASEDIR\reladdr2line.ps1") { set-alias RADDR2LINE "$_ROSBE_BASEDIR\reladdr2line.ps1" -scope Global

1 0

[hyperion] 44594: modified Makefile New ${checkpoint} command to create an empty "checkpoint" file, to store the last modified date of a make target modified tools/rbuild/backend/mingw/rules.mak Rules that output more than one file at once don't mix well with parallel builds: serialize dependency checks through the use of checkpoint files. Fixes intermittent widl issues in highly parallel builds Bonus internal rbuild function that I had to commit one day or another See issue #4994 for more detai
by hyperion＠svn.reactos.org 14 Dec '09

14 Dec '09

Author: hyperion Date: Tue Dec 15 00:02:28 2009 New Revision: 44594 URL: http://svn.reactos.org/svn/reactos?rev=44594&view=rev Log: modified Makefile New ${checkpoint} command to create an empty "checkpoint" file, to store the last modified date of a make target modified tools/rbuild/backend/mingw/rules.mak Rules that output more than one file at once don't mix well with parallel builds: serialize dependency checks through the use of checkpoint files. Fixes intermittent widl issues in highly parallel builds Bonus internal rbuild function that I had to commit one day or another See issue #4994 for more details. Modified: trunk/reactos/Makefile trunk/reactos/tools/rbuild/backend/mingw/rules.mak Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=44594&r1=4459… ============================================================================== --- trunk/reactos/Makefile [iso-8859-1] (original) +++ trunk/reactos/Makefile [iso-8859-1] Tue Dec 15 00:02:28 2009 @@ -353,6 +353,7 @@ endif export SEP = / mkdir = -$(Q)mkdir -p + checkpoint = $(Q)touch rm = $(Q)rm -f cp = $(Q)cp NUL = /dev/null @@ -361,6 +362,7 @@ ROS_EMPTY = export SEP = \$(ROS_EMPTY) mkdir = -$(Q)mkdir + checkpoint = $(Q)copy /y NUL rm = $(Q)del /f /q cp = $(Q)copy /y NUL = NUL Modified: trunk/reactos/tools/rbuild/backend/mingw/rules.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] Tue Dec 15 00:02:28 2009 @@ -20,6 +20,7 @@ #(source) RBUILD_name=$(basename $(notdir $(1))) +RBUILD_noext=$(dir $(1))$(basename $(notdir $(1))) #(source) RBUILD_dir=${call RBUILD_fullpath,$(dir ${call RBUILD_compress_prefixes,$(1)})} @@ -255,9 +256,12 @@ $(2): $${$(1)_precondition} -${call RBUILD_intermediate_path_noext,$(2)}_c.c ${call RBUILD_intermediate_path_noext,$(2)}_c.h: $(2) $(3) $$(widl_TARGET) | ${call RBUILD_intermediate_dir,$(2)} +${call RBUILD_intermediate_path_noext,$(2)}_c.c ${call RBUILD_intermediate_path_noext,$(2)}_c.h: ${call RBUILD_intermediate_path_noext,$(2)}_c + +${call RBUILD_intermediate_path_noext,$(2)}_c: $(2) $(3) $$(widl_TARGET) | ${call RBUILD_intermediate_dir,$(2)} $$(ECHO_WIDL) $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_c.h -c -C ${call RBUILD_intermediate_path_noext,$(2)}_c.c $(2) + $${checkpoint} $$@>$(NUL) ${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_c.c,,-fno-unit-at-a-time,${call RBUILD_intermediate_path_noext,$(2)}_c.o} @@ -268,9 +272,12 @@ $(2): $${$(1)_precondition} -${call RBUILD_intermediate_path_noext,$(2)}_s.c ${call RBUILD_intermediate_path_noext,$(2)}_s.h: $(2) $(3) $$(widl_TARGET) | ${call RBUILD_intermediate_dir,$(2)} +${call RBUILD_intermediate_path_noext,$(2)}_s.c ${call RBUILD_intermediate_path_noext,$(2)}_s.h: ${call RBUILD_intermediate_path_noext,$(2)}_s + +${call RBUILD_intermediate_path_noext,$(2)}_s: $(2) $(3) $$(widl_TARGET) | ${call RBUILD_intermediate_dir,$(2)} $$(ECHO_WIDL) $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_s.h -s -S ${call RBUILD_intermediate_path_noext,$(2)}_s.c $(2) + $${checkpoint} $$@>$(NUL) ${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_s.c,,-fno-unit-at-a-time,${call RBUILD_intermediate_path_noext,$(2)}_s.o} @@ -281,9 +288,12 @@ $(2): $${$(1)_precondition} -${call RBUILD_intermediate_path_noext,$(2)}_p.c ${call RBUILD_intermediate_path_noext,$(2)}_p.h: $(2) $(3) $$(widl_TARGET) | ${call RBUILD_intermediate_dir,$(2)} +${call RBUILD_intermediate_path_noext,$(2)}_p.c ${call RBUILD_intermediate_path_noext,$(2)}_p.h: ${call RBUILD_intermediate_path_noext,$(2)}_p + +${call RBUILD_intermediate_path_noext,$(2)}_p: $(2) $(3) $$(widl_TARGET) | ${call RBUILD_intermediate_dir,$(2)} $$(ECHO_WIDL) $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_p.h -p -P ${call RBUILD_intermediate_path_noext,$(2)}_p.c $(2) + $${checkpoint} $$@>$(NUL) ${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_p.c,,-fno-unit-at-a-time,${call RBUILD_intermediate_path_noext,$(2)}_p.o}

1 0

[tkreuzer] 44593: use tabs in rbuild file (copied from trunk)
by tkreuzer＠svn.reactos.org 14 Dec '09

14 Dec '09

Author: tkreuzer Date: Mon Dec 14 23:59:38 2009 New Revision: 44593 URL: http://svn.reactos.org/svn/reactos?rev=44593&view=rev Log: use tabs in rbuild file (copied from trunk) Modified: branches/ros-amd64-bringup/reactos/dll/win32/nddeapi/nddeapi.rbuild Modified: branches/ros-amd64-bringup/reactos/dll/win32/nddeapi/nddeapi.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/nddeapi/nddeapi.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/nddeapi/nddeapi.rbuild [iso-8859-1] Mon Dec 14 23:59:38 2009 @@ -1,9 +1,9 @@ <module name="nddeapi" type="win32dll" baseaddress="${BASEADDRESS_NDDEAPI}" installbase="system32" installname="nddeapi.dll" allowwarnings="true" entrypoint="0"> - <importlibrary definition="nddeapi.spec" /> - <include base="nddeapi">.</include> - <include base="ReactOS">include/reactos/wine</include> - <define name="__WINESRC__" /> - <library>wine</library> - <library>ntdll</library> - <file>nddeapi.c</file> + <importlibrary definition="nddeapi.spec" /> + <include base="nddeapi">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <library>wine</library> + <library>ntdll</library> + <file>nddeapi.c</file> </module>

1 0

[tkreuzer] 44592: revert last commit (sorry, wrong direction)
by tkreuzer＠svn.reactos.org 14 Dec '09

14 Dec '09

Author: tkreuzer Date: Mon Dec 14 23:58:51 2009 New Revision: 44592 URL: http://svn.reactos.org/svn/reactos?rev=44592&view=rev Log: revert last commit (sorry, wrong direction) Modified: trunk/reactos/dll/win32/nddeapi/nddeapi.rbuild Modified: trunk/reactos/dll/win32/nddeapi/nddeapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/nddeapi/nddeapi.… ============================================================================== --- trunk/reactos/dll/win32/nddeapi/nddeapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/nddeapi/nddeapi.rbuild [iso-8859-1] Mon Dec 14 23:58:51 2009 @@ -1,9 +1,9 @@ <module name="nddeapi" type="win32dll" baseaddress="${BASEADDRESS_NDDEAPI}" installbase="system32" installname="nddeapi.dll" allowwarnings="true" entrypoint="0"> - <importlibrary definition="nddeapi.spec" /> - <include base="nddeapi">.</include> - <include base="ReactOS">include/reactos/wine</include> - <define name="__WINESRC__" /> - <library>wine</library> - <library>ntdll</library> - <file>nddeapi.c</file> + <importlibrary definition="nddeapi.spec" /> + <include base="nddeapi">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <library>wine</library> + <library>ntdll</library> + <file>nddeapi.c</file> </module>

1 0

[gadamopoulos] 44591: [win32k] - Don't store LastChild in WINDOW_OBJECT
by gadamopoulos＠svn.reactos.org 14 Dec '09

14 Dec '09

Author: gadamopoulos Date: Mon Dec 14 23:58:03 2009 New Revision: 44591 URL: http://svn.reactos.org/svn/reactos?rev=44591&view=rev Log: [win32k] - Don't store LastChild in WINDOW_OBJECT Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Mon Dec 14 23:58:03 2009 @@ -1060,11 +1060,6 @@ /* link after WndPrevSibling */ if ((Wnd->spwndNext = WndPrevSibling->spwndNext)) Wnd->spwndNext->spwndPrev = Wnd; - else if ((Parent = Wnd->spwndParent)) - { - if(Parent->LastChild == WndPrevSibling) - Parent->LastChild = Wnd; - } Wnd->spwndPrev->spwndNext = Wnd; } else @@ -1075,7 +1070,6 @@ Wnd->spwndNext->spwndPrev = Wnd; else if (Parent) { - Parent->LastChild = Wnd; Parent->spwndChild = Wnd; return; } @@ -1276,8 +1270,6 @@ if (Wnd->spwndNext) Wnd->spwndNext->spwndPrev = Wnd->spwndPrev; - else if (WndParent && WndParent->LastChild == Wnd) - WndParent->LastChild = Wnd->spwndPrev; if (Wnd->spwndPrev) Wnd->spwndPrev->spwndNext = Wnd->spwndNext; @@ -1956,7 +1948,6 @@ Window->OwnerThread = PsGetCurrentThread(); Window->spwndChild = NULL; - Window->LastChild = NULL; Window->spwndPrev = NULL; Window->spwndNext = NULL; @@ -2290,7 +2281,13 @@ { PWINDOW_OBJECT PrevSibling; - PrevSibling = ParentWindow->LastChild; + PrevSibling = ParentWindow->spwndChild; + + if(PrevSibling) + { + while (PrevSibling->spwndNext) + PrevSibling = PrevSibling->spwndNext; + } /* link window as bottom sibling */ IntLinkWindow(Window, ParentWindow, PrevSibling /*prev sibling*/); @@ -3698,8 +3695,16 @@ case GW_HWNDLAST: if((Parent = Window->spwndParent)) { - if (Parent->LastChild) - hWndResult = Parent->LastChild->hSelf; + if (Parent->spwndChild) + { + Window = Parent->spwndChild; + if(Window) + { + while(Window->spwndNext) + Window = Window->spwndNext; + } + hWndResult = Window->hSelf; + } } break; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Mon Dec 14 23:58:03 2009 @@ -1002,10 +1002,17 @@ } else if (WinPos.hwndInsertAfter == HWND_BOTTOM) { - if(ParentWindow->LastChild) + if(ParentWindow->spwndChild) { - UserReferenceObject(ParentWindow->LastChild); - InsertAfterWindow = ParentWindow->LastChild; + InsertAfterWindow = ParentWindow->spwndChild; + + if(InsertAfterWindow) + { + while (InsertAfterWindow->spwndNext) + InsertAfterWindow = InsertAfterWindow->spwndNext; + } + + UserReferenceObject(InsertAfterWindow); } else InsertAfterWindow = NULL;

1 0

[tkreuzer] 44590: use tabs in rbuild file (copied from trunk)
by tkreuzer＠svn.reactos.org 14 Dec '09

14 Dec '09

Author: tkreuzer Date: Mon Dec 14 23:57:33 2009 New Revision: 44590 URL: http://svn.reactos.org/svn/reactos?rev=44590&view=rev Log: use tabs in rbuild file (copied from trunk) Modified: trunk/reactos/dll/win32/nddeapi/nddeapi.rbuild Modified: trunk/reactos/dll/win32/nddeapi/nddeapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/nddeapi/nddeapi.… ============================================================================== --- trunk/reactos/dll/win32/nddeapi/nddeapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/nddeapi/nddeapi.rbuild [iso-8859-1] Mon Dec 14 23:57:33 2009 @@ -1,9 +1,9 @@ <module name="nddeapi" type="win32dll" baseaddress="${BASEADDRESS_NDDEAPI}" installbase="system32" installname="nddeapi.dll" allowwarnings="true" entrypoint="0"> - <importlibrary definition="nddeapi.spec" /> - <include base="nddeapi">.</include> - <include base="ReactOS">include/reactos/wine</include> - <define name="__WINESRC__" /> - <library>wine</library> - <library>ntdll</library> - <file>nddeapi.c</file> + <importlibrary definition="nddeapi.spec" /> + <include base="nddeapi">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <library>wine</library> + <library>ntdll</library> + <file>nddeapi.c</file> </module>

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
51
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 December 2009