Merge pull request #1470 from matt335672/rename-includes

Move MS-defined constants into separate includes
neutrinolabs · Jan 16, 2020 · 627da8d · 627da8d
2 parents 7ac90b7 + 6f881d4
commit 627da8d
Show file tree

Hide file tree

Showing 25 changed files with 722 additions and 636 deletions.
diff --git a/common/Makefile.am b/common/Makefile.am
@@ -7,6 +7,14 @@ endif
 EXTRA_DIST = pixman-region.c
 
 include_HEADERS = \
+  ms-erref.h \
+  ms-fscc.h \
+  ms-rdpbcgr.h \
+  ms-rdpefs.h \
+  ms-rdpegdi.h \
+  ms-rdpele.h \
+  ms-rdperp.h \
+  ms-smb2.h \
   xrdp_client_info.h \
   xrdp_constants.h \
   xrdp_rail.h \

diff --git a/sesman/chansrv/ms-erref.h → common/ms-erref.h b/sesman/chansrv/ms-erref.h → common/ms-erref.h
@@ -27,18 +27,16 @@
  */
 enum NTSTATUS
 {
-    NT_STATUS_SUCCESS               = 0x00000000,
-    NT_STATUS_UNSUCCESSFUL          = 0xC0000001,
-    NT_STATUS_NO_SUCH_FILE          = 0xC000000F,
-    NT_STATUS_ACCESS_DENIED         = 0xC0000022,
-    NT_STATUS_OBJECT_NAME_INVALID   = 0xC0000033,
-    NT_STATUS_OBJECT_NAME_NOT_FOUND = 0xC0000034,
-    NT_STATUS_SHARING_VIOLATION     = 0xC0000043,
-    NT_STATUS_NO_MORE_FILES         = 0x80000006
-};
-
-#endif /* MS_ERREF_H */
-
+    STATUS_SUCCESS               = 0x00000000,
 
+    STATUS_NO_MORE_FILES         = 0x80000006,
 
+    STATUS_UNSUCCESSFUL          = 0xc0000001,
+    STATUS_NO_SUCH_FILE          = 0xc000000f,
+    STATUS_ACCESS_DENIED         = 0xc0000022,
+    STATUS_OBJECT_NAME_INVALID   = 0xc0000033,
+    STATUS_OBJECT_NAME_NOT_FOUND = 0xc0000034,
+    STATUS_SHARING_VIOLATION     = 0xc0000043
+};
 
+#endif /* MS_ERREF_H */
diff --git a/sesman/chansrv/ms-fscc.h → common/ms-fscc.h b/sesman/chansrv/ms-fscc.h → common/ms-fscc.h