https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1692ab3fe3d26deff353a2...
commit 1692ab3fe3d26deff353a20e52c39c5e86f9a571 Author: Mark Jansen mark.jansen@reactos.org AuthorDate: Thu Jan 3 22:11:13 2019 +0100 Commit: Mark Jansen mark.jansen@reactos.org CommitDate: Sat Jan 5 13:11:35 2019 +0100
[APPCOMPAT] Move sdbtagid.h and sdbtypes.h to a shared location --- dll/appcompat/apphelp/CMakeLists.txt | 4 ++-- dll/appcompat/apphelp/apphelp.h | 8 ++++---- dll/appcompat/apphelp/sdbstringtable.c | 6 +++--- dll/appcompat/apphelp/sdbwrite.c | 11 +++++++---- .../apphelp => sdk/include/reactos/appcompat}/sdbtagid.h | 11 +++++++++-- .../apphelp => sdk/include/reactos/appcompat}/sdbtypes.h | 4 ++-- sdk/tools/xml2sdb/CMakeLists.txt | 4 +++- sdk/tools/xml2sdb/xml2sdb.h | 8 ++++---- 8 files changed, 34 insertions(+), 22 deletions(-)
diff --git a/dll/appcompat/apphelp/CMakeLists.txt b/dll/appcompat/apphelp/CMakeLists.txt index 57a26fdd9e..71cb783c74 100644 --- a/dll/appcompat/apphelp/CMakeLists.txt +++ b/dll/appcompat/apphelp/CMakeLists.txt @@ -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)
diff --git a/dll/appcompat/apphelp/apphelp.h b/dll/appcompat/apphelp/apphelp.h index 5d7e4c3b7f..fda2c501ad 100644 --- a/dll/appcompat/apphelp/apphelp.h +++ b/dll/appcompat/apphelp/apphelp.h @@ -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" diff --git a/dll/appcompat/apphelp/sdbstringtable.c b/dll/appcompat/apphelp/sdbstringtable.c index 8ad571d9eb..ae88c51aee 100644 --- a/dll/appcompat/apphelp/sdbstringtable.c +++ b/dll/appcompat/apphelp/sdbstringtable.c @@ -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> diff --git a/dll/appcompat/apphelp/sdbwrite.c b/dll/appcompat/apphelp/sdbwrite.c index 429d5b9fa7..860208454d 100644 --- a/dll/appcompat/apphelp/sdbwrite.c +++ b/dll/appcompat/apphelp/sdbwrite.c @@ -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"
diff --git a/dll/appcompat/apphelp/sdbtagid.h b/sdk/include/reactos/appcompat/sdbtagid.h similarity index 97% rename from dll/appcompat/apphelp/sdbtagid.h rename to sdk/include/reactos/appcompat/sdbtagid.h index 2ac0e07685..8a3d86f586 100644 --- a/dll/appcompat/apphelp/sdbtagid.h +++ b/sdk/include/reactos/appcompat/sdbtagid.h @@ -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 @@ -203,4 +206,8 @@ #define TAG_APP_ID (0x11 | TAG_TYPE_BINARY) #define TAG_INDEX_BITS (0x801 | TAG_TYPE_BINARY)
+#ifdef __cplusplus +} // extern "C" +#endif + #endif // SDBTAGID_H diff --git a/dll/appcompat/apphelp/sdbtypes.h b/sdk/include/reactos/appcompat/sdbtypes.h similarity index 84% rename from dll/appcompat/apphelp/sdbtypes.h rename to sdk/include/reactos/appcompat/sdbtypes.h index 6231b82847..22ef7ae751 100644 --- a/dll/appcompat/apphelp/sdbtypes.h +++ b/sdk/include/reactos/appcompat/sdbtypes.h @@ -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 diff --git a/sdk/tools/xml2sdb/CMakeLists.txt b/sdk/tools/xml2sdb/CMakeLists.txt index 576e4b6a8c..1a59e62fc4 100644 --- a/sdk/tools/xml2sdb/CMakeLists.txt +++ b/sdk/tools/xml2sdb/CMakeLists.txt @@ -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) diff --git a/sdk/tools/xml2sdb/xml2sdb.h b/sdk/tools/xml2sdb/xml2sdb.h index 9958bc5155..43fec773b9 100644 --- a/sdk/tools/xml2sdb/xml2sdb.h +++ b/sdk/tools/xml2sdb/xml2sdb.h @@ -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 {