Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 16:23:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FLOPPY_NEW] WindowsSync to 8fb512a (#2238)

Browse source 
* [FLOPPY_NEW] Make 6 '#ifdef' explicit about '__REACTOS__'

* [FLOPPY_NEW] RtlStringCbPrintf?() need bytes, not chars

Import
8fb512ac67
This commit is contained in:
Serge Gautherie 2020-01-14 18:50:19 +01:00 • committed by Hermès BÉLUSCA - MAÏTO
parent e5c0052466
commit 82d2f13cea
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
drivers/storage/floppy_new/floppy.c
View file

@ -28,7 +28,7 @@ Revision History:
--*/ --*/
#ifdef _MSC_VER #if !defined(__REACTOS__) || defined(_MSC_VER)
#pragma warning(disable:4214) // nonstandard extension used : bit field types other than int #pragma warning(disable:4214) // nonstandard extension used : bit field types other than int
#pragma warning(disable:4201) // nonstandard extension used : nameless struct/union #pragma warning(disable:4201) // nonstandard extension used : nameless struct/union
#endif #endif
@ -585,7 +585,7 @@ ScsiFlopUnload(
// using #pragma. // using #pragma.
// //
#ifdef _MSC_VER #if !defined(__REACTOS__) || defined(_MSC_VER)
#pragma warning(push) #pragma warning(push)
#pragma warning(disable:28152) #pragma warning(disable:28152)
#endif #endif
@ -699,7 +699,7 @@ Return Value:
DeviceCount++; DeviceCount++;
status = RtlStringCbPrintfA((PCCHAR) name, status = RtlStringCbPrintfA((PCCHAR) name,
sizeof(name)/sizeof(UCHAR), sizeof(name),
"\\Device\\Floppy%u", "\\Device\\Floppy%u",
DeviceCount); DeviceCount);
if (NT_SUCCESS(status)) { if (NT_SUCCESS(status)) {
@ -809,7 +809,7 @@ CreateFlopDeviceObjectExit:
return status; return status;
} // end CreateFlopDeviceObject() } // end CreateFlopDeviceObject()
#ifdef _MSC_VER #if !defined(__REACTOS__) || defined(_MSC_VER)
#pragma warning(pop) #pragma warning(pop)
#endif #endif
@ -934,7 +934,7 @@ ScsiFlopInitDevice(
return (STATUS_SUCCESS); return (STATUS_SUCCESS);
} }
#ifdef _MSC_VER #if !defined(__REACTOS__) || defined(_MSC_VER)
#pragma warning(suppress:6262) // This function uses 1096 bytes of stack which exceed default value of 1024 bytes used by Code Analysis for flagging as warning #pragma warning(suppress:6262) // This function uses 1096 bytes of stack which exceed default value of 1024 bytes used by Code Analysis for flagging as warning
#endif #endif
#ifdef __REACTOS__ #ifdef __REACTOS__
@ -974,7 +974,7 @@ NTSTATUS ScsiFlopStartDevice(
// //
RtlStringCbPrintfW(ntNameBuffer, RtlStringCbPrintfW(ntNameBuffer,
sizeof(ntNameBuffer)/sizeof(WCHAR), sizeof(ntNameBuffer),
L"\\Device\\Floppy%u", L"\\Device\\Floppy%u",
fdoExtension->DeviceNumber); fdoExtension->DeviceNumber);
@ -1020,7 +1020,7 @@ NTSTATUS ScsiFlopStartDevice(
if (NT_SUCCESS(status)) { if (NT_SUCCESS(status)) {
RtlStringCbPrintfW(arcNameBuffer, RtlStringCbPrintfW(arcNameBuffer,
sizeof(arcNameBuffer)/sizeof(WCHAR), sizeof(arcNameBuffer),
L"\\ArcName\\scsi(%u)disk(%u)fdisk(%u)", L"\\ArcName\\scsi(%u)disk(%u)fdisk(%u)",
scsiAddress.PortNumber, scsiAddress.PortNumber,
scsiAddress.TargetId, scsiAddress.TargetId,
@ -1042,7 +1042,7 @@ NTSTATUS ScsiFlopStartDevice(
// //
RtlStringCbPrintfW(arcNameBuffer, RtlStringCbPrintfW(arcNameBuffer,
sizeof(arcNameBuffer)/sizeof(WCHAR), sizeof(arcNameBuffer),
L"\\ArcName\\multi(%u)disk(%u)fdisk(%u)", L"\\ArcName\\multi(%u)disk(%u)fdisk(%u)",
0, 0,
0, 0,
@ -2146,7 +2146,7 @@ Return Value:
// driveMediaType is bounded below by DriveMediaLimits[].LowestDriveMediaType // driveMediaType is bounded below by DriveMediaLimits[].LowestDriveMediaType
#ifdef _MSC_VER #if !defined(__REACTOS__) || defined(_MSC_VER)
#pragma warning(push) #pragma warning(push)
#pragma warning(disable:33010) // 33010: Enum used as array index may be negative #pragma warning(disable:33010) // 33010: Enum used as array index may be negative
#endif #endif
@ -2176,7 +2176,7 @@ Return Value:
return TRUE; return TRUE;
} }
} }
#ifdef _MSC_VER #if !defined(__REACTOS__) || defined(_MSC_VER)
#pragma warning(pop) #pragma warning(pop)
#endif #endif
} }

2
media/doc/README.FSD
View file

@ -20,7 +20,7 @@ The following FSD are shared with: https://github.com/Microsoft/Windows-driver-s
reactos/drivers/filesystems/fastfat_new # Synced to 2817004 reactos/drivers/filesystems/fastfat_new # Synced to 2817004
reactos/drivers/filesystems/cdfs # Synced to f73e552 reactos/drivers/filesystems/cdfs # Synced to f73e552
reactos/drivers/storage/floppy_new # Synced to 9d23d43 reactos/drivers/storage/floppy_new # Synced to 8fb512a
The following FS libs are shared with: https://github.com/dosfstools/dosfstools The following FS libs are shared with: https://github.com/dosfstools/dosfstools
reactos/sdk/lib/fslib/vfatlib/check # Synced to 4.1 reactos/sdk/lib/fslib/vfatlib/check # Synced to 4.1