Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 01:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Changelog:

Browse source 
MSAFD: Add PCH support, PSDK fixes
MISC: Fix everything to build with PSDK changes
PSDK Fixes:
w32api/include/ssdl.h - reimplement based on Wine header which was more correct
w32api/include/ntsecapi.h - Remove duplicate structures and add typedef
w32api/include/winnt.h - add constant and missing structure
w32api/include/winioctl.h - add missing IOCTL code
w32api/include/winbase.h - add missing function declariation
w32api/include/aclui.h - remove duplicate structure

svn path=/trunk/; revision=17394
This commit is contained in:
Steven Edwards 2005-08-15 02:24:48 +00:00
parent 89d916e2c9
commit 54bd458644
27 changed files with 109 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reactos/lib/aclui/precomp.h
View file

@ -4,6 +4,7 @@
#include <prsht.h>
#include <aclui.h>
#include <sddl.h>
#include <winternl.h>
#include <ntsecapi.h>
#if SUPPORT_UXTHEME
#include <uxtheme.h>

4
reactos/lib/advapi32/advapi32.h
View file

@ -13,11 +13,13 @@
/* PSDK/NDK Headers */
#include <windows.h>
#include <ntsecapi.h>
#include <accctrl.h>
#define NTOS_MODE_USER
#include <ndk/ntndk.h>
/* this has to go after the NDK when being used with the NDK */
#include <ntsecapi.h>
#ifndef HAS_FN_PROGRESSW
#define FN_PROGRESSW FN_PROGRESS
#endif

2
reactos/lib/msafd/include/helpers.h
View file

@ -7,7 +7,7 @@
#ifndef __HELPERS_H
#define __HELPERS_H
#include <msafd.h>
//#include <msafd.h>
typedef struct _HELPER_DATA {
LIST_ENTRY Helpers;

5
reactos/lib/msafd/misc/dllmain.c
View file

@ -10,10 +10,9 @@
* CSH 01/09-2000 Created
* Alex 16/07/2004 - Complete Rewrite
*/
#include <roscfg.h>
#include <string.h>
#include <msafd.h>
#include <helpers.h>
#include <debug.h>
#ifdef DBG
//DWORD DebugTraceLevel = DEBUG_ULTRA;

3
reactos/lib/msafd/misc/event.c
View file

@ -10,9 +10,10 @@
* Alex 16/07/2004 - Complete Rewrite
*/
#include <roscfg.h>
#include <msafd.h>
#include <debug.h>
int
WSPAPI
WSPEventSelect(

3
reactos/lib/msafd/misc/helpers.c
View file

@ -10,7 +10,8 @@
* Alex 16/07/2004 - Complete Rewrite
*/
#include <msafd.h>
#include <helpers.h>
#include <debug.h>
CRITICAL_SECTION HelperDLLDatabaseLock;
LIST_ENTRY HelperDLLDatabaseListHead;

3
reactos/lib/msafd/misc/sndrcv.c
View file

@ -10,9 +10,8 @@
* Alex 16/07/2004 - Complete Rewrite
*/
#include <roscfg.h>
#include <string.h>
#include <msafd.h>
#include <debug.h>
INT

1
reactos/lib/msafd/misc/stubs.c
View file

@ -9,6 +9,7 @@
*/
#include <msafd.h>
#include <debug.h>
INT
WSPAPI

12
reactos/lib/msafd/include/msafd.h → reactos/lib/msafd/msafd.h Normal file → Executable file
View file

@ -7,18 +7,20 @@
#ifndef __MSAFD_H
#define __MSAFD_H
#include <roscfg.h>
#include <stdio.h>
#include <stdlib.h>
#include <windows.h>
#include <wsahelp.h>
#include <winsock2.h>
#include <ws2spi.h>
#define NTOS_MODE_USER
#include <ndk/ntndk.h>
/* This includes ntsecapi.h so it needs to come after the NDK */
#include <wsahelp.h>
#include <ddk/tdi.h>
#include <afd/shared.h>
#include <helpers.h>
#define NTOS_MODE_USER
#include <ndk/ntndk.h>
#include <debug.h>
extern HANDLE GlobalHeap;
extern WSPUPCALLTABLE Upcalls;

1
reactos/lib/msafd/msafd.xml
View file

@ -5,6 +5,7 @@
<define name="_UNICODE" />
<define name="__REACTOS__" />
<define name="__USE_W32API" />
<pch>msafd.h</pch>
<library>ntdll</library>
<library>kernel32</library>
<library>advapi32</library>

1
reactos/lib/netapi32/wksta.c
View file

@ -35,6 +35,7 @@
#include "winerror.h"
#include "ntstatus.h"
#include "winreg.h"
#include "winternl.h"
#include "ntsecapi.h"
#include "netbios.h"
#include "wine/debug.h"

3
reactos/lib/secur32/lsa.c
View file

@ -11,11 +11,12 @@
/* INCLUDES ******************************************************************/
#include <windows.h>
#include <ntsecapi.h>
#define NTOS_MODE_USER
#include <ndk/ntndk.h>
#include <lsass/lsass.h>
#include <ntsecapi.h>
/* GLOBALS *******************************************************************/
extern HANDLE Secur32Heap;

7
reactos/lib/snmpapi/snmpapi.c
View file

@ -9,13 +9,8 @@
*/
//#include "snmpapi.h"
#ifdef __GNUC__
#include <wsahelp.h>
#else
#include <winsock2.h>
#endif
#include <windows.h>
#include <winsock2.h>
#ifdef __GNUC__
#define SNMP_FUNC_TYPE STDCALL

3
reactos/lib/ws2_32/include/ws2_32.h
View file

@ -12,10 +12,11 @@
#include <ws2spi.h>
#include <ws2tcpip.h>
#include <windows.h>
#include <wsahelp.h>
#define NTOS_MODE_USER
#include <ndk/ntndk.h>
#include <wsahelp.h>
#undef assert
#include <debug.h>
#include <windns.h> // DNS_A_DATA

1
reactos/lib/ws2help/ws2help.c
View file

@ -9,6 +9,7 @@
*/
#include "ws2help.h"
#include <debug.h>
#ifdef DBG
/* See debug.h for debug/trace constants */

4
reactos/lib/ws2help/ws2help.h
View file

@ -7,11 +7,11 @@
#ifndef __WS2HELP_H
#define __WS2HELP_H
#include <wsahelp.h>
#include <windows.h>
#define NTOS_MODE_USER
#include <ndk/ntndk.h>
#include <debug.h>
#include <wsahelp.h>
#define EXPORT STDCALL

2
reactos/lib/wshirda/wshirda.c
View file

@ -9,6 +9,8 @@
*/
#include "wshirda.h"
#include <debug.h>
#ifdef DBG
/* See debug.h for debug/trace constants */

4
reactos/lib/wshirda/wshirda.h
View file

@ -7,11 +7,11 @@
#ifndef __WSHIRDA_H
#define __WSHIRDA_H
#include <wsahelp.h>
#include <windows.h>
#define NTOS_MODE_USER
#include <ndk/ntndk.h>
#include <debug.h>
#include <wsahelp.h>
#define EXPORT STDCALL

1
reactos/subsys/system/lsass/lsass.c
View file

@ -26,7 +26,6 @@
* Compiled successfully with egcs 1.1.2
*/
#include <windows.h>
#include <ntsecapi.h>
#define NTOS_MODE_USER
#include <ndk/ntndk.h>

1
reactos/subsys/system/winlogon/setup.c
View file

@ -28,7 +28,6 @@
#include <windows.h>
#include <stdio.h>
#include <ntsecapi.h>
#include <wchar.h>
#include "setup.h"

1
reactos/subsys/system/winlogon/winlogon.h
View file

@ -28,7 +28,6 @@
#define __WINLOGON_MAIN_H__
#include <windows.h>
#include <ntsecapi.h>
#include <userenv.h>
#include <winwlx.h>
#define NTOS_MODE_USER

7
reactos/w32api/include/aclui.h
View file

@ -34,13 +34,6 @@ DEFINE_GUID(IID_ISecurityInformation2, 0xc3ccfdb4, 0x6f88, 0x11d2, 0x00a3, 0xce,
DEFINE_GUID(IID_IEffectivePermission, 0x3853dc76, 0x9f35, 0x407c, 0x0088, 0xa1,0xd1,0x93,0x44,0x36,0x5f,0xbc);
DEFINE_GUID(IID_ISecurityObjectTypeInfo, 0xfc3066eb, 0x79ef, 0x444b, 0x0091, 0x11,0xd1,0x8a,0x75,0xeb,0xf2,0xfa);
/* FIXME - defined in structs.h already!? avoid conflicts! */
typedef struct _OBJECT_TYPE_LIST {
WORD Level;
WORD Sbz;
GUID *ObjectType;
} OBJECT_TYPE_LIST, *POBJECT_TYPE_LIST;
typedef interface ISecurityInformation *LPSECURITYINFO;
typedef interface ISecurityInformation2 *LPSECURITYINFO2;
typedef interface IEffectivePermission *LPEFFECTIVEPERMISSION;

20
reactos/w32api/include/ntsecapi.h
View file

@ -124,17 +124,6 @@ extern "C" {
#define TRUST_TYPE_DCE 4
#if !defined(_NTDEF_H) && !defined(_SUBAUTH_H)
typedef LONG NTSTATUS, *PNTSTATUS;
typedef struct _UNICODE_STRING {
USHORT Length;
USHORT MaximumLength;
PWSTR Buffer;
} UNICODE_STRING, *PUNICODE_STRING;
typedef const UNICODE_STRING* PCUNICODE_STRING;
typedef struct _STRING {
USHORT Length;
USHORT MaximumLength;
PCHAR Buffer;
} STRING, *PSTRING;
#endif
typedef UNICODE_STRING LSA_UNICODE_STRING, *PLSA_UNICODE_STRING;
typedef STRING LSA_STRING, *PLSA_STRING;
@ -294,14 +283,7 @@ typedef struct _LSA_ENUMERATION_INFORMATION {
} LSA_ENUMERATION_INFORMATION, *PLSA_ENUMERATION_INFORMATION;
typedef ULONG LSA_OPERATIONAL_MODE, *PLSA_OPERATIONAL_MODE;
#if !defined(_NTDEF_H)
typedef struct _LSA_OBJECT_ATTRIBUTES {
ULONG Length;
HANDLE RootDirectory;
PLSA_UNICODE_STRING ObjectName;
ULONG Attributes;
PVOID SecurityDescriptor;
PVOID SecurityQualityOfService;
} OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES;
typedef OBJECT_ATTRIBUTES LSA_OBJECT_ATTRIBUTES, *PLSA_OBJECT_ATTRIBUTES;
#endif
typedef OBJECT_ATTRIBUTES LSA_OBJECT_ATTRIBUTES, *PLSA_OBJECT_ATTRIBUTES;
typedef struct _LSA_FOREST_TRUST_DOMAIN_INFO {

73
reactos/w32api/include/sddl.h
View file

@ -1,15 +1,71 @@
#ifndef _SDDL_H
#define _SDDL_H
#if __GNUC__ >=3
#pragma GCC system_header
#endif
/*
* Copyright (C) 2003 Ulrich Czekalla for CodeWeavers
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef __SDDL_H__
#define __SDDL_H__
#ifdef __cplusplus
extern "C" {
#endif
BOOL WINAPI ConvertSidToStringSidA(PSID Sid, LPSTR *StringSid);
BOOL WINAPI ConvertSidToStringSidW(PSID Sid, LPWSTR *StringSid);
/*
* SDDL Version information
*/
#define SDDL_REVISION_1 1
#define SDDL_REVISION SDDL_REVISION_1
/*
* SDDL Component tags
*/
#define SDDL_OWNER TEXT("O")
#define SDDL_GROUP TEXT("G")
#define SDDL_DACL TEXT("D")
#define SDDL_SACL TEXT("S")
/*
* SDDL Separators - character version
*/
#define SDDL_SEPERATORC TEXT(";")
#define SDDL_DELIMINATORC TEXT(":")
#define SDDL_ACE_BEGINC TEXT("(")
#define SDDL_ACE_ENDC TEXT(")")
/*
* SDDL Separators - string version
*/
#define SDDL_SEPERATOR TEXT(";")
#define SDDL_DELIMINATOR TEXT(":")
#define SDDL_ACE_BEGIN TEXT("(")
#define SDDL_ACE_END TEXT(")")
BOOL WINAPI ConvertSidToStringSidA( PSID, LPSTR* );
BOOL WINAPI ConvertSidToStringSidW( PSID, LPWSTR* );
BOOL WINAPI ConvertStringSidToSidA( LPCSTR, PSID* );
BOOL WINAPI ConvertStringSidToSidW( LPCWSTR, PSID* );
BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorA(
LPCSTR, DWORD, PSECURITY_DESCRIPTOR*, PULONG );
BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorW(
LPCWSTR, DWORD, PSECURITY_DESCRIPTOR*, PULONG );
BOOL WINAPI ConvertSecurityDescriptorToStringSecurityDescriptorA(
PSECURITY_DESCRIPTOR, DWORD, SECURITY_INFORMATION, LPSTR*, PULONG );
BOOL WINAPI ConvertSecurityDescriptorToStringSecurityDescriptorW(
PSECURITY_DESCRIPTOR, DWORD, SECURITY_INFORMATION, LPWSTR*, PULONG );
#ifdef UNICODE
#define ConvertSidToStringSid ConvertSidToStringSidW
@ -20,4 +76,5 @@ BOOL WINAPI ConvertSidToStringSidW(PSID Sid, LPWSTR *StringSid);
#ifdef __cplusplus
}
#endif
#endif /* ! defined _SDDL_H */
#endif /* __SDDL_H__ */

1
reactos/w32api/include/winbase.h
View file

@ -1057,6 +1057,7 @@ void WINAPI AddRefActCtx(HANDLE);
#if (_WIN32_WINNT >= 0x0500)
PVOID WINAPI AddVectoredExceptionHandler(ULONG,PVECTORED_EXCEPTION_HANDLER);
#endif
BOOL WINAPI AccessCheckByType(PSECURITY_DESCRIPTOR,PSID,HANDLE,DWORD,POBJECT_TYPE_LIST,DWORD,PGENERIC_MAPPING,PPRIVILEGE_SET,LPDWORD,LPDWORD,LPBOOL);
BOOL WINAPI AdjustTokenGroups(HANDLE,BOOL,PTOKEN_GROUPS,DWORD,PTOKEN_GROUPS,PDWORD);
BOOL WINAPI AdjustTokenPrivileges(HANDLE,BOOL,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD);
BOOL WINAPI AllocateAndInitializeSid(PSID_IDENTIFIER_AUTHORITY,BYTE,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,PSID*);

1
reactos/w32api/include/winioctl.h
View file

@ -74,6 +74,7 @@ extern "C" {
#define IOCTL_SERIAL_LSRMST_INSERT CTL_CODE(FILE_DEVICE_SERIAL_PORT,31,METHOD_BUFFERED,FILE_ANY_ACCESS)
#define FSCTL_LOCK_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM,6,METHOD_BUFFERED,FILE_ANY_ACCESS)
#define FSCTL_UNLOCK_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM,7,METHOD_BUFFERED,FILE_ANY_ACCESS)
#define FSCTL_PIPE_IMPERSONATE CTL_CODE(FILE_DEVICE_NAMED_PIPE, 7, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define FSCTL_DISMOUNT_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM,8,METHOD_BUFFERED,FILE_ANY_ACCESS)
#define FSCTL_MOUNT_DBLS_VOLUME CTL_CODE(FILE_DEVICE_FILE_SYSTEM,13,METHOD_BUFFERED,FILE_ANY_ACCESS)
#define FSCTL_GET_COMPRESSION CTL_CODE(FILE_DEVICE_FILE_SYSTEM,15,METHOD_BUFFERED,FILE_ANY_ACCESS)

7
reactos/w32api/include/winnt.h
View file

@ -190,6 +190,7 @@ typedef DWORD FLONG;
#define CONTAINER_INHERIT_ACE 2
#define NO_PROPAGATE_INHERIT_ACE 4
#define INHERIT_ONLY_ACE 8
#define INHERITED_ACE 10
#define VALID_INHERIT_FLAGS 16
#define SUCCESSFUL_ACCESS_ACE_FLAG 64
#define FAILED_ACCESS_ACE_FLAG 128
@ -3492,6 +3493,12 @@ RtlCompareMemory (
#define RtlFillMemory(d,l,f) memset((d), (f), (l))
#define RtlZeroMemory(d,l) RtlFillMemory((d),(l),0)
typedef struct _OBJECT_TYPE_LIST {
WORD Level;
WORD Sbz;
GUID *ObjectType;
} OBJECT_TYPE_LIST, *POBJECT_TYPE_LIST;
#if defined(__GNUC__)
static __inline__ PVOID GetCurrentFiber(void)