Skip to content

Commit e431470

Browse files
committed
[REACTOS] Fix build with VS 17.14.2 / CL 19.44.35207.1
1 parent d663eb4 commit e431470

File tree

13 files changed

+43
-14
lines changed

13 files changed

+43
-14
lines changed

base/ctf/msctf/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ add_library(msctf MODULE
2828
version.rc
2929
${CMAKE_CURRENT_BINARY_DIR}/msctf.def)
3030

31+
if(MSVC)
32+
# Disable C5286: implicit conversion from enum type 'x' to enum type 'y';
33+
target_compile_options(msctf PRIVATE /wd5286)
34+
endif()
35+
3136
set_module_type(msctf win32dll UNICODE)
3237
target_link_libraries(msctf uuid wine cicero)
3338
add_importlibs(msctf user32 advapi32 advapi32_vista msvcrt kernel32 ntdll)

dll/directx/wine/d3d8/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ add_library(d3d8 MODULE
2626
version.rc
2727
${CMAKE_CURRENT_BINARY_DIR}/d3d8.def)
2828

29+
if(MSVC)
30+
# Disable C5286: implicit conversion from enum type 'x' to enum type 'y';
31+
target_compile_options(d3d8 PRIVATE /wd5286)
32+
endif()
33+
2934
set_module_type(d3d8 win32dll UNICODE)
3035
target_link_libraries(d3d8 uuid wine)
3136
add_importlibs(d3d8 d3dwine msvcrt kernel32 ntdll)

dll/directx/wine/d3d9/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ add_library(d3d9 MODULE
2828
${CMAKE_CURRENT_BINARY_DIR}/d3d9_stubs.c
2929
${CMAKE_CURRENT_BINARY_DIR}/d3d9.def)
3030

31+
if(MSVC)
32+
# Disable C5286: implicit conversion from enum type 'x' to enum type 'y';
33+
target_compile_options(d3d9 PRIVATE /wd5286)
34+
endif()
35+
3136
set_module_type(d3d9 win32dll UNICODE)
3237
target_link_libraries(d3d9 wine)
3338
add_importlibs(d3d9 d3dwine user32 msvcrt kernel32 ntdll)

dll/directx/wine/ddraw/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ add_library(ddraw MODULE
3232
ddraw.rc
3333
${CMAKE_CURRENT_BINARY_DIR}/ddraw.def)
3434

35+
if(MSVC)
36+
# Disable C5286: implicit conversion from enum type 'x' to enum type 'y';
37+
target_compile_options(ddraw PRIVATE /wd5286)
38+
endif()
39+
3540
set_module_type(ddraw win32dll)
3641
target_link_libraries(ddraw wine uuid dxguid ${PSEH_LIB})
3742
add_importlibs(ddraw advapi32 gdi32 user32 d3dwine msvcrt kernel32 ntdll)

dll/win32/gdiplus/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ add_library(gdiplus MODULE
3434
if(MSVC)
3535
# Disable warning C4146: unary minus operator applied to unsigned type, result still unsigned
3636
# Disable warning C4305: '=': truncation from 'double' to 'REAL'
37-
target_compile_options(gdiplus PRIVATE /wd4146 /wd4305)
37+
# Disable warning C5286: implicit conversion from enum type 'x' to enum type 'y';
38+
target_compile_options(gdiplus PRIVATE /wd4146 /wd4305 /wd5286)
3839
endif()
3940

4041
set_module_type(gdiplus win32dll)

drivers/bus/pcix/pdo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ PciPdoCreate(IN PPCI_FDO_EXTENSION DeviceExtension,
570570
PdoExtension->IrpDispatchTable = &PciPdoDispatchTable;
571571
PdoExtension->PhysicalDeviceObject = DeviceObject;
572572
PdoExtension->Slot = Slot;
573-
PdoExtension->PowerState.CurrentSystemState = PowerDeviceD0;
573+
PdoExtension->PowerState.CurrentSystemState = PowerSystemWorking;
574574
PdoExtension->PowerState.CurrentDeviceState = PowerDeviceD0;
575575
PdoExtension->ParentFdoExtension = DeviceExtension;
576576

drivers/filesystems/nfs/nfs41_driver.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4579,10 +4579,13 @@ NTSTATUS nfs41_QueryVolumeInformation(
45794579
status = STATUS_SUCCESS;
45804580
goto out;
45814581
}
4582+
#ifndef __REACTOS__
4583+
// FileAccessInformation isn't the correct enum type!
4584+
// It has the value 8, which is FileFsObjectIdInformation
45824585
case FileAccessInformation:
45834586
status = STATUS_NOT_SUPPORTED;
45844587
goto out;
4585-
4588+
#endif
45864589
case FileFsAttributeInformation:
45874590
if (RxContext->Info.LengthRemaining < FS_ATTR_LEN) {
45884591
RxContext->InformationToReturn = FS_ATTR_LEN;

drivers/network/ndis/ndis/io.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ NdisMAllocateMapRegisters(
333333
Description.Master = TRUE; /* implied by calling this function */
334334
Description.ScatterGather = TRUE; /* XXX UNTRUE: All BM DMA are S/G (ms seems to do this) */
335335
Description.BusNumber = Adapter->NdisMiniportBlock.BusNumber;
336-
Description.InterfaceType = Adapter->NdisMiniportBlock.BusType;
336+
Description.InterfaceType = (INTERFACE_TYPE)Adapter->NdisMiniportBlock.BusType;
337337
Description.DmaChannel = DmaChannel;
338338
Description.MaximumLength = MaximumBufferSize;
339339

@@ -883,7 +883,7 @@ NdisMRegisterDmaChannel(
883883
DeviceDesc.Dma64BitAddresses = FALSE;
884884
DeviceDesc.BusNumber = Adapter->NdisMiniportBlock.BusNumber;
885885
DeviceDesc.DmaChannel = DmaDescription->DmaChannel;
886-
DeviceDesc.InterfaceType = Adapter->NdisMiniportBlock.BusType;
886+
DeviceDesc.InterfaceType = (INTERFACE_TYPE)Adapter->NdisMiniportBlock.BusType;
887887
DeviceDesc.DmaWidth = DmaDescription->DmaWidth;
888888
DeviceDesc.DmaSpeed = DmaDescription->DmaSpeed;
889889
DeviceDesc.MaximumLength = MaximumLength;
@@ -1196,7 +1196,7 @@ NdisMInitializeScatterGatherDma(
11961196
DeviceDesc.Dma32BitAddresses = TRUE; // All callers support 32-bit addresses
11971197
DeviceDesc.Dma64BitAddresses = Dma64BitAddresses;
11981198
DeviceDesc.BusNumber = Adapter->NdisMiniportBlock.BusNumber;
1199-
DeviceDesc.InterfaceType = Adapter->NdisMiniportBlock.BusType;
1199+
DeviceDesc.InterfaceType = (INTERFACE_TYPE)Adapter->NdisMiniportBlock.BusType;
12001200
DeviceDesc.MaximumLength = MaximumPhysicalMapping;
12011201

12021202
Adapter->NdisMiniportBlock.SystemAdapterObject =

drivers/network/ndis/ndis/miniport.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2028,7 +2028,7 @@ NdisIPnPStartDevice(
20282028
if (NdisStatus == NDIS_STATUS_SUCCESS)
20292029
Adapter->NdisMiniportBlock.BusType = ConfigParam->ParameterData.IntegerData;
20302030
else
2031-
Adapter->NdisMiniportBlock.BusType = Isa;
2031+
Adapter->NdisMiniportBlock.BusType = NdisInterfaceIsa;
20322032
}
20332033

20342034
Status = IoGetDeviceProperty(Adapter->NdisMiniportBlock.PhysicalDeviceObject,

drivers/storage/class/cdrom/ioctl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ Return Value:
412412
mediaTypes->MediaInfoCount += 1;
413413

414414
mediaInfo++;
415-
mediaInfo->DeviceSpecific.RemovableDiskInfo.MediaType = RemovableMedia;
415+
mediaInfo->DeviceSpecific.RemovableDiskInfo.MediaType = (STORAGE_MEDIA_TYPE)RemovableMedia;
416416
mediaInfo->DeviceSpecific.RemovableDiskInfo.NumberMediaSides = 1;
417417
mediaInfo->DeviceSpecific.RemovableDiskInfo.MediaCharacteristics = MEDIA_READ_WRITE;
418418
mediaInfo->DeviceSpecific.RemovableDiskInfo.Cylinders.QuadPart = DeviceExtension->DiskGeometry.Cylinders.QuadPart;

0 commit comments

Comments
 (0)