Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gbrunmar] 42841: - Implemented MSVC version of atan2
by gbrunmar＠svn.reactos.org 22 Aug '09

22 Aug '09

Author: gbrunmar Date: Sat Aug 22 12:07:25 2009 New Revision: 42841 URL: http://svn.reactos.org/svn/reactos?rev=42841&view=rev Log: - Implemented MSVC version of atan2 Modified: trunk/reactos/lib/sdk/crt/math/i386/atan2.c Modified: trunk/reactos/lib/sdk/crt/math/i386/atan2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/atan… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/atan2.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/atan2.c [iso-8859-1] Sat Aug 22 12:07:25 2009 @@ -15,7 +15,13 @@ "fld %%st(0)" : "=t" (__val) : "0" (__x), "u" (__y)); #else -#error IMPLEMENT ME + __asm + { + fld __y + fld __x + fpatan + fstp __val + } #endif /*__GNUC__*/ return __val; }

1 0

[fireball] 42840: - No need for an annoying dprint message about deleting a DIB section. This section is nothing more than a bitmap in the system, so all specific cleanup is happening inside the kernelmode part of a driver.
by fireball＠svn.reactos.org 22 Aug '09

22 Aug '09

Author: fireball Date: Sat Aug 22 11:51:30 2009 New Revision: 42840 URL: http://svn.reactos.org/svn/reactos?rev=42840&view=rev Log: - No need for an annoying dprint message about deleting a DIB section. This section is nothing more than a bitmap in the system, so all specific cleanup is happening inside the kernelmode part of a driver. Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Sat Aug 22 11:51:30 2009 @@ -187,13 +187,6 @@ BOOL CDECL RosDrv_DeleteBitmap( HBITMAP hbitmap ) { - DIBSECTION dib; - - if (GetObjectW( hbitmap, sizeof(dib), &dib ) == sizeof(dib)) - { - FIXME("TODO: Delete existing DIB section!\n"); - } - return RosGdiDeleteBitmap(hbitmap); }

1 0

[fireball] 42839: - Free brush's pattern bitmap only if it wasn't a user provided one. Fixes a lot of double-free errors.
by fireball＠svn.reactos.org 22 Aug '09

22 Aug '09

Author: fireball Date: Sat Aug 22 11:40:36 2009 New Revision: 42839 URL: http://svn.reactos.org/svn/reactos?rev=42839&view=rev Log: - Free brush's pattern bitmap only if it wasn't a user provided one. Fixes a lot of double-free errors. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c branches/arwinss/reactos/subsystems/win32/win32k/include/brushobj.h Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c [iso-8859-1] Sat Aug 22 11:40:36 2009 @@ -218,8 +218,9 @@ pBrush = EngAllocMem(FL_ZERO_MEMORY, sizeof(BRUSHGDI), TAG_BRUSHOBJ); if (!pBrush) return NULL; - /* Set SOLID flag */ + /* Set BITMAP and USER_BITMAP flags */ pBrush->flAttrs |= GDIBRUSH_IS_BITMAP; + pBrush->flAttrs |= GDIBRUSH_USER_BITMAP; /* Set bitmap */ pBrush->hbmPattern = hbmPattern; @@ -269,8 +270,8 @@ NTAPI GreFreeBrush(PBRUSHGDI pBrush) { - /* Free the pattern bitmap if any */ - if (pBrush->hbmPattern) + /* Free the pattern bitmap if it wasn't user-provided */ + if (pBrush->hbmPattern && !(pBrush->flAttrs & GDIBRUSH_USER_BITMAP)) { GDIOBJ_SetOwnership(pBrush->hbmPattern, PsGetCurrentProcess()); GreDeleteBitmap(pBrush->hbmPattern); Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/brushobj.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/brushobj.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/brushobj.h [iso-8859-1] Sat Aug 22 11:40:36 2009 @@ -18,7 +18,7 @@ #define GDIBRUSH_IS_DEFAULTSTYLE 0x4000 #define GDIBRUSH_IS_MASKING 0x8000 /* Pattern bitmap is used as transparent mask (?) */ #define GDIBRUSH_IS_INSIDEFRAME 0x00010000 -#define GDIBRUSH_CACHED_ENGINE 0x00040000 +#define GDIBRUSH_USER_BITMAP 0x00040000 /* Bitmap is not self-allocated */ #define GDIBRUSH_CACHED_IS_SOLID 0x80000000 /* Total amount of hatch brush styles */

1 0

[mkupfer] 42838: - halve and round up (improved version) ; -)
by mkupfer＠svn.reactos.org 22 Aug '09

22 Aug '09

Author: mkupfer Date: Sat Aug 22 11:26:13 2009 New Revision: 42838 URL: http://svn.reactos.org/svn/reactos?rev=42838&view=rev Log: - halve and round up (improved version) ;-) Modified: trunk/reactos/drivers/network/ndis/ndis/config.c Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Sat Aug 22 11:26:13 2009 @@ -704,15 +704,8 @@ } while (j < str.Length && str.Buffer[j] != '\0') j++; - - if ((j % 2) == 0) - { - *NetworkAddressLength = (UINT)(j/2); - } - else - { - *NetworkAddressLength = (UINT)((j/2)+1); - } + + *NetworkAddressLength = (j+1) >> 1; if ((*NetworkAddressLength) == 0) {

1 0

[janderwald] 42837: [KS] - Store input buffer in Irp->AssociatedIrp.SystemBuffer - Add check [PORTCLS] - Add support for DirectKs
by janderwald＠svn.reactos.org 21 Aug '09

21 Aug '09

Author: janderwald Date: Sat Aug 22 00:46:18 2009 New Revision: 42837 URL: http://svn.reactos.org/svn/reactos?rev=42837&view=rev Log: [KS] - Store input buffer in Irp->AssociatedIrp.SystemBuffer - Add check [PORTCLS] - Add support for DirectKs Modified: trunk/reactos/drivers/ksfilter/ks/api.c trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c trunk/reactos/drivers/wdm/audio/sysaudio/pin.c Modified: trunk/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] Sat Aug 22 00:46:18 2009 @@ -1155,9 +1155,18 @@ } - /* HACK */ + /* Store Fileobject */ IoStack = IoGetNextIrpStackLocation(Irp); IoStack->FileObject = FileObject; + + if (IoControl == IOCTL_KS_WRITE_STREAM) + { + Irp->AssociatedIrp.SystemBuffer = OutBuffer; + } + else if (IoControl == IOCTL_KS_READ_STREAM) + { + Irp->AssociatedIrp.SystemBuffer = InBuffer; + } IoSetCompletionRoutine(Irp, KspSynchronousIoControlDeviceCompletion, (PVOID)&IoStatusBlock, TRUE, TRUE, TRUE); Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Sat Aug 22 00:46:18 2009 @@ -1854,6 +1854,8 @@ DeviceExtension = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension; /* get device header */ DeviceHeader = DeviceExtension->DeviceHeader; + + ASSERT(IoStack->FileObject); /* get object header */ ObjectHeader = (PKSIOBJECT_HEADER) IoStack->FileObject->FsContext; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] Sat Aug 22 00:46:18 2009 @@ -118,24 +118,44 @@ IN PIRP Irp) { PKSSTREAM_HEADER Header; - //PIO_STACK_LOCATION IoStack; - IIrpQueueImpl * This = (IIrpQueueImpl*)iface; - -#if 0 + NTSTATUS Status = STATUS_SUCCESS; + PIO_STACK_LOCATION IoStack; + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + /* get current irp stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); - ASSERT(IoStack->Parameters.DeviceIoControl.InputBufferLength >= sizeof(KSSTREAM_HEADER)); - - /* get stream header */ - Header = (KSSTREAM_HEADER*)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; -#else - /* HACK get stream header */ - Header = (KSSTREAM_HEADER*)Buffer; - - /* HACK untill stream probing is ready */ + if (!Buffer) + { + /* probe the stream irp */ + Status = KsProbeStreamIrp(Irp, KSSTREAM_WRITE | KSPROBE_ALLOCATEMDL | KSPROBE_PROBEANDLOCK | KSPROBE_ALLOWFORMATCHANGE | KSPROBE_SYSTEMADDRESS, 0); + + /* check for success */ + if (!NT_SUCCESS(Status)) + { + DPRINT1("KsProbeStreamIrp failed with %x\n", Status); + return Status; + } + + /* get the stream header */ + Header = (PKSSTREAM_HEADER)Irp->AssociatedIrp.SystemBuffer; + ASSERT(Header); + ASSERT(Irp->MdlAddress); + + if (Irp->RequestorMode != KernelMode) + { + /* use allocated mdl */ + Header->Data = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); + } + } + else + { + /* HACK */ + Header = (PKSSTREAM_HEADER)Buffer; + } + + /* HACK */ Irp->Tail.Overlay.DriverContext[2] = (PVOID)Header; -#endif /* sanity check */ ASSERT(Header); @@ -156,7 +176,7 @@ KsAddIrpToCancelableQueue(&This->IrpList, &This->IrpListLock, Irp, KsListEntryTail, NULL); /* done */ - return STATUS_SUCCESS; + return Status; } NTSTATUS @@ -281,10 +301,10 @@ This->Irp->IoStatus.Information = StreamHeader->FrameExtent; /* free stream data, no tag as wdmaud.drv does it atm */ - ExFreePool(StreamHeader->Data); + //ExFreePool(StreamHeader->Data); /* free stream header, no tag as wdmaud.drv allocates it atm */ - ExFreePool(StreamHeader); + //ExFreePool(StreamHeader); /* complete the request */ IoCompleteRequest(This->Irp, IO_SOUND_INCREMENT); 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] Sat Aug 22 00:46:18 2009 @@ -640,15 +640,7 @@ Status = This->IrpQueue->lpVtbl->AddMapping(This->IrpQueue, NULL, 0, Irp); - /* check if pin is in run state */ - if (This->State != KSSTATE_RUN) - { - /* HACK set pin into run state if caller forgot it */ - SetStreamState(This, KSSTATE_RUN); - DPRINT1("Starting stream with %lu mappings Status %x\n", This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue), Status); - } - - return Status; + return STATUS_PENDING; } /* @@ -911,7 +903,7 @@ OUT PIO_STATUS_BLOCK StatusBlock, IN PDEVICE_OBJECT DeviceObject) { - return FALSE; + return KsDispatchFastIoDeviceControlFailure(FileObject, Wait, InputBuffer, InputBufferLength, OutputBuffer, OutputBufferLength, IoControlCode, StatusBlock, DeviceObject); } /* Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Sat Aug 22 00:46:18 2009 @@ -1105,8 +1105,8 @@ /* now build the irp */ LowerIrp = IoBuildAsynchronousFsdRequest (IRP_MJ_WRITE, IoGetRelatedDeviceObject(FileObject), - Packet, - sizeof(KSSTREAM_HEADER), + Packet, + sizeof(KSSTREAM_HEADER), &Offset, NULL); @@ -1120,6 +1120,12 @@ return SetIrpIoStatus(Irp, STATUS_INSUFFICIENT_RESOURCES, 0); } + /* get next stack location */ + IoStack = IoGetNextIrpStackLocation(LowerIrp); + + /* attach file object */ + IoStack->FileObject = FileObject; + /* set a completion routine */ IoSetCompletionRoutine(LowerIrp, WdmAudWriteCompletion, (PVOID)Irp, TRUE, TRUE, TRUE); Modified: trunk/reactos/drivers/wdm/audio/sysaudio/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] Sat Aug 22 00:46:18 2009 @@ -129,6 +129,7 @@ PDISPATCH_CONTEXT Context; PIO_STACK_LOCATION IoStack; PFILE_OBJECT FileObject; + PVOID Buffer; NTSTATUS Status; ULONG BytesReturned; @@ -159,14 +160,25 @@ return Status; } + Buffer = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); + + if (!Buffer) + { + /* insufficient resources */ + Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; + /* Complete the irp */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* call the portcls audio pin */ Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_WRITE_STREAM, - Irp->UserBuffer, - IoStack->Parameters.Write.Length, NULL, 0, + Buffer, + IoStack->Parameters.Write.Length, &BytesReturned); - /* Release file object */ ObDereferenceObject(FileObject); @@ -329,9 +341,6 @@ PIO_STATUS_BLOCK IoStatus, PDEVICE_OBJECT DeviceObject) { - DPRINT("Pin_fnFastDeviceIoControl called DeviceObject %p Irp %p\n", DeviceObject); - - return FALSE; } @@ -348,8 +357,6 @@ PIO_STATUS_BLOCK IoStatus, PDEVICE_OBJECT DeviceObject) { - DPRINT("Pin_fnFastRead called DeviceObject %p Irp %p\n", DeviceObject); - return FALSE; }

1 0

[mkupfer] 42836: Fix redraw bug by correcting nonclient region calculation. (Window->UpdateRegion has no proper values) TODO: calculate and/or update Window->UpdateRegion properly See issue #4181 for details.
by mkupfer＠svn.reactos.org 21 Aug '09

21 Aug '09

Author: mkupfer Date: Sat Aug 22 00:23:22 2009 New Revision: 42836 URL: http://svn.reactos.org/svn/reactos?rev=42836&view=rev Log: Fix redraw bug by correcting nonclient region calculation. (Window->UpdateRegion has no proper values) TODO: calculate and/or update Window->UpdateRegion properly See issue #4181 for details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Sat Aug 22 00:23:22 2009 @@ -168,7 +168,7 @@ if (Window->UpdateRegion != NULL && Window->UpdateRegion != (HRGN)1) { - hRgnNonClient = NtGdiCreateRectRgn(0, 0, 0, 0); + hRgnNonClient = IntCalcWindowRgn(Window, FALSE); /* * If region creation fails it's safe to fallback to whole @@ -186,7 +186,7 @@ return (HRGN)1; } - RgnType = NtGdiCombineRgn(hRgnNonClient, Window->UpdateRegion, + RgnType = NtGdiCombineRgn(hRgnNonClient, hRgnNonClient, hRgnWindow, RGN_DIFF); if (RgnType == ERROR) {

1 0

[janderwald] 42835: - Implement Window position/size saving & restoring - Implemented by Stefan Ludowicy (IRC: BasisBit) reactos A.T. basisbit .D.O.T. de
by janderwald＠svn.reactos.org 21 Aug '09

21 Aug '09

Author: janderwald Date: Fri Aug 21 22:40:00 2009 New Revision: 42835 URL: http://svn.reactos.org/svn/reactos?rev=42835&view=rev Log: - Implement Window position/size saving & restoring - Implemented by Stefan Ludowicy (IRC: BasisBit) reactos A.T. basisbit .D.O.T. de Added: trunk/tools/reactosdbg/RosDBG/app.config (with props) Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs trunk/tools/reactosdbg/RosDBG/Program.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs trunk/tools/reactosdbg/RosDBG/Properties/Settings.Designer.cs trunk/tools/reactosdbg/RosDBG/Properties/Settings.settings trunk/tools/reactosdbg/RosDBG/RosDBG.csproj 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 Aug 21 22:40:00 2009 @@ -189,6 +189,7 @@ { RosDiagnostics.DebugTrace(RosDiagnostics.TraceType.Info, "Closing application"); mConnection.Close(true); + SaveWindowSettings(); } void UpdateDebuggerMenu() @@ -469,6 +470,14 @@ } } + private void SaveWindowSettings() + { + RosDBG.Properties.Settings.Default.Size = this.Size; + RosDBG.Properties.Settings.Default.Location = this.Location; + RosDBG.Properties.Settings.Default.WindowState = this.WindowState; + RosDBG.Properties.Settings.Default.Save(); + + } } 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] Fri Aug 21 22:40:00 2009 @@ -3,6 +3,7 @@ using System.Linq; using System.Threading; using System.Windows.Forms; +using System.Drawing; namespace RosDBG { @@ -20,6 +21,11 @@ Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); MainWindow mw = new MainWindow(); + + mw.WindowState = RosDBG.Properties.Settings.Default.WindowState; + mw.StartPosition = FormStartPosition.Manual; + mw.Location = RosDBG.Properties.Settings.Default.Location; + mw.Size = RosDBG.Properties.Settings.Default.Size; Application.Run(mw); } else 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 Aug 21 22:40:00 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.69")] -[assembly: AssemblyFileVersion("1.0.2.69")] +[assembly: AssemblyVersion("1.0.2.72")] +[assembly: AssemblyFileVersion("1.0.2.72")] Modified: trunk/tools/reactosdbg/RosDBG/Properties/Settings.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/Settings.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/Settings.Designer.cs [iso-8859-1] Fri Aug 21 22:40:00 2009 @@ -1,7 +1,7 @@ ï»¿//------------------------------------------------------------------------------ // <auto-generated> // Dieser Code wurde von einem Tool generiert. -// Laufzeitversion:2.0.50727.4016 +// Laufzeitversion:2.0.50727.3082 // // Ãnderungen an dieser Datei kÃ¶nnen falsches Verhalten verursachen und gehen verloren, wenn // der Code erneut generiert wird. @@ -22,5 +22,41 @@ return defaultInstance; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0, 0")] + public global::System.Drawing.Point Location { + get { + return ((global::System.Drawing.Point)(this["Location"])); + } + set { + this["Location"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("792, 591")] + public global::System.Drawing.Size Size { + get { + return ((global::System.Drawing.Size)(this["Size"])); + } + set { + this["Size"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("Normal")] + public global::System.Windows.Forms.FormWindowState WindowState { + get { + return ((global::System.Windows.Forms.FormWindowState)(this["WindowState"])); + } + set { + this["WindowState"] = value; + } + } } } Modified: trunk/tools/reactosdbg/RosDBG/Properties/Settings.settings URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/Settings.settings [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/Settings.settings [iso-8859-1] Fri Aug 21 22:40:00 2009 @@ -1,7 +1,15 @@ ï»¿<?xml version='1.0' encoding='utf-8'?> -<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)"> - <Profiles> - <Profile Name="(Default)" /> - </Profiles> - <Settings /> +<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="RosDBG.Properties" GeneratedClassName="Settings"> + <Profiles /> + <Settings> + <Setting Name="Location" Type="System.Drawing.Point" Scope="User"> + <Value Profile="(Default)">0, 0</Value> + </Setting> + <Setting Name="Size" Type="System.Drawing.Size" Scope="User"> + <Value Profile="(Default)">792, 591</Value> + </Setting> + <Setting Name="WindowState" Type="System.Windows.Forms.FormWindowState" Scope="User"> + <Value Profile="(Default)">Normal</Value> + </Setting> + </Settings> </SettingsFile> 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 Aug 21 22:40:00 2009 @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.30729</ProductVersion> + <ProductVersion>9.0.21022</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{FB776BFE-D2C2-465E-B713-6AD82CAE1A39}</ProjectGuid> <OutputType>WinExe</OutputType> @@ -99,7 +99,6 @@ </Compile> <Compile Include="Diagnostics.cs" /> <Compile Include="Dockable Objects\BackTrace.cs"> - <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\BackTrace.Designer.cs"> <DependentUpon>BackTrace.cs</DependentUpon> @@ -117,7 +116,6 @@ <Compile Include="FileDirChooser.cs"> </Compile> <Compile Include="Dockable Objects\ToolWindow.cs"> - <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\ToolWindow.Designer.cs"> <DependentUpon>ToolWindow.cs</DependentUpon> @@ -127,7 +125,6 @@ <Compile Include="IUseDebugConnection.cs" /> <Compile Include="IUseSymbols.cs" /> <Compile Include="Dockable Objects\Locals.cs"> - <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\Locals.Designer.cs"> <DependentUpon>Locals.cs</DependentUpon> @@ -139,7 +136,6 @@ <DependentUpon>MainWindow.cs</DependentUpon> </Compile> <Compile Include="Dockable Objects\MemoryWindow.cs"> - <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\MemoryWindow.Designer.cs"> <DependentUpon>MemoryWindow.cs</DependentUpon> @@ -147,13 +143,11 @@ <Compile Include="Module.cs" /> <Compile Include="ModuleIndex.cs" /> <Compile Include="Dockable Objects\Modules.cs"> - <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\Modules.Designer.cs"> <DependentUpon>Modules.cs</DependentUpon> </Compile> <Compile Include="Dockable Objects\ProcThread.cs"> - <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\ProcThread.Designer.cs"> <DependentUpon>ProcThread.cs</DependentUpon> @@ -193,7 +187,7 @@ <SubType>Designer</SubType> </EmbeddedResource> <EmbeddedResource Include="Properties\Resources.resx"> - <Generator>ResXFileCodeGenerator</Generator> + <Generator>PublicResXFileCodeGenerator</Generator> <LastGenOutput>Resources.Designer.cs</LastGenOutput> <SubType>Designer</SubType> </EmbeddedResource> @@ -232,19 +226,16 @@ <DesignTimeSharedInput>True</DesignTimeSharedInput> </Compile> <Compile Include="Dockable Objects\RawTraffic.cs"> - <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\RawTraffic.Designer.cs"> <DependentUpon>RawTraffic.cs</DependentUpon> </Compile> <Compile Include="Dockable Objects\ReactOSWeb.cs"> - <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\ReactOSWeb.Designer.cs"> <DependentUpon>ReactOSWeb.cs</DependentUpon> </Compile> <Compile Include="Dockable Objects\RegisterView.cs"> - <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\RegisterView.Designer.cs"> <DependentUpon>RegisterView.cs</DependentUpon> @@ -256,7 +247,6 @@ <DependentUpon>Settings.cs</DependentUpon> </Compile> <Compile Include="Dockable Objects\SourceView.cs"> - <SubType>Form</SubType> </Compile> <Compile Include="Dockable Objects\SourceView.Designer.cs"> <DependentUpon>SourceView.cs</DependentUpon> @@ -314,6 +304,7 @@ </ItemGroup> <ItemGroup> <Content Include="app-rosdbg.ico" /> + <None Include="app.config" /> <None Include="Resources\copyToolStripMenuItem.Image.png" /> <None Include="Resources\Run.bmp" /> <None Include="Resources\Pause.bmp" /> Added: trunk/tools/reactosdbg/RosDBG/app.config URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/app.config… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/app.config (added) +++ trunk/tools/reactosdbg/RosDBG/app.config [iso-8859-1] Fri Aug 21 22:40:00 2009 @@ -1,0 +1,22 @@ +ï»¿<?xml version="1.0" encoding="utf-8" ?> +<configuration> + <configSections> + <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" > + <section name="RosDBG.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" /> + </sectionGroup> + </configSections> + <connectionStrings /> + <userSettings> + <RosDBG.Properties.Settings> + <setting name="Location" serializeAs="String"> + <value>0, 0</value> + </setting> + <setting name="Size" serializeAs="String"> + <value>792, 591</value> + </setting> + <setting name="WindowState" serializeAs="String"> + <value>Normal</value> + </setting> + </RosDBG.Properties.Settings> + </userSettings> +</configuration> Propchange: trunk/tools/reactosdbg/RosDBG/app.config ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 42834: - IOCTL_KS_WRITE_STREAM passes the data in the OutputBuffer, not InputBuffer
by janderwald＠svn.reactos.org 21 Aug '09

21 Aug '09

Author: janderwald Date: Fri Aug 21 21:38:45 2009 New Revision: 42834 URL: http://svn.reactos.org/svn/reactos?rev=42834&view=rev Log: - IOCTL_KS_WRITE_STREAM passes the data in the OutputBuffer, not InputBuffer Modified: trunk/reactos/drivers/ksfilter/ks/irp.c Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Fri Aug 21 21:38:45 2009 @@ -657,7 +657,7 @@ /* get current irp stack */ IoStack = IoGetCurrentIrpStackLocation(Irp); - Length = IoStack->Parameters.DeviceIoControl.InputBufferLength; + Length = IoStack->Parameters.DeviceIoControl.OutputBufferLength; if (Irp->RequestorMode == KernelMode || Irp->AssociatedIrp.SystemBuffer) {

1 0

[fireball] 42833: - Implement windows moving (with contents).
by fireball＠svn.reactos.org 21 Aug '09

21 Aug '09

Author: fireball Date: Fri Aug 21 21:13:00 2009 New Revision: 42833 URL: http://svn.reactos.org/svn/reactos?rev=42833&view=rev Log: - Implement windows moving (with contents). Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Fri Aug 21 21:13:00 2009 @@ -44,7 +44,7 @@ if (TRUE) { - OffsetRect( &dst_rect, -data->window_rect.left, -data->window_rect.top ); + //OffsetRect( &dst_rect, -data->window_rect.left, -data->window_rect.top ); parent = GetAncestor( data->hwnd, GA_PARENT ); hdc_src = GetDCEx( parent, 0, DCX_CACHE ); hdc_dst = GetDCEx( data->hwnd, 0, DCX_CACHE | DCX_WINDOW ); @@ -58,18 +58,12 @@ hdc_src = hdc_dst = GetDCEx( data->hwnd, 0, DCX_CACHE ); } - //code = X11DRV_START_EXPOSURES; - //ExtEscape( hdc_dst, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, 0, NULL ); - - ERR( "copying bits for win %p (parent %p)/ %s -> %s\n", - data->hwnd, parent, - wine_dbgstr_rect(&src_rect), wine_dbgstr_rect(&dst_rect) ); + //ERR( "copying bits for win %p (parent %p)/ %s -> %s\n", + // data->hwnd, parent, + // wine_dbgstr_rect(&src_rect), wine_dbgstr_rect(&dst_rect) ); BitBlt( hdc_dst, dst_rect.left, dst_rect.top, dst_rect.right - dst_rect.left, dst_rect.bottom - dst_rect.top, hdc_src, src_rect.left, src_rect.top, SRCCOPY ); - - //code = X11DRV_END_EXPOSURES; - //ExtEscape( hdc_dst, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, sizeof(rgn), (LPSTR)&rgn ); ReleaseDC( data->hwnd, hdc_dst ); if (hdc_src != hdc_dst) ReleaseDC( parent, hdc_src ); @@ -789,20 +783,6 @@ TRACE( "win %p cmd %d at %s flags %08x\n", hwnd, cmd, wine_dbgstr_rect(rect), swp ); -#if 0 - /* HACK */ - x = 1; - y = 1; - width = 50; - height = 50; - - rect->left = x; - rect->top = y; - rect->right = x + width; - rect->bottom = y + height; - //OffsetRect( rect, virtual_screen_rect.left, virtual_screen_rect.top ); - //X11DRV_X_to_window_rect( data, rect ); -#endif return swp & ~(SWP_NOMOVE | SWP_NOCLIENTMOVE | SWP_NOSIZE | SWP_NOCLIENTSIZE); } @@ -876,7 +856,7 @@ } } - RosDrv_UpdateZOrder(hwnd, (RECT*)visible_rect); + //RosDrv_UpdateZOrder(hwnd, (RECT*)visible_rect); } /* EOF */

1 0

[janderwald] 42832: - Fix a few bugs - Bug1 - BufferOverflow - Bug2 - ks expects a '\\' for each pin creation request - Bug3 - ObjectLength was not correctly set, thus truncating the request - Bug4 - Zero byte was not set at correct offset, potentialy leading to a heap overflow
by janderwald＠svn.reactos.org 21 Aug '09

21 Aug '09

Author: janderwald Date: Fri Aug 21 20:36:43 2009 New Revision: 42832 URL: http://svn.reactos.org/svn/reactos?rev=42832&view=rev Log: - Fix a few bugs - Bug1 - BufferOverflow - Bug2 - ks expects a '\\' for each pin creation request - Bug3 - ObjectLength was not correctly set, thus truncating the request - Bug4 - Zero byte was not set at correct offset, potentialy leading to a heap overflow Modified: trunk/reactos/dll/directx/ksuser/ksuser.c Modified: trunk/reactos/dll/directx/ksuser/ksuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.… ============================================================================== --- trunk/reactos/dll/directx/ksuser/ksuser.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksuser/ksuser.c [iso-8859-1] Fri Aug 21 20:36:43 2009 @@ -44,18 +44,19 @@ Length = wcslen(IID); - TotalSize = (Length * sizeof(WCHAR)) + BufferSize + 2 * sizeof(WCHAR); + TotalSize = (Length * sizeof(WCHAR)) + BufferSize + 4 * sizeof(WCHAR); pStr = HeapAlloc(GetProcessHeap(), 0, TotalSize); if (!pStr) return STATUS_INSUFFICIENT_RESOURCES; - - wcscpy(pStr, (LPWSTR)IID); - pStr[Length] = L'\\'; - memcpy(&pStr[Length+1], Buffer, BufferSize); - pStr[Length+1+BufferSize] = L'\0'; + pStr[0] = L'\\'; + wcscpy(&pStr[1], (LPWSTR)IID); + pStr[Length+1] = L'\\'; + memcpy(&pStr[Length+2], Buffer, BufferSize); + pStr[Length+3+(BufferSize/sizeof(WCHAR))] = L'\0'; RtlInitUnicodeString(&ObjectName, pStr); + ObjectName.Length = ObjectName.MaximumLength = TotalSize; InitializeObjectAttributes(&ObjectAttributes, &ObjectName, OBJ_CASE_INSENSITIVE, hHandle, NULL);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs