Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[APPCOMPAT] Move sdbtagid.h and sdbtypes.h to a shared location

Browse source
This commit is contained in:
Mark Jansen 2019-01-03 22:11:13 +01:00
parent 511e793502
commit 1692ab3fe3
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
8 changed files with 34 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dll/appcompat/apphelp/CMakeLists.txt
View file

@ -25,8 +25,8 @@ list(APPEND HEADERS
apphelp.h apphelp.h
sdbpapi.h sdbpapi.h
sdbstringtable.h sdbstringtable.h
sdbtagid.h ${REACTOS_SOURCE_DIR}/sdk/include/reactos/appcompat/sdbtagid.h
sdbtypes.h ${REACTOS_SOURCE_DIR}/sdk/include/reactos/appcompat/sdbtypes.h
sdbwrite.h sdbwrite.h
shimeng.h) shimeng.h)

8
dll/appcompat/apphelp/apphelp.h
View file

@ -1,9 +1,9 @@
/* /*
* PROJECT: ReactOS Application compatibility module * 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 * PURPOSE: common structures / functions
* COPYRIGHT: Copyright 2013 Mislav Blažević * 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 #ifndef APPHELP_H
@ -13,7 +13,7 @@
extern "C" { extern "C" {
#endif #endif
#include "sdbtypes.h" #include <appcompat/sdbtypes.h>
/* Flags for SdbInitDatabase */ /* Flags for SdbInitDatabase */
#define HID_DOS_PATHS 0x1 #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_AVAILABLE 0x1
#define ATTRIBUTE_FAILED 0x2 #define ATTRIBUTE_FAILED 0x2
#include "sdbtagid.h" #include <appcompat/sdbtagid.h>
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"

6
dll/appcompat/apphelp/sdbstringtable.c
View file

@ -1,14 +1,14 @@
/* /*
* PROJECT: ReactOS Application compatibility module * 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 * 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) #if !defined(SDBWRITE_HOSTTOOL)
#define WIN32_NO_STATUS #define WIN32_NO_STATUS
#include "windows.h" #include "windows.h"
#include "sdbtypes.h" #include <appcompat/sdbtypes.h>
#include "sdbpapi.h" #include "sdbpapi.h"
#else /* !defined(SDBWRITE_HOSTTOOL) */ #else /* !defined(SDBWRITE_HOSTTOOL) */
#include <typedefs.h> #include <typedefs.h>

11
dll/appcompat/apphelp/sdbwrite.c
View file

@ -1,24 +1,27 @@
/* /*
* PROJECT: ReactOS Application compatibility module * 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 * PURPOSE: Shim database manipulation functions
* COPYRIGHT: Copyright 2011 André Hentschel * COPYRIGHT: Copyright 2011 André Hentschel
* Copyright 2013 Mislav Blažević * 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) #if !defined(SDBWRITE_HOSTTOOL)
#define WIN32_NO_STATUS #define WIN32_NO_STATUS
#include "windef.h" #include "windef.h"
#include "ntndk.h" #include "ntndk.h"
#include <appcompat/sdbtypes.h>
#include <appcompat/sdbtagid.h>
#else #else
#include <typedefs.h> #include <typedefs.h>
#include <guiddef.h> #include <guiddef.h>
#include <sdbtypes.h>
#include <sdbtagid.h>
#endif #endif
#include "sdbtypes.h"
#include "sdbpapi.h" #include "sdbpapi.h"
#include "sdbtagid.h"
#include "sdbstringtable.h" #include "sdbstringtable.h"

11
dll/appcompat/apphelp/sdbtagid.h → sdk/include/reactos/appcompat/sdbtagid.h
View file

@ -1,14 +1,17 @@
/* /*
* PROJECT: ReactOS Application compatibility module * 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 * PURPOSE: All tags
* COPYRIGHT: Copyright 2013 Mislav Blažević * 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 #ifndef SDBTAGID_H
#define SDBTAGID_H #define SDBTAGID_H
#ifdef __cplusplus
extern "C" {
#endif
#define TAGID_NULL 0x0 #define TAGID_NULL 0x0
#define TAGID_ROOT 0x0 #define TAGID_ROOT 0x0
@ -203,4 +206,8 @@
#define TAG_APP_ID (0x11 | TAG_TYPE_BINARY) #define TAG_APP_ID (0x11 | TAG_TYPE_BINARY)
#define TAG_INDEX_BITS (0x801 | TAG_TYPE_BINARY) #define TAG_INDEX_BITS (0x801 | TAG_TYPE_BINARY)
#ifdef __cplusplus
} // extern "C"
#endif
#endif // SDBTAGID_H #endif // SDBTAGID_H

4
dll/appcompat/apphelp/sdbtypes.h → sdk/include/reactos/appcompat/sdbtypes.h
View file

@ -1,9 +1,9 @@
/* /*
* PROJECT: ReactOS Application compatibility module * 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 * PURPOSE: Sdb core definitions
* COPYRIGHT: Copyright 2013 Mislav Blažević * 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 #ifndef SDBTYPES_H

4
sdk/tools/xml2sdb/CMakeLists.txt
View file

@ -9,7 +9,9 @@ list(APPEND SOURCE
${REACTOS_SOURCE_DIR}/dll/appcompat/apphelp/sdbwrite.c ${REACTOS_SOURCE_DIR}/dll/appcompat/apphelp/sdbwrite.c
${REACTOS_SOURCE_DIR}/dll/appcompat/apphelp/sdbstringtable.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}) add_host_tool(xml2sdb ${SOURCE})
if(NOT MSVC) if(NOT MSVC)

8
sdk/tools/xml2sdb/xml2sdb.h
View file

@ -1,8 +1,8 @@
/* /*
* PROJECT: xml2sdb * 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 * 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 #pragma once
@ -14,9 +14,9 @@
#include <typedefs.h> #include <typedefs.h>
#include <guiddef.h> #include <guiddef.h>
#include "sdbtypes.h" #include <sdbtypes.h>
#include "sdbwrite.h" #include "sdbwrite.h"
#include "sdbtagid.h" #include <sdbtagid.h>
namespace tinyxml2 namespace tinyxml2
{ {