aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Inline temporary variable.

Browse Source
This commit is contained in:
Natalia Portillo
2022-11-15 00:20:20 +00:00
parent 2f6ef0c498
commit 47965f0584
7 changed files with 28 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Aaru.Core/Devices/Dumping/MiniDisc.cs
View File

@@ -165,7 +165,6 @@ partial class Dump
} }
uint blocksToRead = scsiReader.BlocksToRead; uint blocksToRead = scsiReader.BlocksToRead;
uint logicalBlockSize = blockSize;
uint physicalBlockSize = scsiReader.PhysicalBlockSize; uint physicalBlockSize = scsiReader.PhysicalBlockSize;
if(blocks == 0) if(blocks == 0)
@@ -794,7 +793,7 @@ partial class Dump
sidecar.BlockMedia[0].LogicalBlocks = blocks; sidecar.BlockMedia[0].LogicalBlocks = blocks;
sidecar.BlockMedia[0].PhysicalBlockSize = physicalBlockSize; sidecar.BlockMedia[0].PhysicalBlockSize = physicalBlockSize;
sidecar.BlockMedia[0].LogicalBlockSize = logicalBlockSize; sidecar.BlockMedia[0].LogicalBlockSize = blockSize;
sidecar.BlockMedia[0].Manufacturer = _dev.Manufacturer; sidecar.BlockMedia[0].Manufacturer = _dev.Manufacturer;
sidecar.BlockMedia[0].Model = _dev.Model; sidecar.BlockMedia[0].Model = _dev.Model;

14
Aaru.Devices/Windows/Usb.cs
View File

@@ -93,9 +93,8 @@ static partial class Usb
// now we can get some more detailed information // now we can get some more detailed information
var nRequiredSize = 0; var nRequiredSize = 0;
const int nBytes = BUFFER_SIZE;
if(SetupDiGetDeviceInterfaceDetail(h, ref dia, ref didd, nBytes, ref nRequiredSize, ref da)) if(SetupDiGetDeviceInterfaceDetail(h, ref dia, ref didd, BUFFER_SIZE, ref nRequiredSize, ref da))
{ {
host._controllerDevicePath = didd.DevicePath; host._controllerDevicePath = didd.DevicePath;
@@ -131,11 +130,10 @@ static partial class Usb
static string GetDescriptionByKeyName(string driverKeyName) static string GetDescriptionByKeyName(string driverKeyName)
{ {
var ans = ""; var ans = "";
const string devEnum = REGSTR_KEY_USB;
// Use the "enumerator form" of the SetupDiGetClassDevs API // Use the "enumerator form" of the SetupDiGetClassDevs API
// to generate a list of all USB devices // to generate a list of all USB devices
IntPtr h = SetupDiGetClassDevs(0, devEnum, IntPtr.Zero, DIGCF_PRESENT | DIGCF_ALLCLASSES); IntPtr h = SetupDiGetClassDevs(0, REGSTR_KEY_USB, IntPtr.Zero, DIGCF_PRESENT | DIGCF_ALLCLASSES);
if(h == _invalidHandleValue) if(h == _invalidHandleValue)
return ans; return ans;
@@ -190,11 +188,10 @@ static partial class Usb
static string GetInstanceIdByKeyName(string driverKeyName) static string GetInstanceIdByKeyName(string driverKeyName)
{ {
var ans = ""; var ans = "";
const string devEnum = REGSTR_KEY_USB;
// Use the "enumerator form" of the SetupDiGetClassDevs API // Use the "enumerator form" of the SetupDiGetClassDevs API
// to generate a list of all USB devices // to generate a list of all USB devices
IntPtr h = SetupDiGetClassDevs(0, devEnum, IntPtr.Zero, DIGCF_PRESENT | DIGCF_ALLCLASSES); IntPtr h = SetupDiGetClassDevs(0, REGSTR_KEY_USB, IntPtr.Zero, DIGCF_PRESENT | DIGCF_ALLCLASSES);
if(h == _invalidHandleValue) if(h == _invalidHandleValue)
return ans; return ans;
@@ -227,9 +224,8 @@ static partial class Usb
// is it a match? // is it a match?
if(keyName == driverKeyName) if(keyName == driverKeyName)
{ {
const int nBytes = BUFFER_SIZE; var sb = new StringBuilder(BUFFER_SIZE);
var sb = new StringBuilder(nBytes); SetupDiGetDeviceInstanceId(h, ref da, sb, BUFFER_SIZE, out requiredSize);
SetupDiGetDeviceInstanceId(h, ref da, sb, nBytes, out requiredSize);
ans = sb.ToString(); ans = sb.ToString();
break; break;

7
Aaru.Devices/Windows/UsbFunctions.cs
View File

@@ -241,9 +241,8 @@ static partial class Usb
// now we can get some more detailed information // now we can get some more detailed information
var nRequiredSize = 0; var nRequiredSize = 0;
const int nBytes = BUFFER_SIZE;
if(SetupDiGetDeviceInterfaceDetail(h, ref dia, ref didd, nBytes, ref nRequiredSize, ref da)) if(SetupDiGetDeviceInterfaceDetail(h, ref dia, ref didd, BUFFER_SIZE, ref nRequiredSize, ref da))
if(GetDeviceNumber(didd.DevicePath) == devNum) if(GetDeviceNumber(didd.DevicePath) == devNum)
{ {
// current InstanceID is at the "USBSTOR" level, so we // current InstanceID is at the "USBSTOR" level, so we
@@ -251,8 +250,8 @@ static partial class Usb
CM_Get_Parent(out IntPtr ptrPrevious, da.DevInst, 0); CM_Get_Parent(out IntPtr ptrPrevious, da.DevInst, 0);
// Now we get the InstanceID of the USB level device // Now we get the InstanceID of the USB level device
IntPtr ptrInstanceBuf = Marshal.AllocHGlobal(nBytes); nint ptrInstanceBuf = Marshal.AllocHGlobal(BUFFER_SIZE);
CM_Get_Device_ID(ptrPrevious, ptrInstanceBuf, nBytes, 0); CM_Get_Device_ID(ptrPrevious, ptrInstanceBuf, BUFFER_SIZE, 0);
instanceId = Marshal.PtrToStringAuto(ptrInstanceBuf); instanceId = Marshal.PtrToStringAuto(ptrInstanceBuf);
Marshal.FreeHGlobal(ptrInstanceBuf); Marshal.FreeHGlobal(ptrInstanceBuf);

5
Aaru.Gui/Controls/BlockMap.cs
View File

@@ -445,20 +445,19 @@ public sealed class BlockMap : ItemsControl
using var ctx = new DrawingContext(ctxi, false); using var ctx = new DrawingContext(ctxi, false);
int squareWidth = (sideLength - 2 * borderWidth) / colors.Length; int squareWidth = (sideLength - 2 * borderWidth) / colors.Length;
int squareHeight = squareWidth;
var x = 0; var x = 0;
var y = 0; var y = 0;
foreach(Color color in colors) foreach(Color color in colors)
{ {
ctx.FillRectangle(new SolidColorBrush(color), new Rect(x, y, squareWidth, squareHeight)); ctx.FillRectangle(new SolidColorBrush(color), new Rect(x, y, squareWidth, squareWidth));
x += squareWidth + 2 * borderWidth; x += squareWidth + 2 * borderWidth;
if(x < sideLength) if(x < sideLength)
continue; continue;
x = 0; x = 0;
y += squareHeight + 2 * borderWidth; y += squareWidth + 2 * borderWidth;
} }
} }

9
Aaru.Images/Alcohol120/Write.cs
View File

@@ -457,7 +457,6 @@ public sealed partial class Alcohol120
foreach(CommonTypes.Structs.Track track in tracks.OrderBy(t => t.Sequence)) foreach(CommonTypes.Structs.Track track in tracks.OrderBy(t => t.Sequence))
{ {
CommonTypes.Structs.Track newTrack = track;
uint subchannelSize; uint subchannelSize;
switch(track.SubchannelType) switch(track.SubchannelType)
@@ -477,12 +476,12 @@ public sealed partial class Alcohol120
return false; return false;
} }
newTrack.FileOffset = currentDataOffset; track.FileOffset = currentDataOffset;
currentDataOffset += (ulong)(newTrack.RawBytesPerSector + subchannelSize) * currentDataOffset += (ulong)(track.RawBytesPerSector + subchannelSize) *
(newTrack.EndSector - newTrack.StartSector + 1); (track.EndSector - track.StartSector + 1);
_writingTracks.Add(newTrack); _writingTracks.Add(track);
} }
return true; return true;

12
Aaru.Images/CDRDAO/Write.cs
View File

@@ -468,18 +468,16 @@ public sealed partial class Cdrdao
return false; return false;
} }
Track newTrack = track; track.File = _separateTracksWriting ? _writingBaseName + $"_track{track.Sequence:D2}.bin"
newTrack.File = _separateTracksWriting ? _writingBaseName + $"_track{track.Sequence:D2}.bin"
: _writingBaseName + ".bin"; : _writingBaseName + ".bin";
newTrack.FileOffset = _separateTracksWriting ? 0 : currentOffset; track.FileOffset = _separateTracksWriting ? 0 : currentOffset;
_writingTracks.Add(newTrack); _writingTracks.Add(track);
currentOffset += (ulong)newTrack.RawBytesPerSector * (newTrack.EndSector - newTrack.StartSector + 1); currentOffset += (ulong)track.RawBytesPerSector * (track.EndSector - track.StartSector + 1);
if(track.SubchannelType != TrackSubchannelType.None) if(track.SubchannelType != TrackSubchannelType.None)
currentOffset += 96 * (newTrack.EndSector - newTrack.StartSector + 1); currentOffset += 96 * (track.EndSector - track.StartSector + 1);
} }
_writingStreams = new Dictionary<uint, FileStream>(); _writingStreams = new Dictionary<uint, FileStream>();

8
Aaru.Images/CDRWin/Write.cs
View File

@@ -389,13 +389,11 @@ public sealed partial class CdrWin
foreach(Track track in tracks.OrderBy(t => t.Sequence)) foreach(Track track in tracks.OrderBy(t => t.Sequence))
{ {
Track newTrack = track; track.File = _separateTracksWriting ? _writingBaseName + $"_track{track.Sequence:D2}.bin"
newTrack.File = _separateTracksWriting ? _writingBaseName + $"_track{track.Sequence:D2}.bin"
: _writingBaseName + ".bin"; : _writingBaseName + ".bin";
newTrack.FileOffset = _separateTracksWriting ? 0 : track.StartSector * 2352; track.FileOffset = _separateTracksWriting ? 0 : track.StartSector * 2352;
_writingTracks.Add(newTrack); _writingTracks.Add(track);
} }
_writingStreams = new Dictionary<uint, FileStream>(); _writingStreams = new Dictionary<uint, FileStream>();