Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 33240: - Add more defines
by dchapyshev＠svn.reactos.org 02 May '08

02 May '08

Author: dchapyshev Date: Fri May 2 09:44:43 2008 New Revision: 33240 URL: http://svn.reactos.org/svn/reactos?rev=33240&view=rev Log: - Add more defines Modified: trunk/reactos/base/shell/explorer-new/precomp.h Modified: trunk/reactos/base/shell/explorer-new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/pr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] Fri May 2 09:44:43 2008 @@ -349,12 +349,14 @@ /* TrayClockWnd */ #define TCWM_GETMINIMUMSIZE (WM_USER + 0x100) -#define TCWM_UPDATETIME (WM_USER + 0x101) +#define TCWM_UPDATETIME (WM_USER + 0x101) /* TrayNotifyWnd */ #define TNWM_GETMINIMUMSIZE (WM_USER + 0x100) -#define TNWM_UPDATETIME (WM_USER + 0x101) -#define TNWM_SHOWCLOCK (WM_USER + 0x102) +#define TNWM_UPDATETIME (WM_USER + 0x101) +#define TNWM_SHOWCLOCK (WM_USER + 0x102) +#define TNWM_SHOWTRAY (WM_USER + 0x103) +#define TNWM_CHANGETRAYPOS (WM_USER + 0x104) #define NTNWM_REALIGN (0x1)

1 0

[dchapyshev] 33239: - Change icons to Tango icons
by dchapyshev＠svn.reactos.org 02 May '08

02 May '08

Author: dchapyshev Date: Fri May 2 09:35:45 2008 New Revision: 33239 URL: http://svn.reactos.org/svn/reactos?rev=33239&view=rev Log: - Change icons to Tango icons Modified: trunk/reactos/base/applications/calc/res/calc.ico trunk/reactos/base/applications/calc/res/calc_sm.ico Modified: trunk/reactos/base/applications/calc/res/calc.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/calc/res/calc_sm.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… ============================================================================== Binary files - no diff available.

1 0

[dchapyshev] 33238: - Add InstallNewDevice exported function
by dchapyshev＠svn.reactos.org 02 May '08

02 May '08

Author: dchapyshev Date: Fri May 2 09:15:04 2008 New Revision: 33238 URL: http://svn.reactos.org/svn/reactos?rev=33238&view=rev Log: - Add InstallNewDevice exported function Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c?re… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c [iso-8859-1] Fri May 2 09:15:04 2008 @@ -43,6 +43,15 @@ }; typedef BOOL (WINAPI *PINSTALL_NEW_DEVICE)(HWND, LPGUID, PDWORD); + + +BOOL CALLBACK +InstallNewDevice(HWND hwndParent, + LPGUID ClassGuid, + PDWORD pReboot) +{ + return TRUE; +} static LONG APIENTRY Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def?… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def [iso-8859-1] Fri May 2 09:15:04 2008 @@ -2,5 +2,6 @@ EXPORTS CPlApplet@16 +InstallNewDevice ; EOF

1 0

[dchapyshev] 33237: - Move console.dll to cpl folder
by dchapyshev＠svn.reactos.org 02 May '08

02 May '08

Author: dchapyshev Date: Fri May 2 09:08:25 2008 New Revision: 33237 URL: http://svn.reactos.org/svn/reactos?rev=33237&view=rev Log: - Move console.dll to cpl folder Added: trunk/reactos/dll/cpl/console/ trunk/reactos/dll/cpl/console/colors.c (with props) trunk/reactos/dll/cpl/console/console.c (with props) trunk/reactos/dll/cpl/console/console.def (with props) trunk/reactos/dll/cpl/console/console.h (with props) trunk/reactos/dll/cpl/console/console.rbuild (with props) trunk/reactos/dll/cpl/console/console.rc (with props) trunk/reactos/dll/cpl/console/font.c (with props) trunk/reactos/dll/cpl/console/lang/ trunk/reactos/dll/cpl/console/lang/de-DE.rc (with props) trunk/reactos/dll/cpl/console/lang/en-US.rc (with props) trunk/reactos/dll/cpl/console/lang/es-ES.rc (with props) trunk/reactos/dll/cpl/console/lang/id-ID.rc (with props) trunk/reactos/dll/cpl/console/lang/it-IT.rc (with props) trunk/reactos/dll/cpl/console/lang/pl-PL.rc (with props) trunk/reactos/dll/cpl/console/lang/ru-RU.rc (with props) trunk/reactos/dll/cpl/console/lang/uk-UA.rc (with props) trunk/reactos/dll/cpl/console/layout.c (with props) trunk/reactos/dll/cpl/console/options.c (with props) trunk/reactos/dll/cpl/console/resource.h (with props) trunk/reactos/dll/cpl/console/rsrc.rc (with props) Removed: trunk/reactos/dll/win32/console/ Modified: trunk/reactos/dll/cpl/cpl.rbuild trunk/reactos/dll/win32/win32.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/cpl/console/colors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/colors.c?r… Added: trunk/reactos/dll/cpl/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/console.c?… Added: trunk/reactos/dll/cpl/console/console.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/console.de… Added: trunk/reactos/dll/cpl/console/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/console.h?… Added: trunk/reactos/dll/cpl/console/console.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/console.rb… Added: trunk/reactos/dll/cpl/console/console.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/console.rc… Added: trunk/reactos/dll/cpl/console/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/font.c?rev… Added: trunk/reactos/dll/cpl/console/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/de-DE… Added: trunk/reactos/dll/cpl/console/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/en-US… Added: trunk/reactos/dll/cpl/console/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/es-ES… Added: trunk/reactos/dll/cpl/console/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/id-ID… Added: trunk/reactos/dll/cpl/console/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/it-IT… Added: trunk/reactos/dll/cpl/console/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/pl-PL… Added: trunk/reactos/dll/cpl/console/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/ru-RU… Added: trunk/reactos/dll/cpl/console/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/uk-UA… Added: trunk/reactos/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/layout.c?r… Added: trunk/reactos/dll/cpl/console/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/options.c?… Added: trunk/reactos/dll/cpl/console/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/resource.h… Added: trunk/reactos/dll/cpl/console/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/rsrc.rc?re… Modified: trunk/reactos/dll/cpl/cpl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/cpl.rbuild?rev=332… Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev…

1 0

[dreimer] 33236: Improve code style. Still tbd. Remove some of the external tools, like buildtime, checknewer etc Fix the last bug which causes the args not to be parsed to make.
by dreimer＠svn.reactos.org 02 May '08

02 May '08

Author: dreimer Date: Fri May 2 08:45:09 2008 New Revision: 33236 URL: http://svn.reactos.org/svn/reactos?rev=33236&view=rev Log: Improve code style. Still tbd. Remove some of the external tools, like buildtime, checknewer etc Fix the last bug which causes the args not to be parsed to make. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Fri May 2 08:45:09 2008 @@ -49,8 +49,8 @@ } # -# Check if the user has chosen to use a different object or output path -# and set it accordingly. +# Check if the user has chosen to use a different object or output path and set +# it accordingly. # if ($_ROSBE_OBJPATH -ne $null) { if ( Test-Path "$_ROSBE_OBJPATH\.") { @@ -77,10 +77,9 @@ $DATENAME = get-date -f dyMMyyyy $TIMENAME = get-date -f HHmm - # -# Check if writing logs is enabled, if so check if our log directory -# exists, if it doesn't, create it. +# Check if writing logs is enabled, if so check if our log directory exists, if +# it doesn't, create it. # if ($_ROSBE_WRITELOG -eq 1) { if (!(Test-Path "$_ROSBE_LOGDIR")) { @@ -92,7 +91,7 @@ if ($_ROSBE_SHOWTIME -eq 1) { if ($_ROSBE_WRITELOG -eq 1) { if (!(Test-Path "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt")) { - $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) + $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) } & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" } else { @@ -101,7 +100,7 @@ } else { if ($_ROSBE_WRITELOG -eq 1) { if (!(Test-Path "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt")) { - $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) + $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) } & "$_ROSBE_MINGWMAKE" $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" } else { @@ -119,12 +118,12 @@ # -x2 - Number of CPUs, doubled. # -a - Determine the cpu count based on the inherited process affinity mask. # -$CPUCOUNT= &"$_ROSBE_BASEDIR\Tools\cpucount.exe" -x1 + $CPUCOUNT= &"$_ROSBE_BASEDIR\Tools\cpucount.exe" -x1 if ($_ROSBE_SHOWTIME -eq 1) { if ($_ROSBE_WRITELOG -eq 1) { if (!(Test-Path "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt")) { - $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) + $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) } & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" } else { @@ -133,7 +132,7 @@ } else { if ($_ROSBE_WRITELOG -eq 1) { if (!(Test-Path "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt")) { - $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) + $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) } & "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" } else { @@ -146,15 +145,15 @@ # Check if we are using -j or not. # if ($args.count -gt 1) { -if ($args[0] -eq "multi") { + if ($args[0] -eq "multi") { $host.ui.RawUI.WindowTitle = "makex $($args) parallel build started: $TIMERAW" -} -BUILDMULTI + } + BUILDMULTI } else { -if ($args.count -gt 0) { + if ($args.count -gt 0) { $host.ui.RawUI.WindowTitle = "make $($args) build started: $TIMERAW" -} -BUILD + } + BUILD } # @@ -163,19 +162,19 @@ "$_ROSBE_BASEDIR\Tools\flash.exe" if ($_ROSBE_VERSION -ne $null) { -$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" + $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" } # # Unload all used Vars. # -$ENV:ROS_LEAN_AND_MEAN = "" -$ENV:HOST_CC = "" -$ENV:HOST_CPP = "" -$ENV:TARGET_CC = "" -$ENV:TARGET_CPP = "" -$ENV:ROS_INTERMEDIATE = "" -$ENV:ROS_OUTPUT = "" -$ENV:ROS_TEMPORARY = "" -$ENV:CPUCOUNT = "" -$ENV:CCACHE_DIR = "" +$ENV:ROS_LEAN_AND_MEAN = $null +$ENV:HOST_CC = $null +$ENV:HOST_CPP = $null +$ENV:TARGET_CC = $null +$ENV:TARGET_CPP = $null +$ENV:ROS_INTERMEDIATE = $null +$ENV:ROS_OUTPUT = $null +$ENV:ROS_TEMPORARY = $null +$ENV:CPUCOUNT = $null +$ENV:CCACHE_DIR = $null 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] Fri May 2 08:45:09 2008 @@ -9,20 +9,22 @@ # # -# Set defaults to work with and override them if edited by -# the options utility. +# Set defaults to work with and override them if edited by the options utility. # (Get-Host).UI.RawUI.ForegroundColor = "Green" (Get-Host).UI.RawUI.BackgroundColor = "Black" cls -if ($APPDATA.Length -lt 1) {$APPDATA = $ENV:USERPROFILE} -$global:PATH = "$ENV:SystemRoot\system32;$ENV:SystemRoot" + +if ($APPDATA.Length -lt 1) { + $APPDATA = $ENV:USERPROFILE +} +$ENV:PATH = "$ENV:SystemRoot\system32;$ENV:SystemRoot" $global:_ROSBE_VERSION = 1.2 $global:0 = $myInvocation.MyCommand.Definition $global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0) $global:_ROSBE_MODE = "RosBE" $global:_ROSBE_ROSSOURCEDIR = "$pwd" -$global:_ROSBE_ORIGINALPATH = "$PATH" +$global:_ROSBE_ORIGINALPATH = "$ENV:PATH" $global:_ROSBE_SHOWTIME = 1 $global:_ROSBE_WRITELOG = 1 $global:_ROSBE_USECCACHE = 0 @@ -36,20 +38,19 @@ # Display the banner and set up the environment for the GCC 4.x.x build # environment. # -function RosBE4 -{ -"*******************************************************************************" -"* *" -"* ReactOS Build Environment $_ROSBE_VERSION *" -"* *" -"*******************************************************************************" -"" -"" -(get-WmiObject Win32_OperatingSystem).caption -# -# Set the correct path for the build tools and set the MinGW make. -# -& "$_ROSBE_BASEDIR\rosbe-gcc-env.ps1" +function RosBE4 { + "*******************************************************************************" + "* *" + "* ReactOS Build Environment $_ROSBE_VERSION *" + "* *" + "*******************************************************************************" + "" + "" + (get-WmiObject Win32_OperatingSystem).caption + # + # Set the correct path for the build tools and set the MinGW make. + # + & "$_ROSBE_BASEDIR\rosbe-gcc-env.ps1" } # @@ -57,86 +58,85 @@ # that are not actually present. # -function LOADDOSKEYMACROS -{ -if (Test-Path "$_ROSBE_BASEDIR\chdefdir.ps1") { -set-alias CHDEFDIR "$_ROSBE_BASEDIR\chdefdir.ps1" -scope Global -} +function LOADDOSKEYMACROS { + if (Test-Path "$_ROSBE_BASEDIR\chdefdir.ps1") { + set-alias CHDEFDIR "$_ROSBE_BASEDIR\chdefdir.ps1" -scope Global + } -if (Test-Path "$_ROSBE_BASEDIR\chdefgcc.ps1") { -set-alias CHDEFGCC "$_ROSBE_BASEDIR\chdefgcc.ps1" -scope Global -} + if (Test-Path "$_ROSBE_BASEDIR\chdefgcc.ps1") { + set-alias CHDEFGCC "$_ROSBE_BASEDIR\chdefgcc.ps1" -scope Global + } -if (Test-Path "$_ROSBE_BASEDIR\charch.ps1") { -set-alias CHARCH "$_ROSBE_BASEDIR\charch.ps1" -scope Global -} + if (Test-Path "$_ROSBE_BASEDIR\charch.ps1") { + set-alias CHARCH "$_ROSBE_BASEDIR\charch.ps1" -scope Global + } -set-alias CLEAN "$_ROSBE_BASEDIR\Clean.ps1" -scope Global + set-alias CLEAN "$_ROSBE_BASEDIR\Clean.ps1" -scope Global -if (Test-Path "$_ROSBE_BASEDIR\Config.ps1") { -set-alias CONFIG "$_ROSBE_BASEDIR\Config.ps1" -scope Global -} + if (Test-Path "$_ROSBE_BASEDIR\Config.ps1") { + set-alias CONFIG "$_ROSBE_BASEDIR\Config.ps1" -scope Global + } -set-alias HELP "$_ROSBE_BASEDIR\Help.ps1" -scope Global -set-alias MAKE "$_ROSBE_BASEDIR\Build.ps1" -scope Global -set-alias MAKEX "$_ROSBE_BASEDIR\Build.ps1 multi" -scope Global + set-alias HELP "$_ROSBE_BASEDIR\Help.ps1" -scope Global + set-alias MAKE "$_ROSBE_BASEDIR\Build.ps1" -scope Global + set-alias MAKEX "$_ROSBE_BASEDIR\Build.ps1 multi" -scope Global -if (Test-Path "$_ROSBE_BASEDIR\reladdr2line.ps1") { -set-alias RADDR2LINE "$_ROSBE_BASEDIR\reladdr2line.ps1" -scope Global -} + if (Test-Path "$_ROSBE_BASEDIR\reladdr2line.ps1") { + set-alias RADDR2LINE "$_ROSBE_BASEDIR\reladdr2line.ps1" -scope Global + } -if (Test-Path "$_ROSBE_BASEDIR\scut.ps1") { -set-alias SCUT "$_ROSBE_BASEDIR\scut.ps1" -scope Global -} + if (Test-Path "$_ROSBE_BASEDIR\scut.ps1") { + set-alias SCUT "$_ROSBE_BASEDIR\scut.ps1" -scope Global + } -if (Test-Path "$_ROSBE_BASEDIR\sSVN.ps1") { -set-alias SSVN "$_ROSBE_BASEDIR\sSVN.ps1" -scope Global -set-alias SVN "$_ROSBE_BASEDIR\Tools\svn.exe" -scope Global -} + if (Test-Path "$_ROSBE_BASEDIR\sSVN.ps1") { + set-alias SSVN "$_ROSBE_BASEDIR\sSVN.ps1" -scope Global + set-alias SVN "$_ROSBE_BASEDIR\Tools\svn.exe" -scope Global + } -if (Test-Path "$_ROSBE_BASEDIR\options.ps1") { -set-alias OPTIONS "$_ROSBE_BASEDIR\options.ps1" -scope Global -} + if (Test-Path "$_ROSBE_BASEDIR\options.ps1") { + set-alias OPTIONS "$_ROSBE_BASEDIR\options.ps1" -scope Global + } } # # Check if RosBE data directory exists, if not, create it. # -if (!(Test-Path "$APPDATA\RosBE")) {New-Item -path "$APPDATA" -name "RosBE" -type directory} +if (!(Test-Path "$APPDATA\RosBE")) { + New-Item -path "$APPDATA" -name "RosBE" -type directory +} # -# Check if the user has used the options utility and -# if so, load their options. +# Check if the user has used the options utility and if so, load their options. # if (Test-Path "$APPDATA\RosBE\rosbe-options.ps1") { -& "$APPDATA\RosBE\rosbe-options.ps1" + & "$APPDATA\RosBE\rosbe-options.ps1" } $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" # -# Check if we are using oldmode or if any unknown parameters -# were specified. +# Check if we are using oldmode or if any unknown parameters were specified. # if ($args.count -gt 0) { -if ($args[0] = "oldmode") { - cls - $_ROSBE_MODE = "MinGW" + if ($args[0] = "oldmode") { + cls + $_ROSBE_MODE = "MinGW" -} else { - cls - "Unknown parameter specified. Exiting." -exit -} + } else { + cls + "Unknown parameter specified. Exiting." + exit + } } RosBE4 # -# Load the base directory from srclist.txt and set it as the -# new source directory. +# Load the base directory from srclist.txt and set it as the new source +# directory. # if (Test-Path "$_ROSBE_BASEDIR\scut.ps1") { -& "$_ROSBE_BASEDIR\scut.ps1" + & "$_ROSBE_BASEDIR\scut.ps1" } # @@ -153,8 +153,8 @@ LOADDOSKEYMACROS # -# Look if the ReactOS source directory is empty. If so, -# inform the user and mention 'ssvn create' (only if ssvn is installed). +# Look if the ReactOS source directory is empty. If so, inform the user and +# mention 'ssvn create' (only if ssvn is installed). # if (!(Test-Path "$_ROSBE_BASEDIR\sSVN.ps1")) { if ((get-childitem $_ROSBE_ROSSOURCEDIR).Count -le 0) { 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] Fri May 2 08:45:09 2008 @@ -8,8 +8,8 @@ # # -# Check if we are running within the RosBE, and if not -# initialize GCC for the current directory. +# Check if we are running within the RosBE, and if not initialize GCC for the +# current directory. # if ($ENV:_ROSBE_MINGWPATH -eq $null) { $ENV:_ROSBE_MODE = "MinGW" @@ -57,7 +57,7 @@ } } if (Test-Path "$_ROSBE_MINGWPATH\bin\flex.exe") { -$fver = (& flex --version) -replace ".*version ((\d|\.)+).*",'$1' + $fver = (& flex --version) -replace ".*version ((\d|\.)+).*",'$1' "flex $fver" } else { if ($_ROSBE_MODE -eq "RosBE") {

1 0

[gedmurphy] 33235: fix build
by gedmurphy＠svn.reactos.org 02 May '08

02 May '08

Author: gedmurphy Date: Fri May 2 08:25:58 2008 New Revision: 33235 URL: http://svn.reactos.org/svn/reactos?rev=33235&view=rev Log: fix build Modified: trunk/reactos/dll/win32/browseui/browseui_main.c Modified: trunk/reactos/dll/win32/browseui/browseui_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui_main.c [iso-8859-1] Fri May 2 08:25:58 2008 @@ -35,6 +35,7 @@ #include "browseui.h" #include "shobjidl.h" /* for IShellFolder used in undoc.h */ +#include "initguid.h" #include "undoc.h" /* for CLSID_RebarBandSite */ WINE_DEFAULT_DEBUG_CHANNEL(browseui); @@ -44,6 +45,10 @@ HINSTANCE browseui_hinstance = 0; typedef HRESULT (WINAPI *LPFNCONSTRUCTOR)(IUnknown *pUnkOuter, IUnknown **ppvOut); + +/* undoc GUID */ +DEFINE_GUID(CLSID_RebarBandSite, 0xECD4FC4D, 0x521C, 0x11D0, 0xB7, 0x92, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1); + static const struct { REFCLSID clsid;

1 0

[gedmurphy] 33234: - Remove CLSID_RebarBandSite from uuid, and contain it within explorer as it's an undoc GUID - Load SHInvokeDefaultCommand when required to avoid msvc linker dependencies - explorer_new now builds and links with msvc9, although it'll crash if you try to run it at the moment. Investigation needed.
by gedmurphy＠svn.reactos.org 02 May '08

02 May '08

Author: gedmurphy Date: Fri May 2 07:09:39 2008 New Revision: 33234 URL: http://svn.reactos.org/svn/reactos?rev=33234&view=rev Log: - Remove CLSID_RebarBandSite from uuid, and contain it within explorer as it's an undoc GUID - Load SHInvokeDefaultCommand when required to avoid msvc linker dependencies - explorer_new now builds and links with msvc9, although it'll crash if you try to run it at the moment. Investigation needed. Modified: trunk/reactos/base/shell/explorer-new/explorer.c trunk/reactos/base/shell/explorer-new/precomp.h trunk/reactos/base/shell/explorer-new/startmnu.c trunk/reactos/base/shell/explorer-new/undoc.h trunk/reactos/lib/sdk/uuid/uuid.c Modified: trunk/reactos/base/shell/explorer-new/explorer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/explorer.c [iso-8859-1] Fri May 2 07:09:39 2008 @@ -24,6 +24,9 @@ HANDLE hProcessHeap; HKEY hkExplorer = NULL; +/* undoc GUID */ +DEFINE_GUID(CLSID_RebarBandSite, 0xECD4FC4D, 0x521C, 0x11D0, 0xB7, 0x92, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1); + LONG SetWindowStyle(IN HWND hWnd, IN LONG dwStyleMask, Modified: trunk/reactos/base/shell/explorer-new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/pr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] Fri May 2 07:09:39 2008 @@ -21,11 +21,13 @@ #include "resource.h" #include "comcsup.h" #include "todo.h" +#include "initguid.h" #include "undoc.h" /* dynamic imports due to lack of support in msvc linker libs */ typedef INT (STDCALL *REGSHELLHOOK)(HWND, DWORD); typedef BOOL (STDCALL *DRAWCAPTEMP)(HWND, HDC, const RECT*, HFONT, HICON, LPCWSTR, UINT); +typedef HRESULT (STDCALL *SHINVDEFCMD)(HWND, IShellFolder*, LPCITEMIDLIST); static ULONG __inline Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...) Modified: trunk/reactos/base/shell/explorer-new/startmnu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/st… ============================================================================== --- trunk/reactos/base/shell/explorer-new/startmnu.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/startmnu.c [iso-8859-1] Fri May 2 07:09:39 2008 @@ -471,12 +471,32 @@ IN IShellFolder *pShellFolder, IN LPCITEMIDLIST pidl) { + HMODULE hShlwapi; + HRESULT ret = S_FALSE; + IStartMenuSiteImpl *This = IStartMenuSiteImpl_from_IStartMenuCallback(iface); DbgPrint("IStartMenuCallback::Execute\n"); - return SHInvokeDefaultCommand(ITrayWindow_GetHWND(This->Tray), - pShellFolder, - pidl); + + hShlwapi = LoadLibrary(TEXT("SHLWAPI.DLL")); + if (hShlwapi != NULL) + { + SHINVDEFCMD SHInvokeDefCmd; + + /* SHInvokeDefaultCommand */ + SHInvokeDefCmd = (SHINVDEFCMD)GetProcAddress(hShlwapi, + (LPCSTR)((LONG)279)); + if (SHInvokeDefCmd != NULL) + { + ret = SHInvokeDefCmd(ITrayWindow_GetHWND(This->Tray), + pShellFolder, + pidl); + } + + FreeLibrary(hShlwapi); + } + + return ret; } static HRESULT STDMETHODCALLTYPE Modified: trunk/reactos/base/shell/explorer-new/undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/un… ============================================================================== --- trunk/reactos/base/shell/explorer-new/undoc.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/undoc.h [iso-8859-1] Fri May 2 07:09:39 2008 @@ -228,8 +228,7 @@ #define DrawCaptionTemp DrawCaptionTempA #endif -DEFINE_GUID(CLSID_RebarBandSite, 0xECD4FC4D, 0x521C, 0x11D0, 0xB7, 0x92, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1); -DEFINE_GUID(IID_IDeskBand, 0xEB0FE172, 0x1A3A, 0x11D0, 0x89, 0xB3, 0x00, 0xA0, 0xC9, 0x0A, 0x90, 0xAC); +EXTERN_C const GUID CLSID_RebarBandSite; HRESULT WINAPI SHInvokeDefaultCommand(HWND,IShellFolder*,LPCITEMIDLIST); Modified: trunk/reactos/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=33… ============================================================================== --- trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] Fri May 2 07:09:39 2008 @@ -122,4 +122,3 @@ DEFINE_GUID(CLSID_StdEvent, 0x0000032b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_ManualResetEvent, 0x0000032c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_SynchronizeContainer, 0x0000032d,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(CLSID_RebarBandSite, 0xECD4FC4D, 0x521C, 0x11D0, 0xB7, 0x92, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1);

1 0

[gedmurphy] 33233: Fix build due to recent header changes
by gedmurphy＠svn.reactos.org 02 May '08

02 May '08

Author: gedmurphy Date: Fri May 2 03:43:47 2008 New Revision: 33233 URL: http://svn.reactos.org/svn/reactos?rev=33233&view=rev Log: Fix build due to recent header changes Modified: trunk/reactos/dll/win32/shell32/pidl.c Modified: trunk/reactos/dll/win32/shell32/pidl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.c?r… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] Fri May 2 03:43:47 2008 @@ -432,7 +432,7 @@ * Caller is responsible for deallocating the returned ItemIDList with the * shells IMalloc interface, aka ILFree. */ -LPITEMIDLIST WINAPI SHCloneSpecialIDList(HWND hwndOwner, DWORD nFolder, BOOL fCreate) +PIDLIST_ABSOLUTE WINAPI SHCloneSpecialIDList(HWND hwndOwner, int nFolder, BOOL fCreate) { LPITEMIDLIST ppidl; TRACE_(shell)("(hwnd=%p,csidl=0x%x,%s).\n", hwndOwner, nFolder, fCreate ? "T" : "F");

1 0

[gedmurphy] 33232: - Get the locations of DrawCaptionTemp and RegisterShellHook when required instead of at link time. This allows building with msvc due to missing .lib stuff - Remove SHGetViewStatePropertyBag test code - Move more stuff to appropiate headers - Remove unneeded linker libs
by gedmurphy＠svn.reactos.org 02 May '08

02 May '08

Author: gedmurphy Date: Fri May 2 03:22:09 2008 New Revision: 33232 URL: http://svn.reactos.org/svn/reactos?rev=33232&view=rev Log: - Get the locations of DrawCaptionTemp and RegisterShellHook when required instead of at link time. This allows building with msvc due to missing .lib stuff - Remove SHGetViewStatePropertyBag test code - Move more stuff to appropiate headers - Remove unneeded linker libs Modified: trunk/reactos/base/shell/explorer-new/explorer.rbuild trunk/reactos/base/shell/explorer-new/precomp.h trunk/reactos/base/shell/explorer-new/taskswnd.c trunk/reactos/base/shell/explorer-new/todo.h trunk/reactos/base/shell/explorer-new/traywnd.c trunk/reactos/include/psdk/shlobj.h trunk/reactos/include/psdk/shlwapi.h trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/base/shell/explorer-new/explorer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/explorer.rbuild [iso-8859-1] Fri May 2 03:22:09 2008 @@ -11,11 +11,8 @@ <library>gdi32</library> <library>user32</library> <library>comctl32</library> - <library>msvcrt20</library> - <library>ntdll</library> <library>ole32</library> <library>oleaut32</library> - <library>shdocvw</library> <library>shell32</library> <library>shlwapi</library> <library>uuid</library> Modified: trunk/reactos/base/shell/explorer-new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/pr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] Fri May 2 03:22:09 2008 @@ -22,6 +22,10 @@ #include "comcsup.h" #include "todo.h" #include "undoc.h" + +/* dynamic imports due to lack of support in msvc linker libs */ +typedef INT (STDCALL *REGSHELLHOOK)(HWND, DWORD); +typedef BOOL (STDCALL *DRAWCAPTEMP)(HWND, HDC, const RECT*, HFONT, HICON, LPCWSTR, UINT); static ULONG __inline Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...) @@ -222,13 +226,6 @@ /* * desktop.c */ - -#define SHCNRF_InterruptLevel (0x0001) -#define SHCNRF_ShellLevel (0x0002) -#define SHCNRF_RecursiveInterrupt (0x1000) -#define SHCNRF_NewDelivery (0x8000) - - HANDLE DesktopCreateWindow(IN OUT ITrayWindow *Tray); Modified: trunk/reactos/base/shell/explorer-new/taskswnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ta… ============================================================================== --- trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] Fri May 2 03:22:09 2008 @@ -1358,6 +1358,7 @@ if (This->hWndToolbar != NULL) { + HMODULE hShell32; SIZE BtnSize; /* Identify the version we're using */ @@ -1391,8 +1392,22 @@ /* Register the shell hook */ This->ShellHookMsg = RegisterWindowMessage(TEXT("SHELLHOOK")); - RegisterShellHook(This->hWnd, - 3); /* 1 if not NT! We're targeting NT so we don't care! */ + hShell32 = LoadLibrary(TEXT("SHELL32.DLL")); + if (hShell32 != NULL) + { + REGSHELLHOOK RegShellHook; + + /* RegisterShellHook */ + RegShellHook = (REGSHELLHOOK)GetProcAddress(hShell32, + (LPCSTR)((LONG)181)); + if (RegShellHook != NULL) + { + RegShellHook(This->hWnd, + 3); /* 1 if no NT! We're targeting NT so we don't care! */ + } + + FreeLibrary(hShell32); + } /* Add all windows to the toolbar */ EnumWindows(TaskSwitchWnd_EnumWindowsProc, @@ -1414,11 +1429,27 @@ static VOID TaskSwitchWnd_NCDestroy(IN OUT PTASK_SWITCH_WND This) { + HMODULE hShell32; + This->IsDestroying = TRUE; /* Unregister the shell hook */ - RegisterShellHook(This->hWnd, - FALSE); + hShell32 = LoadLibrary(TEXT("SHELL32.DLL")); + if (hShell32 != NULL) + { + REGSHELLHOOK RegShellHook; + + /* RegisterShellHook */ + RegShellHook = (REGSHELLHOOK)GetProcAddress(hShell32, + (LPCSTR)((LONG)181)); + if (RegShellHook != NULL) + { + RegShellHook(This->hWnd, + FALSE); + } + + FreeLibrary(hShell32); + } TaskSwitchWnd_DeleteAllTasks(This); } @@ -1572,6 +1603,7 @@ { HFONT hCaptionFont, hBoldCaptionFont; LRESULT Ret = CDRF_DODEFAULT; + HMODULE hUser32; #if TASK_USE_DRAWCAPTIONTEMP != 0 @@ -1627,14 +1659,31 @@ uidctFlags |= DC_ACTIVE; } - /* Draw the button content */ - TaskItem->DisplayTooltip = !DrawCaptionTemp(TaskItem->hWnd, - nmtbcd->nmcd.hdc, - &nmtbcd->nmcd.rc, - hCaptionFont, - NULL, - NULL, - uidctFlags); + hUser32 = LoadLibrary(TEXT("USER32.DLL")); + if (hUser32 != NULL) + { + DRAWCAPTEMP DrawCapTemp; + LONG ord = 187; +#ifndef UNICODE + ord = 186; +#endif + /* DrawCaptionTemp */ + DrawCapTemp = (DRAWCAPTEMP)GetProcAddress(hUser32, + (LPCSTR)ord); + if (DrawCapTemp != NULL) + { + /* Draw the button content */ + TaskItem->DisplayTooltip = !DrawCapTemp(TaskItem->hWnd, + nmtbcd->nmcd.hdc, + &nmtbcd->nmcd.rc, + hCaptionFont, + NULL, + NULL, + uidctFlags); + } + + FreeLibrary(hUser32); + } return CDRF_SKIPDEFAULT; Modified: trunk/reactos/base/shell/explorer-new/todo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/to… ============================================================================== --- trunk/reactos/base/shell/explorer-new/todo.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/todo.h [iso-8859-1] Fri May 2 03:22:09 2008 @@ -1,11 +1,5 @@ #ifndef __TODO_H #define __TODO_H - -/* - * Stuff missing in our headers - */ - -#define SM_REMOTECONTROL 0x2001 /* FIXME: Ugly hack!!! FIX ASAP! Move to uuid! */ static const GUID IID_HACK_IShellView2 = {0x88E39E80,0x3578,0x11CF,{0xAE,0x69,0x08,0x00,0x2B,0x2E,0x12,0x62}}; @@ -46,18 +40,6 @@ #define IDeskBarClient_GetSize(T,a,b) (T)->lpVtbl->GetSize(T,a,b) #endif - -#define SHGVSPB_PERUSER 0x1 -#define SHGVSPB_PERFOLDER 0x4 -#define SHGVSPB_ROAM 0x00000020 -#define SHGVSPB_NOAUTODEFAULTS 0x80000000 -#define SHGVSPB_FOLDER (SHGVSPB_PERUSER | SHGVSPB_PERFOLDER) -#define SHGVSPB_FOLDERNODEFAULTS (SHGVSPB_PERUSER | SHGVSPB_PERFOLDER | SHGVSPB_NOAUTODEFAULTS) - - -#define DBC_SHOW 1 -#define DBC_HIDE 0 - static const GUID IID_HACK_IShellService = {0x5836FB00,0x8187,0x11CF,{0xA1,0x2B,0x00,0xAA,0x00,0x4A,0xE8,0x37}}; #define IID_IShellService IID_HACK_IShellService @@ -80,40 +62,4 @@ #define IShellService_SetOwner(T,a) (T)->lpVtbl->SetOwner(T,a) #endif -#if _MSC_VER -HRESULT WINAPI SHGetViewStatePropertyBag(LPCITEMIDLIST,LPCWSTR,DWORD,REFIID,PVOID*);/* FIXME: Parameter should be PCIDLIST_ABSOLUTE */ -#else -typedef HRESULT (WINAPI *PSHGetViewStatePropertyBag)(LPCITEMIDLIST,LPCWSTR,DWORD,REFIID,PVOID*); -static HRESULT __inline -SHGetViewStatePropertyBag(IN LPCITEMIDLIST pidl, - IN LPCWSTR pszBagName, - IN DWORD dwFlags, - IN REFIID riid, - OUT PVOID* ppv) -{ - static PSHGetViewStatePropertyBag Func = NULL; - - if (Func == NULL) - { - HMODULE hShlwapi; - hShlwapi = LoadLibrary(TEXT("SHLWAPI.DLL")); - if (hShlwapi != NULL) - { - Func = (PSHGetViewStatePropertyBag)GetProcAddress(hShlwapi, "SHGetViewStatePropertyBag"); - } - } - - if (Func != NULL) - { - return Func(pidl, pszBagName, dwFlags, riid, ppv); - } - - MessageBox(NULL, TEXT("SHGetViewStatePropertyBag not available"), NULL, 0); - return E_NOTIMPL; -} -#endif - -#define PIDLIST_ABSOLUTE LPITEMIDLIST -PIDLIST_ABSOLUTE WINAPI SHCloneSpecialIDList(HWND hwnd, int csidl, BOOL fCreate); - #endif /* __TODO_H */ Modified: trunk/reactos/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] Fri May 2 03:22:09 2008 @@ -1224,6 +1224,7 @@ BOOL Ret; UINT Flags; RECT rcButton; + HMODULE hUser32; /* NOTE: This is the backwards compatibility code that is used if the Common Controls Version 6.0 are not available! */ @@ -1294,13 +1295,30 @@ if (hIconStart != NULL) Flags |= DC_ICON; - Ret = DrawCaptionTemp(NULL, - hDC, - &rcButton, - This->hStartBtnFont, - hIconStart, - szStartCaption, - Flags); + hUser32 = LoadLibrary(TEXT("USER32.DLL")); + if (hUser32 != NULL) + { + DRAWCAPTEMP DrawCapTemp; + LONG ord = 187; +#ifndef UNICODE + ord = 186; +#endif + /* DrawCaptionTemp */ + DrawCapTemp = (DRAWCAPTEMP)GetProcAddress(hUser32, + (LPCSTR)ord); + if (DrawCapTemp != NULL) + { + Ret = DrawCapTemp(NULL, + hDC, + &rcButton, + This->hStartBtnFont, + hIconStart, + szStartCaption, + Flags); + } + + FreeLibrary(hUser32); + } SelectObject(hDC, hbmpOld); Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Fri May 2 03:22:09 2008 @@ -441,6 +441,13 @@ STDMETHOD_(HRESULT,GetSize)(THIS_ DWORD,LPRECT) PURE; }; #undef INTERFACE + +#define DBC_GS_IDEAL 0 +#define DBC_GS_SIZEDOWN 1 + +#define DBC_HIDE 0 +#define DBC_SHOW 1 +#define DBC_SHOWOBSCURE 2 /**************************************************************************** @@ -752,6 +759,7 @@ HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, int nFormat, LPVOID pv, int cb); #define SHGetDataFromIDList WINELIB_NAME_AW(SHGetDataFromIDList) +PIDLIST_ABSOLUTE WINAPI SHCloneSpecialIDList(HWND hwnd, int csidl, BOOL fCreate); BOOL WINAPI SHGetSpecialFolderPathA (HWND hwndOwner, LPSTR szPath, int nFolder, BOOL bCreate); BOOL WINAPI SHGetSpecialFolderPathW (HWND hwndOwner, LPWSTR szPath, int nFolder, BOOL bCreate); #define SHGetSpecialFolderPath WINELIB_NAME_AW(SHGetSpecialFolderPath) Modified: trunk/reactos/include/psdk/shlwapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlwapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/shlwapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlwapi.h [iso-8859-1] Fri May 2 03:22:09 2008 @@ -999,6 +999,24 @@ ((ULONGLONG)(mnr)<< 32) | ((ULONGLONG)(bld)<< 16) | (ULONGLONG)(qfe)) HRESULT WINAPI DllInstall(BOOL,LPCWSTR) DECLSPEC_HIDDEN; + + +#if (_WIN32_IE >= 0x0600) +#define SHGVSPB_PERUSER 0x00000001 +#define SHGVSPB_ALLUSERS 0x00000002 +#define SHGVSPB_PERFOLDER 0x00000004 +#define SHGVSPB_ALLFOLDERS 0x00000008 +#define SHGVSPB_INHERIT 0x00000010 +#define SHGVSPB_ROAM 0x00000020 +#define SHGVSPB_NOAUTODEFAULTS 0x80000000 + +#define SHGVSPB_FOLDER (SHGVSPB_PERUSER | SHGVSPB_PERFOLDER) +#define SHGVSPB_FOLDERNODEFAULTS (SHGVSPB_PERUSER | SHGVSPB_PERFOLDER | SHGVSPB_NOAUTODEFAULTS) +#define SHGVSPB_USERDEFAULTS (SHGVSPB_PERUSER | SHGVSPB_ALLFOLDERS) +#define SHGVSPB_GLOBALDEAFAULTS (SHGVSPB_ALLUSERS | SHGVSPB_ALLFOLDERS) + +HRESULT WINAPI SHGetViewStatePropertyBag(PCIDLIST_ABSOLUTE pidl, LPCWSTR pszBagName, DWORD dwFlags, REFIID riid, void** ppv); +#endif /* (_WIN32_IE >= 0x0600) */ /* IsOS definitions */ Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Fri May 2 03:22:09 2008 @@ -1004,6 +1004,7 @@ #define SM_CXFOCUSBORDER 83 #define SM_CYFOCUSBORDER 84 #define SM_SHUTTINGDOWN 0x2000 +#define SM_REMOTECONTROL 0x2001 #endif /* _WIN32_WINNT >= 0x0501 */ #define SM_REMOTESESSION 0X1000 #define ARW_BOTTOMLEFT 0

1 0

[dchapyshev] 33231: - The division of right and the left menu - Fix formatting in translations
by dchapyshev＠svn.reactos.org 02 May '08

02 May '08

Author: dchapyshev Date: Fri May 2 02:58:03 2008 New Revision: 33231 URL: http://svn.reactos.org/svn/reactos?rev=33231&view=rev Log: - The division of right and the left menu - Fix formatting in translations Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c trunk/reactos/base/applications/kbswitch/lang/cs-CZ.rc trunk/reactos/base/applications/kbswitch/lang/fr-FR.rc trunk/reactos/base/applications/kbswitch/lang/pl-PL.rc Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Fri May 2 02:58:03 2008 @@ -272,14 +272,11 @@ } static HMENU -BuildPopupMenu() +BuildLeftPopupMenu() { HMENU hMenu; - HMENU hMenuTemplate; HKEY hKey; DWORD dwIndex, dwSize; - LPTSTR pszMenuItem; - MENUITEMINFO mii; TCHAR szLayoutNum[CCH_ULONG_DEC + 1]; TCHAR szName[MAX_PATH]; @@ -303,6 +300,21 @@ RegCloseKey(hKey); } + return hMenu; +} + +static HMENU +BuildRightPopupMenu() +{ + HMENU hMenu; + HMENU hMenuTemplate; + DWORD dwIndex; + LPTSTR pszMenuItem; + MENUITEMINFO mii; + + // Add the keyboard layouts to the popup menu + hMenu = BuildLeftPopupMenu(); + // Add the menu items from the popup menu template hMenuTemplate = GetSubMenu(LoadMenu(hInst, MAKEINTRESOURCE(IDR_POPUP)), 0); dwIndex = 0; @@ -340,26 +352,30 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { - static HMENU hPopupMenu; + static HMENU hLeftPopupMenu, hRightPopupMenu; switch (Message) { case WM_CREATE: AddTrayIcon(hwnd); - hPopupMenu = BuildPopupMenu(hwnd); + hLeftPopupMenu = BuildLeftPopupMenu(hwnd); + hRightPopupMenu = BuildRightPopupMenu(hwnd); break; case WM_NOTIFYICONMSG: switch (lParam) { + case WM_RBUTTONDOWN: case WM_LBUTTONDOWN: - case WM_RBUTTONDOWN: { POINT pt; GetCursorPos(&pt); SetForegroundWindow(hwnd); - TrackPopupMenu(hPopupMenu, 0, pt.x, pt.y, 0, hwnd, NULL); + if (lParam == WM_LBUTTONDOWN) + TrackPopupMenu(hLeftPopupMenu, 0, pt.x, pt.y, 0, hwnd, NULL); + else + TrackPopupMenu(hRightPopupMenu, 0, pt.x, pt.y, 0, hwnd, NULL); PostMessage(hwnd, WM_NULL, 0, 0); break; } @@ -396,7 +412,8 @@ break; case WM_DESTROY: - DestroyMenu(hPopupMenu); + DestroyMenu(hLeftPopupMenu); + DestroyMenu(hRightPopupMenu); DelTrayIcon(hwnd); PostQuitMessage(0); break; Modified: trunk/reactos/base/applications/kbswitch/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/lang/cs-CZ.rc [iso-8859-1] Fri May 2 02:58:03 2008 @@ -11,6 +11,6 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Pøedvolby...", ID_PREFERENCES - MENUITEM "&Ukonèit", ID_EXIT + MENUITEM "&Ukonèit", ID_EXIT END END Modified: trunk/reactos/base/applications/kbswitch/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/lang/fr-FR.rc [iso-8859-1] Fri May 2 02:58:03 2008 @@ -6,6 +6,6 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Préférences...", ID_PREFERENCES - MENUITEM "Quitt&er", ID_EXIT + MENUITEM "Quitt&er", ID_EXIT END END Modified: trunk/reactos/base/applications/kbswitch/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/lang/pl-PL.rc [iso-8859-1] Fri May 2 02:58:03 2008 @@ -13,6 +13,6 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Ustawienia...", ID_PREFERENCES - MENUITEM "&Wyjcie", ID_EXIT + MENUITEM "&Wyjcie", ID_EXIT END END

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs