Ros-diffs June 2009

ros-diffs@reactos.org

21 participants
496 discussions

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Jun 30 01:53:41 2009 New Revision: 41701 URL: http://svn.reactos.org/svn/reactos?rev=41701&view=rev Log: RosBE 1.4.4 is out. Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Tue Jun 30 01:53:41 2009 @@ -6,10 +6,11 @@ the "buildno.h not found" error, too (Daniel Reimer) - Fixed "ssvn create" not working due to the fact that RosBE creates a log folder and then tries to verify a empty folder. Thx for gabriel_it and kjk_hyperion for mentioning. (Daniel Reimer) -- Updated: NSIS to 2.45 (Daniel Reimer) -- Added a while like loop to the batch scripts where needed and used in PS. This allows us to use update.cmd for - more than 10 updates and made the show logs feature of ssvn working in Batch too (Daniel Reimer, Victor Martinez) -- Fixed Update.cmd by removing a missed prerelease hack. (Daniel Reimer) +- Updated: NSIS to 2.45 (Daniel Reimer) +- Added a way to enable/disable the Version Show up (Daniel Reimer) +- Fixed a bug with not activating settings in options.ps1 (Daniel Reimer) +- Added a way to enable/disable the Version Show up (Daniel Reimer) +- Fixed a bug with not activating settings in options.ps1 (Daniel Reimer) *** May 26th, 2009 - RosBE 1.4.3 Released

15 years, 5 months

[cwittich] 41700: fix formatting

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Jun 30 01:10:40 2009 New Revision: 41700 URL: http://svn.reactos.org/svn/reactos?rev=41700&view=rev Log: fix formatting Modified: trunk/reactos/base/system/smss/smapi.c Modified: trunk/reactos/base/system/smss/smapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smapi.c?r… ============================================================================== --- trunk/reactos/base/system/smss/smapi.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/smapi.c [iso-8859-1] Tue Jun 30 01:10:40 2009 @@ -20,9 +20,9 @@ SMAPI(SmInvalid) { - DPRINT("SM: %s called\n",__FUNCTION__); - Request->SmHeader.Status = STATUS_NOT_IMPLEMENTED; - return STATUS_SUCCESS; + DPRINT("SM: %s called\n",__FUNCTION__); + Request->SmHeader.Status = STATUS_NOT_IMPLEMENTED; + return STATUS_SUCCESS; } /* SM API Table */ @@ -30,20 +30,20 @@ SM_PORT_API SmApi [] = { - SmInvalid, /* unused */ - SmCompSes, /* smapicomp.c */ - SmInvalid, /* obsolete */ - SmInvalid, /* unknown */ - SmExecPgm, /* smapiexec.c */ - SmQryInfo /* smapyqry.c */ + SmInvalid, /* unused */ + SmCompSes, /* smapicomp.c */ + SmInvalid, /* obsolete */ + SmInvalid, /* unknown */ + SmExecPgm, /* smapiexec.c */ + SmQryInfo /* smapyqry.c */ }; /* TODO: optimize this address computation (it should be done * with a macro) */ PSM_CONNECT_DATA FASTCALL SmpGetConnectData (PSM_PORT_MESSAGE Request) { - PPORT_MESSAGE PortMessage = (PPORT_MESSAGE) Request; - return (PSM_CONNECT_DATA)(PortMessage + 1); + PPORT_MESSAGE PortMessage = (PPORT_MESSAGE) Request; + return (PSM_CONNECT_DATA)(PortMessage + 1); } NTSTATUS NTAPI @@ -60,46 +60,46 @@ */ static NTSTATUS SmpCallbackServer (PSM_PORT_MESSAGE Request, - PSM_CLIENT_DATA ClientData) -{ - NTSTATUS Status = STATUS_SUCCESS; - PSM_CONNECT_DATA ConnectData = SmpGetConnectData (Request); - UNICODE_STRING CallbackPortName; - ULONG CallbackPortNameLength = SM_SB_NAME_MAX_LENGTH; /* TODO: compute length */ - SB_CONNECT_DATA SbConnectData; - ULONG SbConnectDataLength = sizeof SbConnectData; - SECURITY_QUALITY_OF_SERVICE SecurityQos; - - DPRINT("SM: %s called\n", __FUNCTION__); - - if ( ((USHORT)-1 == ConnectData->SubSystemId) || - (IMAGE_SUBSYSTEM_NATIVE == ConnectData->SubSystemId)) - { - DPRINT("SM: %s: we do not need calling back SM!\n", - __FUNCTION__); - return STATUS_SUCCESS; - } - RtlCopyMemory (ClientData->SbApiPortName, - ConnectData->SbName, - CallbackPortNameLength); - RtlInitUnicodeString (& CallbackPortName, - ClientData->SbApiPortName); + PSM_CLIENT_DATA ClientData) +{ + NTSTATUS Status = STATUS_SUCCESS; + PSM_CONNECT_DATA ConnectData = SmpGetConnectData (Request); + UNICODE_STRING CallbackPortName; + ULONG CallbackPortNameLength = SM_SB_NAME_MAX_LENGTH; /* TODO: compute length */ + SB_CONNECT_DATA SbConnectData; + ULONG SbConnectDataLength = sizeof SbConnectData; + SECURITY_QUALITY_OF_SERVICE SecurityQos; + + DPRINT("SM: %s called\n", __FUNCTION__); + + if ( ((USHORT)-1 == ConnectData->SubSystemId) || + (IMAGE_SUBSYSTEM_NATIVE == ConnectData->SubSystemId)) + { + DPRINT("SM: %s: we do not need calling back SM!\n", + __FUNCTION__); + return STATUS_SUCCESS; + } + RtlCopyMemory (ClientData->SbApiPortName, + ConnectData->SbName, + CallbackPortNameLength); + RtlInitUnicodeString (& CallbackPortName, + ClientData->SbApiPortName); SecurityQos.Length = sizeof (SecurityQos); SecurityQos.ImpersonationLevel = SecurityIdentification; SecurityQos.ContextTrackingMode = SECURITY_DYNAMIC_TRACKING; SecurityQos.EffectiveOnly = TRUE; - SbConnectData.SmApiMax = (sizeof SmApi / sizeof SmApi[0]); - Status = NtConnectPort (& ClientData->SbApiPort, - & CallbackPortName, - &SecurityQos, - NULL, - NULL, - NULL, - & SbConnectData, - & SbConnectDataLength); - return Status; + SbConnectData.SmApiMax = (sizeof SmApi / sizeof SmApi[0]); + Status = NtConnectPort (& ClientData->SbApiPort, + & CallbackPortName, + &SecurityQos, + NULL, + NULL, + NULL, + & SbConnectData, + & SbConnectDataLength); + return Status; } /********************************************************************** @@ -112,62 +112,62 @@ VOID NTAPI SmpApiConnectedThread(PVOID pConnectedPort) { - NTSTATUS Status = STATUS_SUCCESS; - PPORT_MESSAGE Reply = NULL; - SM_PORT_MESSAGE Request; - HANDLE ConnectedPort = * (PHANDLE) pConnectedPort; - - DPRINT("SM: %s called\n", __FUNCTION__); - RtlZeroMemory(&Request, sizeof(SM_PORT_MESSAGE)); - - while (TRUE) - { - DPRINT("SM: %s: waiting for message\n",__FUNCTION__); - - Status = NtReplyWaitReceivePort(ConnectedPort, - NULL, - Reply, - (PPORT_MESSAGE) & Request); - if (NT_SUCCESS(Status)) - { - DPRINT("SM: %s: message received (type=%d)\n", - __FUNCTION__, - Request.Header.u2.s2.Type); - - switch (Request.Header.u2.s2.Type) - { - case LPC_CONNECTION_REQUEST: - SmpHandleConnectionRequest (&Request); - Reply = NULL; - break; - case LPC_DEBUG_EVENT: + NTSTATUS Status = STATUS_SUCCESS; + PPORT_MESSAGE Reply = NULL; + SM_PORT_MESSAGE Request; + HANDLE ConnectedPort = * (PHANDLE) pConnectedPort; + + DPRINT("SM: %s called\n", __FUNCTION__); + RtlZeroMemory(&Request, sizeof(SM_PORT_MESSAGE)); + + while (TRUE) + { + DPRINT("SM: %s: waiting for message\n",__FUNCTION__); + + Status = NtReplyWaitReceivePort(ConnectedPort, + NULL, + Reply, + (PPORT_MESSAGE) & Request); + if (NT_SUCCESS(Status)) + { + DPRINT("SM: %s: message received (type=%d)\n", + __FUNCTION__, + Request.Header.u2.s2.Type); + + switch (Request.Header.u2.s2.Type) + { + case LPC_CONNECTION_REQUEST: + SmpHandleConnectionRequest (&Request); + Reply = NULL; + break; + case LPC_DEBUG_EVENT: // DbgSsHandleKmApiMsg (&Request, 0); - Reply = NULL; - break; - case LPC_PORT_CLOSED: - Reply = NULL; - continue; - default: - if ((Request.SmHeader.ApiIndex) && - (Request.SmHeader.ApiIndex < (sizeof SmApi / sizeof SmApi[0]))) - { - Status = SmApi[Request.SmHeader.ApiIndex](&Request); - Reply = (PPORT_MESSAGE) & Request; - } else { - Request.SmHeader.Status = STATUS_NOT_IMPLEMENTED; - Reply = (PPORT_MESSAGE) & Request; - } - } - } else { - /* LPC failed */ - DPRINT1("SM: %s: NtReplyWaitReceivePort() failed (Status=0x%08lx)\n", - __FUNCTION__, Status); - break; - } - } - NtClose (ConnectedPort); - DPRINT("SM: %s done\n", __FUNCTION__); - NtTerminateThread (NtCurrentThread(), Status); + Reply = NULL; + break; + case LPC_PORT_CLOSED: + Reply = NULL; + continue; + default: + if ((Request.SmHeader.ApiIndex) && + (Request.SmHeader.ApiIndex < (sizeof SmApi / sizeof SmApi[0]))) + { + Status = SmApi[Request.SmHeader.ApiIndex](&Request); + Reply = (PPORT_MESSAGE) & Request; + } else { + Request.SmHeader.Status = STATUS_NOT_IMPLEMENTED; + Reply = (PPORT_MESSAGE) & Request; + } + } + } else { + /* LPC failed */ + DPRINT1("SM: %s: NtReplyWaitReceivePort() failed (Status=0x%08lx)\n", + __FUNCTION__, Status); + break; + } + } + NtClose (ConnectedPort); + DPRINT("SM: %s done\n", __FUNCTION__); + NtTerminateThread (NtCurrentThread(), Status); } /********************************************************************** @@ -183,106 +183,106 @@ NTSTATUS NTAPI SmpHandleConnectionRequest (PSM_PORT_MESSAGE Request) { - PSM_CONNECT_DATA ConnectData = SmpGetConnectData (Request); - NTSTATUS Status = STATUS_SUCCESS; - BOOL Accept = FALSE; - PSM_CLIENT_DATA ClientData = NULL; - HANDLE hClientDataApiPort = (HANDLE) 0; - PHANDLE ClientDataApiPort = & hClientDataApiPort; - HANDLE hClientDataApiPortThread = (HANDLE) 0; - PHANDLE ClientDataApiPortThread = & hClientDataApiPortThread; - PVOID Context = NULL; - - DPRINT("SM: %s called:\n SubSystemID=%d\n SbName=\"%S\"\n", - __FUNCTION__, ConnectData->SubSystemId, ConnectData->SbName); - - if(sizeof (SM_CONNECT_DATA) == Request->Header.u1.s1.DataLength) - { - if(IMAGE_SUBSYSTEM_UNKNOWN == ConnectData->SubSystemId) - { - /* - * This is not a call to register an image set, - * but a simple connection request from a process - * that will use the SM API. - */ - DPRINT("SM: %s: simple request\n", __FUNCTION__); - ClientDataApiPort = & hClientDataApiPort; - ClientDataApiPortThread = & hClientDataApiPortThread; - Accept = TRUE; - } else { - DPRINT("SM: %s: request to register an image set\n", __FUNCTION__); - /* - * Reject GUIs classes: only odd subsystem IDs are - * allowed to register here (tty mode images). - */ - if(1 == (ConnectData->SubSystemId % 2)) - { - DPRINT("SM: %s: id = %d\n", __FUNCTION__, ConnectData->SubSystemId); - /* - * SmBeginClientInitialization/2 will succeed only if there - * is a candidate client ready. - */ - Status = SmBeginClientInitialization (Request, & ClientData); - if(STATUS_SUCCESS == Status) - { - DPRINT("SM: %s: ClientData = %p\n", - __FUNCTION__, ClientData); - /* - * OK: the client is an environment subsystem - * willing to manage a free image type. - */ - ClientDataApiPort = & ClientData->ApiPort; - ClientDataApiPortThread = & ClientData->ApiPortThread; - /* - * Call back the candidate environment subsystem - * server (use the port name sent in in the - * connection request message). - */ - Status = SmpCallbackServer (Request, ClientData); - if(NT_SUCCESS(Status)) - { - DPRINT("SM: %s: SmpCallbackServer OK\n", - __FUNCTION__); - Accept = TRUE; - } else { - DPRINT("SM: %s: SmpCallbackServer failed (Status=%08lx)\n", - __FUNCTION__, Status); - Status = SmDestroyClient (ConnectData->SubSystemId); - } - } - } - } - } - DPRINT("SM: %s: before NtAcceptConnectPort\n", __FUNCTION__); - - Status = NtAcceptConnectPort (ClientDataApiPort, - Context, - (PPORT_MESSAGE) Request, - Accept, - NULL, - NULL); - - if(Accept) - { - if(!NT_SUCCESS(Status)) - { - DPRINT1("SM: %s: NtAcceptConnectPort() failed (Status=0x%08lx)\n", - __FUNCTION__, Status); - return Status; - } else { - DPRINT("SM: %s: completing connection request\n", __FUNCTION__); - Status = NtCompleteConnectPort (*ClientDataApiPort); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SM: %s: NtCompleteConnectPort() failed (Status=0x%08lx)\n", - __FUNCTION__, Status); - return Status; - } - } - Status = STATUS_SUCCESS; - } - DPRINT("SM: %s done\n", __FUNCTION__); - return Status; + PSM_CONNECT_DATA ConnectData = SmpGetConnectData (Request); + NTSTATUS Status = STATUS_SUCCESS; + BOOL Accept = FALSE; + PSM_CLIENT_DATA ClientData = NULL; + HANDLE hClientDataApiPort = (HANDLE) 0; + PHANDLE ClientDataApiPort = & hClientDataApiPort; + HANDLE hClientDataApiPortThread = (HANDLE) 0; + PHANDLE ClientDataApiPortThread = & hClientDataApiPortThread; + PVOID Context = NULL; + + DPRINT("SM: %s called:\n SubSystemID=%d\n SbName=\"%S\"\n", + __FUNCTION__, ConnectData->SubSystemId, ConnectData->SbName); + + if(sizeof (SM_CONNECT_DATA) == Request->Header.u1.s1.DataLength) + { + if(IMAGE_SUBSYSTEM_UNKNOWN == ConnectData->SubSystemId) + { + /* + * This is not a call to register an image set, + * but a simple connection request from a process + * that will use the SM API. + */ + DPRINT("SM: %s: simple request\n", __FUNCTION__); + ClientDataApiPort = & hClientDataApiPort; + ClientDataApiPortThread = & hClientDataApiPortThread; + Accept = TRUE; + } else { + DPRINT("SM: %s: request to register an image set\n", __FUNCTION__); + /* + * Reject GUIs classes: only odd subsystem IDs are + * allowed to register here (tty mode images). + */ + if(1 == (ConnectData->SubSystemId % 2)) + { + DPRINT("SM: %s: id = %d\n", __FUNCTION__, ConnectData->SubSystemId); + /* + * SmBeginClientInitialization/2 will succeed only if there + * is a candidate client ready. + */ + Status = SmBeginClientInitialization (Request, & ClientData); + if(STATUS_SUCCESS == Status) + { + DPRINT("SM: %s: ClientData = %p\n", + __FUNCTION__, ClientData); + /* + * OK: the client is an environment subsystem + * willing to manage a free image type. + */ + ClientDataApiPort = & ClientData->ApiPort; + ClientDataApiPortThread = & ClientData->ApiPortThread; + /* + * Call back the candidate environment subsystem + * server (use the port name sent in in the + * connection request message). + */ + Status = SmpCallbackServer (Request, ClientData); + if(NT_SUCCESS(Status)) + { + DPRINT("SM: %s: SmpCallbackServer OK\n", + __FUNCTION__); + Accept = TRUE; + } else { + DPRINT("SM: %s: SmpCallbackServer failed (Status=%08lx)\n", + __FUNCTION__, Status); + Status = SmDestroyClient (ConnectData->SubSystemId); + } + } + } + } + } + DPRINT("SM: %s: before NtAcceptConnectPort\n", __FUNCTION__); + + Status = NtAcceptConnectPort (ClientDataApiPort, + Context, + (PPORT_MESSAGE) Request, + Accept, + NULL, + NULL); + + if(Accept) + { + if(!NT_SUCCESS(Status)) + { + DPRINT1("SM: %s: NtAcceptConnectPort() failed (Status=0x%08lx)\n", + __FUNCTION__, Status); + return Status; + } else { + DPRINT("SM: %s: completing connection request\n", __FUNCTION__); + Status = NtCompleteConnectPort (*ClientDataApiPort); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SM: %s: NtCompleteConnectPort() failed (Status=0x%08lx)\n", + __FUNCTION__, Status); + return Status; + } + } + Status = STATUS_SUCCESS; + } + DPRINT("SM: %s done\n", __FUNCTION__); + return Status; } @@ -303,16 +303,16 @@ NTSTATUS Status = STATUS_SUCCESS; InitializeObjectAttributes(&ObjectAttributes, - &UnicodeString, - 0, - NULL, - NULL); + &UnicodeString, + 0, + NULL, + NULL); Status = NtCreatePort(&SmApiPort, - &ObjectAttributes, - sizeof(SM_CONNECT_DATA), - sizeof(SM_PORT_MESSAGE), - 0); + &ObjectAttributes, + sizeof(SM_CONNECT_DATA), + sizeof(SM_PORT_MESSAGE), + 0); if (!NT_SUCCESS(Status)) { return(Status); @@ -323,22 +323,22 @@ * port \SmApiPort */ RtlCreateUserThread(NtCurrentProcess(), - NULL, - FALSE, - 0, - 0, - 0, - (PTHREAD_START_ROUTINE)SmpApiConnectedThread, - &SmApiPort, - NULL, - NULL); - - // - // On NT LPC, we need a second thread to handle incoming connections - // generated by incoming requests, otherwise the thread handling - // the request will be busy sending the LPC message, without any other - // thread being busy to receive the LPC message. - // + NULL, + FALSE, + 0, + 0, + 0, + (PTHREAD_START_ROUTINE)SmpApiConnectedThread, + &SmApiPort, + NULL, + NULL); + + /* + * On NT LPC, we need a second thread to handle incoming connections + * generated by incoming requests, otherwise the thread handling + * the request will be busy sending the LPC message, without any other + * thread being busy to receive the LPC message. + */ Status = RtlCreateUserThread(NtCurrentProcess(), NULL, FALSE,

15 years, 5 months

[dreimer] 41699: Added a setting to reenable the Version show up stuff. For all the guys out there who loved it. Fixed a bug in options.ps1.

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Jun 30 00:44:05 2009 New Revision: 41699 URL: http://svn.reactos.org/svn/reactos?rev=41699&view=rev Log: Added a setting to reenable the Version show up stuff. For all the guys out there who loved it. Fixed a bug in options.ps1. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/de-DE.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/en-US.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/es-ES.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/fr-FR.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/pl-PL.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/ru-RU.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/uk-UA.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.c trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.h trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/resources.h 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/options.c trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.h 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 Jun 30 00:44:05 2009 @@ -37,6 +37,7 @@ $global:_ROSBE_USECCACHE = 0 $global:_ROSBE_STRIP = 0 $global:_ROSBE_NOSTRIP = 0 +$global:_ROSBE_SHOWVERSION = 0 $global:_ROSBE_LOGDIR = "$pwd\RosBE-Logs" $global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\i386" $global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\$ENV:ROS_ARCH" @@ -155,6 +156,9 @@ if (Test-Path "$_ROSBE_BASEDIR\scut.ps1") { & "$_ROSBE_BASEDIR\scut.ps1" } +if ($_ROSBE_SHOWVERSION -eq "1") { + & "$_ROSBE_BASEDIR\version.ps1" +} # Tell how to display the available commands. "" 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 Jun 30 00:44:05 2009 @@ -12,10 +12,10 @@ if ("$ROS_ARCH" -eq "amd64") { $options="$_ROSBE_BASEDIR\Tools\options64.exe" - $cfgfile="$ENV:APPDATA\RosBE\rosbe-options-amd64.cmd" + $cfgfile="$ENV:APPDATA\RosBE\rosbe-options-amd64.ps1" } else { $options="$_ROSBE_BASEDIR\Tools\options.exe" - $cfgfile="$ENV:APPDATA\RosBE\rosbe-options.cmd" + $cfgfile="$ENV:APPDATA\RosBE\rosbe-options.ps1" } # Run options.exe 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 Jun 30 00:44:05 2009 @@ -40,6 +40,7 @@ set _ROSBE_LOGDIR=%CD%\RosBE-Logs set _ROSBE_OBJPATH= set _ROSBE_OUTPATH= +set _ROSBE_SHOWVERSION=0 set _ROSBE_HOST_MINGWPATH=%_ROSBE_BASEDIR%\i386 set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\%ROS_ARCH% set _ROSBE_ORIGINALPATH=%_ROSBE_HOST_MINGWPATH%\bin;%PATH% @@ -105,6 +106,9 @@ if exist "%_ROSBE_BASEDIR%\scut.cmd" ( call "%_ROSBE_BASEDIR%\scut.cmd" ) +if "%_ROSBE_SHOWVERSION%" == "1" ( + call "%_ROSBE_BASEDIR%\version.cmd" +) :: Tell how to display the available commands. echo. Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/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/amd64/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/de-DE.rc [iso-8859-1] Tue Jun 30 00:44:05 2009 @@ -13,7 +13,8 @@ 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, 150, 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 @@ -75,4 +76,5 @@ HLP_QUITBUTTON, "Dieser Button lässt Sie das Programm, ohne die Konfiguration zu speichern, beenden." HLP_DEFAULTMSG, "Bewegen Sie sich über eine Fläche um Hilfe zu erhalten." HLP_NOSTRIP, "Erzeugt Debuginformation für den ReactOS Debugger." + HLP_VERSION, "Zeige die Versionen der RosBE Komponenten." END Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/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/amd64/lang/en-US.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/en-US.rc [iso-8859-1] Tue Jun 30 00:44:05 2009 @@ -13,7 +13,8 @@ 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, 150, 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 @@ -75,4 +76,5 @@ HLP_QUITBUTTON, "This button lets you quit configuration without saving." HLP_DEFAULTMSG, "Hover over a control to get help." HLP_NOSTRIP, "Creates debug information for the ReactOS Debugger." + HLP_VERSION, "Show the Versions of the RosBE Components." END Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/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/amd64/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/es-ES.rc [iso-8859-1] Tue Jun 30 00:44:05 2009 @@ -13,7 +13,8 @@ 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, 150, 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 @@ -75,4 +76,5 @@ HLP_QUITBUTTON, "Este botón le permite salir de la configuración sin guardar los cambios." HLP_DEFAULTMSG, "Situese sobre un control para obtener ayuda." HLP_NOSTRIP, "Crea información de depuración para el ReactOS Debugger." + HLP_VERSION, "Show the Versions of the RosBE Components." END Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/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/amd64/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/fr-FR.rc [iso-8859-1] Tue Jun 30 00:44:05 2009 @@ -13,7 +13,8 @@ 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, 150, 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 @@ -75,4 +76,5 @@ HLP_QUITBUTTON, "Ce bouton vous permet de quitter la configuration sans sauvegarder." HLP_DEFAULTMSG, "Passez sur un contrôle pour avoir de l'aide." HLP_NOSTRIP, "Creates debug information for the ReactOS Debugger." + HLP_VERSION, "Show the Versions of the RosBE Components." END Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/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/amd64/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/pl-PL.rc [iso-8859-1] Tue Jun 30 00:44:05 2009 @@ -13,7 +13,8 @@ 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, 150, 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 @@ -75,4 +76,5 @@ HLP_QUITBUTTON, "Przycisk pozwala na wyjcie bez zapisania ustawieñ." HLP_DEFAULTMSG, "Najed na element, aby uzyskaæ pomoc." HLP_NOSTRIP, "Utwórz informacje debugowania dla Debuggera ReactOS." + HLP_VERSION, "Show the Versions of the RosBE Components." END Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/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/amd64/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/ru-RU.rc [iso-8859-1] Tue Jun 30 00:44:05 2009 @@ -15,7 +15,8 @@ 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, 150, 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 @@ -77,4 +78,5 @@ HLP_QUITBUTTON, "Ýòî êëàâèøà ïîçâîëÿåò âûéòè áåç ñîõðàíåíèÿ èçìåíåíèé" HLP_DEFAULTMSG, "Ïîìîùü ïî èçíà÷àëüíûì ïàðàìåòðàì" HLP_NOSTRIP, "Êîìïèëÿöèÿ ôàéëîâ ReactOS'à ñ ñîçäàíèåì èíôîðìàöèè äëÿ äåáàãåðà." + HLP_VERSION, "Show the Versions of the RosBE Components." END Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/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/amd64/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/lang/uk-UA.rc [iso-8859-1] Tue Jun 30 00:44:05 2009 @@ -21,7 +21,8 @@ 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, 150, 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 @@ -83,4 +84,5 @@ HLP_QUITBUTTON, "Öå êíîïêà äîçâîëÿº âèéòè ç êîíô³ãóðóâàííÿ áåç çáåðåæåííÿ çì³í." HLP_DEFAULTMSG, "Íàâåä³òü âêàç³âíèê ìèø³ íà åëåìåíò êåðóâàííÿ, ùîá îòðèìàòè äîâ³äêó." HLP_NOSTRIP, "Creates debug information for the ReactOS Debugger." + HLP_VERSION, "Show the Versions of the RosBE Components." END Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.c [iso-8859-1] Tue Jun 30 00:44:05 2009 @@ -77,7 +77,7 @@ WriteSettings(POPTIONS_DLG infoPtr) { INT foreground, background; - BOOL showtime, writelog, useccache, strip, nostrip, objstate, outstate; + BOOL showtime, writelog, useccache, strip, nostrip, objstate, outstate, showversion; WCHAR logdir[MAX_PATH], objdir[MAX_PATH], outdir[MAX_PATH], mingwpath[MAX_PATH], checkmgw[MAX_PATH]; WCHAR msgerror[256]; HANDLE hFile; @@ -90,6 +90,7 @@ nostrip = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_NOSTRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); objstate = (SendDlgItemMessage(infoPtr->hwndDlg, ID_OTHEROBJ, BM_GETCHECK, 0, 0) == BST_CHECKED); outstate = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_OTHEROUT, BM_GETCHECK, 0, 0) == BST_CHECKED); + showversion = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_SHOWVERSION, BM_GETCHECK, 0, 0) == BST_CHECKED); foreground = (INT) SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_GETCURSEL, 0, 0); background = (INT) SendDlgItemMessageW(infoPtr->hwndDlg, IDC_BACK, CB_GETCURSEL, 0, 0); GetDlgItemTextW(infoPtr->hwndDlg, ID_LOGDIR, logdir, MAX_PATH); @@ -136,6 +137,7 @@ fwprintf(pFilecmd, L"set _ROSBE_STRIP=%d\n", strip); fwprintf(pFilecmd, L"set _ROSBE_NOSTRIP=%d\n", nostrip); 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 (mingwpath[0] != 0) fwprintf(pFilecmd, L"set _ROSBE_TARGET_MINGWPATH=%s\n", mingwpath); if ((objdir[0] != 0) && objstate) fwprintf(pFilecmd, L"set _ROSBE_OBJPATH=%s\n", objdir); @@ -151,15 +153,16 @@ fwprintf(pFileps1, L"(Get-Host).UI.RawUI.ForegroundColor = 0x%X\n", foreground); fwprintf(pFileps1, L"(Get-Host).UI.RawUI.BackgroundColor = 0x%X\n", background); fwprintf(pFileps1, L"clear-host\n"); - fwprintf(pFileps1, L"$_ROSBE_SHOWTIME = %d\n", showtime); - fwprintf(pFileps1, L"$_ROSBE_USECCACHE = %d\n", useccache); - fwprintf(pFileps1, L"$_ROSBE_STRIP = %d\n", strip); - fwprintf(pFileps1, L"$_ROSBE_NOSTRIP = %d\n", nostrip); - fwprintf(pFileps1, L"$_ROSBE_WRITELOG = %d\n", writelog); - if (logdir[0] != 0) fwprintf(pFileps1, L"$_ROSBE_LOGDIR = \"%s\"\n", logdir); - if (mingwpath[0] != 0) fwprintf(pFileps1, L"$_ROSBE_TARGET_MINGWPATH = \"%s\"\n", mingwpath); - if ((objdir[0] != 0) && objstate) fwprintf(pFileps1, L"$_ROSBE_OBJPATH = \"%s\"\n", objdir); - if ((outdir[0] != 0) && outstate) fwprintf(pFileps1, L"$_ROSBE_OUTPATH = \"%s\"\n", outdir); + fwprintf(pFileps1, L"$global:_ROSBE_SHOWTIME = %d\n", showtime); + fwprintf(pFileps1, L"$global:_ROSBE_USECCACHE = %d\n", useccache); + fwprintf(pFileps1, L"$global:_ROSBE_STRIP = %d\n", strip); + fwprintf(pFileps1, L"$global:_ROSBE_NOSTRIP = %d\n", nostrip); + 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 (mingwpath[0] != 0) fwprintf(pFileps1, L"$global:_ROSBE_HOST_MINGWPATH = \"%s\"\n", mingwpath); + if ((objdir[0] != 0) && objstate) fwprintf(pFileps1, L"$global:_ROSBE_OBJPATH = \"%s\"\n", objdir); + if ((outdir[0] != 0) && outstate) fwprintf(pFileps1, L"$global:_ROSBE_OUTPATH = \"%s\"\n", outdir); } if (pFilecmd && pFileps1) @@ -224,6 +227,8 @@ LoadedSettings->nostrip = wcstol(ptr2, NULL, 2); 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 (wcscmp(ptr, L"_ROSBE_TARGET_MINGWPATH") == 0) @@ -244,6 +249,7 @@ LoadedSettings->background = 0; LoadedSettings->showtime = 1; LoadedSettings->writelog = 1; + LoadedSettings->showversion = 0; GetCurrentDirectory(MAX_PATH, LoadedSettings->mingwpath); if ((wcslen(LoadedSettings->mingwpath) + wcslen(MINGWVERSION)) < MAX_PATH) wcscat(LoadedSettings->mingwpath, MINGWVERSION); @@ -254,6 +260,7 @@ SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_SETCURSEL, LoadedSettings->foreground, 0); SendDlgItemMessageW(infoPtr->hwndDlg, IDC_BACK, CB_SETCURSEL, LoadedSettings->background, 0); SendDlgItemMessage(infoPtr->hwndDlg, ID_SHOWBUILDTIME, BM_SETCHECK, LoadedSettings->showtime, 0); + SendDlgItemMessage(infoPtr->hwndDlg, ID_SHOWVERSION, BM_SETCHECK, LoadedSettings->showversion, 0); SendDlgItemMessage(infoPtr->hwndDlg, ID_SAVELOGS, BM_SETCHECK, LoadedSettings->writelog, 0); if (LoadedSettings->writelog) { @@ -286,7 +293,7 @@ VOID SetSaveState(POPTIONS_DLG infoPtr) { INT foreground, background; - BOOL showtime, writelog, useccache, strip, nostrip, objstate, outstate; + BOOL showtime, writelog, useccache, strip, nostrip, objstate, outstate, showversion; WCHAR logdir[MAX_PATH], objdir[MAX_PATH], outdir[MAX_PATH], mingwpath[MAX_PATH]; BOOL StateObj = TRUE, StateOut = TRUE, StateLog = TRUE, State = TRUE; PSETTINGS DefaultSettings = &infoPtr->Settings; @@ -298,6 +305,7 @@ nostrip = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_NOSTRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); objstate = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_OTHEROBJ, BM_GETCHECK, 0, 0) == BST_CHECKED); outstate = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_OTHEROUT, BM_GETCHECK, 0, 0) == BST_CHECKED); + showversion = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_SHOWVERSION, BM_GETCHECK, 0, 0) == BST_CHECKED); foreground = (INT) SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_GETCURSEL, 0, 0); background = (INT) SendDlgItemMessageW(infoPtr->hwndDlg, IDC_BACK, CB_GETCURSEL, 0, 0); GetDlgItemTextW(infoPtr->hwndDlg, ID_LOGDIR, logdir, MAX_PATH); @@ -320,7 +328,7 @@ (useccache == DefaultSettings->useccache) && (strip == DefaultSettings->strip) && (objstate == DefaultSettings->objstate) && (outstate == DefaultSettings->outstate) && (StateLog) && (wcscmp(mingwpath, DefaultSettings->mingwpath) == 0) && - (StateObj) && (StateOut) && (nostrip == DefaultSettings->nostrip)); + (StateObj) && (StateOut) && (nostrip == DefaultSettings->nostrip) && (showversion == DefaultSettings->showversion)); EnableWindow(GetDlgItem(infoPtr->hwndDlg, ID_OK), State); } @@ -425,6 +433,7 @@ {ID_BROWSEOBJ, HLP_FINDOBJDIR}, {ID_OTHEROBJ, HLP_FINDOBJDIR}, {ID_OUTDIR, HLP_FINDOUTDIR}, + {ID_SHOWVERSION, HLP_VERSION}, {ID_BROWSEOUT, HLP_FINDOUTDIR}, {ID_OTHEROUT, HLP_FINDOUTDIR}, {ID_OK, HLP_SAVEBUTTON}, Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.h [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/options64.h [iso-8859-1] Tue Jun 30 00:44:05 2009 @@ -31,6 +31,7 @@ BOOL writelog; BOOL objstate; BOOL outstate; + BOOL showversion; } SETTINGS, *PSETTINGS; Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/resources.h [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/resources.h [iso-8859-1] Tue Jun 30 00:44:05 2009 @@ -50,32 +50,34 @@ #define IDC_BACK 0x25 #define ID_STATUSBAR 0x26 #define ID_NOSTRIP 0x27 +#define ID_SHOWVERSION 0x28 /* Strings */ -#define MSG_NOGCCFOUND 0x27 -#define MSG_CMDFFAILED 0x28 -#define MSG_PS1FFAILED 0x29 -#define MSG_DIREFAILED 0x2a -#define MSG_SETLOADSUC 0x2b -#define MSG_FINDLOGDIR 0x2c -#define MSG_FINDMGWDIR 0x2d -#define MSG_FINDOBJDIR 0x2e -#define MSG_FINDOUTDIR 0x2f -#define MSG_WARNINGBOX 0x30 -#define MSG_EXITCHANGE 0x31 -#define MSG_INVALIDDIR 0x32 +#define MSG_NOGCCFOUND 0x29 +#define MSG_CMDFFAILED 0x2a +#define MSG_PS1FFAILED 0x2b +#define MSG_DIREFAILED 0x2c +#define MSG_SETLOADSUC 0x2d +#define MSG_FINDLOGDIR 0x2e +#define MSG_FINDMGWDIR 0x2f +#define MSG_FINDOBJDIR 0x30 +#define MSG_FINDOUTDIR 0x31 +#define MSG_WARNINGBOX 0x32 +#define MSG_EXITCHANGE 0x33 +#define MSG_INVALIDDIR 0x34 /* Help Strings */ -#define HLP_BACKCOLORC 0x33 -#define HLP_FONTCOLORC 0x34 -#define HLP_SBUILDTIME 0x35 -#define HLP_CCACHEUSED 0x36 -#define HLP_STRIPEDEXE 0x37 -#define HLP_FINDMGWDIR 0x38 -#define HLP_FINDLOGDIR 0x39 -#define HLP_FINDOBJDIR 0x3a -#define HLP_FINDOUTDIR 0x3b -#define HLP_SAVEBUTTON 0x3c -#define HLP_QUITBUTTON 0x3d -#define HLP_DEFAULTMSG 0x3e -#define HLP_NOSTRIP 0x3f +#define HLP_BACKCOLORC 0x35 +#define HLP_FONTCOLORC 0x36 +#define HLP_SBUILDTIME 0x37 +#define HLP_CCACHEUSED 0x38 +#define HLP_STRIPEDEXE 0x39 +#define HLP_FINDMGWDIR 0x3a +#define HLP_FINDLOGDIR 0x3b +#define HLP_FINDOBJDIR 0x3c +#define HLP_FINDOUTDIR 0x3d +#define HLP_SAVEBUTTON 0x3e +#define HLP_QUITBUTTON 0x3f +#define HLP_DEFAULTMSG 0x40 +#define HLP_NOSTRIP 0x41 +#define HLP_VERSION 0x42 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 Jun 30 00:44:05 2009 @@ -13,7 +13,8 @@ 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, 150, 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 @@ -75,4 +76,5 @@ HLP_QUITBUTTON, "Dieser Button lässt Sie das Programm, ohne die Konfiguration zu speichern, beenden." HLP_DEFAULTMSG, "Bewegen Sie sich über eine Fläche um Hilfe zu erhalten." HLP_NOSTRIP, "Erzeugt Debuginformation für den ReactOS Debugger." + HLP_VERSION, "Zeige die Versionen der RosBE Komponenten." END 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 Jun 30 00:44:05 2009 @@ -13,7 +13,8 @@ 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, 150, 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 @@ -75,4 +76,5 @@ HLP_QUITBUTTON, "This button lets you quit configuration without saving." HLP_DEFAULTMSG, "Hover over a control to get help." HLP_NOSTRIP, "Creates debug information for the ReactOS Debugger." + HLP_VERSION, "Show the Versions of the RosBE Components." END 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 Jun 30 00:44:05 2009 @@ -13,7 +13,8 @@ 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, 150, 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 @@ -75,4 +76,5 @@ HLP_QUITBUTTON, "Este botón le permite salir de la configuración sin guardar los cambios." HLP_DEFAULTMSG, "Situese sobre un control para obtener ayuda." HLP_NOSTRIP, "Crea información de depuración para el ReactOS Debugger." + HLP_VERSION, "Show the Versions of the RosBE Components." END 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 Jun 30 00:44:05 2009 @@ -13,7 +13,8 @@ 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, 150, 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 @@ -75,4 +76,5 @@ HLP_QUITBUTTON, "Ce bouton vous permet de quitter la configuration sans sauvegarder." HLP_DEFAULTMSG, "Passez sur un contrôle pour avoir de l'aide." HLP_NOSTRIP, "Creates debug information for the ReactOS Debugger." + HLP_VERSION, "Show the Versions of the RosBE Components." END 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 Jun 30 00:44:05 2009 @@ -13,7 +13,8 @@ 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, 150, 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 @@ -75,4 +76,5 @@ HLP_QUITBUTTON, "Przycisk pozwala na wyjcie bez zapisania ustawieñ." HLP_DEFAULTMSG, "Najed na element, aby uzyskaæ pomoc." HLP_NOSTRIP, "Utwórz informacje debugowania dla Debuggera ReactOS." + HLP_VERSION, "Show the Versions of the RosBE Components." END 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 Jun 30 00:44:05 2009 @@ -15,7 +15,8 @@ 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, 150, 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 @@ -77,4 +78,5 @@ HLP_QUITBUTTON, "Ýòî êëàâèøà ïîçâîëÿåò âûéòè áåç ñîõðàíåíèÿ èçìåíåíèé" HLP_DEFAULTMSG, "Ïîìîùü ïî èçíà÷àëüíûì ïàðàìåòðàì" HLP_NOSTRIP, "Êîìïèëÿöèÿ ôàéëîâ ReactOS'à ñ ñîçäàíèåì èíôîðìàöèè äëÿ äåáàãåðà." + HLP_VERSION, "Show the Versions of the RosBE Components." END 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 Jun 30 00:44:05 2009 @@ -21,7 +21,8 @@ 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, 150, 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 @@ -83,4 +84,5 @@ HLP_QUITBUTTON, "Öå êíîïêà äîçâîëÿº âèéòè ç êîíô³ãóðóâàííÿ áåç çáåðåæåííÿ çì³í." HLP_DEFAULTMSG, "Íàâåä³òü âêàç³âíèê ìèø³ íà åëåìåíò êåðóâàííÿ, ùîá îòðèìàòè äîâ³äêó." HLP_NOSTRIP, "Creates debug information for the ReactOS Debugger." + HLP_VERSION, "Show the Versions of the RosBE Components." END 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 Jun 30 00:44:05 2009 @@ -77,7 +77,7 @@ WriteSettings(POPTIONS_DLG infoPtr) { INT foreground, background; - BOOL showtime, writelog, useccache, strip, nostrip, objstate, outstate; + BOOL showtime, writelog, useccache, strip, nostrip, objstate, outstate, showversion; WCHAR logdir[MAX_PATH], objdir[MAX_PATH], outdir[MAX_PATH], mingwpath[MAX_PATH], checkmgw[MAX_PATH]; WCHAR msgerror[256]; HANDLE hFile; @@ -90,6 +90,7 @@ nostrip = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_NOSTRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); objstate = (SendDlgItemMessage(infoPtr->hwndDlg, ID_OTHEROBJ, BM_GETCHECK, 0, 0) == BST_CHECKED); outstate = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_OTHEROUT, BM_GETCHECK, 0, 0) == BST_CHECKED); + showversion = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_SHOWVERSION, BM_GETCHECK, 0, 0) == BST_CHECKED); foreground = (INT) SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_GETCURSEL, 0, 0); background = (INT) SendDlgItemMessageW(infoPtr->hwndDlg, IDC_BACK, CB_GETCURSEL, 0, 0); GetDlgItemTextW(infoPtr->hwndDlg, ID_LOGDIR, logdir, MAX_PATH); @@ -136,6 +137,7 @@ fwprintf(pFilecmd, L"set _ROSBE_STRIP=%d\n", strip); fwprintf(pFilecmd, L"set _ROSBE_NOSTRIP=%d\n", nostrip); 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 (mingwpath[0] != 0) fwprintf(pFilecmd, L"set _ROSBE_HOST_MINGWPATH=%s\n", mingwpath); if ((objdir[0] != 0) && objstate) fwprintf(pFilecmd, L"set _ROSBE_OBJPATH=%s\n", objdir); @@ -151,15 +153,16 @@ fwprintf(pFileps1, L"(Get-Host).UI.RawUI.ForegroundColor = 0x%X\n", foreground); fwprintf(pFileps1, L"(Get-Host).UI.RawUI.BackgroundColor = 0x%X\n", background); fwprintf(pFileps1, L"clear-host\n"); - fwprintf(pFileps1, L"$_ROSBE_SHOWTIME = %d\n", showtime); - fwprintf(pFileps1, L"$_ROSBE_USECCACHE = %d\n", useccache); - fwprintf(pFileps1, L"$_ROSBE_STRIP = %d\n", strip); - fwprintf(pFileps1, L"$_ROSBE_NOSTRIP = %d\n", nostrip); - fwprintf(pFileps1, L"$_ROSBE_WRITELOG = %d\n", writelog); - if (logdir[0] != 0) fwprintf(pFileps1, L"$_ROSBE_LOGDIR = \"%s\"\n", logdir); - if (mingwpath[0] != 0) fwprintf(pFileps1, L"$_ROSBE_HOST_MINGWPATH = \"%s\"\n", mingwpath); - if ((objdir[0] != 0) && objstate) fwprintf(pFileps1, L"$_ROSBE_OBJPATH = \"%s\"\n", objdir); - if ((outdir[0] != 0) && outstate) fwprintf(pFileps1, L"$_ROSBE_OUTPATH = \"%s\"\n", outdir); + fwprintf(pFileps1, L"$global:_ROSBE_SHOWTIME = %d\n", showtime); + fwprintf(pFileps1, L"$global:_ROSBE_USECCACHE = %d\n", useccache); + fwprintf(pFileps1, L"$global:_ROSBE_STRIP = %d\n", strip); + fwprintf(pFileps1, L"$global:_ROSBE_NOSTRIP = %d\n", nostrip); + 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 (mingwpath[0] != 0) fwprintf(pFileps1, L"$global:_ROSBE_HOST_MINGWPATH = \"%s\"\n", mingwpath); + if ((objdir[0] != 0) && objstate) fwprintf(pFileps1, L"$global:_ROSBE_OBJPATH = \"%s\"\n", objdir); + if ((outdir[0] != 0) && outstate) fwprintf(pFileps1, L"$global:_ROSBE_OUTPATH = \"%s\"\n", outdir); } if (pFilecmd && pFileps1) @@ -224,6 +227,8 @@ LoadedSettings->nostrip = wcstol(ptr2, NULL, 2); 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 (wcscmp(ptr, L"_ROSBE_HOST_MINGWPATH") == 0) @@ -244,6 +249,7 @@ LoadedSettings->background = 0; LoadedSettings->showtime = 1; LoadedSettings->writelog = 1; + LoadedSettings->showversion = 0; GetCurrentDirectory(MAX_PATH, LoadedSettings->mingwpath); if ((wcslen(LoadedSettings->mingwpath) + wcslen(MINGWVERSION)) < MAX_PATH) wcscat(LoadedSettings->mingwpath, MINGWVERSION); @@ -254,6 +260,7 @@ SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_SETCURSEL, LoadedSettings->foreground, 0); SendDlgItemMessageW(infoPtr->hwndDlg, IDC_BACK, CB_SETCURSEL, LoadedSettings->background, 0); SendDlgItemMessage(infoPtr->hwndDlg, ID_SHOWBUILDTIME, BM_SETCHECK, LoadedSettings->showtime, 0); + SendDlgItemMessage(infoPtr->hwndDlg, ID_SHOWVERSION, BM_SETCHECK, LoadedSettings->showversion, 0); SendDlgItemMessage(infoPtr->hwndDlg, ID_SAVELOGS, BM_SETCHECK, LoadedSettings->writelog, 0); if (LoadedSettings->writelog) { @@ -286,7 +293,7 @@ VOID SetSaveState(POPTIONS_DLG infoPtr) { INT foreground, background; - BOOL showtime, writelog, useccache, strip, nostrip, objstate, outstate; + BOOL showtime, writelog, useccache, strip, nostrip, objstate, outstate, showversion; WCHAR logdir[MAX_PATH], objdir[MAX_PATH], outdir[MAX_PATH], mingwpath[MAX_PATH]; BOOL StateObj = TRUE, StateOut = TRUE, StateLog = TRUE, State = TRUE; PSETTINGS DefaultSettings = &infoPtr->Settings; @@ -298,6 +305,7 @@ nostrip = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_NOSTRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); objstate = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_OTHEROBJ, BM_GETCHECK, 0, 0) == BST_CHECKED); outstate = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_OTHEROUT, BM_GETCHECK, 0, 0) == BST_CHECKED); + showversion = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_SHOWVERSION, BM_GETCHECK, 0, 0) == BST_CHECKED); foreground = (INT) SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_GETCURSEL, 0, 0); background = (INT) SendDlgItemMessageW(infoPtr->hwndDlg, IDC_BACK, CB_GETCURSEL, 0, 0); GetDlgItemTextW(infoPtr->hwndDlg, ID_LOGDIR, logdir, MAX_PATH); @@ -320,7 +328,7 @@ (useccache == DefaultSettings->useccache) && (strip == DefaultSettings->strip) && (objstate == DefaultSettings->objstate) && (outstate == DefaultSettings->outstate) && (StateLog) && (wcscmp(mingwpath, DefaultSettings->mingwpath) == 0) && - (StateObj) && (StateOut) && (nostrip == DefaultSettings->nostrip)); + (StateObj) && (StateOut) && (nostrip == DefaultSettings->nostrip) && (showversion == DefaultSettings->showversion)); EnableWindow(GetDlgItem(infoPtr->hwndDlg, ID_OK), State); } @@ -425,6 +433,7 @@ {ID_BROWSEOBJ, HLP_FINDOBJDIR}, {ID_OTHEROBJ, HLP_FINDOBJDIR}, {ID_OUTDIR, HLP_FINDOUTDIR}, + {ID_SHOWVERSION, HLP_VERSION}, {ID_BROWSEOUT, HLP_FINDOUTDIR}, {ID_OTHEROUT, HLP_FINDOUTDIR}, {ID_OK, HLP_SAVEBUTTON}, 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 Jun 30 00:44:05 2009 @@ -31,6 +31,7 @@ BOOL writelog; BOOL objstate; BOOL outstate; + BOOL showversion; } SETTINGS, *PSETTINGS; 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 Jun 30 00:44:05 2009 @@ -50,32 +50,34 @@ #define IDC_BACK 0x25 #define ID_STATUSBAR 0x26 #define ID_NOSTRIP 0x27 +#define ID_SHOWVERSION 0x28 /* Strings */ -#define MSG_NOGCCFOUND 0x27 -#define MSG_CMDFFAILED 0x28 -#define MSG_PS1FFAILED 0x29 -#define MSG_DIREFAILED 0x2a -#define MSG_SETLOADSUC 0x2b -#define MSG_FINDLOGDIR 0x2c -#define MSG_FINDMGWDIR 0x2d -#define MSG_FINDOBJDIR 0x2e -#define MSG_FINDOUTDIR 0x2f -#define MSG_WARNINGBOX 0x30 -#define MSG_EXITCHANGE 0x31 -#define MSG_INVALIDDIR 0x32 +#define MSG_NOGCCFOUND 0x29 +#define MSG_CMDFFAILED 0x2a +#define MSG_PS1FFAILED 0x2b +#define MSG_DIREFAILED 0x2c +#define MSG_SETLOADSUC 0x2d +#define MSG_FINDLOGDIR 0x2e +#define MSG_FINDMGWDIR 0x2f +#define MSG_FINDOBJDIR 0x30 +#define MSG_FINDOUTDIR 0x31 +#define MSG_WARNINGBOX 0x32 +#define MSG_EXITCHANGE 0x33 +#define MSG_INVALIDDIR 0x34 /* Help Strings */ -#define HLP_BACKCOLORC 0x33 -#define HLP_FONTCOLORC 0x34 -#define HLP_SBUILDTIME 0x35 -#define HLP_CCACHEUSED 0x36 -#define HLP_STRIPEDEXE 0x37 -#define HLP_FINDMGWDIR 0x38 -#define HLP_FINDLOGDIR 0x39 -#define HLP_FINDOBJDIR 0x3a -#define HLP_FINDOUTDIR 0x3b -#define HLP_SAVEBUTTON 0x3c -#define HLP_QUITBUTTON 0x3d -#define HLP_DEFAULTMSG 0x3e -#define HLP_NOSTRIP 0x3f +#define HLP_BACKCOLORC 0x35 +#define HLP_FONTCOLORC 0x36 +#define HLP_SBUILDTIME 0x37 +#define HLP_CCACHEUSED 0x38 +#define HLP_STRIPEDEXE 0x39 +#define HLP_FINDMGWDIR 0x3a +#define HLP_FINDLOGDIR 0x3b +#define HLP_FINDOBJDIR 0x3c +#define HLP_FINDOUTDIR 0x3d +#define HLP_SAVEBUTTON 0x3e +#define HLP_QUITBUTTON 0x3f +#define HLP_DEFAULTMSG 0x40 +#define HLP_NOSTRIP 0x41 +#define HLP_VERSION 0x42

15 years, 5 months

[cgutman] 41698: - Allocate IP_PACKET on the stack - Reduces non-paged memory consumption

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Jun 30 00:18:32 2009 New Revision: 41698 URL: http://svn.reactos.org/svn/reactos?rev=41698&view=rev Log: - Allocate IP_PACKET on the stack - Reduces non-paged memory consumption Modified: trunk/reactos/lib/drivers/ip/network/ip.c trunk/reactos/lib/drivers/ip/network/receive.c Modified: trunk/reactos/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/ip.… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] Tue Jun 30 00:18:32 2009 @@ -19,23 +19,9 @@ UINT MinLLFrameSize; /* Largest minimum frame size */ BOOLEAN IPInitialized = FALSE; BOOLEAN IpWorkItemQueued = FALSE; -NPAGED_LOOKASIDE_LIST IPPacketList; /* Work around calling timer at Dpc level */ IP_PROTOCOL_HANDLER ProtocolTable[IP_PROTOCOL_TABLE_SIZE]; - - -VOID FreePacket( - PVOID Object) -/* - * FUNCTION: Frees an IP packet object - * ARGUMENTS: - * Object = Pointer to an IP packet structure - */ -{ - exFreeToNPagedLookasideList(&IPPacketList, Object); -} - VOID DontFreePacket( PVOID Object) @@ -56,34 +42,6 @@ */ { exFreePool(Object); -} - - -PIP_PACKET IPCreatePacket(ULONG Type) -/* - * FUNCTION: Creates an IP packet object - * ARGUMENTS: - * Type = Type of IP packet - * RETURNS: - * Pointer to the created IP packet. NULL if there was not enough free resources. - */ -{ - PIP_PACKET IPPacket; - - IPPacket = exAllocateFromNPagedLookasideList(&IPPacketList); - if (!IPPacket) - return NULL; - - /* FIXME: Is this needed? */ - RtlZeroMemory(IPPacket, sizeof(IP_PACKET)); - - INIT_TAG(IPPacket, TAG('I','P','K','T')); - - IPPacket->Free = FreePacket; - IPPacket->Type = Type; - IPPacket->HeaderSize = 20; - - return IPPacket; } PIP_PACKET IPInitializePacket( @@ -416,15 +374,6 @@ 0); /* Depth */ ExInitializeNPagedLookasideList( - &IPPacketList, /* Lookaside list */ - NULL, /* Allocate routine */ - NULL, /* Free routine */ - 0, /* Flags */ - sizeof(IP_PACKET), /* Size of each entry */ - TAG('I','P','P','K'), /* Tag */ - 0); /* Depth */ - - ExInitializeNPagedLookasideList( &IPFragmentList, /* Lookaside list */ NULL, /* Allocate routine */ NULL, /* Free routine */ @@ -491,7 +440,6 @@ /* Destroy lookaside lists */ ExDeleteNPagedLookasideList(&IPHoleList); ExDeleteNPagedLookasideList(&IPDRList); - ExDeleteNPagedLookasideList(&IPPacketList); ExDeleteNPagedLookasideList(&IPFragmentList); IPInitialized = FALSE; Modified: trunk/reactos/lib/drivers/ip/network/receive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/rec… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/receive.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/receive.c [iso-8859-1] Tue Jun 30 00:18:32 2009 @@ -174,7 +174,9 @@ } -PIP_PACKET ReassembleDatagram( +BOOLEAN +ReassembleDatagram( + PIP_PACKET IPPacket, PIPDATAGRAM_REASSEMBLY IPDR) /* * FUNCTION: Reassembles an IP datagram @@ -189,7 +191,6 @@ * At this point, header is expected to point to the IP header */ { - PIP_PACKET IPPacket; PLIST_ENTRY CurrentEntry; PIP_FRAGMENT Current; PVOID Data; @@ -200,11 +201,6 @@ TI_DbgPrint(DEBUG_IP, ("Fragment header:\n")); //OskitDumpBuffer((PCHAR)IPDR->IPv4Header, IPDR->HeaderSize); - - /* FIXME: Assume IPv4 */ - IPPacket = IPCreatePacket(IP_ADDRESS_V4); - if (!IPPacket) - return NULL; IPPacket->TotalSize = IPDR->HeaderSize + IPDR->DataSize; IPPacket->ContigSize = IPPacket->TotalSize; @@ -219,7 +215,7 @@ if (!IPPacket->Header) { TI_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); (*IPPacket->Free)(IPPacket); - return NULL; + return FALSE; } /* Copy the header into the buffer */ @@ -243,7 +239,7 @@ CurrentEntry = CurrentEntry->Flink; } - return IPPacket; + return TRUE; } @@ -289,8 +285,9 @@ USHORT FragLast; BOOLEAN MoreFragments; PIPv4_HEADER IPv4Header; - PIP_PACKET Datagram; + IP_PACKET Datagram; PIP_FRAGMENT Fragment; + BOOLEAN Success; /* FIXME: Assume IPv4 */ @@ -448,26 +445,29 @@ TI_DbgPrint(DEBUG_IP, ("Complete datagram received.\n")); - Datagram = ReassembleDatagram(IPDR); + /* FIXME: Assumes IPv4 */ + IPInitializePacket(&Datagram, IP_ADDRESS_V4); + + Success = ReassembleDatagram(&Datagram, IPDR); RemoveIPDR(IPDR); TcpipReleaseSpinLock(&IPDR->Lock, OldIrql); FreeIPDR(IPDR); - if (!Datagram) + if (!Success) /* Not enough free resources, discard the packet */ return; - DISPLAY_IP_PACKET(Datagram); + DISPLAY_IP_PACKET(&Datagram); /* Give the packet to the protocol dispatcher */ - IPDispatchProtocol(IF, Datagram); + IPDispatchProtocol(IF, &Datagram); /* We're done with this datagram */ - exFreePool(Datagram->Header); + exFreePool(Datagram.Header); TI_DbgPrint(MAX_TRACE, ("Freeing datagram at (0x%X).\n", Datagram)); - (*Datagram->Free)(Datagram); + (*Datagram.Free)(&Datagram); } else TcpipReleaseSpinLock(&IPDR->Lock, OldIrql); }

15 years, 5 months

[mkupfer] 41697: - continue "marletting" - scrollbar size grip with marlett - untested for DFCS_SIZEGRIPRIGHT, but should work too

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Tue Jun 30 00:18:21 2009 New Revision: 41697 URL: http://svn.reactos.org/svn/reactos?rev=41697&view=rev Log: - continue "marletting" - scrollbar size grip with marlett - untested for DFCS_SIZEGRIPRIGHT, but should work too Modified: trunk/reactos/dll/win32/user32/windows/draw.c Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] Tue Jun 30 00:18:21 2009 @@ -890,15 +890,6 @@ RECT myr; INT bkmode; TCHAR Symbol; - // for scrollgripsize - POINT Line[4]; - int SmallDiam = UITOOLS_MakeSquareRect(r, &myr) - 2; - int i; - HBRUSH hbsave; - HPEN hpsave; - COLORREF crPen1, crPen2, crBrush1, crBrush2; - int d46, d93; - // end scrollgripsize switch(uFlags & 0xff) { case DFCS_SCROLLCOMBOBOX: @@ -919,82 +910,39 @@ break; case DFCS_SCROLLSIZEGRIP: - // FIXME: needs to use marlett too, copied for compatibility only - /* This one breaks the flow... */ - IntDrawRectEdge(dc, r, EDGE_BUMP, BF_MIDDLE | ((uFlags&(DFCS_MONO|DFCS_FLAT)) ? BF_MONO : 0)); - hpsave = (HPEN)SelectObject(dc, GetStockObject(DC_PEN)); - hbsave = (HBRUSH)SelectObject(dc, GetStockObject(DC_BRUSH)); - if(uFlags & (DFCS_MONO|DFCS_FLAT)) - { - crPen1 = crPen2 = GetSysColor(COLOR_WINDOWFRAME); - crBrush1 = crBrush2 = GetSysColor(COLOR_WINDOWFRAME); - } - else - { - crPen1 = GetSysColor(COLOR_BTNHIGHLIGHT); - crPen2 = GetSysColor(COLOR_BTNSHADOW); - crBrush1 = GetSysColor(COLOR_BTNHIGHLIGHT); - crBrush2 = GetSysColor(COLOR_BTNSHADOW); - } - - Line[0].x = Line[1].x = r->right-1; - Line[2].y = Line[3].y = r->bottom-1; - d46 = 46*SmallDiam/750; - d93 = 93*SmallDiam/750; - - i = 586*SmallDiam/750; - Line[0].y = r->bottom - i - 1; - Line[3].x = r->right - i - 1; - Line[1].y = Line[0].y + d46; - Line[2].x = Line[3].x + d46; - SetDCBrushColor(dc, crBrush1); - SetDCPenColor(dc, crPen1); - Polygon(dc, Line, 4); - - Line[1].y++; Line[2].x++; - Line[0].y = Line[1].y + d93; - Line[3].x = Line[2].x + d93; - SetDCBrushColor(dc, crBrush2); - SetDCPenColor(dc, crPen2); - Polygon(dc, Line, 4); - - i = 398*SmallDiam/750; - Line[0].y = r->bottom - i - 1; - Line[3].x = r->right - i - 1; - Line[1].y = Line[0].y + d46; - Line[2].x = Line[3].x + d46; - SetDCBrushColor(dc, crBrush1); - SetDCPenColor(dc, crPen1); - Polygon(dc, Line, 4); - - Line[1].y++; Line[2].x++; - Line[0].y = Line[1].y + d93; - Line[3].x = Line[2].x + d93; - SetDCBrushColor(dc, crBrush2); - SetDCPenColor(dc, crPen2); - Polygon(dc, Line, 4); - - i = 210*SmallDiam/750; - Line[0].y = r->bottom - i - 1; - Line[3].x = r->right - i - 1; - Line[1].y = Line[0].y + d46; - Line[2].x = Line[3].x + d46; - SetDCBrushColor(dc, crBrush1); - SetDCPenColor(dc, crPen1); - Polygon(dc, Line, 4); - - Line[1].y++; Line[2].x++; - Line[0].y = Line[1].y + d93; - Line[3].x = Line[2].x + d93; - SetDCBrushColor(dc, crBrush2); - SetDCPenColor(dc, crPen2); - Polygon(dc, Line, 4); - - SelectObject(dc, hpsave); - SelectObject(dc, hbsave); + case DFCS_SCROLLSIZEGRIPRIGHT: + ZeroMemory(&lf, sizeof(LOGFONT)); + UITOOLS_MakeSquareRect(r, &myr); + lf.lfHeight = myr.bottom - myr.top; + lf.lfWidth = 0; + lf.lfWeight = FW_NORMAL; + lf.lfCharSet = DEFAULT_CHARSET; + lstrcpy(lf.lfFaceName, TEXT("Marlett")); + hFont = CreateFontIndirect(&lf); + /* save font and text color */ + hOldFont = SelectObject(dc, hFont); + clrsave = GetTextColor(dc); + bkmode = GetBkMode(dc); + /* set color and drawing mode */ + SetBkMode(dc, TRANSPARENT); + if (!(uFlags & (DFCS_MONO | DFCS_FLAT))) + { + SetTextColor(dc, GetSysColor(COLOR_BTNHIGHLIGHT)); + /* draw selected symbol */ + Symbol = ((uFlags & 0xff) == DFCS_SCROLLSIZEGRIP) ? 'o' : 'x'; + TextOut(dc, myr.left, myr.top, &Symbol, 1); + SetTextColor(dc, GetSysColor(COLOR_BTNSHADOW)); + } else + SetTextColor(dc, GetSysColor(COLOR_WINDOWFRAME)); + /* draw selected symbol */ + Symbol = ((uFlags & 0xff) == DFCS_SCROLLSIZEGRIP) ? 'p' : 'y'; + TextOut(dc, myr.left, myr.top, &Symbol, 1); + /* restore previous settings */ + SetTextColor(dc, clrsave); + SelectObject(dc, hOldFont); + SetBkMode(dc, bkmode); + DeleteObject(hFont); return TRUE; - case DFCS_SCROLLSIZEGRIPRIGHT: - return FALSE; // unimplemented yet default: return FALSE; }

15 years, 5 months

[cwittich] 41696: more header cleanup

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Jun 29 23:50:12 2009 New Revision: 41696 URL: http://svn.reactos.org/svn/reactos?rev=41696&view=rev Log: more header cleanup Modified: trunk/reactos/include/psdk/winbase.h Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Mon Jun 29 23:50:12 2009 @@ -572,6 +572,7 @@ #endif #ifndef RC_INVOKED + #ifndef _FILETIME_ #define _FILETIME_ typedef struct _FILETIME { @@ -579,6 +580,7 @@ DWORD dwHighDateTime; } FILETIME,*PFILETIME,*LPFILETIME; #endif + typedef struct _BY_HANDLE_FILE_INFORMATION { DWORD dwFileAttributes; FILETIME ftCreationTime; @@ -590,7 +592,8 @@ DWORD nNumberOfLinks; DWORD nFileIndexHigh; DWORD nFileIndexLow; -} BY_HANDLE_FILE_INFORMATION,*LPBY_HANDLE_FILE_INFORMATION; +} BY_HANDLE_FILE_INFORMATION,*PBY_HANDLE_FILE_INFORMATION,*LPBY_HANDLE_FILE_INFORMATION; + typedef struct _DCB { DWORD DCBlength; DWORD BaudRate; @@ -621,6 +624,7 @@ char EvtChar; WORD wReserved1; } DCB,*LPDCB; + typedef struct _COMM_CONFIG { DWORD dwSize; WORD wVersion; @@ -631,6 +635,7 @@ DWORD dwProviderSize; WCHAR wcProviderData[1]; } COMMCONFIG,*LPCOMMCONFIG; + typedef struct _COMMPROP { WORD wPacketLength; WORD wPacketVersion; @@ -651,6 +656,7 @@ DWORD dwProvSpec2; WCHAR wcProvChar[1]; } COMMPROP,*LPCOMMPROP; + typedef struct _COMMTIMEOUTS { DWORD ReadIntervalTimeout; DWORD ReadTotalTimeoutMultiplier; @@ -658,6 +664,7 @@ DWORD WriteTotalTimeoutMultiplier; DWORD WriteTotalTimeoutConstant; } COMMTIMEOUTS,*LPCOMMTIMEOUTS; + typedef struct _COMSTAT { DWORD fCtsHold:1; DWORD fDsrHold:1; @@ -670,7 +677,9 @@ DWORD cbInQue; DWORD cbOutQue; } COMSTAT,*LPCOMSTAT; + typedef DWORD (WINAPI *LPTHREAD_START_ROUTINE)(LPVOID); + typedef struct _CREATE_PROCESS_DEBUG_INFO { HANDLE hFile; HANDLE hProcess; @@ -683,21 +692,26 @@ LPVOID lpImageName; WORD fUnicode; } CREATE_PROCESS_DEBUG_INFO,*LPCREATE_PROCESS_DEBUG_INFO; + typedef struct _CREATE_THREAD_DEBUG_INFO { HANDLE hThread; LPVOID lpThreadLocalBase; LPTHREAD_START_ROUTINE lpStartAddress; } CREATE_THREAD_DEBUG_INFO,*LPCREATE_THREAD_DEBUG_INFO; + typedef struct _EXCEPTION_DEBUG_INFO { EXCEPTION_RECORD ExceptionRecord; DWORD dwFirstChance; } EXCEPTION_DEBUG_INFO,*LPEXCEPTION_DEBUG_INFO; + typedef struct _EXIT_THREAD_DEBUG_INFO { DWORD dwExitCode; } EXIT_THREAD_DEBUG_INFO,*LPEXIT_THREAD_DEBUG_INFO; + typedef struct _EXIT_PROCESS_DEBUG_INFO { DWORD dwExitCode; } EXIT_PROCESS_DEBUG_INFO,*LPEXIT_PROCESS_DEBUG_INFO; + typedef struct _LOAD_DLL_DEBUG_INFO { HANDLE hFile; LPVOID lpBaseOfDll; @@ -706,18 +720,22 @@ LPVOID lpImageName; WORD fUnicode; } LOAD_DLL_DEBUG_INFO,*LPLOAD_DLL_DEBUG_INFO; + typedef struct _UNLOAD_DLL_DEBUG_INFO { LPVOID lpBaseOfDll; } UNLOAD_DLL_DEBUG_INFO,*LPUNLOAD_DLL_DEBUG_INFO; + typedef struct _OUTPUT_DEBUG_STRING_INFO { LPSTR lpDebugStringData; WORD fUnicode; WORD nDebugStringLength; } OUTPUT_DEBUG_STRING_INFO,*LPOUTPUT_DEBUG_STRING_INFO; + typedef struct _RIP_INFO { DWORD dwError; DWORD dwType; } RIP_INFO,*LPRIP_INFO; + typedef struct _DEBUG_EVENT { DWORD dwDebugEventCode; DWORD dwProcessId; @@ -734,6 +752,7 @@ RIP_INFO RipInfo; } u; } DEBUG_EVENT,*LPDEBUG_EVENT; + typedef struct _OVERLAPPED { ULONG_PTR Internal; ULONG_PTR InternalHigh; @@ -741,6 +760,7 @@ DWORD OffsetHigh; HANDLE hEvent; } OVERLAPPED,*POVERLAPPED,*LPOVERLAPPED; + typedef struct _STARTUPINFOA { DWORD cb; LPSTR lpReserved; @@ -761,6 +781,7 @@ HANDLE hStdOutput; HANDLE hStdError; } STARTUPINFOA,*LPSTARTUPINFOA; + typedef struct _STARTUPINFOW { DWORD cb; LPWSTR lpReserved; @@ -781,12 +802,14 @@ HANDLE hStdOutput; HANDLE hStdError; } STARTUPINFOW,*LPSTARTUPINFOW; + typedef struct _PROCESS_INFORMATION { HANDLE hProcess; HANDLE hThread; DWORD dwProcessId; DWORD dwThreadId; -} PROCESS_INFORMATION,*LPPROCESS_INFORMATION; +} PROCESS_INFORMATION,*PPROCESS_INFORMATION,*LPPROCESS_INFORMATION; + typedef struct _CRITICAL_SECTION_DEBUG { WORD Type; WORD CreatorBackTraceIndex; @@ -799,7 +822,8 @@ //#else //WORD SpareWORD; //#endif -} CRITICAL_SECTION_DEBUG,*PCRITICAL_SECTION_DEBUG; +} CRITICAL_SECTION_DEBUG,*PCRITICAL_SECTION_DEBUG,*LPCRITICAL_SECTION_DEBUG; + typedef struct _CRITICAL_SECTION { PCRITICAL_SECTION_DEBUG DebugInfo; LONG LockCount; @@ -808,6 +832,7 @@ HANDLE LockSemaphore; ULONG_PTR SpinCount; } CRITICAL_SECTION,*PCRITICAL_SECTION,*LPCRITICAL_SECTION; + #ifndef _SYSTEMTIME_ #define _SYSTEMTIME_ typedef struct _SYSTEMTIME { @@ -856,15 +881,18 @@ WCHAR cFileName[MAX_PATH]; WCHAR cAlternateFileName[14]; } WIN32_FIND_DATAW,*PWIN32_FIND_DATAW,*LPWIN32_FIND_DATAW; + #if (_WIN32_WINNT >= 0x0501) typedef enum _STREAM_INFO_LEVELS { FindStreamInfoStandard } STREAM_INFO_LEVELS; + typedef struct _WIN32_FIND_STREAM_DATA { LARGE_INTEGER StreamSize; WCHAR cStreamName[MAX_PATH + 36]; } WIN32_FIND_STREAM_DATA, *PWIN32_FIND_STREAM_DATA; #endif + typedef struct _WIN32_STREAM_ID { DWORD dwStreamId; DWORD dwStreamAttributes; @@ -872,11 +900,13 @@ DWORD dwStreamNameSize; WCHAR cStreamName[ANYSIZE_ARRAY]; } WIN32_STREAM_ID, *LPWIN32_STREAM_ID; + #if (_WIN32_WINNT >= 0x0600) typedef enum _FILE_ID_TYPE { FileIdType, MaximumFileIdType } FILE_ID_TYPE, *PFILE_ID_TYPE; + typedef struct _FILE_ID_DESCRIPTOR { DWORD dwSize; FILE_ID_TYPE Type; @@ -885,30 +915,36 @@ } DUMMYUNIONNAME; } FILE_ID_DESCRIPTOR, *LPFILE_ID_DESCRIPTOR; #endif + typedef enum _FINDEX_INFO_LEVELS { FindExInfoStandard, FindExInfoMaxInfoLevel } FINDEX_INFO_LEVELS; + typedef enum _FINDEX_SEARCH_OPS { FindExSearchNameMatch, FindExSearchLimitToDirectories, FindExSearchLimitToDevices, FindExSearchMaxSearchOp } FINDEX_SEARCH_OPS; + typedef struct tagHW_PROFILE_INFOA { DWORD dwDockInfo; CHAR szHwProfileGuid[HW_PROFILE_GUIDLEN]; CHAR szHwProfileName[MAX_PROFILE_LEN]; } HW_PROFILE_INFOA,*LPHW_PROFILE_INFOA; + typedef struct tagHW_PROFILE_INFOW { DWORD dwDockInfo; WCHAR szHwProfileGuid[HW_PROFILE_GUIDLEN]; WCHAR szHwProfileName[MAX_PROFILE_LEN]; } HW_PROFILE_INFOW,*LPHW_PROFILE_INFOW; + typedef enum _GET_FILEEX_INFO_LEVELS { GetFileExInfoStandard, GetFileExMaxInfoLevel } GET_FILEEX_INFO_LEVELS; + typedef struct _SYSTEM_INFO { _ANONYMOUS_UNION union { DWORD dwOemId; @@ -927,6 +963,7 @@ WORD wProcessorLevel; WORD wProcessorRevision; } SYSTEM_INFO,*LPSYSTEM_INFO; + typedef struct _SYSTEM_POWER_STATUS { BYTE ACLineStatus; BYTE BatteryFlag; @@ -935,6 +972,7 @@ DWORD BatteryLifeTime; DWORD BatteryFullLifeTime; } SYSTEM_POWER_STATUS,*LPSYSTEM_POWER_STATUS; + typedef struct _TIME_ZONE_INFORMATION { LONG Bias; WCHAR StandardName[32]; @@ -943,7 +981,8 @@ WCHAR DaylightName[32]; SYSTEMTIME DaylightDate; LONG DaylightBias; -} TIME_ZONE_INFORMATION,*LPTIME_ZONE_INFORMATION; +} TIME_ZONE_INFORMATION,*PTIME_ZONE_INFORMATION,*LPTIME_ZONE_INFORMATION; + typedef struct _MEMORYSTATUS { DWORD dwLength; DWORD dwMemoryLoad; @@ -954,6 +993,7 @@ DWORD dwTotalVirtual; DWORD dwAvailVirtual; } MEMORYSTATUS,*LPMEMORYSTATUS; + #if (_WIN32_WINNT >= 0x0500) typedef struct _MEMORYSTATUSEX { DWORD dwLength; @@ -967,6 +1007,7 @@ DWORDLONG ullAvailExtendedVirtual; } MEMORYSTATUSEX, *LPMEMORYSTATUSEX; #endif + #ifndef _LDT_ENTRY_DEFINED #define _LDT_ENTRY_DEFINED typedef struct _LDT_ENTRY { @@ -994,6 +1035,7 @@ } HighWord; } LDT_ENTRY,*PLDT_ENTRY,*LPLDT_ENTRY; #endif + typedef struct _PROCESS_HEAP_ENTRY { PVOID lpData; DWORD cbData; @@ -1012,7 +1054,8 @@ LPVOID lpLastBlock; } Region; } DUMMYUNIONNAME; -} PROCESS_HEAP_ENTRY,*LPPROCESS_HEAP_ENTRY; +} PROCESS_HEAP_ENTRY,*PPROCESS_HEAP_ENTRY,*LPPROCESS_HEAP_ENTRY; + typedef struct _OFSTRUCT { BYTE cBytes; BYTE fFixedDisk; @@ -1021,6 +1064,7 @@ WORD Reserved2; CHAR szPathName[OFS_MAXPATHNAME]; } OFSTRUCT,*LPOFSTRUCT,*POFSTRUCT; + #if (_WIN32_WINNT >= 0x0501) typedef struct tagACTCTXA { ULONG cbSize; @@ -1034,6 +1078,7 @@ HMODULE hModule; } ACTCTXA,*PACTCTXA; typedef const ACTCTXA *PCACTCTXA; + typedef struct tagACTCTXW { ULONG cbSize; DWORD dwFlags; @@ -1046,6 +1091,30 @@ HMODULE hModule; } ACTCTXW,*PACTCTXW; typedef const ACTCTXW *PCACTCTXW; + +typedef struct tagACTCTX_SECTION_KEYED_DATA_2600 { + ULONG cbSize; + ULONG ulDataFormatVersion; + PVOID lpData; + ULONG ulLength; + PVOID lpSectionGlobalData; + ULONG ulSectionGlobalDataLength; + PVOID lpSectionBase; + ULONG ulSectionTotalLength; + HANDLE hActCtx; + ULONG ulAssemblyRosterIndex; +} ACTCTX_SECTION_KEYED_DATA_2600, *PACTCTX_SECTION_KEYED_DATA_2600; +typedef const ACTCTX_SECTION_KEYED_DATA_2600 *PCACTCTX_SECTION_KEYED_DATA_2600; + +typedef struct tagACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA { + PVOID lpInformation; + PVOID lpSectionBase; + ULONG ulSectionLength; + PVOID lpSectionGlobalDataBase; + ULONG ulSectionGlobalDataLength; +} ACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA, *PACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA; +typedef const ACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA *PCACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA; + typedef struct tagACTCTX_SECTION_KEYED_DATA { ULONG cbSize; ULONG ulDataFormatVersion; @@ -1057,18 +1126,27 @@ ULONG ulSectionTotalLength; HANDLE hActCtx; ULONG ulAssemblyRosterIndex; + /* Non 2600 extra fields */ + ULONG ulFlags; + ACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA AssemblyMetadata; } ACTCTX_SECTION_KEYED_DATA,*PACTCTX_SECTION_KEYED_DATA; + typedef const ACTCTX_SECTION_KEYED_DATA *PCACTCTX_SECTION_KEYED_DATA; + typedef struct _ACTIVATION_CONTEXT_BASIC_INFORMATION { HANDLE hActCtx; DWORD dwFlags; } ACTIVATION_CONTEXT_BASIC_INFORMATION, *PACTIVATION_CONTEXT_BASIC_INFORMATION; typedef const struct _ACTIVATION_CONTEXT_BASIC_INFORMATION *PCACTIVATION_CONTEXT_BASIC_INFORMATION; + +typedef BOOL (WINAPI *PQUERYACTCTXW_FUNC)(DWORD,HANDLE,PVOID,ULONG,PVOID,SIZE_T,SIZE_T *); + typedef enum { LowMemoryResourceNotification , HighMemoryResourceNotification } MEMORY_RESOURCE_NOTIFICATION_TYPE; #endif /* (_WIN32_WINNT >= 0x0501) */ + #if (_WIN32_WINNT >= 0x0500) typedef enum _COMPUTER_NAME_FORMAT { ComputerNameNetBIOS, @@ -1082,12 +1160,17 @@ ComputerNameMax } COMPUTER_NAME_FORMAT; #endif /* (_WIN32_WINNT >= 0x0500) */ + #if (_WIN32_WINNT >= 0x0600) typedef RTL_SRWLOCK SRWLOCK, *PSRWLOCK; typedef RTL_CONDITION_VARIABLE CONDITION_VARIABLE, *PCONDITION_VARIABLE; #endif + typedef DWORD(WINAPI *LPPROGRESS_ROUTINE)(LARGE_INTEGER,LARGE_INTEGER,LARGE_INTEGER,LARGE_INTEGER,DWORD,DWORD,HANDLE,HANDLE,LPVOID); -typedef void(WINAPI *LPFIBER_START_ROUTINE)(PVOID); + +typedef VOID (WINAPI *PFIBER_START_ROUTINE)( LPVOID lpFiberParameter ); +typedef PFIBER_START_ROUTINE LPFIBER_START_ROUTINE; + typedef VOID (WINAPI *PFLS_CALLBACK_FUNCTION)(PVOID); typedef BOOL(CALLBACK *ENUMRESLANGPROCA)(HMODULE,LPCSTR,LPCSTR,WORD,LONG_PTR); typedef BOOL(CALLBACK *ENUMRESLANGPROCW)(HMODULE,LPCWSTR,LPCWSTR,WORD,LONG_PTR);

15 years, 5 months

[cwittich] 41695: fix build

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Jun 29 22:47:29 2009 New Revision: 41695 URL: http://svn.reactos.org/svn/reactos?rev=41695&view=rev Log: fix build Modified: trunk/reactos/subsystems/win32/win32k/include/engobjects.h Modified: trunk/reactos/subsystems/win32/win32k/include/engobjects.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/engobjects.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/engobjects.h [iso-8859-1] Mon Jun 29 22:47:29 2009 @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - * + /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: GDI Internal Objects

15 years, 5 months

[cfinck] 41694: SVN maintenance: Remove some svn:keywords properties

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Jun 29 22:24:35 2009 New Revision: 41694 URL: http://svn.reactos.org/svn/reactos?rev=41694&view=rev Log: SVN maintenance: Remove some svn:keywords properties Modified: trunk/reactos/subsystems/win32/win32k/include/engobjects.h (contents, props changed) trunk/reactos/tools/rsym/rsym.c (props changed) trunk/reactos/tools/rsym/rsym.h (props changed) trunk/reactos/tools/rsym/rsym_common.c (props changed) Modified: trunk/reactos/subsystems/win32/win32k/include/engobjects.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/engobjects.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/engobjects.h [iso-8859-1] Mon Jun 29 22:24:35 2009 @@ -16,7 +16,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel Propchange: trunk/reactos/subsystems/win32/win32k/include/engobjects.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/tools/rsym/rsym.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/tools/rsym/rsym.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -Author Date Id Revision Propchange: trunk/reactos/tools/rsym/rsym_common.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -Author Date Id Revision

15 years, 5 months

[cwittich] 41693: include winreg.h

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Jun 29 22:23:48 2009 New Revision: 41693 URL: http://svn.reactos.org/svn/reactos?rev=41693&view=rev Log: include winreg.h Modified: trunk/rostests/winetests/powrprof/pwrprof.c Modified: trunk/rostests/winetests/powrprof/pwrprof.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/powrprof/pwrpro… ============================================================================== --- trunk/rostests/winetests/powrprof/pwrprof.c [iso-8859-1] (original) +++ trunk/rostests/winetests/powrprof/pwrprof.c [iso-8859-1] Mon Jun 29 22:23:48 2009 @@ -1,4 +1,4 @@ -#include<stdarg.h> +#include <stdarg.h> #include "ntstatus.h" #define WIN32_NO_STATUS #define STANDALONE @@ -6,6 +6,7 @@ #include "winternl.h" #include "windef.h" #include "winbase.h" +#include "winreg.h" #include "powrprof.h" #include "assert.h"

15 years, 5 months

[cfinck] 41692: Merge 41676, 41684

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Jun 29 22:03:56 2009 New Revision: 41692 URL: http://svn.reactos.org/svn/reactos?rev=41692&view=rev Log: Merge 41676, 41684 Modified: branches/ros-branch-0_3_10/reactos/ (props changed) branches/ros-branch-0_3_10/reactos/drivers/storage/ide/uniata/bm_devs.h branches/ros-branch-0_3_10/reactos/subsystems/win32/win32k/include/engobjects.h (props changed) branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.c (props changed) branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.h (props changed) branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.mak (props changed) branches/ros-branch-0_3_10/reactos/tools/rsym/rsym_common.c (props changed) Propchange: branches/ros-branch-0_3_10/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 29 22:03:56 2009 @@ -1,1 +1,1 @@ -/trunk/reactos:41447,41526,41666 +/trunk/reactos:41447,41526,41666,41676,41684 Modified: branches/ros-branch-0_3_10/reactos/drivers/storage/ide/uniata/bm_devs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/drive… ============================================================================== --- branches/ros-branch-0_3_10/reactos/drivers/storage/ide/uniata/bm_devs.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_10/reactos/drivers/storage/ide/uniata/bm_devs.h [iso-8859-1] Mon Jun 29 22:03:56 2009 @@ -557,31 +557,44 @@ PCI_DEV_HW_SPEC_BM( 2651, 8086, 0x00, ATA_SA150, "Intel ICH6" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 2652, 8086, 0x00, ATA_SA150, "Intel ICH6" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 2653, 8086, 0x00, ATA_SA150, "Intel ICH6M" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 27df, 8086, 0x00, ATA_UDMA5, "Intel ICH7" , 0 ), - PCI_DEV_HW_SPEC_BM( 27c0, 8086, 0x00, ATA_SA300, "Intel ICH7" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 27c0, 8086, 0x00, ATA_UDMA5, "Intel ICH7" , 0 ), PCI_DEV_HW_SPEC_BM( 27c1, 8086, 0x00, ATA_SA300, "Intel ICH7" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 27c3, 8086, 0x00, ATA_SA300, "Intel ICH7" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 27c4, 8086, 0x00, ATA_SA300, "Intel ICH7M" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 27c5, 8086, 0x00, ATA_SA300, "Intel ICH7M" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 27c6, 8086, 0x00, ATA_SA300, "Intel ICH7M" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 27c4, 8086, 0x00, ATA_UDMA5, "Intel ICH7M" , 0 ), + PCI_DEV_HW_SPEC_BM( 27c5, 8086, 0x00, ATA_SA150, "Intel ICH7M" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 27c6, 8086, 0x00, ATA_SA150, "Intel ICH7M" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 27df, 8086, 0x00, ATA_UDMA5, "Intel ICH7" , 0 ), PCI_DEV_HW_SPEC_BM( 269e, 8086, 0x00, ATA_UDMA5, "Intel 63XXESB2" , 0 ), PCI_DEV_HW_SPEC_BM( 2680, 8086, 0x00, ATA_SA300, "Intel 63XXESB2" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 2681, 8086, 0x00, ATA_SA300, "Intel 63XXESB2" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 2682, 8086, 0x00, ATA_SA300, "Intel 63XXESB2" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 2683, 8086, 0x00, ATA_SA300, "Intel 63XXESB2" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 2820, 8086, 0x00, ATA_SA300, "Intel ICH8" , 0 ), + PCI_DEV_HW_SPEC_BM( 2820, 8086, 0x00, ATA_UDMA5, "Intel ICH8" , 0 ), PCI_DEV_HW_SPEC_BM( 2821, 8086, 0x00, ATA_SA300, "Intel ICH8" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 2822, 8086, 0x00, ATA_SA300, "Intel ICH8" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 2824, 8086, 0x00, ATA_SA300, "Intel ICH8" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 2825, 8086, 0x00, ATA_SA300, "Intel ICH8" , UNIATA_SATA | UNIATA_AHCI ), -// PCI_DEV_HW_SPEC_BM( 2828, 8086, 0x00, ATA_SA300, "Intel ICH8M" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 2825, 8086, 0x00, ATA_UDMA5, "Intel ICH8" , 0 ), + PCI_DEV_HW_SPEC_BM( 2828, 8086, 0x00, ATA_UDMA5, "Intel ICH8M" , 0 ), PCI_DEV_HW_SPEC_BM( 2829, 8086, 0x00, ATA_SA300, "Intel ICH8M" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 282a, 8086, 0x00, ATA_SA300, "Intel ICH8M" , UNIATA_SATA | UNIATA_AHCI ), -// PCI_DEV_HW_SPEC_BM( 2850, 8086, 0x00, ATA_SA300, "Intel ICH8M" , UNIATA_SATA ), - PCI_DEV_HW_SPEC_BM( 2920, 8086, 0x00, ATA_SA300, "Intel ICH9" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 2926, 8086, 0x00, ATA_SA300, "Intel ICH9" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 2850, 8086, 0x00, ATA_UDMA5, "Intel ICH8M" , 0 ), + PCI_DEV_HW_SPEC_BM( 2920, 8086, 0x00, ATA_UDMA5, "Intel ICH9R/DO/DH", 0 ), + PCI_DEV_HW_SPEC_BM( 2921, 8086, 0x00, ATA_UDMA5, "Intel ICH9" , 0 ), + PCI_DEV_HW_SPEC_BM( 2922, 8086, 0x00, ATA_SA300, "Intel ICH9" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 2923, 8086, 0x00, ATA_SA300, "Intel ICH9" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 2922, 8086, 0x00, ATA_SA300, "Intel ICH9" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 2926, 8086, 0x00, ATA_UDMA5, "Intel ICH9" , 0 ), + PCI_DEV_HW_SPEC_BM( 2928, 8086, 0x00, ATA_UDMA5, "Intel ICH9M/M-E" , 0 ), + PCI_DEV_HW_SPEC_BM( 2929, 8086, 0x00, ATA_SA300, "Intel ICH9M/M-E" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 292d, 8086, 0x00, ATA_UDMA5, "Intel ICH9M/M-E" , 0 ), + PCI_DEV_HW_SPEC_BM( 3a00, 8086, 0x00, ATA_UDMA5, "Intel ICH10" , 0 ), + PCI_DEV_HW_SPEC_BM( 3a02, 8086, 0x00, ATA_SA300, "Intel ICH10" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 3a03, 8086, 0x00, ATA_SA300, "Intel ICH10" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 3a06, 8086, 0x00, ATA_UDMA5, "Intel ICH10" , 0 ), + PCI_DEV_HW_SPEC_BM( 3a20, 8086, 0x00, ATA_UDMA5, "Intel ICH10" , 0 ), + PCI_DEV_HW_SPEC_BM( 3a22, 8086, 0x00, ATA_SA300, "Intel ICH10" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 3a23, 8086, 0x00, ATA_SA300, "Intel ICH10" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 3a26, 8086, 0x00, ATA_UDMA5, "Intel ICH10" , 0 ), + // PCI_DEV_HW_SPEC_BM( 3200, 8086, 0x00, ATA_SA150, "Intel 31244" , UNIATA_SATA ), /* PCI_DEV_HW_SPEC_BM( 5040, 11ab, 0x00, ATA_SA150, "Marvell 88SX5040" , UNIATA_SATA ), Propchange: branches/ros-branch-0_3_10/reactos/subsystems/win32/win32k/include/engobjects.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 29 22:03:56 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/engobjects.h:40095 -/trunk/reactos/subsystems/win32/win32k/include/engobjects.h:41447,41526,41666 +/trunk/reactos/subsystems/win32/win32k/include/engobjects.h:41447,41526,41666,41676,41684 Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 29 22:03:56 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 -/trunk/reactos/tools/rsym/rsym.c:41447,41526,41666 +/trunk/reactos/tools/rsym/rsym.c:41447,41526,41666,41676,41684 Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 29 22:03:56 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 -/trunk/reactos/tools/rsym/rsym.h:41447,41526,41666 +/trunk/reactos/tools/rsym/rsym.h:41447,41526,41666,41676,41684 Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.mak ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 29 22:03:56 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 -/trunk/reactos/tools/rsym/rsym.mak:41447,41526,41666 +/trunk/reactos/tools/rsym/rsym.mak:41447,41526,41666,41676,41684 Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym_common.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 29 22:03:56 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 -/trunk/reactos/tools/rsym/rsym_common.c:41447,41526,41666 +/trunk/reactos/tools/rsym/rsym_common.c:41447,41526,41666,41676,41684

15 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2009