Ros-diffs May 2009

ros-diffs@reactos.org

27 participants
504 discussions

[cgutman] 41223: - Fix build
by cgutman＠svn.reactos.org 31 May '09

31 May '09

Author: cgutman Date: Sun May 31 18:59:56 2009 New Revision: 41223 URL: http://svn.reactos.org/svn/reactos?rev=41223&view=rev Log: - Fix build Modified: trunk/reactos/drivers/network/ndis/include/ndissys.h Modified: trunk/reactos/drivers/network/ndis/include/ndissys.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/ndissys.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/ndissys.h [iso-8859-1] Sun May 31 18:59:56 2009 @@ -17,6 +17,7 @@ #include <xfilter.h> #include <afilter.h> #include <atm.h> +#include <ndistapi.h> struct _ADAPTER_BINDING;

1 0

[cgutman] 41222: - Export and stub NdisAllocateFromBlockPool, NdisCancelSendPackets, NdisCoAssignInstanceName, NdisCoGetTapiCallId, NdisCreateBlockPool, NdisDestroyBlockPool, NdisGeneratePartialCancelId, NdisGetRoutineAddress, NdisGetSharedDataAlignment, NdisGetVersion, NdisIMGetCurrentPacketStack, NdisIMNotifyPnPEvent, NdisQueryPendingIOCount, and NdisSetPacketStatus
by cgutman＠svn.reactos.org 31 May '09

31 May '09

Author: cgutman Date: Sun May 31 18:47:06 2009 New Revision: 41222 URL: http://svn.reactos.org/svn/reactos?rev=41222&view=rev Log: - Export and stub NdisAllocateFromBlockPool, NdisCancelSendPackets, NdisCoAssignInstanceName, NdisCoGetTapiCallId, NdisCreateBlockPool, NdisDestroyBlockPool, NdisGeneratePartialCancelId, NdisGetRoutineAddress, NdisGetSharedDataAlignment, NdisGetVersion, NdisIMGetCurrentPacketStack, NdisIMNotifyPnPEvent, NdisQueryPendingIOCount, and NdisSetPacketStatus Modified: trunk/reactos/drivers/network/ndis/ndis.def trunk/reactos/drivers/network/ndis/ndis/50stubs.c trunk/reactos/drivers/network/ndis/ndis/co.c Modified: trunk/reactos/drivers/network/ndis/ndis.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis.… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis.def [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis.def [iso-8859-1] Sun May 31 18:47:06 2009 @@ -16,6 +16,7 @@ NdisAllocateBuffer@20 NdisAllocateBufferPool@12 NdisAllocateDmaChannel@20 +NdisAllocateFromBlockPool@4 NdisAllocateMemory@20 NdisAllocateMemoryWithTag@12 NdisAllocatePacket@12 @@ -26,6 +27,7 @@ NdisAnsiStringToUnicodeString@8 NdisBufferLength@4 NdisBufferVirtualAddress@4 +NdisCancelSendPackets@8 NdisCancelTimer@8 NdisClAddParty@16 NdisClCloseAddressFamily@4 @@ -57,8 +59,10 @@ NdisCmOpenAddressFamilyComplete@12 NdisCmRegisterAddressFamily@16 NdisCmRegisterSapComplete@12 +NdisCoAssignInstanceName@12 NdisCoCreateVc@16 NdisCoDeleteVc@4 +NdisCoGetTapiCallId@8 NdisCoRequest@20 NdisCoRequestComplete@20 NdisCoSendPackets@12 @@ -75,10 +79,13 @@ NdisCopyBuffer@24 NdisCopyFromPacketToPacket@24 NdisCopyFromPacketToPacketSafe@28 +NdisCreateBlockPool@16 NdisDeregisterAdapter@4 NdisDeregisterAdapterShutdownHandler@4 NdisDeregisterMac@8 NdisDeregisterProtocol@8 +;NdisDeregisterTdiCallback ? +NdisDestroyBlockPool@4 NdisDprAcquireSpinLock@4 NdisDprAllocatePacket@12 NdisDprAllocatePacketNonInterlocked@12 @@ -94,6 +101,7 @@ NdisFreePacketPool@4 NdisFreeSharedMemory@24 NdisFreeSpinLock@4 +NdisGeneratePartialCancelId@0 NdisGetBufferPhysicalArraySize@8 NdisGetCurrentProcessorCounts@12 NdisGetCurrentProcessorCpuUsage@4 @@ -104,7 +112,10 @@ NdisGetPacketCancelId@4 NdisGetPoolFromPacket@4 NdisGetReceivedPacket@8 +NdisGetRoutineAddress@4 +NdisGetSharedDataAlignment@0 NdisGetSystemUpTime@4 +NdisGetVersion@0 NdisIMAssociateMiniport@8 NdisIMCancelInitializeDeviceInstance@8 NdisIMCopySendCompletePerPacketInfo@8 @@ -112,9 +123,11 @@ NdisIMDeInitializeDeviceInstance@4 NdisIMDeregisterLayeredMiniport@4 NdisIMGetBindingContext@4 +NdisIMGetCurrentPacketStack@8 NdisIMGetDeviceContext@4 NdisIMInitializeDeviceInstance@8 NdisIMInitializeDeviceInstanceEx@12 +NdisIMNotifyPnPEvent@8 NdisImmediateReadPciSlotInformation@20 NdisImmediateReadPortUchar@12 NdisImmediateReadPortUlong@12 @@ -231,6 +244,7 @@ NdisQueryBufferOffset@12 NdisQueryBufferSafe@16 NdisQueryMapRegisterCount@8 +NdisQueryPendingIOCount@8 NdisReadConfiguration@20 NdisReadEisaSlotInformation@16 NdisReadEisaSlotInformationEx@20 @@ -255,6 +269,7 @@ NdisSetEvent@4 NdisSetPacketCancelId@8 NdisSetPacketPoolProtocolId@8 +NdisSetPacketStatus@16 ;NdisSetProtocolFilter ? NdisSetTimer@8 NdisSetTimerEx@12 Modified: trunk/reactos/drivers/network/ndis/ndis/50stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] Sun May 31 18:47:06 2009 @@ -9,6 +9,176 @@ */ #include "ndissys.h" + +/* + * @unimplemented + */ +VOID +EXPORT +NdisSetPacketStatus( + IN PNDIS_PACKET Packet, + IN NDIS_STATUS Status, + IN NDIS_HANDLE Handle, + IN ULONG Code) +{ + UNIMPLEMENTED +} + +/* + * @unimplemented + */ +NDIS_STATUS +EXPORT +NdisQueryPendingIOCount( + IN PVOID NdisBindingHandle, + OUT PULONG IoCount) +{ + UNIMPLEMENTED + + return NDIS_STATUS_FAILURE; +} + +/* + * @unimplemented + */ +NDIS_STATUS +EXPORT +NdisIMNotifyPnPEvent( + IN NDIS_HANDLE MiniportHandle, + IN PNET_PNP_EVENT NetPnPEvent) +{ + UNIMPLEMENTED + + return NDIS_STATUS_FAILURE; +} + +/* + * @unimplemented + */ +PNDIS_PACKET_STACK +EXPORT +NdisIMGetCurrentPacketStack( + IN PNDIS_PACKET Packet, + OUT BOOLEAN *StacksRemaining) +{ + UNIMPLEMENTED + + *StacksRemaining = FALSE; + + return NULL; +} + +/* + * @unimplemented + */ +UCHAR +EXPORT +NdisGeneratePartialCancelId(VOID) +{ + UNIMPLEMENTED + + return 0; +} + +/* + * @unimplemented + */ +VOID +EXPORT +NdisFreeToBlockPool( + IN PUCHAR Block) +{ + UNIMPLEMENTED +} + +/* + * @unimplemented + */ +VOID +EXPORT +NdisDestroyBlockPool( + IN NDIS_HANDLE BlockPoolHandle) +{ + UNIMPLEMENTED +} + +/* + * @unimplemented + */ +NDIS_HANDLE +EXPORT +NdisCreateBlockPool( + IN USHORT BlockSize, + IN USHORT FreeBlockLinkOffset, + IN ULONG Tag, + IN NDIS_BLOCK_INITIALIZER InitFunction OPTIONAL) +{ + UNIMPLEMENTED + + return NULL; +} + +/* + * @unimplemented + */ +PUCHAR +EXPORT +NdisAllocateFromBlockPool( + IN NDIS_HANDLE BlockPoolHandle) +{ + UNIMPLEMENTED + + return NULL; +} + +/* + * @unimplemented + */ +ULONG +EXPORT +NdisGetSharedDataAlignment(VOID) +{ + UNIMPLEMENTED + + return 0; +} + +/* + * @unimplemented + */ +UINT +EXPORT +NdisGetVersion(VOID) +{ + UNIMPLEMENTED + + return 0; +} + +/* + * @unimplemented + */ +PVOID +EXPORT +NdisGetRoutineAddress( + IN PUNICODE_STRING NdisRoutineName) +{ + UNIMPLEMENTED + + return NULL; +} + +/* + * @unimplemented + */ +VOID +EXPORT +NdisCancelSendPackets( + IN NDIS_HANDLE NdisBindingHandle, + IN PVOID CancelId) +{ + UNIMPLEMENTED +} /* * @unimplemented Modified: trunk/reactos/drivers/network/ndis/ndis/co.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/co.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/co.c [iso-8859-1] Sun May 31 18:47:06 2009 @@ -10,6 +10,34 @@ #include "ndissys.h" +/* + * @unimplemented + */ +NDIS_STATUS +EXPORT +NdisCoGetTapiCallId( + IN NDIS_HANDLE NdisVcHandle, + IN OUT PVAR_STRING TapiCallId) +{ + UNIMPLEMENTED + + return NDIS_STATUS_FAILURE; +} + +/* + * @unimplemented + */ +NDIS_STATUS +EXPORT +NdisCoAssignInstanceName( + IN NDIS_HANDLE NdisVcHandle, + IN PNDIS_STRING BaseInstanceName, + OUT PNDIS_STRING VcInstanceName) +{ + UNIMPLEMENTED + + return NDIS_STATUS_FAILURE; +} /* * @unimplemented

1 0

[cgutman] 41221: - Add NDIS_PACKET_STACK and NDIS_BLOCK_INITIALIZER
by cgutman＠svn.reactos.org 31 May '09

31 May '09

Author: cgutman Date: Sun May 31 18:42:17 2009 New Revision: 41221 URL: http://svn.reactos.org/svn/reactos?rev=41221&view=rev Log: - Add NDIS_PACKET_STACK and NDIS_BLOCK_INITIALIZER Modified: trunk/reactos/include/ddk/ndis.h Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=412… ============================================================================== --- trunk/reactos/include/ddk/ndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndis.h [iso-8859-1] Sun May 31 18:42:17 2009 @@ -451,6 +451,10 @@ ULONG PatternFlags; } NDIS_PM_PACKET_PATTERN, *PNDIS_PM_PACKET_PATTERN; +typedef struct _NDIS_PACKET_STACK { + ULONG_PTR IMReserved[2]; + ULONG_PTR NdisReserved[4]; +} NDIS_PACKET_STACK, *PNDIS_PACKET_STACK; /* Request types used by NdisRequest */ typedef enum _NDIS_REQUEST_TYPE { @@ -2432,7 +2436,11 @@ #define NdisZeroMemory(Destination, Length) \ RtlZeroMemory(Destination, Length) - +typedef VOID DDKAPI +(*NDIS_BLOCK_INITIALIZER) ( + IN PUCHAR Block, + IN SIZE_T NumberOfBytes + ); /* Configuration routines */

1 0

[cwittich] 41220: -show EIP in hex -clear regs on disconnect
by cwittich＠svn.reactos.org 31 May '09

31 May '09

Author: cwittich Date: Sun May 31 17:29:55 2009 New Revision: 41220 URL: http://svn.reactos.org/svn/reactos?rev=41220&view=rev Log: -show EIP in hex -clear regs on disconnect Modified: trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs trunk/tools/reactosdbg/DebugProtocol/Registers.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/RegisterView.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs Modified: trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/DebugProtocol/Deb… ============================================================================== --- trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs [iso-8859-1] Sun May 31 17:29:55 2009 @@ -1,5 +1,6 @@ ï»¿using System; using System.Collections.Generic; +using System.ComponentModel; using System.Linq; using System.Text; using System.Net; @@ -74,6 +75,7 @@ ulong mTid; public ulong ThreadId { get { return mTid; } set { mTid = value; } } ulong mEip; + [TypeConverter(typeof(UlongToHexTypeConverter))] public ulong Eip { get { return mEip; } set { mEip = value; } } string mDescription; public string Description { get { return mDescription; } set { mDescription = value; } } Modified: trunk/tools/reactosdbg/DebugProtocol/Registers.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/DebugProtocol/Reg… ============================================================================== --- trunk/tools/reactosdbg/DebugProtocol/Registers.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/DebugProtocol/Registers.cs [iso-8859-1] Sun May 31 17:29:55 2009 @@ -88,5 +88,11 @@ [TypeConverter(typeof(UlongToHexTypeConverter))] public ulong Ss { get { return RegisterSet[15]; } set { RegisterSet[15] = value; } } public ulong[] RegisterSet = new ulong[32]; + + public void Clear() + { + RegisterSet = new ulong[32]; + } + } } Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RegisterView.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/RegisterView.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/RegisterView.cs [iso-8859-1] Sun May 31 17:29:55 2009 @@ -29,6 +29,7 @@ mConnection = conn; mConnection.DebugRegisterChangeEvent += DebugRegisterChangeEvent; mConnection.DebugRunningChangeEvent += DebugRunningChangeEvent; + mConnection.DebugConnectionModeChangedEvent += DebugConnectionModeChangedEvent; if (!mConnection.Running) { mConnection.Debugger.GetRegisterUpdate(); @@ -39,6 +40,19 @@ void UpdateGridEnabled() { RegisterGrid.Enabled = mGridEnabled; + } + + void ClearRegs() + { + if (mRegisters != null) + mRegisters.Clear(); + UpdateGrid(); + } + + void DebugConnectionModeChangedEvent(object sender, DebugConnectionModeChangedEventArgs args) + { + if (mConnection.ConnectionMode == DebugConnection.Mode.ClosedMode) + Invoke(Delegate.CreateDelegate(typeof(NoParamsDelegate), this, "ClearRegs")); } void DebugRunningChangeEvent(object sender, DebugRunningChangeEventArgs args) Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Sun May 31 17:29:55 2009 @@ -39,5 +39,5 @@ // will be increased as well. MSI installers must not be generated with the same Build Number // otherwise they won't upgrade the old installation! -[assembly: AssemblyVersion("1.0.2.14")] -[assembly: AssemblyFileVersion("1.0.2.14")] +[assembly: AssemblyVersion("1.0.2.20")] +[assembly: AssemblyFileVersion("1.0.2.20")]

1 0

[cgutman] 41219: - Fix a typo - Found by Fireball
by cgutman＠svn.reactos.org 31 May '09

31 May '09

Author: cgutman Date: Sun May 31 17:17:42 2009 New Revision: 41219 URL: http://svn.reactos.org/svn/reactos?rev=41219&view=rev Log: - Fix a typo - Found by Fireball Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c [iso-8859-1] Sun May 31 17:17:42 2009 @@ -301,7 +301,7 @@ } #endif -#ifndef notdef +#ifdef notdef /* * If source address not specified yet, use address * of outgoing interface.

1 0

[cwittich] 41218: remove AnyCPU and Mixed targets - only x86 can load dbghelp.dll from ReactOS
by cwittich＠svn.reactos.org 31 May '09

31 May '09

Author: cwittich Date: Sun May 31 16:54:55 2009 New Revision: 41218 URL: http://svn.reactos.org/svn/reactos?rev=41218&view=rev Log: remove AnyCPU and Mixed targets - only x86 can load dbghelp.dll from ReactOS Modified: trunk/tools/reactosdbg/ReactosDBG.sln Modified: trunk/tools/reactosdbg/ReactosDBG.sln URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/ReactosDBG.sln?re… ============================================================================== --- trunk/tools/reactosdbg/ReactosDBG.sln [iso-8859-1] (original) +++ trunk/tools/reactosdbg/ReactosDBG.sln [iso-8859-1] Sun May 31 16:54:55 2009 @@ -23,93 +23,35 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|Mixed Platforms = Debug|Mixed Platforms Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|Mixed Platforms = Release|Mixed Platforms Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Debug|x86.ActiveCfg = Debug|x86 {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Debug|x86.Build.0 = Debug|x86 - {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Release|Any CPU.Build.0 = Release|Any CPU - {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Release|Mixed Platforms.Build.0 = Release|Any CPU {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Release|x86.ActiveCfg = Release|x86 {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Release|x86.Build.0 = Release|x86 - {76A02C1D-4B11-4D43-966E-E5C053870D65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {76A02C1D-4B11-4D43-966E-E5C053870D65}.Debug|Any CPU.Build.0 = Debug|Any CPU - {76A02C1D-4B11-4D43-966E-E5C053870D65}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {76A02C1D-4B11-4D43-966E-E5C053870D65}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {76A02C1D-4B11-4D43-966E-E5C053870D65}.Debug|x86.ActiveCfg = Debug|x86 {76A02C1D-4B11-4D43-966E-E5C053870D65}.Debug|x86.Build.0 = Debug|x86 - {76A02C1D-4B11-4D43-966E-E5C053870D65}.Release|Any CPU.ActiveCfg = Release|Any CPU - {76A02C1D-4B11-4D43-966E-E5C053870D65}.Release|Any CPU.Build.0 = Release|Any CPU - {76A02C1D-4B11-4D43-966E-E5C053870D65}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {76A02C1D-4B11-4D43-966E-E5C053870D65}.Release|Mixed Platforms.Build.0 = Release|Any CPU {76A02C1D-4B11-4D43-966E-E5C053870D65}.Release|x86.ActiveCfg = Release|x86 {76A02C1D-4B11-4D43-966E-E5C053870D65}.Release|x86.Build.0 = Release|x86 - {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Debug|x86.ActiveCfg = Debug|x86 {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Debug|x86.Build.0 = Debug|x86 - {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Release|Any CPU.Build.0 = Release|Any CPU - {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Release|Mixed Platforms.Build.0 = Release|Any CPU {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Release|x86.ActiveCfg = Release|x86 {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Release|x86.Build.0 = Release|x86 - {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Debug|x86.ActiveCfg = Debug|x86 {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Debug|x86.Build.0 = Debug|x86 - {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Release|Any CPU.Build.0 = Release|Any CPU - {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Release|Mixed Platforms.Build.0 = Release|Any CPU {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Release|x86.ActiveCfg = Release|x86 {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Release|x86.Build.0 = Release|x86 - {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Debug|Any CPU.ActiveCfg = Debug|x86 - {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Debug|Mixed Platforms.Build.0 = Debug|x86 {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Debug|x86.ActiveCfg = Debug|x86 - {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Release|Any CPU.ActiveCfg = Release|x86 - {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Release|Mixed Platforms.Build.0 = Release|x86 {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Release|x86.ActiveCfg = Release|x86 {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Release|x86.Build.0 = Release|x86 - {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|x86.ActiveCfg = Debug|x86 {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|x86.Build.0 = Debug|x86 - {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|Any CPU.Build.0 = Release|Any CPU - {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|Mixed Platforms.Build.0 = Release|Any CPU {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|x86.ActiveCfg = Release|x86 {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|x86.Build.0 = Release|x86 - {D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C}.Debug|x86.ActiveCfg = Debug|x86 {D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C}.Debug|x86.Build.0 = Debug|x86 - {D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C}.Release|Any CPU.Build.0 = Release|Any CPU - {D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C}.Release|Mixed Platforms.Build.0 = Release|Any CPU {D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C}.Release|x86.ActiveCfg = Release|x86 {D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C}.Release|x86.Build.0 = Release|x86 EndGlobalSection

1 0

[cwittich] 41217: -show registers in hex -set pipe server as default instead of client patches by basisbit: -fix continue toolbar button -fix printing multiple pages -possible fix for backtraces
by cwittich＠svn.reactos.org 31 May '09

31 May '09

Author: cwittich Date: Sun May 31 16:50:16 2009 New Revision: 41217 URL: http://svn.reactos.org/svn/reactos?rev=41217&view=rev Log: -show registers in hex -set pipe server as default instead of client patches by basisbit: -fix continue toolbar button -fix printing multiple pages -possible fix for backtraces Modified: trunk/tools/reactosdbg/DebugProtocol/KDBG.cs trunk/tools/reactosdbg/DebugProtocol/Registers.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs trunk/tools/reactosdbg/RosDBG/Settings.cs Modified: trunk/tools/reactosdbg/DebugProtocol/KDBG.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/DebugProtocol/KDB… ============================================================================== --- trunk/tools/reactosdbg/DebugProtocol/KDBG.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/DebugProtocol/KDBG.cs [iso-8859-1] Sun May 31 16:50:16 2009 @@ -88,7 +88,7 @@ string cleanedLine = line.Trim(); try { - if (cleanedLine.StartsWith("Entered debugger on ")) + if (cleanedLine.Contains("Entered debugger on ")) { mReceivingProcs = false; mReceivingThreads = false; Modified: trunk/tools/reactosdbg/DebugProtocol/Registers.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/DebugProtocol/Reg… ============================================================================== --- trunk/tools/reactosdbg/DebugProtocol/Registers.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/DebugProtocol/Registers.cs [iso-8859-1] Sun May 31 16:50:16 2009 @@ -1,28 +1,91 @@ ï»¿using System; using System.Collections.Generic; +using System.Globalization; using System.Linq; using System.Text; using System.ComponentModel; namespace DebugProtocol { + public class UlongToHexTypeConverter : TypeConverter + { + public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType) + { + if (sourceType == typeof(string)) + return true; + else + return base.CanConvertFrom(context, sourceType); + } + + public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType) + { + if (destinationType == typeof(string)) + return true; + else + return base.CanConvertTo(context, destinationType); + } + + public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType) + { + if (destinationType == typeof(string) && value.GetType() == typeof(ulong)) + return string.Format("0x{0:X8}", value); + else + return base.ConvertTo(context, culture, value, destinationType); + } + + public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value) + { + if (value.GetType() == typeof(string)) + { + string input = (string)value; + + if (input.StartsWith("0x", StringComparison.OrdinalIgnoreCase)) + { + input = input.Substring(2); + } + + return ulong.Parse(input, NumberStyles.HexNumber, culture); + } + else + { + return base.ConvertFrom(context, culture, value); + } + } + } + public class Registers { + [TypeConverter(typeof(UlongToHexTypeConverter))] public ulong Eax { get { return RegisterSet[0]; } set { RegisterSet[0] = value; } } + [TypeConverter(typeof(UlongToHexTypeConverter))] public ulong Ecx { get { return RegisterSet[1]; } set { RegisterSet[1] = value; } } + [TypeConverter(typeof(UlongToHexTypeConverter))] public ulong Edx { get { return RegisterSet[2]; } set { RegisterSet[2] = value; } } + [TypeConverter(typeof(UlongToHexTypeConverter))] public ulong Ebx { get { return RegisterSet[3]; } set { RegisterSet[3] = value; } } + [TypeConverter(typeof(UlongToHexTypeConverter))] public ulong Esp { get { return RegisterSet[4]; } set { RegisterSet[4] = value; } } + [TypeConverter(typeof(UlongToHexTypeConverter))] public ulong Ebp { get { return RegisterSet[5]; } set { RegisterSet[5] = value; } } + [TypeConverter(typeof(UlongToHexTypeConverter))] public ulong Esi { get { return RegisterSet[6]; } set { RegisterSet[6] = value; } } + [TypeConverter(typeof(UlongToHexTypeConverter))] public ulong Edi { get { return RegisterSet[7]; } set { RegisterSet[7] = value; } } + [TypeConverter(typeof(UlongToHexTypeConverter))] public ulong Eip { get { return RegisterSet[8]; } set { RegisterSet[8] = value; } } + [TypeConverter(typeof(UlongToHexTypeConverter))] public ulong Eflags { get { return RegisterSet[9]; } set { RegisterSet[9] = value; } } + [TypeConverter(typeof(UlongToHexTypeConverter))] public ulong Cs { get { return RegisterSet[10]; } set { RegisterSet[10] = value; } } + [TypeConverter(typeof(UlongToHexTypeConverter))] public ulong Ds { get { return RegisterSet[11]; } set { RegisterSet[11] = value; } } + [TypeConverter(typeof(UlongToHexTypeConverter))] public ulong Es { get { return RegisterSet[12]; } set { RegisterSet[12] = value; } } + [TypeConverter(typeof(UlongToHexTypeConverter))] public ulong Fs { get { return RegisterSet[13]; } set { RegisterSet[13] = value; } } + [TypeConverter(typeof(UlongToHexTypeConverter))] public ulong Gs { get { return RegisterSet[14]; } set { RegisterSet[14] = value; } } + [TypeConverter(typeof(UlongToHexTypeConverter))] public ulong Ss { get { return RegisterSet[15]; } set { RegisterSet[15] = value; } } public ulong[] RegisterSet = new ulong[32]; } Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs [iso-8859-1] Sun May 31 16:50:16 2009 @@ -16,6 +16,13 @@ [DebugControl, BuildAtStartup] public partial class RawTraffic : ToolWindow, IUseDebugConnection { + private int startPage; + private int totalPages; + private int pageNumber; + private string strPrintText; + PrintDialog pd; + PrintDocument printDoc; + DebugConnection mConnection; List<string> textToAdd = new List<string>(); @@ -139,19 +146,95 @@ public override void Print(bool ShowDialog) { - PrintDocument printDoc = new PrintDocument(); - printDoc.PrintPage += new PrintPageEventHandler(printDoc_PrintPage); - PrintDialog pd = new PrintDialog(); - pd.Document = printDoc; - if ((!ShowDialog) || (pd.ShowDialog() == DialogResult.OK)) - { - printDoc.Print(); - } + printDoc = new PrintDocument(); + printDoc.PrintPage += new PrintPageEventHandler(printDoc_PrintPage); + pd = new PrintDialog(); + pd.Document = printDoc; + pd.AllowSomePages = true; + if ((!ShowDialog) || (pd.ShowDialog() == DialogResult.OK)) + { + printDoc.DocumentName = "debuglog-" + DateTime.Now.Date.ToShortDateString() + ".txt"; + strPrintText = RawTrafficText.Text.Length > 0 ? RawTrafficText.Text : " "; + switch (pd.PrinterSettings.PrintRange) + { + case PrintRange.AllPages: + startPage = 1; + totalPages = pd.PrinterSettings.MaximumPage; + break; + case PrintRange.SomePages: + startPage = pd.PrinterSettings.FromPage; + totalPages = pd.PrinterSettings.ToPage - startPage + 1; + break; + } + // start printing + pageNumber = 1; + printDoc.Print(); + } } private void printDoc_PrintPage(object sender, PrintPageEventArgs e) { - e.Graphics.DrawString(RawTrafficText.Text, RawTrafficText.Font, Brushes.Black, 10, 25); + StringFormat stringFormat = new StringFormat(); + RectangleF rectFPaper, rectFText; + int intChars, intLines; + + rectFPaper = e.MarginBounds; + rectFText = RectangleF.Inflate(rectFPaper, 0, + -2 * RawTrafficText.Font.GetHeight(e.Graphics)); + int totalLines = (int)Math.Floor(rectFText.Height / + RawTrafficText.Font.GetHeight(e.Graphics)); + rectFText.Height = totalLines * + RawTrafficText.Font.GetHeight(e.Graphics); + stringFormat.Trimming = StringTrimming.Word; + + while ((pageNumber < startPage) && (strPrintText.Length > 0)) + { + e.Graphics.MeasureString(strPrintText, RawTrafficText.Font, + rectFText.Size, stringFormat, + out intChars, out intLines); + strPrintText = strPrintText.Substring(intChars); + pageNumber++; + } + + // Cancel job when nothing to print is left + if (strPrintText.Length == 0) + { + e.Cancel = true; + return; + } + + e.Graphics.DrawString(strPrintText, RawTrafficText.Font, Brushes.Black, rectFText, stringFormat); + e.Graphics.MeasureString(strPrintText, RawTrafficText.Font, + rectFText.Size, stringFormat, + out intChars, out intLines); + strPrintText = strPrintText.Substring(intChars); + stringFormat = new StringFormat(); + + // show filename in header + stringFormat.Alignment = StringAlignment.Center; + + e.Graphics.DrawString(printDoc.DocumentName, RawTrafficText.Font, + Brushes.Black, rectFPaper, stringFormat); + + // show page number in footer + stringFormat.LineAlignment = StringAlignment.Far; + + e.Graphics.DrawString("Page " + pageNumber, RawTrafficText.Font, + Brushes.Black, rectFPaper, stringFormat); + + pageNumber++; + e.HasMorePages = (strPrintText.Length > 0) && + (pageNumber < startPage + totalPages); + + //re-init + if (!e.HasMorePages) + { + strPrintText = RawTrafficText.Text; + startPage = 1; + totalPages = pd.PrinterSettings.MaximumPage; + pageNumber = 1; + } + } } Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] Sun May 31 16:50:16 2009 @@ -30,21 +30,21 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainWindow)); - WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin3 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin(); - WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin3 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient7 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient15 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin3 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient3 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient16 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient8 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient17 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient3 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient18 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient19 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient9 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient20 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient21 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin1 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin(); + WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin1 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient1 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient2 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient3 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient4 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient5 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient3 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient6 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient7 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); this.menuStrip = new System.Windows.Forms.MenuStrip(); this.fileMenu = new System.Windows.Forms.ToolStripMenuItem(); this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -138,14 +138,14 @@ this.openToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Black; this.openToolStripMenuItem.Name = "openToolStripMenuItem"; this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.openToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.openToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.openToolStripMenuItem.Text = "&Open"; this.openToolStripMenuItem.Click += new System.EventHandler(this.OpenFile); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(145, 6); // // saveToolStripMenuItem // @@ -153,21 +153,21 @@ this.saveToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Black; this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.saveToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.saveToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.saveToolStripMenuItem.Text = "&Save"; this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); // // saveAsToolStripMenuItem // this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem"; - this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.saveAsToolStripMenuItem.Text = "Save &as"; this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.SaveAsToolStripMenuItem_Click); // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(149, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(145, 6); // // printToolStripMenuItem // @@ -175,7 +175,7 @@ this.printToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Black; this.printToolStripMenuItem.Name = "printToolStripMenuItem"; this.printToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); - this.printToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.printToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.printToolStripMenuItem.Text = "&Print"; this.printToolStripMenuItem.Click += new System.EventHandler(this.printToolStripMenuItem_Click); // @@ -183,18 +183,18 @@ // this.printSetupToolStripMenuItem.Enabled = false; this.printSetupToolStripMenuItem.Name = "printSetupToolStripMenuItem"; - this.printSetupToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.printSetupToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.printSetupToolStripMenuItem.Text = "Print setup"; // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(149, 6); + this.toolStripSeparator5.Size = new System.Drawing.Size(145, 6); // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.exitToolStripMenuItem.Text = "&Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.ExitToolsStripMenuItem_Click); // @@ -493,6 +493,7 @@ this.continueToolStripButton.Name = "continueToolStripButton"; this.continueToolStripButton.Size = new System.Drawing.Size(23, 22); this.continueToolStripButton.Text = "Continue"; + this.continueToolStripButton.Click += new System.EventHandler(this.continueToolStripMenuItem_Click); // // breakToolStripButton // @@ -532,50 +533,50 @@ this.dockPanel.Location = new System.Drawing.Point(0, 49); this.dockPanel.Name = "dockPanel"; this.dockPanel.Size = new System.Drawing.Size(784, 490); - dockPanelGradient7.EndColor = System.Drawing.SystemColors.ControlLight; - dockPanelGradient7.StartColor = System.Drawing.SystemColors.ControlLight; - autoHideStripSkin3.DockStripGradient = dockPanelGradient7; - tabGradient15.EndColor = System.Drawing.SystemColors.Control; - tabGradient15.StartColor = System.Drawing.SystemColors.Control; - tabGradient15.TextColor = System.Drawing.SystemColors.ControlDarkDark; - autoHideStripSkin3.TabGradient = tabGradient15; - dockPanelSkin3.AutoHideStripSkin = autoHideStripSkin3; - tabGradient16.EndColor = System.Drawing.SystemColors.ControlLightLight; - tabGradient16.StartColor = System.Drawing.SystemColors.ControlLightLight; - tabGradient16.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripGradient3.ActiveTabGradient = tabGradient16; - dockPanelGradient8.EndColor = System.Drawing.SystemColors.Control; - dockPanelGradient8.StartColor = System.Drawing.SystemColors.Control; - dockPaneStripGradient3.DockStripGradient = dockPanelGradient8; - tabGradient17.EndColor = System.Drawing.SystemColors.ControlLight; - tabGradient17.StartColor = System.Drawing.SystemColors.ControlLight; - tabGradient17.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripGradient3.InactiveTabGradient = tabGradient17; - dockPaneStripSkin3.DocumentGradient = dockPaneStripGradient3; - tabGradient18.EndColor = System.Drawing.SystemColors.ActiveCaption; - tabGradient18.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; - tabGradient18.StartColor = System.Drawing.SystemColors.GradientActiveCaption; - tabGradient18.TextColor = System.Drawing.SystemColors.ActiveCaptionText; - dockPaneStripToolWindowGradient3.ActiveCaptionGradient = tabGradient18; - tabGradient19.EndColor = System.Drawing.SystemColors.Control; - tabGradient19.StartColor = System.Drawing.SystemColors.Control; - tabGradient19.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripToolWindowGradient3.ActiveTabGradient = tabGradient19; - dockPanelGradient9.EndColor = System.Drawing.SystemColors.ControlLight; - dockPanelGradient9.StartColor = System.Drawing.SystemColors.ControlLight; - dockPaneStripToolWindowGradient3.DockStripGradient = dockPanelGradient9; - tabGradient20.EndColor = System.Drawing.SystemColors.GradientInactiveCaption; - tabGradient20.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; - tabGradient20.StartColor = System.Drawing.SystemColors.GradientInactiveCaption; - tabGradient20.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripToolWindowGradient3.InactiveCaptionGradient = tabGradient20; - tabGradient21.EndColor = System.Drawing.Color.Transparent; - tabGradient21.StartColor = System.Drawing.Color.Transparent; - tabGradient21.TextColor = System.Drawing.SystemColors.ControlDarkDark; - dockPaneStripToolWindowGradient3.InactiveTabGradient = tabGradient21; - dockPaneStripSkin3.ToolWindowGradient = dockPaneStripToolWindowGradient3; - dockPanelSkin3.DockPaneStripSkin = dockPaneStripSkin3; - this.dockPanel.Skin = dockPanelSkin3; + dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight; + dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight; + autoHideStripSkin1.DockStripGradient = dockPanelGradient1; + tabGradient1.EndColor = System.Drawing.SystemColors.Control; + tabGradient1.StartColor = System.Drawing.SystemColors.Control; + tabGradient1.TextColor = System.Drawing.SystemColors.ControlDarkDark; + autoHideStripSkin1.TabGradient = tabGradient1; + dockPanelSkin1.AutoHideStripSkin = autoHideStripSkin1; + tabGradient2.EndColor = System.Drawing.SystemColors.ControlLightLight; + tabGradient2.StartColor = System.Drawing.SystemColors.ControlLightLight; + tabGradient2.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripGradient1.ActiveTabGradient = tabGradient2; + dockPanelGradient2.EndColor = System.Drawing.SystemColors.Control; + dockPanelGradient2.StartColor = System.Drawing.SystemColors.Control; + dockPaneStripGradient1.DockStripGradient = dockPanelGradient2; + tabGradient3.EndColor = System.Drawing.SystemColors.ControlLight; + tabGradient3.StartColor = System.Drawing.SystemColors.ControlLight; + tabGradient3.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripGradient1.InactiveTabGradient = tabGradient3; + dockPaneStripSkin1.DocumentGradient = dockPaneStripGradient1; + tabGradient4.EndColor = System.Drawing.SystemColors.ActiveCaption; + tabGradient4.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + tabGradient4.StartColor = System.Drawing.SystemColors.GradientActiveCaption; + tabGradient4.TextColor = System.Drawing.SystemColors.ActiveCaptionText; + dockPaneStripToolWindowGradient1.ActiveCaptionGradient = tabGradient4; + tabGradient5.EndColor = System.Drawing.SystemColors.Control; + tabGradient5.StartColor = System.Drawing.SystemColors.Control; + tabGradient5.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripToolWindowGradient1.ActiveTabGradient = tabGradient5; + dockPanelGradient3.EndColor = System.Drawing.SystemColors.ControlLight; + dockPanelGradient3.StartColor = System.Drawing.SystemColors.ControlLight; + dockPaneStripToolWindowGradient1.DockStripGradient = dockPanelGradient3; + tabGradient6.EndColor = System.Drawing.SystemColors.GradientInactiveCaption; + tabGradient6.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + tabGradient6.StartColor = System.Drawing.SystemColors.GradientInactiveCaption; + tabGradient6.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripToolWindowGradient1.InactiveCaptionGradient = tabGradient6; + tabGradient7.EndColor = System.Drawing.Color.Transparent; + tabGradient7.StartColor = System.Drawing.Color.Transparent; + tabGradient7.TextColor = System.Drawing.SystemColors.ControlDarkDark; + dockPaneStripToolWindowGradient1.InactiveTabGradient = tabGradient7; + dockPaneStripSkin1.ToolWindowGradient = dockPaneStripToolWindowGradient1; + dockPanelSkin1.DockPaneStripSkin = dockPaneStripSkin1; + this.dockPanel.Skin = dockPanelSkin1; this.dockPanel.TabIndex = 4; this.dockPanel.ActiveDocumentChanged += new System.EventHandler(this.dockPanel_ActiveDocumentChanged); // Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Sun May 31 16:50:16 2009 @@ -39,5 +39,5 @@ // will be increased as well. MSI installers must not be generated with the same Build Number // otherwise they won't upgrade the old installation! -[assembly: AssemblyVersion("1.0.2.4")] -[assembly: AssemblyFileVersion("1.0.2.4")] +[assembly: AssemblyVersion("1.0.2.14")] +[assembly: AssemblyFileVersion("1.0.2.14")] Modified: trunk/tools/reactosdbg/RosDBG/Settings.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Settings.c… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Settings.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Settings.cs [iso-8859-1] Sun May 31 16:50:16 2009 @@ -56,7 +56,7 @@ set { this["Pipe"] = value; } } - [UserScopedSetting, DefaultSettingValue(@"Client")] + [UserScopedSetting, DefaultSettingValue(@"Server")] [Browsable(false)] public string Mode {

1 0

[spetreolle] 41216: Sync GetNamedSecurityInfoA with Wine. RtlCreateUnicodeStringFromAsciiz is unwanted since the call to GetNamedSecurityInfoW checks for NULL and in this case sets ERROR_INVALID_PARAMETER.
by spetreolle＠svn.reactos.org 31 May '09

31 May '09

Author: spetreolle Date: Sun May 31 16:39:45 2009 New Revision: 41216 URL: http://svn.reactos.org/svn/reactos?rev=41216&view=rev Log: Sync GetNamedSecurityInfoA with Wine. RtlCreateUnicodeStringFromAsciiz is unwanted since the call to GetNamedSecurityInfoW checks for NULL and in this case sets ERROR_INVALID_PARAMETER. Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] Sun May 31 16:39:45 2009 @@ -1874,29 +1874,26 @@ PACL *ppSacl, PSECURITY_DESCRIPTOR *ppSecurityDescriptor) { - UNICODE_STRING ObjectName; - NTSTATUS Status; - DWORD Ret; - - Status = RtlCreateUnicodeStringFromAsciiz(&ObjectName, - pObjectName); - if (!NT_SUCCESS(Status)) - { - return RtlNtStatusToDosError(Status); - } - - Ret = GetNamedSecurityInfoW(ObjectName.Buffer, - ObjectType, - SecurityInfo, - ppsidOwner, - ppsidGroup, - ppDacl, - ppSacl, - ppSecurityDescriptor); - - RtlFreeUnicodeString(&ObjectName); - - return Ret; + DWORD len; + LPWSTR wstr = NULL; + DWORD r; + + TRACE("%s %d %d %p %p %p %p %p\n", pObjectName, ObjectType, SecurityInfo, + ppsidOwner, ppsidGroup, ppDacl, ppSacl, ppSecurityDescriptor); + + if( pObjectName ) + { + len = MultiByteToWideChar( CP_ACP, 0, pObjectName, -1, NULL, 0 ); + wstr = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR)); + MultiByteToWideChar( CP_ACP, 0, pObjectName, -1, wstr, len ); + } + + r = GetNamedSecurityInfoW( wstr, ObjectType, SecurityInfo, ppsidOwner, + ppsidGroup, ppDacl, ppSacl, ppSecurityDescriptor ); + + HeapFree( GetProcessHeap(), 0, wstr ); + + return r; }

1 0

[dgorbachev] 41215: Sync Dutch translation with English original.
by dgorbachev＠svn.reactos.org 31 May '09

31 May '09

Author: dgorbachev Date: Sun May 31 16:25:05 2009 New Revision: 41215 URL: http://svn.reactos.org/svn/reactos?rev=41215&view=rev Log: Sync Dutch translation with English original. Modified: trunk/reactos/dll/win32/netshell/lang/nl-NL.rc Modified: trunk/reactos/dll/win32/netshell/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/nl… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/nl-NL.rc [iso-8859-1] Sun May 31 16:25:05 2009 @@ -1,21 +1,24 @@ -LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //vertaald door Lionel Lowie +// vertaald door Lionel Lowie + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 228 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Algemeen" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Verbinden met:", -1, 9,9,217,8 - EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP - PUSHBUTTON "&Configureren", IDC_CONFIGURE, 189, 38, 50, 14 - LTEXT "Components checked are used by this connection:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT - PUSHBUTTON "&Installeren", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP - PUSHBUTTON "&Verwijderen", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP - PUSHBUTTON "&Eigenschappen", IDC_PROPERTIES, 174, 130, 65, 14 - GROUPBOX "Description", -1, 9, 153, 230, 46, BS_GROUPBOX - LTEXT "Component Description goes here...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "Show Icon in taskbar when connected", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP + CONTROL "", IDC_COMPONENTSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55 + LTEXT "Verbinden met:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_TABSTOP | ES_READONLY + PUSHBUTTON "&Configureren", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "Components checked are used by this connection:", -1, 9, 59, 217, 8 + PUSHBUTTON "&Installeren", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Verwijderen", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Eigenschappen", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "Description", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "Component Description goes here...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "&Show Icon in taskbar when connected", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP END IDD_STATUS DIALOGEX DISCARDABLE 0, 0, 200, 280 @@ -26,26 +29,26 @@ END IDD_LAN_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Algemeen" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Verbinding", -1, 9, 8, 182, 58, BS_GROUPBOX - LTEXT "Status:", -1, 19, 20, 60, 8 - LTEXT "Duur:", -1, 19, 34, 60, 8 - LTEXT "Snelheid:", -1, 19, 48, 60, 8 - GROUPBOX "Activiteit", -1, 9, 74, 182, 70, BS_GROUPBOX - RTEXT "Verzonden", -1, 26, 90, 60, 8 - ICON IDI_NETSTAT, -1, 110, 85, 32, 32 - LTEXT "Ontvangen", -1, 149, 90, 37, 8 - LTEXT "Bytes:", -1, 17, 115, 32, 8 - RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 - RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 - PUSHBUTTON "&Eigenschappen", IDC_PROPERTIES, 10, 150, 50, 14 - PUSHBUTTON "&Uitschakelen", IDC_ENDISABLE, 66, 150, 50, 14 - RTEXT "",IDC_STATUS,83,20,98,8 - RTEXT "",IDC_DURATION,83,34,98,8 - RTEXT "",IDC_SPEED,83,48,98,8 + GROUPBOX "Verbinding", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "Status:", -1, 19, 20, 60, 8 + LTEXT "Duur:", -1, 19, 34, 60, 8 + LTEXT "Snelheid:", -1, 19, 48, 60, 8 + GROUPBOX "Activiteit", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "Verzonden", -1, 26, 90, 60, 8 + ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + LTEXT "Ontvangen", -1, 149, 90, 37, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "&Eigenschappen", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Uitschakelen", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 END IDD_LAN_NETSTATUSADVANCED DIALOGEX DISCARDABLE 0, 0, 200,180 @@ -53,18 +56,18 @@ CAPTION "Support" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Connection Status", -1, 9, 8, 200, 88, BS_GROUPBOX - LTEXT "Address type:", -1, 22, 20, 80, 8 - LTEXT "IP address:", -1, 22, 34, 80, 8 - LTEXT "SubNet mask:", -1, 22, 48, 80, 8 - LTEXT "Default gateway:", -1, 22, 62, 80, 8 + GROUPBOX "Connection Status", -1, 9, 8, 200, 88, BS_GROUPBOX + LTEXT "Address type:", -1, 22, 20, 80, 8 + LTEXT "IP address:", -1, 22, 34, 80, 8 + LTEXT "SubNet mask:", -1, 22, 48, 80, 8 + LTEXT "Default gateway:", -1, 22, 62, 80, 8 - RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8 - RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 - RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 - RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8 + RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8 + RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 + RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 + RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8 - PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14 + PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14 END IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 @@ -72,55 +75,54 @@ CAPTION "Network Connection Details" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 - CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 - PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 + LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 + CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 + PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 END STRINGTABLE DISCARDABLE BEGIN - IDS_PHYSICAL_ADDRESS "Physical Address" - IDS_IP_ADDRESS "IP Address" - IDS_SUBNET_MASK "Subnet Mask" - IDS_DEF_GATEWAY "Default Gateway" - IDS_DHCP_SERVER "DHCP Server" - IDS_LEASE_OBTAINED "Lease Obtained" - IDS_LEASE_EXPIRES "Lease Expires" - IDS_DNS_SERVERS "DNS Servers" - IDS_WINS_SERVERS "WINS Servers" - IDS_PROPERTY "Property" - IDS_VALUE "Value" - IDS_NETWORKCONNECTION "Network Connection" - IDS_SHV_COLUMN_NAME "Name" - IDS_SHV_COLUMN_TYPE "Type" - IDS_SHV_COLUMN_STATE "Status" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" - IDS_TYPE_ETHERNET "LAN or High-Speed Internet" - IDS_STATUS_NON_OPERATIONAL "Disabled" - IDS_STATUS_UNREACHABLE "Not Connected" - IDS_STATUS_DISCONNECTED "Network cable unplugged" - IDS_STATUS_CONNECTING "Acquiring network address" - IDS_STATUS_CONNECTED "Connected" - IDS_STATUS_OPERATIONAL "Connected" + IDS_PHYSICAL_ADDRESS "Physical Address" + IDS_IP_ADDRESS "IP Address" + IDS_SUBNET_MASK "Subnet Mask" + IDS_DEF_GATEWAY "Default Gateway" + IDS_DHCP_SERVER "DHCP Server" + IDS_LEASE_OBTAINED "Lease Obtained" + IDS_LEASE_EXPIRES "Lease Expires" + IDS_DNS_SERVERS "DNS Servers" + IDS_WINS_SERVERS "WINS Servers" + IDS_PROPERTY "Property" + IDS_VALUE "Value" + IDS_NETWORKCONNECTION "Network Connection" + IDS_SHV_COLUMN_NAME "Name" + IDS_SHV_COLUMN_TYPE "Type" + IDS_SHV_COLUMN_STATE "Status" + IDS_SHV_COLUMN_DEVNAME "Device Name" + IDS_SHV_COLUMN_PHONE "Phone # or Host Address" + IDS_SHV_COLUMN_OWNER "Owner" + IDS_TYPE_ETHERNET "LAN or High-Speed Internet" + IDS_STATUS_NON_OPERATIONAL "Disabled" + IDS_STATUS_UNREACHABLE "Not Connected" + IDS_STATUS_DISCONNECTED "Network cable unplugged" + IDS_STATUS_CONNECTING "Acquiring network address" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" - IDS_NET_ACTIVATE "Enable" - IDS_NET_DEACTIVATE "Disable" - IDS_NET_STATUS "Status" - IDS_NET_REPAIR "Repair" - IDS_NET_CREATELINK "Create Shortcut" - IDS_NET_DELETE "Delete" - IDS_NET_PROPERTIES "Properties" + IDS_NET_ACTIVATE "Enable" + IDS_NET_DEACTIVATE "Disable" + IDS_NET_STATUS "Status" + IDS_NET_REPAIR "Repair" + IDS_NET_CREATELINK "Create Shortcut" + IDS_NET_DELETE "Delete" + IDS_NET_RENAME "Rename" + IDS_NET_PROPERTIES "Properties" - IDS_FORMAT_BIT "%u Bit/s" - IDS_FORMAT_KBIT "%u KBit/s" - IDS_FORMAT_MBIT "%u MBit/s" - IDS_FORMAT_GBIT "%u GBit/s" - IDS_DURATION_DAY "%d Day %s" - IDS_DURATION_DAYS "%d Days %s" - IDS_ASSIGNED_DHCP "Assigned by DHCP" - IDS_ASSIGNED_MANUAL "Manually configured" + IDS_FORMAT_BIT "%u Bit/s" + IDS_FORMAT_KBIT "%u KBit/s" + IDS_FORMAT_MBIT "%u MBit/s" + IDS_FORMAT_GBIT "%u GBit/s" + IDS_DURATION_DAY "%d Day %s" + IDS_DURATION_DAYS "%d Days %s" + IDS_ASSIGNED_DHCP "Assigned by DHCP" + IDS_ASSIGNED_MANUAL "Manually configured" END - -

1 0

[cwittich] 41214: -only allow one instance to run
by cwittich＠svn.reactos.org 31 May '09

31 May '09

Author: cwittich Date: Sun May 31 11:43:51 2009 New Revision: 41214 URL: http://svn.reactos.org/svn/reactos?rev=41214&view=rev Log: -only allow one instance to run Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs trunk/tools/reactosdbg/RosDBG/Program.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs [iso-8859-1] Sun May 31 11:43:51 2009 @@ -42,6 +42,7 @@ // RawTrafficText // this.RawTrafficText.Dock = System.Windows.Forms.DockStyle.Fill; + this.RawTrafficText.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.RawTrafficText.Location = new System.Drawing.Point(0, 0); this.RawTrafficText.MaxLength = 10000000; this.RawTrafficText.Multiline = true; @@ -90,19 +91,19 @@ this.copyToolStripMenuItem.Enabled = false; this.copyToolStripMenuItem.Image = global::RosDBG.Properties.Resources.copyToolStripMenuItem_Image; this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; - this.copyToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.copyToolStripMenuItem.Size = new System.Drawing.Size(120, 22); this.copyToolStripMenuItem.Text = "&Copy"; this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(117, 6); // // selectAllToolStripMenuItem // this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem"; - this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(120, 22); this.selectAllToolStripMenuItem.Text = "&Select all"; this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click); // Modified: trunk/tools/reactosdbg/RosDBG/Program.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Program.cs… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Program.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Program.cs [iso-8859-1] Sun May 31 11:43:51 2009 @@ -1,6 +1,7 @@ ï»¿using System; using System.Collections.Generic; using System.Linq; +using System.Threading; using System.Windows.Forms; namespace RosDBG @@ -13,10 +14,18 @@ [STAThread] static void Main() { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - MainWindow mw = new MainWindow(); - Application.Run(mw); + Mutex m = new Mutex(false, "ReactOS Remote Debugger"); + if (m.WaitOne(10, false)) + { + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); + MainWindow mw = new MainWindow(); + Application.Run(mw); + } + else + { + /* TODO */ + } } } } Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Sun May 31 11:43:51 2009 @@ -39,5 +39,5 @@ // will be increased as well. MSI installers must not be generated with the same Build Number // otherwise they won't upgrade the old installation! -[assembly: AssemblyVersion("1.0.0.2")] -[assembly: AssemblyFileVersion("1.0.0.2")] +[assembly: AssemblyVersion("1.0.2.4")] +[assembly: AssemblyFileVersion("1.0.2.4")]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2009