[APPCOMPAT] Move sdbtagid.h and sdbtypes.h to a shared location
authorMark Jansen <mark.jansen@reactos.org>
Thu, 3 Jan 2019 21:11:13 +0000 (22:11 +0100)
committerMark Jansen <mark.jansen@reactos.org>
Sat, 5 Jan 2019 12:11:35 +0000 (13:11 +0100)
dll/appcompat/apphelp/CMakeLists.txt
dll/appcompat/apphelp/apphelp.h
dll/appcompat/apphelp/sdbstringtable.c
dll/appcompat/apphelp/sdbwrite.c
sdk/include/reactos/appcompat/sdbtagid.h [moved from dll/appcompat/apphelp/sdbtagid.h with 97% similarity]
sdk/include/reactos/appcompat/sdbtypes.h [moved from dll/appcompat/apphelp/sdbtypes.h with 84% similarity]
sdk/tools/xml2sdb/CMakeLists.txt
sdk/tools/xml2sdb/xml2sdb.h

index 57a26fd..71cb783 100644 (file)
@@ -25,8 +25,8 @@ list(APPEND HEADERS
     apphelp.h
     sdbpapi.h
     sdbstringtable.h
-    sdbtagid.h
-    sdbtypes.h
+    ${REACTOS_SOURCE_DIR}/sdk/include/reactos/appcompat/sdbtagid.h
+    ${REACTOS_SOURCE_DIR}/sdk/include/reactos/appcompat/sdbtypes.h
     sdbwrite.h
     shimeng.h)
 
index 5d7e4c3..fda2c50 100644 (file)
@@ -1,9 +1,9 @@
 /*
  * PROJECT:     ReactOS Application compatibility module
- * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
  * PURPOSE:     common structures / functions
  * COPYRIGHT:   Copyright 2013 Mislav Blažević
- *              Copyright 2017 Mark Jansen (mark.jansen@reactos.org)
+ *              Copyright 2017-2019 Mark Jansen (mark.jansen@reactos.org)
  */
 
 #ifndef APPHELP_H
@@ -13,7 +13,7 @@
 extern "C" {
 #endif
 
-#include "sdbtypes.h"
+#include <appcompat/sdbtypes.h>
 
 /* Flags for SdbInitDatabase */
 #define HID_DOS_PATHS 0x1
@@ -126,7 +126,7 @@ DWORD WINAPI SdbQueryData(HSDB hsdb, TAGREF trWhich, LPCWSTR lpszDataName, LPDWO
 #define ATTRIBUTE_AVAILABLE 0x1
 #define ATTRIBUTE_FAILED 0x2
 
-#include "sdbtagid.h"
+#include <appcompat/sdbtagid.h>
 
 #ifdef __cplusplus
 } // extern "C"
index 8ad571d..ae88c51 100644 (file)
@@ -1,14 +1,14 @@
 /*
  * PROJECT:     ReactOS Application compatibility module
- * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
  * PURPOSE:     Shim database string table builder
- * COPYRIGHT:   Copyright 2016 Mark Jansen (mark.jansen@reactos.org)
+ * COPYRIGHT:   Copyright 2016-2019 Mark Jansen (mark.jansen@reactos.org)
  */
 
 #if !defined(SDBWRITE_HOSTTOOL)
 #define WIN32_NO_STATUS
 #include "windows.h"
-#include "sdbtypes.h"
+#include <appcompat/sdbtypes.h>
 #include "sdbpapi.h"
 #else /* !defined(SDBWRITE_HOSTTOOL) */
 #include <typedefs.h>
index 429d5b9..8602084 100644 (file)
@@ -1,24 +1,27 @@
 /*
  * PROJECT:     ReactOS Application compatibility module
- * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
  * PURPOSE:     Shim database manipulation functions
  * COPYRIGHT:   Copyright 2011 André Hentschel
  *              Copyright 2013 Mislav Blažević
- *              Copyright 2015-2017 Mark Jansen (mark.jansen@reactos.org)
+ *              Copyright 2015-2019 Mark Jansen (mark.jansen@reactos.org)
  */
 
 #if !defined(SDBWRITE_HOSTTOOL)
 #define WIN32_NO_STATUS
 #include "windef.h"
 #include "ntndk.h"
+#include <appcompat/sdbtypes.h>
+#include <appcompat/sdbtagid.h>
 #else
 #include <typedefs.h>
 #include <guiddef.h>
+#include <sdbtypes.h>
+#include <sdbtagid.h>
 #endif
 
-#include "sdbtypes.h"
+
 #include "sdbpapi.h"
-#include "sdbtagid.h"
 #include "sdbstringtable.h"
 
 
similarity index 97%
rename from dll/appcompat/apphelp/sdbtagid.h
rename to sdk/include/reactos/appcompat/sdbtagid.h
index 2ac0e07..8a3d86f 100644 (file)
@@ -1,14 +1,17 @@
 /*
  * PROJECT:     ReactOS Application compatibility module
- * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
  * PURPOSE:     All tags
  * COPYRIGHT:   Copyright 2013 Mislav Blažević
- *              Copyright 2015,2016 Mark Jansen (mark.jansen@reactos.org)
+ *              Copyright 2015-2019 Mark Jansen (mark.jansen@reactos.org)
  */
 
 #ifndef SDBTAGID_H
 #define SDBTAGID_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #define TAGID_NULL 0x0
 #define TAGID_ROOT 0x0
 #define TAG_APP_ID (0x11 | TAG_TYPE_BINARY)
 #define TAG_INDEX_BITS (0x801 | TAG_TYPE_BINARY)
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif // SDBTAGID_H
similarity index 84%
rename from dll/appcompat/apphelp/sdbtypes.h
rename to sdk/include/reactos/appcompat/sdbtypes.h
index 6231b82..22ef7ae 100644 (file)
@@ -1,9 +1,9 @@
 /*
  * PROJECT:     ReactOS Application compatibility module
- * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
  * PURPOSE:     Sdb core definitions
  * COPYRIGHT:   Copyright 2013 Mislav Blažević
- *              Copyright 2015-2017 Mark Jansen (mark.jansen@reactos.org)
+ *              Copyright 2015-2019 Mark Jansen (mark.jansen@reactos.org)
  */
 
 #ifndef SDBTYPES_H
index 576e4b6..1a59e62 100644 (file)
@@ -9,7 +9,9 @@ list(APPEND SOURCE
     ${REACTOS_SOURCE_DIR}/dll/appcompat/apphelp/sdbwrite.c
     ${REACTOS_SOURCE_DIR}/dll/appcompat/apphelp/sdbstringtable.c)
 
-include_directories(${REACTOS_SOURCE_DIR}/dll/appcompat/apphelp)
+include_directories(
+    ${REACTOS_SOURCE_DIR}/dll/appcompat/apphelp
+    ${REACTOS_SOURCE_DIR}/sdk/include/reactos/appcompat)
 add_host_tool(xml2sdb ${SOURCE})
 
 if(NOT MSVC)
index 9958bc5..43fec77 100644 (file)
@@ -1,8 +1,8 @@
 /*
  * PROJECT:     xml2sdb
- * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
  * PURPOSE:     Define mapping of all shim database types to xml
- * COPYRIGHT:   Copyright 2016-2018 Mark Jansen (mark.jansen@reactos.org)
+ * COPYRIGHT:   Copyright 2016-2019 Mark Jansen (mark.jansen@reactos.org)
  */
 
 #pragma once
@@ -14,9 +14,9 @@
 
 #include <typedefs.h>
 #include <guiddef.h>
-#include "sdbtypes.h"
+#include <sdbtypes.h>
 #include "sdbwrite.h"
-#include "sdbtagid.h"
+#include <sdbtagid.h>
 
 namespace tinyxml2
 {