Ros-diffs May 2009

ros-diffs@reactos.org

27 participants
504 discussions

[janderwald] 41195: - Use a reference name when registering audio subdevices (bug 4566) - Release subdevice interface when it is no longer needed - Fix a memory leak - Audio support is on hold untill bug 4566 is resolved
by janderwald＠svn.reactos.org 29 May '09

29 May '09

Author: janderwald Date: Fri May 29 16:40:09 2009 New Revision: 41195 URL: http://svn.reactos.org/svn/reactos?rev=41195&view=rev Log: - Use a reference name when registering audio subdevices (bug 4566) - Release subdevice interface when it is no longer needed - Fix a memory leak - Audio support is on hold untill bug 4566 is resolved Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] Fri May 29 16:40:09 2009 @@ -54,6 +54,7 @@ DriverObject->MajorFunction[IRP_MJ_PNP] = PcDispatchIrp; DriverObject->MajorFunction[IRP_MJ_POWER] = PcDispatchIrp; DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = PcDispatchIrp; + DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = PcDispatchIrp; /* The driver-supplied AddDevice */ DriverObject->DriverExtension->AddDevice = AddDevice; @@ -181,6 +182,10 @@ status = STATUS_UNSUCCESSFUL; goto cleanup; } + + /* register shutdown notification */ + IoRegisterShutdownNotification(PhysicalDeviceObject); + return status; cleanup: @@ -223,6 +228,7 @@ UNICODE_STRING SymbolicLinkName; SUBDEVICE_DESCRIPTOR * SubDeviceDescriptor; ULONG Index; + UNICODE_STRING RefName; DPRINT1("PcRegisterSubdevice DeviceObject %p Name %S Unknown %p\n", DeviceObject, Name, Unknown); ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); @@ -272,18 +278,17 @@ return Status; } - /* increment reference count */ - SubDevice->lpVtbl->AddRef(SubDevice); + /* initialize reference string */ + RtlInitUnicodeString(&RefName, Name); for(Index = 0; Index < SubDeviceDescriptor->InterfaceCount; Index++) { - //FIXME - // Use a reference string such as Wave0001 / Topology0001 - // - + /* FIXME + * check if reference string with that name already exists + */ Status = IoRegisterDeviceInterface(DeviceExt->PhysicalDeviceObject, &SubDeviceDescriptor->Interfaces[Index], - NULL, + &RefName, &SymbolicLinkName); if (NT_SUCCESS(Status)) { @@ -292,5 +297,8 @@ } } + /* Release SubDevice reference */ + SubDevice->lpVtbl->Release(SubDevice); + return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] Fri May 29 16:40:09 2009 @@ -236,16 +236,20 @@ IN PIRP Irp) { ULONG Index; + PMINIPORTWAVECYCLIC Miniport; IPortFilterWaveCyclicImpl * This = (IPortFilterWaveCyclicImpl *)iface; for(Index = 0; Index < This->Descriptor->Factory.PinDescriptorCount; Index++) { - if (This->Pins[Index]) - { - This->Pins[Index]->lpVtbl->Close(This->Pins[Index], DeviceObject, NULL); - } - - } + /* all pins should have been closed by now */ + ASSERT(This->Pins[Index] == NULL); + } + + /* release reference to port */ + This->Port->lpVtbl->Release(This->Port); + + Miniport = GetWaveCyclicMiniport(This->Port); + Miniport->lpVtbl->Release(Miniport); Irp->IoStatus.Status = STATUS_SUCCESS; @@ -386,6 +390,29 @@ Port->lpVtbl->AddRef(Port); return STATUS_SUCCESS; +} + + +static +NTSTATUS +NTAPI +IPortFilterWaveCyclic_fnFreePin( + IN IPortFilterWaveCyclic* iface, + IN struct IPortPinWaveCyclic* Pin) +{ + ULONG Index; + IPortFilterWaveCyclicImpl * This = (IPortFilterWaveCyclicImpl*)iface; + + for(Index = 0; Index < This->Descriptor->Factory.PinDescriptorCount; Index++) + { + if (This->Pins[Index] == Pin) + { + This->Pins[Index]->lpVtbl->Release(This->Pins[Index]); + This->Pins[Index] = NULL; + return STATUS_SUCCESS; + } + } + return STATUS_UNSUCCESSFUL; } static IPortFilterWaveCyclicVtbl vt_IPortFilterWaveCyclic = @@ -404,7 +431,8 @@ IPortFilterWaveCyclic_fnFastDeviceIoControl, IPortFilterWaveCyclic_fnFastRead, IPortFilterWaveCyclic_fnFastWrite, - IPortFilterWaveCyclic_fnInit + IPortFilterWaveCyclic_fnInit, + IPortFilterWaveCyclic_fnFreePin }; NTSTATUS Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] Fri May 29 16:40:09 2009 @@ -532,6 +532,8 @@ #undef INTERFACE #define INTERFACE IPortFilterWaveCyclic +struct IPortPinWaveCyclic; + DECLARE_INTERFACE_(IPortFilterWaveCyclic, IIrpTarget) { DEFINE_ABSTRACT_UNKNOWN() @@ -540,6 +542,9 @@ STDMETHOD_(NTSTATUS, Init)(THIS_ IN PPORTWAVECYCLIC Port)PURE; + + STDMETHOD_(NTSTATUS, FreePin)(THIS_ + IN struct IPortPinWaveCyclic* Pin)PURE; }; typedef IPortFilterWaveCyclic *PPORTFILTERWAVECYCLIC; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] Fri May 29 16:40:09 2009 @@ -151,7 +151,7 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_SUPPORTED; case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: - DPRINT("IRP_MN_FILTER_RESOURCE_REQUIREMENTS Status %x Information %p\n", Irp->IoStatus.Status, Irp->IoStatus.Information); + DPRINT("IRP_MN_FILTER_RESOURCE_REQUIREMENTS Status %x Information %p Information2 %p\n", Irp->IoStatus.Status, Irp->IoStatus.Information, IoStack->Parameters.FilterResourceRequirements.IoResourceRequirementList); Status = Irp->IoStatus.Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; @@ -210,6 +210,25 @@ return STATUS_SUCCESS; } +NTSTATUS +NTAPI +PortClsShutdown( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT("PortClsShutdown called\n"); + //DbgBreakPoint(); + + /* TODO */ + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + + /* ========================================================================== @@ -252,6 +271,9 @@ case IRP_MJ_SYSTEM_CONTROL : return PortClsSysControl(DeviceObject, Irp); + + case IRP_MJ_SHUTDOWN: + return PortClsShutdown(DeviceObject, Irp); default: DPRINT1("Unhandled function %x\n", IoStack->MajorFunction); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Fri May 29 16:40:09 2009 @@ -732,6 +732,7 @@ { Stream = This->Stream; This->Stream = NULL; + This->Filter->lpVtbl->FreePin(This->Filter, (IPortPinWaveCyclic*)This); DPRINT1("Closing stream at Irql %u\n", KeGetCurrentIrql()); Stream->lpVtbl->Release(Stream); /* this line is never reached */ @@ -1064,7 +1065,7 @@ //This->Stream->lpVtbl->SetFormat(This->Stream, (PKSDATAFORMAT)This->Format); DPRINT1("Setting state to acquire %x\n", This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_ACQUIRE)); - DPRINT1("Setting state to run %x\n", This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_PAUSE)); + DPRINT1("Setting state to pause %x\n", This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_PAUSE)); This->State = KSSTATE_PAUSE; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c [iso-8859-1] Fri May 29 16:40:09 2009 @@ -242,7 +242,7 @@ IPortWaveCyclic* iface) { IPortWaveCyclicImpl * This = (IPortWaveCyclicImpl*)iface; - + DPRINT("IPortWaveCyclic_fnAddRef %u entered\n", This->ref); return InterlockedIncrement(&This->ref); } @@ -254,13 +254,10 @@ IPortWaveCyclicImpl * This = (IPortWaveCyclicImpl*)iface; InterlockedDecrement(&This->ref); + DPRINT("IPortWaveCyclic_fnRelease %u entered\n", This->ref); if (This->ref == 0) { - if (This->bInitialized) - { - This->pMiniport->lpVtbl->Release(This->pMiniport); - } if (This->pPinCount) This->pPinCount->lpVtbl->Release(This->pPinCount); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] Fri May 29 16:40:09 2009 @@ -197,6 +197,9 @@ /* Release reference */ Port->lpVtbl->Release(Port); + + /* Release subdevice reference */ + SubDevice->lpVtbl->Release(SubDevice); return Status; }

1 0

[cwittich] 41194: -don't build an installer for debug builds -redesign auto versioning: increase "Revision" on every build, increase "Build Number" on every release build to make sure the MSI installer upgrade will work
by cwittich＠svn.reactos.org 29 May '09

29 May '09

Author: cwittich Date: Fri May 29 13:15:56 2009 New Revision: 41194 URL: http://svn.reactos.org/svn/reactos?rev=41194&view=rev Log: -don't build an installer for debug builds -redesign auto versioning: increase "Revision" on every build, increase "Build Number" on every release build to make sure the MSI installer upgrade will work Modified: trunk/tools/reactosdbg/ReactosDBG.sln trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs trunk/tools/reactosdbg/buildhelper/Program.cs trunk/tools/reactosdbg/buildhelper/buildhelper.csproj 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] Fri May 29 13:15:56 2009 @@ -35,7 +35,8 @@ {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|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 @@ -46,7 +47,8 @@ {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|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 @@ -57,7 +59,8 @@ {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|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 @@ -68,7 +71,8 @@ {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|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 @@ -79,7 +83,6 @@ {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}.Debug|x86.Build.0 = 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 @@ -89,7 +92,8 @@ {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|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 @@ -100,12 +104,14 @@ {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|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|Any CPU + {D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C}.Release|x86.ActiveCfg = Release|x86 + {D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE 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] Fri May 29 13:15:56 2009 @@ -32,5 +32,12 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.5.1204")] -[assembly: AssemblyFileVersion("1.0.5.1204")] + + +// WARNING: Build numbers are increased automatically! +// On debug build only Revision will be increased, on release build the Build Number +// 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.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] Modified: trunk/tools/reactosdbg/buildhelper/Program.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/buildhelper/Progr… ============================================================================== --- trunk/tools/reactosdbg/buildhelper/Program.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/buildhelper/Program.cs [iso-8859-1] Fri May 29 13:15:56 2009 @@ -32,10 +32,20 @@ StreamReader reader = File.OpenText(infoPath); string contents = reader.ReadToEnd(); reader.Close(); - Regex version = new Regex(@"(\d+\.\d+\.)(\d+)(\.\d+)"); + Regex version = new Regex(@"(\d+\.\d+\.)(\d+)(\.)(\d+)"); Match versionMatch = version.Match(contents); string oldVersion = versionMatch.Value; - string newVersion = versionMatch.Groups[1].Value + (Convert.ToUInt32(versionMatch.Groups[2].Value) + 1).ToString() + "." + DateTime.Now.ToString("mss"); +#if DEBUG + string newVersion = versionMatch.Groups[1].Value + + versionMatch.Groups[2].Value + + versionMatch.Groups[3].Value + + (Convert.ToUInt32(versionMatch.Groups[4].Value) + 1).ToString(); +#else + string newVersion = versionMatch.Groups[1].Value + + (Convert.ToUInt32(versionMatch.Groups[2].Value) + 1).ToString() + + versionMatch.Groups[3].Value + + (Convert.ToUInt32(versionMatch.Groups[4].Value) + 1).ToString(); +#endif contents = contents.Replace(oldVersion, newVersion); StreamWriter writer = File.CreateText(infoPath); writer.Write(contents); Modified: trunk/tools/reactosdbg/buildhelper/buildhelper.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/buildhelper/build… ============================================================================== --- trunk/tools/reactosdbg/buildhelper/buildhelper.csproj [iso-8859-1] (original) +++ trunk/tools/reactosdbg/buildhelper/buildhelper.csproj [iso-8859-1] Fri May 29 13:15:56 2009 @@ -31,6 +31,22 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\x86\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <DebugType>full</DebugType> + <PlatformTarget>x86</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> + <OutputPath>bin\x86\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <Optimize>true</Optimize> + <DebugType>pdbonly</DebugType> + <PlatformTarget>x86</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + </PropertyGroup> <ItemGroup> <Reference Include="System" /> <Reference Include="System.Core">

1 0

[cwittich] 41193: renamed wiki page to "ReactOS Remote Debugger"
by cwittich＠svn.reactos.org 29 May '09

29 May '09

Author: cwittich Date: Fri May 29 12:27:39 2009 New Revision: 41193 URL: http://svn.reactos.org/svn/reactos?rev=41193&view=rev Log: renamed wiki page to "ReactOS Remote Debugger" Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] Fri May 29 12:27:39 2009 @@ -251,7 +251,7 @@ private void contentsToolStripMenuItem_Click(object sender, EventArgs e) { - ReactOSWeb Help = new ReactOSWeb("Help", "http://www.reactos.org/wiki/index.php/ReactOSDbg"); + ReactOSWeb Help = new ReactOSWeb("Help", "http://www.reactos.org/wiki/index.php/ReactOS_Remote_Debugger"); Help.Show(dockPanel); }

1 0

[jimtabor] 41192: - Hack around the system start up Dll Initialization, this time we moved it to User32.
by jimtabor＠svn.reactos.org 29 May '09

29 May '09

Author: jimtabor Date: Fri May 29 12:16:16 2009 New Revision: 41192 URL: http://svn.reactos.org/svn/reactos?rev=41192&view=rev Log: - Hack around the system start up Dll Initialization, this time we moved it to User32. Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c trunk/reactos/dll/win32/user32/misc/dllmain.c Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/misc.… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/misc.c [iso-8859-1] Fri May 29 12:16:16 2009 @@ -124,11 +124,6 @@ BOOL GdiGetHandleUserData(HGDIOBJ hGdiObj, DWORD ObjectType, PVOID *UserData) { - if ( !GdiHandleTable ) - { - // FIXME HAX!! Due to the "Dll Initialization Bug" set the local handle table pointer. - GdiHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; - } PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_GET_INDEX(hGdiObj); if((Entry->Type & GDI_ENTRY_BASETYPE_MASK) == ObjectType && ( (Entry->Type << GDI_ENTRY_UPPER_SHIFT) & GDI_HANDLE_TYPE_MASK ) == @@ -168,11 +163,6 @@ FASTCALL GdiGetLDC(HDC hDC) { - if ( !GdiHandleTable ) - { - // FIXME HAX!! Due to the "Dll Initialization Bug" set the local handle table pointer. - GdiHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; - } PDC_ATTR Dc_Attr; PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_GET_INDEX((HGDIOBJ) hDC); HANDLE pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1); Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] Fri May 29 12:16:16 2009 @@ -331,11 +331,14 @@ GetConnected(VOID) { USERCONNECT UserCon; +// ERR("GetConnected\n"); if ((PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo == NULL) NtUserGetThreadState(THREADSTATE_GETTHREADINFO); if (g_psi && g_ppi) return; +// FIXME HAX: Due to the "Dll Initialization Bug" we have to call this too. + GdiDllInitialize(NULL, DLL_PROCESS_ATTACH, NULL); NtUserProcessConnect( NtCurrentProcess(), &UserCon, @@ -346,5 +349,4 @@ g_psi = SharedPtrToUser(UserCon.siClient.psi); gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); gHandleEntries = SharedPtrToUser(gHandleTable->handles); -// ERR("2 SI 0x%x : HT 0x%x : D 0x%x\n", UserCon.siClient.psi, UserCon.siClient.aheList, g_ulSharedDelta); -} +}

1 0

[jimtabor] 41191: - Hack around the system start up Dll Initialization Bug for GdiHandleTable.
by jimtabor＠svn.reactos.org 29 May '09

29 May '09

Author: jimtabor Date: Fri May 29 11:13:43 2009 New Revision: 41191 URL: http://svn.reactos.org/svn/reactos?rev=41191&view=rev Log: - Hack around the system start up Dll Initialization Bug for GdiHandleTable. Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/misc.… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/misc.c [iso-8859-1] Fri May 29 11:13:43 2009 @@ -124,47 +124,43 @@ BOOL GdiGetHandleUserData(HGDIOBJ hGdiObj, DWORD ObjectType, PVOID *UserData) { - if ( GdiHandleTable ) - { - PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_GET_INDEX(hGdiObj); - if((Entry->Type & GDI_ENTRY_BASETYPE_MASK) == ObjectType && - ( (Entry->Type << GDI_ENTRY_UPPER_SHIFT) & GDI_HANDLE_TYPE_MASK ) == - GDI_HANDLE_GET_TYPE(hGdiObj)) - { - HANDLE pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1); - if(pid == NULL || pid == CurrentProcessId) - { - // - // Need to test if we have Read & Write access to the VM address space. - // - BOOL Result = TRUE; - if(Entry->UserData) + if ( !GdiHandleTable ) + { + // FIXME HAX!! Due to the "Dll Initialization Bug" set the local handle table pointer. + GdiHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; + } + PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_GET_INDEX(hGdiObj); + if((Entry->Type & GDI_ENTRY_BASETYPE_MASK) == ObjectType && + ( (Entry->Type << GDI_ENTRY_UPPER_SHIFT) & GDI_HANDLE_TYPE_MASK ) == + GDI_HANDLE_GET_TYPE(hGdiObj)) + { + HANDLE pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1); + if(pid == NULL || pid == CurrentProcessId) + { + // + // Need to test if we have Read & Write access to the VM address space. + // + BOOL Result = TRUE; + if(Entry->UserData) + { + volatile CHAR *Current = (volatile CHAR*)Entry->UserData; + _SEH2_TRY { - volatile CHAR *Current = (volatile CHAR*)Entry->UserData; - _SEH2_TRY - { - *Current = *Current; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Result = FALSE; - } - _SEH2_END + *Current = *Current; } - else - Result = FALSE; // Can not be zero. - if (Result) *UserData = Entry->UserData; - return Result; - } - } - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - else - { - DPRINT1("!GGHUD: Warning System Initialization Error!!!! GdiHandleTable == 0x%x !!!\n",GdiHandleTable); - *UserData = NULL; - } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Result = FALSE; + } + _SEH2_END + } + else + Result = FALSE; // Can not be zero. + if (Result) *UserData = Entry->UserData; + return Result; + } + } + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -172,43 +168,40 @@ FASTCALL GdiGetLDC(HDC hDC) { - if ( GdiHandleTable ) - { - PDC_ATTR Dc_Attr; - PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_GET_INDEX((HGDIOBJ) hDC); - HANDLE pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1); - // Don't check the mask, just the object type. - if ( Entry->ObjectType == GDIObjType_DC_TYPE && - (pid == NULL || pid == CurrentProcessId) ) + if ( !GdiHandleTable ) + { + // FIXME HAX!! Due to the "Dll Initialization Bug" set the local handle table pointer. + GdiHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; + } + PDC_ATTR Dc_Attr; + PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_GET_INDEX((HGDIOBJ) hDC); + HANDLE pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1); + // Don't check the mask, just the object type. + if ( Entry->ObjectType == GDIObjType_DC_TYPE && + (pid == NULL || pid == CurrentProcessId) ) + { + BOOL Result = TRUE; + if (Entry->UserData) { - BOOL Result = TRUE; - if (Entry->UserData) + volatile CHAR *Current = (volatile CHAR*)Entry->UserData; + _SEH2_TRY { - volatile CHAR *Current = (volatile CHAR*)Entry->UserData; - _SEH2_TRY - { - *Current = *Current; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Result = FALSE; - } - _SEH2_END + *Current = *Current; } - else - Result = FALSE; - - if (Result) + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Dc_Attr = (PDC_ATTR)Entry->UserData; - return Dc_Attr->pvLDC; + Result = FALSE; } + _SEH2_END } - return NULL; - } - else - { - DPRINT1("!LDC: Warning System Initialization Error!!!! GdiHandleTable == 0x%x !!!\n",GdiHandleTable); + else + Result = FALSE; + + if (Result) + { + Dc_Attr = (PDC_ATTR)Entry->UserData; + return Dc_Attr->pvLDC; + } } return NULL; }

1 0

[mjmartin] 41190: - ProcessMouseInputData: Mouse pointer shown on window was slightly off. Fix calculation in conversion to screen position.
by mjmartin＠svn.reactos.org 29 May '09

29 May '09

Author: mjmartin Date: Fri May 29 08:35:07 2009 New Revision: 41190 URL: http://svn.reactos.org/svn/reactos?rev=41190&view=rev Log: - ProcessMouseInputData: Mouse pointer shown on window was slightly off. Fix calculation in conversion to screen position. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Fri May 29 08:35:07 2009 @@ -140,8 +140,8 @@ { /* Set flag and convert to screen location */ mi.dwFlags |= MOUSEEVENTF_ABSOLUTE; - mi.dx = mi.dx / (65535 / UserGetSystemMetrics(SM_CXVIRTUALSCREEN)); - mi.dy = mi.dy / (65535 / UserGetSystemMetrics(SM_CYVIRTUALSCREEN)); + mi.dx = mi.dx / (65535 / (UserGetSystemMetrics(SM_CXVIRTUALSCREEN) - 1)); + mi.dy = mi.dy / (65535 / (UserGetSystemMetrics(SM_CYVIRTUALSCREEN) - 1)); } if(mid->ButtonFlags)

1 0

[cwittich] 41189: -add a tool to automatically increase the buildno at each build and update the WiX script to get upgrade installations to work
by cwittich＠svn.reactos.org 28 May '09

28 May '09

Author: cwittich Date: Fri May 29 02:17:14 2009 New Revision: 41189 URL: http://svn.reactos.org/svn/reactos?rev=41189&view=rev Log: -add a tool to automatically increase the buildno at each build and update the WiX script to get upgrade installations to work Added: trunk/tools/reactosdbg/buildhelper/ (with props) trunk/tools/reactosdbg/buildhelper/Program.cs (with props) trunk/tools/reactosdbg/buildhelper/Properties/ (with props) trunk/tools/reactosdbg/buildhelper/Properties/AssemblyInfo.cs (with props) trunk/tools/reactosdbg/buildhelper/buildhelper.csproj (with props) Modified: trunk/tools/reactosdbg/Installer/Installer.wixproj trunk/tools/reactosdbg/Installer/Product.wxs trunk/tools/reactosdbg/ReactosDBG.sln trunk/tools/reactosdbg/RosDBG/AboutDlg.Designer.cs trunk/tools/reactosdbg/RosDBG/AboutDlg.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs trunk/tools/reactosdbg/RosDBG/RosDBG.csproj Modified: trunk/tools/reactosdbg/Installer/Installer.wixproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/Installer/Install… ============================================================================== --- trunk/tools/reactosdbg/Installer/Installer.wixproj [iso-8859-1] (original) +++ trunk/tools/reactosdbg/Installer/Installer.wixproj [iso-8859-1] Fri May 29 02:17:14 2009 @@ -66,4 +66,8 @@ <Target Name="AfterBuild"> </Target> --> + <PropertyGroup> + <PreBuildEvent>"$(SolutionDir)buildhelper" "$(SolutionDir)temp.exe" "$(ProjectDir)version.wxs" +del "$(SolutionDir)temp.exe"</PreBuildEvent> + </PropertyGroup> </Project> Modified: trunk/tools/reactosdbg/Installer/Product.wxs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/Installer/Product… ============================================================================== --- trunk/tools/reactosdbg/Installer/Product.wxs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/Installer/Product.wxs [iso-8859-1] Fri May 29 02:17:14 2009 @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> - <Product Id="c10bd463-0752-4b27-82ab-fc852bb11ee3" Name="ReactOS Remote Debugger" Language="1033" Version="1.0.0.0" Manufacturer="ReactOS Team" UpgradeCode="ea120514-a7ac-44c9-b68f-819bb15d22bd"> + <?include version.wxs ?> + <Product Id="*" Name="ReactOS Remote Debugger" Language="1033" Version="$(var.version)" Manufacturer="ReactOS Team" UpgradeCode="ea120514-a7ac-44c9-b68f-819bb15d22bd"> <Package InstallerVersion="200" Compressed="yes" /> <Media Id="1" Cabinet="media1.cab" EmbedCab="yes" /> <Directory Id="TARGETDIR" Name="SourceDir"> - + <Directory Id="ProgramFilesFolder"> <Directory Id="INSTALLLOCATION" Name="ReactOS Remote Debugger"> <Component Id ="ProgramFiles" Guid ="326981F4-EF71-49fc-BE0C-9433F674F059"> @@ -44,6 +45,19 @@ <Property Id="WIXUI_INSTALLDIR" Value="INSTALLLOCATION" /> <UIRef Id="WixUI_Common" /> <UIRef Id="WixUI_ErrorProgressText" /> + + <Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" /> + <Property Id="ALLUSERS" Value="1" /> + <Upgrade Id="ea120514-a7ac-44c9-b68f-819bb15d22bd"> + <UpgradeVersion Property='PREVIOUSVERSIONSINSTALLED' OnlyDetect="no" IncludeMinimum='yes' Minimum='0.0.0' IncludeMaximum='no' Maximum='$(var.version)' /> + <UpgradeVersion Minimum="$(var.version)" IncludeMinimum="no" OnlyDetect="yes" Language="1033" Property="NEWERPRODUCTFOUND" /> + </Upgrade> + <InstallExecuteSequence> + <Custom Action="PreventDowngrading" After="FindRelatedProducts">NEWERPRODUCTFOUND AND NOT Installed</Custom> + <RemoveExistingProducts Before='InstallInitialize' /> + </InstallExecuteSequence> + <CustomAction Id="PreventDowngrading" Error="Newer version already installed." /> + <UI Id="WixUI_InstallDir"> <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" /> 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] Fri May 29 02:17:14 2009 @@ -2,6 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RosDBG", "RosDBG\RosDBG.csproj", "{FB776BFE-D2C2-465E-B713-6AD82CAE1A39}" + ProjectSection(ProjectDependencies) = postProject + {D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C} = {D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C} + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DebugProtocol", "DebugProtocol\DebugProtocol.csproj", "{76A02C1D-4B11-4D43-966E-E5C053870D65}" EndProject @@ -10,8 +13,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DbgHelp", "DbgHelp\DbgHelp.csproj", "{3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}" EndProject Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "Installer\Installer.wixproj", "{B2C4FEDE-C383-49A2-B871-D17DA238BB47}" + ProjectSection(ProjectDependencies) = postProject + {D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C} = {D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C} + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "WinFormsUI\WinFormsUI.csproj", "{C75532C4-765B-418E-B09B-46D36B2ABDB1}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "buildhelper", "buildhelper\buildhelper.csproj", "{D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -88,6 +96,16 @@ {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|Any CPU + {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|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: trunk/tools/reactosdbg/RosDBG/AboutDlg.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/AboutDlg.D… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/AboutDlg.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/AboutDlg.Designer.cs [iso-8859-1] Fri May 29 02:17:14 2009 @@ -31,6 +31,7 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutDlg)); this.btnOK = new System.Windows.Forms.Button(); this.label1 = new System.Windows.Forms.Label(); + this.versionLabel = new System.Windows.Forms.Label(); this.SuspendLayout(); // // btnOK @@ -47,11 +48,20 @@ // label1 // this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label1.Location = new System.Drawing.Point(37, 30); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(141, 13); + this.label1.Size = new System.Drawing.Size(164, 13); this.label1.TabIndex = 1; this.label1.Text = "ReactOS Remote Debugger"; + // + // versionLabel + // + this.versionLabel.AutoSize = true; + this.versionLabel.Location = new System.Drawing.Point(37, 56); + this.versionLabel.Name = "versionLabel"; + this.versionLabel.Size = new System.Drawing.Size(0, 13); + this.versionLabel.TabIndex = 2; // // AboutDlg // @@ -59,6 +69,7 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(284, 264); + this.Controls.Add(this.versionLabel); this.Controls.Add(this.label1); this.Controls.Add(this.btnOK); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; @@ -68,6 +79,7 @@ this.Name = "AboutDlg"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "About ReactOS Remote Debugger"; + this.Load += new System.EventHandler(this.AboutDlg_Load); this.ResumeLayout(false); this.PerformLayout(); @@ -77,5 +89,6 @@ private System.Windows.Forms.Button btnOK; private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label versionLabel; } } Modified: trunk/tools/reactosdbg/RosDBG/AboutDlg.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/AboutDlg.c… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/AboutDlg.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/AboutDlg.cs [iso-8859-1] Fri May 29 02:17:14 2009 @@ -6,6 +6,7 @@ using System.Linq; using System.Text; using System.Windows.Forms; +using System.Reflection; namespace RosDBG { @@ -20,5 +21,10 @@ { Close(); } + + private void AboutDlg_Load(object sender, EventArgs e) + { + versionLabel.Text = Assembly.GetExecutingAssembly().GetName().Version.ToString(); + } } } 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] Fri May 29 02:17:14 2009 @@ -1,16 +1,16 @@ -ï»¿using System.Reflection; +using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("WindowsFormsApplication1")] +[assembly: AssemblyTitle("ReactOS Remote Debugger")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("WindowsFormsApplication1")] -[assembly: AssemblyCopyright("Copyright Â© 2008")] +[assembly: AssemblyProduct("ReactOS Remote Debugger")] +[assembly: AssemblyCopyright("Copyright Â© 2009")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.0.5.1204")] +[assembly: AssemblyFileVersion("1.0.5.1204")] Modified: trunk/tools/reactosdbg/RosDBG/RosDBG.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/RosDBG.csp… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] Fri May 29 02:17:14 2009 @@ -12,6 +12,8 @@ <AssemblyName>RosDBG</AssemblyName> <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> + <IsWebBootstrapper>false</IsWebBootstrapper> + <ApplicationIcon>app-rosdbg.ico</ApplicationIcon> <PublishUrl>publish\</PublishUrl> <Install>true</Install> <InstallFrom>Disk</InstallFrom> @@ -24,10 +26,8 @@ <MapFileExtensions>true</MapFileExtensions> <ApplicationRevision>0</ApplicationRevision> <ApplicationVersion>1.0.0.%2a</ApplicationVersion> - <IsWebBootstrapper>false</IsWebBootstrapper> <UseApplicationTrust>false</UseApplicationTrust> <BootstrapperEnabled>true</BootstrapperEnabled> - <ApplicationIcon>app-rosdbg.ico</ApplicationIcon> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -254,6 +254,11 @@ </Compile> </ItemGroup> <ItemGroup> + <BootstrapperPackage Include="Microsoft.Net.Client.3.5"> + <Visible>False</Visible> + <ProductName>.NET Framework Client Profile</ProductName> + <Install>false</Install> + </BootstrapperPackage> <BootstrapperPackage Include="Microsoft.Net.Framework.2.0"> <Visible>False</Visible> <ProductName>.NET Framework 2.0 %28x86%29</ProductName> @@ -268,6 +273,11 @@ <Visible>False</Visible> <ProductName>.NET Framework 3.5</ProductName> <Install>true</Install> + </BootstrapperPackage> + <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1"> + <Visible>False</Visible> + <ProductName>.NET Framework 3.5 SP1</ProductName> + <Install>false</Install> </BootstrapperPackage> <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1"> <Visible>False</Visible> @@ -311,6 +321,8 @@ </Target> --> <PropertyGroup> - <PostBuildEvent>copy "$(SolutionDir)dbghelptest\dbghelp.dll" "$(TargetDir)"</PostBuildEvent> + <PostBuildEvent>copy "$(SolutionDir)dbghelptest\dbghelp.dll" "$(TargetDir)" +copy "$(TargetPath)" "$(SolutionDir)temp.exe"</PostBuildEvent> + <PreBuildEvent>"$(SolutionDir)buildhelper" "$(ProjectDir)Properties\AssemblyInfo.cs"</PreBuildEvent> </PropertyGroup> </Project> Propchange: trunk/tools/reactosdbg/buildhelper/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri May 29 02:17:14 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/tools/reactosdbg/buildhelper/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/tools/reactosdbg/buildhelper/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Added: trunk/tools/reactosdbg/buildhelper/Program.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/buildhelper/Progr… ============================================================================== --- trunk/tools/reactosdbg/buildhelper/Program.cs (added) +++ trunk/tools/reactosdbg/buildhelper/Program.cs [iso-8859-1] Fri May 29 02:17:14 2009 @@ -1,0 +1,63 @@ +ï»¿using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using System.Text.RegularExpressions; +using System.Diagnostics; + +namespace buildhelper +{ + class Program + { + static void Main(string[] args) + { + if (args.Length == 1) // updating Version Info + { + string infoPath = args[0]; + if (!infoPath.EndsWith("AssemblyInfo.cs")) + { + Console.WriteLine("Please specify the 'AssemblyInfo.cs' you want to update."); + return; + } + + if (!File.Exists(infoPath)) + { + Console.WriteLine(infoPath + " does not exist."); + return; + } + + try + { + StreamReader reader = File.OpenText(infoPath); + string contents = reader.ReadToEnd(); + reader.Close(); + Regex version = new Regex(@"(\d+\.\d+\.)(\d+)(\.\d+)"); + Match versionMatch = version.Match(contents); + string oldVersion = versionMatch.Value; + string newVersion = versionMatch.Groups[1].Value + (Convert.ToUInt32(versionMatch.Groups[2].Value) + 1).ToString() + "." + DateTime.Now.ToString("mss"); + contents = contents.Replace(oldVersion, newVersion); + StreamWriter writer = File.CreateText(infoPath); + writer.Write(contents); + writer.Close(); + Console.WriteLine(string.Format("New version is [{0}]", newVersion)); + } + catch (Exception ex) + { + Console.WriteLine(ex.Message); + } + return; + } + + if (args.Length == 2) // updating WiX Version Info + { + FileVersionInfo version = FileVersionInfo.GetVersionInfo(args[0]); + StreamWriter sw = new StreamWriter(args[1]); + sw.WriteLine("<Include>"); + sw.WriteLine(" <?define version=\"" + version.ProductVersion + "\" ?>"); + sw.WriteLine("</Include>"); + sw.Close(); + } + } + } +} Propchange: trunk/tools/reactosdbg/buildhelper/Program.cs ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/reactosdbg/buildhelper/Properties/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri May 29 02:17:14 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/tools/reactosdbg/buildhelper/Properties/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/tools/reactosdbg/buildhelper/Properties/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Added: trunk/tools/reactosdbg/buildhelper/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/buildhelper/Prope… ============================================================================== --- trunk/tools/reactosdbg/buildhelper/Properties/AssemblyInfo.cs (added) +++ trunk/tools/reactosdbg/buildhelper/Properties/AssemblyInfo.cs [iso-8859-1] Fri May 29 02:17:14 2009 @@ -1,0 +1,36 @@ +ï»¿using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// Allgemeine Informationen Ã¼ber eine Assembly werden Ã¼ber die folgenden +// Attribute gesteuert. Ãndern Sie diese Attributwerte, um die Informationen zu Ã¤ndern, +// die mit einer Assembly verknÃ¼pft sind. +[assembly: AssemblyTitle("buildhelper")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Microsoft")] +[assembly: AssemblyProduct("buildhelper")] +[assembly: AssemblyCopyright("Copyright Â© Microsoft 2009")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar +// fÃ¼r COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von +// COM zugreifen mÃ¼ssen, legen Sie das ComVisible-Attribut fÃ¼r diesen Typ auf "true" fest. +[assembly: ComVisible(false)] + +// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt fÃ¼r COM verfÃ¼gbar gemacht wird +[assembly: Guid("3430edbf-ff75-49b5-a532-835abd929e47")] + +// Versionsinformationen fÃ¼r eine Assembly bestehen aus den folgenden vier Werten: +// +// Hauptversion +// Nebenversion +// Buildnummer +// Revision +// +// Sie kÃ¶nnen alle Werte angeben oder die standardmÃ¤Ãigen Build- und Revisionsnummern +// Ã¼bernehmen, indem Sie "*" eingeben: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] Propchange: trunk/tools/reactosdbg/buildhelper/Properties/AssemblyInfo.cs ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/reactosdbg/buildhelper/buildhelper.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/buildhelper/build… ============================================================================== --- trunk/tools/reactosdbg/buildhelper/buildhelper.csproj (added) +++ trunk/tools/reactosdbg/buildhelper/buildhelper.csproj [iso-8859-1] Fri May 29 02:17:14 2009 @@ -1,0 +1,63 @@ +ï»¿<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>9.0.30729</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{D5599C1D-3A8B-4EBA-B54A-1B17E68CDC6C}</ProjectGuid> + <OutputType>Exe</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>buildhelper</RootNamespace> + <AssemblyName>buildhelper</AssemblyName> + <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + <FileAlignment>512</FileAlignment> + <StartupObject>buildhelper.Program</StartupObject> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <ItemGroup> + <Reference Include="System" /> + <Reference Include="System.Core"> + <RequiredTargetFramework>3.5</RequiredTargetFramework> + </Reference> + <Reference Include="System.Xml.Linq"> + <RequiredTargetFramework>3.5</RequiredTargetFramework> + </Reference> + <Reference Include="System.Data.DataSetExtensions"> + <RequiredTargetFramework>3.5</RequiredTargetFramework> + </Reference> + <Reference Include="System.Data" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <ItemGroup> + <Compile Include="Program.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + </ItemGroup> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> +  + <PropertyGroup> + <PostBuildEvent>copy "$(TargetPath)" "$(SolutionDir)buildhelper.exe"</PostBuildEvent> + </PropertyGroup> +</Project> Propchange: trunk/tools/reactosdbg/buildhelper/buildhelper.csproj ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dgoette] 423: fixes for forum subsystem: * update user count * update newest user
by dgoette＠svn.reactos.org 28 May '09

28 May '09

Author: dgoette Date: Fri May 29 00:21:51 2009 New Revision: 423 URL: http://svn.reactos.org/svn/reactos?rev=423&view=rev Log: fixes for forum subsystem: * update user count * update newest user Modified: branches/danny-web/www/www.reactos.org/roscms/lib/subsystem/Subsystem_PHPBB… Modified: branches/danny-web/www/www.reactos.org/roscms/lib/subsystem/Subsystem_PHPBB… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/subsystem/Subsystem_PHPBB… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/subsystem/Subsystem_PHPBB… [iso-8859-1] Fri May 29 00:21:51 2009 @@ -178,6 +178,21 @@ $stmt->bindParam('user_id',$phpbb_user_id,PDO::PARAM_INT); $stmt->execute() or die('DB error (subsys_phpbb #19)'); + // update forum statistics + // num_users + DBConnection::getInstance()->exec("UPDATE ".self::DB_NAME.".phpbb_config SET config_value = (SELECT COUNT(*) FROM ".$this->user_table.") WHERE config_name = 'num_users'"); + + // newest_user_id + $stmt=&DBConnection::getInstance()->prepare("UPDATE ".self::DB_NAME.".phpbb_config SET config_value = :user_id WHERE config_name = 'newest_user_id'"); + $stmt->bindParam('user_id',$phpbb_user_id,PDO::PARAM_INT); + $stmt->execute(); + + // newest_username + $stmt=&DBConnection::getInstance()->prepare("UPDATE ".self::DB_NAME.".phpbb_config SET config_value = :user_name WHERE config_name = 'newest_username'"); + $stmt->bindParam('user_name',$name,PDO::PARAM_STR); + $stmt->execute(); + // end update forum statistics + // Finally, insert a row in the mapping table $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_SUBSYS." (user_id, subsys, subsys_user_id) VALUES(:roscms_user, 'phpbb', :phpbb_user)"); $stmt->bindParam('roscms_user',$user_id,PDO::PARAM_INT);

1 0

[dgorbachev] 41188: Show CDROM as CDROM in "Properties for Local Disk" dialog. Marcus Boillat, bug #4552.
by dgorbachev＠svn.reactos.org 28 May '09

28 May '09

Author: dgorbachev Date: Thu May 28 23:13:59 2009 New Revision: 41188 URL: http://svn.reactos.org/svn/reactos?rev=41188&view=rev Log: Show CDROM as CDROM in "Properties for Local Disk" dialog. Marcus Boillat, bug #4552. Modified: trunk/reactos/dll/win32/shell32/drive.c Modified: trunk/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] Thu May 28 23:13:59 2009 @@ -327,7 +327,7 @@ FillRect(drawItem->hDC, &drawItem->rcItem, hBrush); DeleteObject((HGDIOBJ)hBrush); } - } + } else if (drawItem->CtlID == 14014) { hBrush = CreateSolidBrush(RGB(255, 0, 255)); @@ -435,9 +435,16 @@ Result = LargeIntegerSubtract(ConvertUlongToLargeInteger(100), Result); swprintf(szResult, L"%02d%%", Result.QuadPart); SendDlgItemMessageW(hwndDlg, 14004, WM_SETTEXT, (WPARAM)0, (LPARAM)szResult); - if (LoadStringW(shell32_hInstance, IDS_DRIVE_FIXED, szBuffer, sizeof(szBuffer) / sizeof(WCHAR))) - SendDlgItemMessageW(hwndDlg, 14001, WM_SETTEXT, (WPARAM)0, (LPARAM)szBuffer); - + if (DriveType == DRIVE_FIXED) + { + if (LoadStringW(shell32_hInstance, IDS_DRIVE_FIXED, szBuffer, sizeof(szBuffer) / sizeof(WCHAR))) + SendDlgItemMessageW(hwndDlg, 14001, WM_SETTEXT, (WPARAM)0, (LPARAM)szBuffer); + } + else /* DriveType == DRIVE_CDROM) */ + { + if (LoadStringW(shell32_hInstance, IDS_DRIVE_CDROM, szBuffer, sizeof(szBuffer) / sizeof(WCHAR))) + SendDlgItemMessageW(hwndDlg, 14001, WM_SETTEXT, (WPARAM)0, (LPARAM)szBuffer); + } } } /* set drive description */

1 0

[gedmurphy] 41187: - Improve the diagnostics. Now includes function, file and line to assist debugging - Remove the null checks from DockPanel and wrap it in try/catch blocks instead (considering it shouldn't happen) - Use RosDiagnostics.DebugTrace to add debug info now. The app now needs to make correct use of exception handling
by gedmurphy＠svn.reactos.org 28 May '09

28 May '09

Author: gedmurphy Date: Thu May 28 23:09:41 2009 New Revision: 41187 URL: http://svn.reactos.org/svn/reactos?rev=41187&view=rev Log: - Improve the diagnostics. Now includes function, file and line to assist debugging - Remove the null checks from DockPanel and wrap it in try/catch blocks instead (considering it shouldn't happen) - Use RosDiagnostics.DebugTrace to add debug info now. The app now needs to make correct use of exception handling Added: trunk/tools/reactosdbg/RosDBG/Diagnostics.cs Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs trunk/tools/reactosdbg/RosDBG/RosDBG.csproj Added: trunk/tools/reactosdbg/RosDBG/Diagnostics.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Diagnostic… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Diagnostics.cs (added) +++ trunk/tools/reactosdbg/RosDBG/Diagnostics.cs [iso-8859-1] Thu May 28 23:09:41 2009 @@ -1,0 +1,61 @@ +ï»¿using System; +using System.IO; +using System.Diagnostics; +using System.Windows.Forms; + +namespace RosDBG +{ + static class RosDiagnostics + { + public enum TraceType + { + Info, Error, Exception + } + + static public void SetupLogger() + { + try + { + if (Convert.ToBoolean(Settings.AppLogging)) + { + File.Delete(Settings.AppLogFile); + FileStream traceLogFile = new FileStream(Settings.AppLogFile, FileMode.OpenOrCreate); + Trace.Listeners.Add(new TextWriterTraceListener(traceLogFile)); + Trace.AutoFlush = true; + } + } + catch (DirectoryNotFoundException) + { + MessageBox.Show(String.Format("Logging: {0} does not exist.\n" + + "Please use the settings dialog to correct this", + Settings.AppLogFile)); + } + catch (Exception ex) + { + MessageBox.Show(String.Format("Failed to setup logging. Unexpected error:\n {0}", + ex.Message)); + } + } + + static public void DebugTrace(TraceType type, string msg) + { + StackTrace st = new StackTrace(true); + StackFrame sf = st.GetFrame(1); + + string typeStr = ""; + switch (type) + { + case TraceType.Info: typeStr = "Info"; break; + case TraceType.Error: typeStr = "Err"; break; + case TraceType.Exception: typeStr = "Exception"; break; + } + + Trace.WriteLine(String.Format("{0, -9} : {1} {2}:{3} {4}", + typeStr, + msg, + sf.GetMethod().Name, + sf.GetFileName(), + sf.GetFileLineNumber())); + } + } +} Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] Thu May 28 23:09:41 2009 @@ -46,27 +46,9 @@ InitializeComponent(); // Setup the logger - try - { - if (Convert.ToBoolean(Settings.AppLogging)) - { - File.Delete(Settings.AppLogFile); - FileStream traceLogFile = new FileStream(Settings.AppLogFile, FileMode.OpenOrCreate); - Trace.Listeners.Add(new TextWriterTraceListener(traceLogFile)); - Trace.AutoFlush = true; - } - } - catch (DirectoryNotFoundException) - { - MessageBox.Show(String.Format("Logging: {0} does not exist.\n" + - "Please use the settings dialog to correct this", - Settings.AppLogFile)); - } - catch (Exception ex) - { - MessageBox.Show(String.Format("Failed to setup logging. Unexpected error:\n {0}", - ex.Message)); - } + RosDiagnostics.SetupLogger(); + + RosDiagnostics.DebugTrace(RosDiagnostics.TraceType.Info, "Initialising application"); mSymbolContext = new SymbolContext(); @@ -177,6 +159,7 @@ private void MainWindowMDI_FormClosing(object sender, FormClosingEventArgs e) { + RosDiagnostics.DebugTrace(RosDiagnostics.TraceType.Info, "Closing application"); mConnection.Close(true); } @@ -371,7 +354,7 @@ private void dockPanel_ActiveDocumentChanged(object sender, EventArgs e) { - if ((dockPanel != null) && (dockPanel.ActiveDocument != null)) + try { ToolWindow Wnd = (ToolWindow)dockPanel.ActiveDocument.DockHandler.Form; @@ -381,6 +364,14 @@ printToolStripButton.Enabled = Wnd.IsCmdEnabled(ToolWindow.Commands.Print); printToolStripMenuItem.Enabled = Wnd.IsCmdEnabled(ToolWindow.Commands.Print); } + catch (NullReferenceException ex) + { + RosDiagnostics.DebugTrace(RosDiagnostics.TraceType.Exception, "Null reference : " + ex.Message); + } + catch (Exception) + { + RosDiagnostics.DebugTrace(RosDiagnostics.TraceType.Exception, "Unexpected error"); + } } } Modified: trunk/tools/reactosdbg/RosDBG/RosDBG.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/RosDBG.csp… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] Thu May 28 23:09:41 2009 @@ -97,6 +97,7 @@ <Compile Include="Connect.Designer.cs"> <DependentUpon>Connect.cs</DependentUpon> </Compile> + <Compile Include="Diagnostics.cs" /> <Compile Include="Dockable Objects\BackTrace.cs"> <SubType>Form</SubType> </Compile>

1 0

← Newer
1
2
3
4
5
6
7
8
...
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2009