Commit e19a9041 authored by Jon Griffiths's avatar Jon Griffiths Committed by Alexandre Julliard

include: Avoid TEXT() in sddl component tags, hide them when building Wine.

parent 7b7cd31f
...@@ -15,46 +15,83 @@ ...@@ -15,46 +15,83 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef __SDDL_H__ #ifndef __SDDL_H__
#define __SDDL_H__ #define __SDDL_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* /* Versioning */
* SDDL Version information #define SDDL_REVISION_1 1
*/ #define SDDL_REVISION SDDL_REVISION_1
#define SDDL_REVISION_1 1
#define SDDL_REVISION SDDL_REVISION_1
/* #ifndef __WINESRC__
* SDDL Component tags /* Component tags */
*/ #ifndef UNICODE
#define SDDL_OWNER TEXT("O") # define SDDL_OWNER "O"
#define SDDL_GROUP TEXT("G") # define SDDL_GROUP "G"
#define SDDL_DACL TEXT("D") # define SDDL_DACL "D"
#define SDDL_SACL TEXT("S") # define SDDL_SACL "S"
#else
# if defined(__GNUC__)
# define SDDL_OWNER (const WCHAR[]){ 'O',0 }
# define SDDL_GROUP (const WCHAR[]){ 'G',0 }
# define SDDL_DACL (const WCHAR[]){ 'D',0 }
# define SDDL_SACL (const WCHAR[]){ 'S',0 }
# elif defined(_MSC_VER)
# define SDDL_OWNER L"O"
# define SDDL_GROUP L"G"
# define SDDL_DACL L"D"
# define SDDL_SACL L"S"
# else
static const WCHAR SDDL_OWNER[] = { 'O',0 };
static const WCHAR SDDL_GROUP[] = { 'G',0 };
static const WCHAR SDDL_DACL[] = { 'D',0 };
static const WCHAR SDDL_SACL[] = { 'S',0 };
# endif
#endif /* UNICODE */
/* /* Separators as characters */
* SDDL Separators - character version
*/
/* SDDL_SEPERATORC is not a typo, as per Microsoft's headers */ /* SDDL_SEPERATORC is not a typo, as per Microsoft's headers */
#define SDDL_SEPERATORC TEXT(";") #ifndef UNICODE
#define SDDL_DELIMINATORC TEXT(":") # define SDDL_SEPERATORC ';'
#define SDDL_ACE_BEGINC TEXT("(") # define SDDL_DELIMINATORC ':'
#define SDDL_ACE_ENDC TEXT(")") # define SDDL_ACE_BEGINC '('
# define SDDL_ACE_ENDC ')'
#else
# define SDDL_SEPERATORC ((WCHAR)';')
# define SDDL_DELIMINATORC ((WCHAR)':')
# define SDDL_ACE_BEGINC ((WCHAR)'(')
# define SDDL_ACE_ENDC ((WCHAR)')')
#endif /* UNICODE */
/* /* Separators as strings */
* SDDL Separators - string version
*/
/* SDDL_SEPERATOR is not a typo, as per Microsoft's headers */ /* SDDL_SEPERATOR is not a typo, as per Microsoft's headers */
#define SDDL_SEPERATOR TEXT(";") #ifndef UNICODE
#define SDDL_DELIMINATOR TEXT(":") # define SDDL_SEPERATOR ";"
#define SDDL_ACE_BEGIN TEXT("(") # define SDDL_DELIMINATOR ":"
#define SDDL_ACE_END TEXT(")") # define SDDL_ACE_BEGIN "("
# define SDDL_ACE_END ")"
#else
# if defined(__GNUC__)
# define SDDL_SEPERATOR (const WCHAR[]){ ';',0 }
# define SDDL_DELIMINATOR (const WCHAR[]){ ':',0 }
# define SDDL_ACE_BEGIN (const WCHAR[]){ '(',0 }
# define SDDL_ACE_END (const WCHAR[]){ ')',0 }
# elif defined(_MSC_VER)
# define SDDL_SEPERATOR L";"
# define SDDL_DELIMINATOR L":"
# define SDDL_ACE_BEGIN L"("
# define SDDL_ACE_END L")"
# else
static const WCHAR SDDL_SEPERATOR[] = { ';',0 };
static const WCHAR SDDL_DELIMINATOR[] = { ':',0 };
static const WCHAR SDDL_ACE_BEGIN[] = { '(',0 };
static const WCHAR SDDL_ACE_END[] = { ')',0 };
# endif
#endif /* UNICODE */
#endif /* __WINESRC__ */
BOOL WINAPI ConvertSidToStringSidA( PSID, LPSTR* ); BOOL WINAPI ConvertSidToStringSidA( PSID, LPSTR* );
BOOL WINAPI ConvertSidToStringSidW( PSID, LPWSTR* ); BOOL WINAPI ConvertSidToStringSidW( PSID, LPWSTR* );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment