[ros-diffs] [janderwald] 55451: [DISK] - Add more structures to ntdddisk.h - Fix more compile errors in disk_new - disk_new builds but fails to link as classpnp import lib is broken

Author: janderwald
Date: Mon Feb  6 08:15:21 2012
New Revision: 55451

URL: http://svn.reactos.org/svn/reactos?rev=55451&view=rev
Log:
[DISK]
- Add more structures to ntdddisk.h
- Fix more compile errors in disk_new
- disk_new builds but fails to link as classpnp import lib is broken

Modified:
    branches/usb-bringup-trunk/drivers/storage/class/disk_new/disk.c
    branches/usb-bringup-trunk/drivers/storage/class/disk_new/diskwmi.c
    branches/usb-bringup-trunk/drivers/storage/class/disk_new/enum.c
    branches/usb-bringup-trunk/drivers/storage/classpnp/CMakeLists.txt
    branches/usb-bringup-trunk/include/psdk/ntdddisk.h

Modified: branches/usb-bringup-trunk/drivers/storage/class/disk_new/disk.c
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora…
==============================================================================
--- branches/usb-bringup-trunk/drivers/storage/class/disk_new/disk.c [iso-8859-1]
(original)
+++ branches/usb-bringup-trunk/drivers/storage/class/disk_new/disk.c [iso-8859-1] Mon Feb 
6 08:15:21 2012
@@ -1201,6 +1201,7 @@
         break;
     }
 
+#if(_WIN32_WINNT >= 0x0500)
     case IOCTL_DISK_GET_WRITE_CACHE_STATE: {
 
         PDISK_WRITE_CACHE_STATE writeCacheState =
(PDISK_WRITE_CACHE_STATE)Irp->AssociatedIrp.SystemBuffer;
@@ -1248,6 +1249,7 @@
         status = STATUS_SUCCESS;
         break;
     }
+#endif
 
     case SMART_GET_VERSION: {
 

Modified: branches/usb-bringup-trunk/drivers/storage/class/disk_new/diskwmi.c
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora…
==============================================================================
--- branches/usb-bringup-trunk/drivers/storage/class/disk_new/diskwmi.c [iso-8859-1]
(original)
+++ branches/usb-bringup-trunk/drivers/storage/class/disk_new/diskwmi.c [iso-8859-1] Mon
Feb  6 08:15:21 2012
@@ -281,7 +281,7 @@
 //
 // Enable SMART
 //
-_inline NTSTATUS
+__inline NTSTATUS
 DiskEnableSmart(
     PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
     )
@@ -302,7 +302,7 @@
 //
 // Disable SMART
 //
-_inline NTSTATUS
+__inline NTSTATUS
 DiskDisableSmart(
     PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
     )
@@ -322,7 +322,7 @@
 //
 // Enable Attribute Autosave
 //
-_inline NTSTATUS
+__inline NTSTATUS
 DiskEnableSmartAttributeAutosave(
     PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
     )
@@ -342,7 +342,7 @@
 //
 // Disable Attribute Autosave
 //
-_inline NTSTATUS
+__inline NTSTATUS
 DiskDisableSmartAttributeAutosave(
     PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
     )
@@ -362,7 +362,7 @@
 //
 // Initialize execution of SMART online diagnostics
 //
-_inline NTSTATUS
+__inline NTSTATUS
 DiskExecuteSmartDiagnostics(
     PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
     UCHAR Subcommand

Modified: branches/usb-bringup-trunk/drivers/storage/class/disk_new/enum.c
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora…
==============================================================================
--- branches/usb-bringup-trunk/drivers/storage/class/disk_new/enum.c [iso-8859-1]
(original)
+++ branches/usb-bringup-trunk/drivers/storage/class/disk_new/enum.c [iso-8859-1] Mon Feb 
6 08:15:21 2012
@@ -646,7 +646,7 @@
     ULONG partitionOrdinal;
     ULONG newPartitionNumber;
 
-    PPARTITION_INFORMATION_EX partitionEntry;
+    PPARTITION_INFORMATION_EX partitionEntry = NULL;
     PDISK_DATA pdoData;
     PARTITION_STYLE partitionStyle;
 

Modified: branches/usb-bringup-trunk/drivers/storage/classpnp/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora…
==============================================================================
--- branches/usb-bringup-trunk/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/usb-bringup-trunk/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] Mon
Feb  6 08:15:21 2012
@@ -42,4 +42,5 @@
 target_link_libraries(classpnp ${PSEH_LIB} libcntpr)
 set_module_type(classpnp kernelmodedriver)
 add_importlibs(classpnp hal ntoskrnl)
+add_importlib_target(class.spec)
 add_cd_file(TARGET classpnp DESTINATION reactos/system32/drivers NO_CAB FOR all)

Modified: branches/usb-bringup-trunk/include/psdk/ntdddisk.h
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/include/psdk/…
==============================================================================
--- branches/usb-bringup-trunk/include/psdk/ntdddisk.h [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/include/psdk/ntdddisk.h [iso-8859-1] Mon Feb  6 08:15:21
2012
@@ -581,6 +581,29 @@
 
 
 #if(_WIN32_WINNT >= 0x0500)
+
+typedef struct _CREATE_DISK_GPT 
+{
+    GUID DiskId;
+    ULONG MaxPartitionCount;
+} CREATE_DISK_GPT, *PCREATE_DISK_GPT;
+
+typedef struct _CREATE_DISK_MBR 
+{
+    ULONG Signature;
+} CREATE_DISK_MBR, *PCREATE_DISK_MBR;
+
+
+typedef struct _CREATE_DISK 
+{
+    PARTITION_STYLE PartitionStyle;
+    union {
+        CREATE_DISK_MBR Mbr;
+        CREATE_DISK_GPT Gpt;
+    };
+} CREATE_DISK, *PCREATE_DISK;
+
+
 typedef enum {
     EqualPriority,
     KeepPrefetchedData,