Merge branch 'master' into x64-boot-fixes

.github/PULL_REQUEST_TEMPLATE.md

@@ -5,9 +5,15 @@ _Do a quick recap of your work here._
 JIRA issue: [CORE-XXXX](https://jira.reactos.org/browse/CORE-XXXX)
 
 ## Proposed changes
+
+_Describe what you propose to change/add/fix with this pull request._
+
 - 
 - 
 
 ## TODO
-- [ ] Task 1
-- [ ] Task 2
+
+_Use a TODO when your pull request is Work in Progress._
+
+- [ ] 
+- [ ] 

drivers/filesystems/cdfs_new/CMakeLists.txt

@@ -0,0 +1,37 @@
+
+include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers)
+
+list(APPEND SOURCE
+    allocsup.c
+    cachesup.c
+    cddata.c
+    cdinit.c
+    cleanup.c
+    close.c
+    create.c
+    devctrl.c
+    deviosup.c
+    dirctrl.c
+    dirsup.c
+    fileinfo.c
+    filobsup.c
+    fsctrl.c
+    fspdisp.c
+    lockctrl.c
+    namesup.c
+    pathsup.c
+    pnp.c
+    prefxsup.c
+    read.c
+    resrcsup.c
+    strucsup.c
+    verfysup.c
+    volinfo.c
+    workque.c)
+
+add_library(cdfs SHARED ${SOURCE} cdfs.rc)
+set_module_type(cdfs kernelmodedriver)
+target_link_libraries(cdfs ${PSEH_LIB} memcmp)
+add_importlibs(cdfs ntoskrnl hal)
+add_cd_file(TARGET cdfs DESTINATION reactos/system32/drivers NO_CAB FOR all)
+add_registry_inf(cdfs_reg.inf)

drivers/filesystems/cdfs_new/allocsup.c

@@ -44,7 +44,7 @@ Module Name:
 
 --*/
 
-#include "CdProcs.h"
+#include "cdprocs.h"
 
 //
 //  The Bug check file id for this module

drivers/filesystems/cdfs_new/cachesup.c

@@ -14,7 +14,7 @@ Module Name:
 
 --*/
 
-#include "CdProcs.h"
+#include "cdprocs.h"
 
 //
 //  The Bug check file id for this module

drivers/filesystems/cdfs_new/cddata.c

@@ -17,7 +17,7 @@ Module Name:
 
 --*/
 
-#include "CdProcs.h"
+#include "cdprocs.h"
 
 #ifdef CD_SANITY
 BOOLEAN CdTestTopLevel = TRUE;

drivers/filesystems/cdfs_new/cdfs_reg.inf

@@ -0,0 +1,7 @@
+; Cdfs (ISO96660) filesystem driver
+[AddReg]
+HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ErrorControl",0x00010001,0x00000000
+HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Group",0x00000000,"File System"
+HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ImagePath",0x00020000,"system32\drivers\cdfs.sys"
+HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Start",0x00010001,0x00000003
+HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Type",0x00010001,0x00000002

drivers/filesystems/cdfs_new/cdinit.c

@@ -13,7 +13,7 @@ Module Name:
 
 --*/
 
-#include "CdProcs.h"
+#include "cdprocs.h"
 
 //
 //  The Bug check file id for this module

drivers/filesystems/cdfs_new/cdprocs.h

@@ -28,9 +28,9 @@ Module Name:
 #endif
 
 #include "nodetype.h"
-#include "Cd.h"
-#include "CdStruc.h"
-#include "CdData.h"
+#include "cd.h"
+#include "cdstruc.h"
+#include "cddata.h"
 
 
 //**** x86 compiler bug ****
@@ -44,30 +44,28 @@ Module Name:
 //  Here are the different pool tags.
 //
 
-/* ReactOS Change: GCC doesn't understand this, use TAG macro */
-#include <reactos/helper.h>
-#define TAG_CCB                 TAG('c','c','d','C')      //  Ccb
-#define TAG_CDROM_TOC           TAG('c','t','d','C')      //  TOC
-#define TAG_DIRENT_NAME         TAG('n','d','d','C')      //  CdName in dirent
-#define TAG_ENUM_EXPRESSION     TAG('e','e','d','C')      //  Search expression for enumeration
-#define TAG_FCB_DATA            TAG('d','f','d','C')      //  Data Fcb
-#define TAG_FCB_INDEX           TAG('i','f','d','C')      //  Index Fcb
-#define TAG_FCB_NONPAGED        TAG('n','f','d','C')      //  Nonpaged Fcb
-#define TAG_FCB_TABLE           TAG('t','f','d','C')      //  Fcb Table entry
-#define TAG_FILE_NAME           TAG('n','F','d','C')      //  Filename buffer
-#define TAG_GEN_SHORT_NAME      TAG('s','g','d','C')      //  Generated short name
-#define TAG_IO_BUFFER           TAG('f','b','d','C')      //  Temporary IO buffer
-#define TAG_IO_CONTEXT          TAG('o','i','d','C')      //  Io context for async reads
-#define TAG_IRP_CONTEXT         TAG('c','i','d','C')      //  Irp Context
-#define TAG_IRP_CONTEXT_LITE    TAG('l','i','d','C')      //  Irp Context lite
-#define TAG_MCB_ARRAY           TAG('a','m','d','C')      //  Mcb array
-#define TAG_PATH_ENTRY_NAME     TAG('n','P','d','C')      //  CdName in path entry
-#define TAG_PREFIX_ENTRY        TAG('e','p','d','C')      //  Prefix Entry
-#define TAG_PREFIX_NAME         TAG('n','p','d','C')      //  Prefix Entry name
-#define TAG_SPANNING_PATH_TABLE TAG('p','s','d','C')      //  Buffer for spanning path table
-#define TAG_UPCASE_NAME         TAG('n','u','d','C')      //  Buffer for upcased name
-#define TAG_VOL_DESC            TAG('d','v','d','C')      //  Buffer for volume descriptor
-#define TAG_VPB                 TAG('p','v','d','C')      //  Vpb allocated in filesystem
+#define TAG_CCB                 'ccdC'      //  Ccb
+#define TAG_CDROM_TOC           'ctdC'      //  TOC
+#define TAG_DIRENT_NAME         'nddC'      //  CdName in dirent
+#define TAG_ENUM_EXPRESSION     'eedC'      //  Search expression for enumeration
+#define TAG_FCB_DATA            'dfdC'      //  Data Fcb
+#define TAG_FCB_INDEX           'ifdC'      //  Index Fcb
+#define TAG_FCB_NONPAGED        'nfdC'      //  Nonpaged Fcb
+#define TAG_FCB_TABLE           'tfdC'      //  Fcb Table entry
+#define TAG_FILE_NAME           'nFdC'      //  Filename buffer
+#define TAG_GEN_SHORT_NAME      'sgdC'      //  Generated short name
+#define TAG_IO_BUFFER           'fbdC'      //  Temporary IO buffer
+#define TAG_IO_CONTEXT          'oidC'      //  Io context for async reads
+#define TAG_IRP_CONTEXT         'cidC'      //  Irp Context
+#define TAG_IRP_CONTEXT_LITE    'lidC'      //  Irp Context lite
+#define TAG_MCB_ARRAY           'amdC'      //  Mcb array
+#define TAG_PATH_ENTRY_NAME     'nPdC'      //  CdName in path entry
+#define TAG_PREFIX_ENTRY        'epdC'      //  Prefix Entry
+#define TAG_PREFIX_NAME         'npdC'      //  Prefix Entry name
+#define TAG_SPANNING_PATH_TABLE 'psdC'      //  Buffer for spanning path table
+#define TAG_UPCASE_NAME         'nudC'      //  Buffer for upcased name
+#define TAG_VOL_DESC            'dvdC'      //  Buffer for volume descriptor
+#define TAG_VPB                 'pvdC'      //  Vpb allocated in filesystem
 
 //
 //  Tag all of our allocations if tagging is turned on
@@ -1891,8 +1889,8 @@ CdCommonPnp (                               //  Implemented in Pnp.c
 #define GetExceptionCode() 0
 #define AbnormalTermination() 0
 
-#define try_return(S) { goto try_exit; }
-#define try_leave(S) { leave; }
+#define try_return(S) { S; goto try_exit; }
+#define try_leave(S) { S; leave; }
 
 
 //

drivers/filesystems/cdfs_new/cleanup.c

@@ -14,7 +14,7 @@ Module Name:
 
 --*/
 
-#include "CdProcs.h"
+#include "cdprocs.h"
 
 //
 //  The Bug check file id for this module

drivers/filesystems/cdfs_new/close.c

@@ -42,7 +42,7 @@ Module Name:
 
 --*/
 
-#include "CdProcs.h"
+#include "cdprocs.h"
 
 //
 //  The Bug check file id for this module

drivers/filesystems/cdfs_new/create.c

@@ -14,7 +14,7 @@ Module Name:
 
 --*/
 
-#include "CdProcs.h"
+#include "cdprocs.h"
 
 //
 //  The Bug check file id for this module

drivers/filesystems/cdfs_new/devctrl.c

@@ -14,7 +14,7 @@ Module Name:
 
 --*/
 
-#include "CdProcs.h"
+#include "cdprocs.h"
 
 //
 //  The Bug check file id for this module
@@ -27,6 +27,7 @@ Module Name:
 //
 
 NTSTATUS
+NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 CdDevCtrlCompletionRoutine (
     IN PDEVICE_OBJECT DeviceObject,
     IN PIRP Irp,
@@ -171,6 +172,7 @@ Return Value:
 //
 
 NTSTATUS
+NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 CdDevCtrlCompletionRoutine (
     IN PDEVICE_OBJECT DeviceObject,
     IN PIRP Irp,

drivers/filesystems/cdfs_new/deviosup.c

@@ -13,7 +13,7 @@ Module Name:
 
 --*/
 
-#include "CdProcs.h"
+#include "cdprocs.h"
 
 //
 //  The Bug check file id for this module

drivers/filesystems/cdfs_new/dirctrl.c

@@ -14,7 +14,7 @@ Module Name:
 
 --*/
 
-#include "CdProcs.h"
+#include "cdprocs.h"
 
 //
 //  The Bug check file id for this module

drivers/filesystems/cdfs_new/dirsup.c

@@ -65,7 +65,7 @@ Module Name:
 
 --*/
 
-#include "CdProcs.h"
+#include "cdprocs.h"
 
 //
 //  The Bug check file id for this module

drivers/filesystems/cdfs_new/fieldoff.c

@@ -1,4 +1,4 @@
-#include "CdProcs.h"
+#include "cdprocs.h"
 #include <stdio.h>
 
 #define doit(a,b) { printf("%s %04lx %4lx %s\n", #a, FIELD_OFFSET(a,b), sizeof(d.b), #b); }

drivers/filesystems/cdfs_new/fileinfo.c

@@ -14,7 +14,7 @@ Module Name:
 
 --*/
 
-#include "CdProcs.h"
+#include "cdprocs.h"
 
 //
 //  The Bug check file id for this module

drivers/filesystems/cdfs_new/filobsup.c

@@ -13,7 +13,7 @@ Module Name:
 
 --*/
 
-#include "CdProcs.h"
+#include "cdprocs.h"
 
 //
 //  The Bug check file id for this module

drivers/filesystems/cdfs_new/fsctrl.c

@@ -14,7 +14,7 @@ Module Name:
 
 --*/
 
-#include "CdProcs.h"
+#include "cdprocs.h"
 
 //
 //  The Bug check file id for this module
@@ -2295,7 +2295,7 @@ Return Value:
 
     Status = ObReferenceObjectByHandle( Handle,
                                         0,
-                                        IoFileObjectType, /* ReactOS Change: GCC/LD Incompatibility with exported kernel data */
+                                        *IoFileObjectType,
                                         KernelMode,
                                         (PVOID*)&FileToMarkBad, /* ReactOS Change: GCC "passing argument 5 of 'ObReferenceObjectByHandle' from incompatible pointer type" */
                                         NULL );

drivers/filesystems/cdfs_new/fspdisp.c

@@ -14,7 +14,7 @@ Module Name:
 
 --*/
 
-#include "CdProcs.h"
+#include "cdprocs.h"
 
 //
 //  The Bug check file id for this module

drivers/filesystems/cdfs_new/lockctrl.c

@@ -14,7 +14,7 @@ Module Name:
 
 --*/
 
-#include "CdProcs.h"
+#include "cdprocs.h"
 
 //
 //  The Bug check file id for this module

drivers/filesystems/cdfs_new/namesup.c

@@ -13,7 +13,7 @@ Module Name:
 
 --*/
 
-#include "CdProcs.h"
+#include "cdprocs.h"
 
 //
 //  The Bug check file id for this module

drivers/filesystems/cdfs_new/nodetype.h

@@ -97,8 +97,6 @@ typedef CSHORT NODE_BYTE_SIZE;
 #define CDFS_BUG_CHECK_VOLINFO           (0x001b0000)
 #define CDFS_BUG_CHECK_WORKQUE           (0x001c0000)
 
-/* ReactOS Change: Need to add to reactos.mc */
-#define CDFS_FILE_SYSTEM                 ((ULONG)0x00000026L)
 #define CdBugCheck(A,B,C) { KeBugCheckEx(CDFS_FILE_SYSTEM, BugCheckFileId | __LINE__, A, B, C ); }
 
 #endif // _NODETYPE_

drivers/filesystems/cdfs_new/pathsup.c

@@ -73,7 +73,7 @@ Module Name:
 
 --*/
 
-#include "CdProcs.h"
+#include "cdprocs.h"
 
 //
 //  The Bug check file id for this module

drivers/filesystems/cdfs_new/pnp.c

@@ -14,7 +14,7 @@ Module Name:
 
 --*/
 
-#include "CdProcs.h"
+#include "cdprocs.h"
 
 //
 //  The Bug check file id for this module
@@ -51,6 +51,7 @@ CdPnpCancelRemove (
     );
 
 NTSTATUS
+NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 CdPnpCompletionRoutine (
     IN PDEVICE_OBJECT DeviceObject,
     IN PIRP Irp,
@@ -774,6 +775,7 @@ Return Value:
 //
 
 NTSTATUS
+NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 CdPnpCompletionRoutine (
     IN PDEVICE_OBJECT DeviceObject,
     IN PIRP Irp,

drivers/filesystems/cdfs_new/prefxsup.c

@@ -13,7 +13,7 @@ Module Name:
 
 --*/
 
-#include "CdProcs.h"
+#include "cdprocs.h"
 
 //
 //  The Bug check file id for this module

drivers/filesystems/cdfs_new/read.c

@@ -14,7 +14,7 @@ Module Name:
 
 --*/
 
-#include "CdProcs.h"
+#include "cdprocs.h"
 
 //
 //  The Bug check file id for this module

drivers/filesystems/cdfs_new/resrcsup.c

@@ -13,7 +13,7 @@ Module Name:
 
 --*/
 
-#include "CdProcs.h"
+#include "cdprocs.h"
 
 //
 //  The Bug check file id for this module