ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add/correct prototypes for some already defined functions in 

advapi32. Correct spec file entry for GetSecurityInfoExW.
This commit is contained in:
Vincent Béron 2005-11-21 12:06:00 +00:00 committed by Alexandre Julliard
parent 83ef91ce2d
commit f41abbd07a
5 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/advapi32/advapi32.spec
View File

@ -273,7 +273,7 @@
@ stdcall GetSecurityDescriptorSacl (ptr ptr ptr ptr) @ stdcall GetSecurityDescriptorSacl (ptr ptr ptr ptr)
@ stdcall GetSecurityInfo (long long long ptr ptr ptr ptr ptr) @ stdcall GetSecurityInfo (long long long ptr ptr ptr ptr ptr)
# @ stub GetSecurityInfoExA # @ stub GetSecurityInfoExA
@ stdcall GetSecurityInfoExW (long long long wstr wstr ptr ptr wstr wstr) @ stdcall GetSecurityInfoExW (long long long wstr wstr ptr ptr ptr ptr)
@ stdcall GetServiceDisplayNameA(ptr str ptr ptr) @ stdcall GetServiceDisplayNameA(ptr str ptr ptr)
@ stdcall GetServiceDisplayNameW(ptr wstr ptr ptr) @ stdcall GetServiceDisplayNameW(ptr wstr ptr ptr)
@ stdcall GetServiceKeyNameA(long str ptr ptr) @ stdcall GetServiceKeyNameA(long str ptr ptr)

36
dlls/advapi32/security.c
View File

@ -637,15 +637,15 @@ GetLengthSid (PSID pSid)
* Failure: nonzero error code from Winerror.h * Failure: nonzero error code from Winerror.h
*/ */
DWORD WINAPI BuildSecurityDescriptorA( DWORD WINAPI BuildSecurityDescriptorA(
IN PTRUSTEE_A pOwner, IN PTRUSTEEA pOwner,
IN PTRUSTEE_A pGroup, IN PTRUSTEEA pGroup,
IN DWORD cCountOfAccessEntries, IN ULONG cCountOfAccessEntries,
IN PEXPLICIT_ACCESS_A pListOfAccessEntries, IN PEXPLICIT_ACCESSA pListOfAccessEntries,
IN DWORD cCountOfAuditEntries, IN ULONG cCountOfAuditEntries,
IN PEXPLICIT_ACCESS_A pListofAuditEntries, IN PEXPLICIT_ACCESSA pListofAuditEntries,
IN PSECURITY_DESCRIPTOR pOldSD, IN PSECURITY_DESCRIPTOR pOldSD,
IN OUT PDWORD lpdwBufferLength, IN OUT PULONG lpdwBufferLength,
OUT PSECURITY_DESCRIPTOR pNewSD) OUT PSECURITY_DESCRIPTOR* pNewSD)
{ {
FIXME("(%p,%p,%ld,%p,%ld,%p,%p,%p,%p) stub!\n",pOwner,pGroup, FIXME("(%p,%p,%ld,%p,%ld,%p,%p,%p,%p) stub!\n",pOwner,pGroup,
cCountOfAccessEntries,pListOfAccessEntries,cCountOfAuditEntries, cCountOfAccessEntries,pListOfAccessEntries,cCountOfAuditEntries,
@ -660,15 +660,15 @@ DWORD WINAPI BuildSecurityDescriptorA(
* See BuildSecurityDescriptorA. * See BuildSecurityDescriptorA.
*/ */
DWORD WINAPI BuildSecurityDescriptorW( DWORD WINAPI BuildSecurityDescriptorW(
IN PTRUSTEE_W pOwner, IN PTRUSTEEW pOwner,
IN PTRUSTEE_W pGroup, IN PTRUSTEEW pGroup,
IN DWORD cCountOfAccessEntries, IN ULONG cCountOfAccessEntries,
IN PEXPLICIT_ACCESS_W pListOfAccessEntries, IN PEXPLICIT_ACCESSW pListOfAccessEntries,
IN DWORD cCountOfAuditEntries, IN ULONG cCountOfAuditEntries,
IN PEXPLICIT_ACCESS_W pListofAuditEntries, IN PEXPLICIT_ACCESSW pListofAuditEntries,
IN PSECURITY_DESCRIPTOR pOldSD, IN PSECURITY_DESCRIPTOR pOldSD,
IN OUT PDWORD lpdwBufferLength, IN OUT PULONG lpdwBufferLength,
OUT PSECURITY_DESCRIPTOR pNewSD) OUT PSECURITY_DESCRIPTOR* pNewSD)
{ {
FIXME("(%p,%p,%ld,%p,%ld,%p,%p,%p,%p) stub!\n",pOwner,pGroup, FIXME("(%p,%p,%ld,%p,%ld,%p,%p,%p,%p) stub!\n",pOwner,pGroup,
cCountOfAccessEntries,pListOfAccessEntries,cCountOfAuditEntries, cCountOfAccessEntries,pListOfAccessEntries,cCountOfAuditEntries,
@ -1616,9 +1616,9 @@ SynchronizeWindows31FilesAndWindowsNTRegistry( DWORD x1, DWORD x2, DWORD x3,
* x1 [] * x1 []
*/ */
BOOL WINAPI BOOL WINAPI
NotifyBootConfigStatus( DWORD x1 ) NotifyBootConfigStatus( BOOL x1 )
{ {
FIXME("(0x%08lx):stub\n",x1); FIXME("(0x%08d):stub\n",x1);
return 1; return 1;
} }

16
include/aclapi.h
View File

@ -35,6 +35,12 @@ DWORD WINAPI GetExplicitEntriesFromAclW( PACL, PULONG, PEXPLICIT_ACCESS_W* );
DWORD WINAPI GetSecurityInfo( HANDLE, SE_OBJECT_TYPE, SECURITY_INFORMATION, DWORD WINAPI GetSecurityInfo( HANDLE, SE_OBJECT_TYPE, SECURITY_INFORMATION,
PSID*, PSID*, PACL*, PACL*, PSECURITY_DESCRIPTOR*); PSID*, PSID*, PACL*, PACL*, PSECURITY_DESCRIPTOR*);
DWORD WINAPI GetSecurityInfoExA(HANDLE, SE_OBJECT_TYPE, SECURITY_INFORMATION,
LPCSTR, LPCSTR, PACTRL_ACCESSA*, PACTRL_AUDITA*, LPSTR*, LPSTR*);
DWORD WINAPI GetSecurityInfoExW(HANDLE, SE_OBJECT_TYPE, SECURITY_INFORMATION,
LPCWSTR, LPCWSTR, PACTRL_ACCESSW*, PACTRL_AUDITW*, LPWSTR*, LPWSTR*);
#define GetSecurityInfoEx WINELIB_NAME_AW(GetSecurityInfoEx)
DWORD WINAPI GetNamedSecurityInfoA(LPSTR, SE_OBJECT_TYPE, SECURITY_INFORMATION, DWORD WINAPI GetNamedSecurityInfoA(LPSTR, SE_OBJECT_TYPE, SECURITY_INFORMATION,
PSID*, PSID*, PACL*, PACL*, PSECURITY_DESCRIPTOR*); PSID*, PSID*, PACL*, PACL*, PSECURITY_DESCRIPTOR*);
DWORD WINAPI GetNamedSecurityInfoW(LPWSTR, SE_OBJECT_TYPE, SECURITY_INFORMATION, DWORD WINAPI GetNamedSecurityInfoW(LPWSTR, SE_OBJECT_TYPE, SECURITY_INFORMATION,
@ -66,6 +72,16 @@ TRUSTEE_TYPE WINAPI GetTrusteeTypeA( PTRUSTEEA );
TRUSTEE_TYPE WINAPI GetTrusteeTypeW( PTRUSTEEW ); TRUSTEE_TYPE WINAPI GetTrusteeTypeW( PTRUSTEEW );
#define GetTrusteeType WINELIB_NAME_AW(GetTrusteeType) #define GetTrusteeType WINELIB_NAME_AW(GetTrusteeType)
DWORD WINAPI BuildSecurityDescriptorA( PTRUSTEEA, PTRUSTEEA, ULONG, PEXPLICIT_ACCESS_A,
ULONG, PEXPLICIT_ACCESS_A,
PSECURITY_DESCRIPTOR, PULONG,
PSECURITY_DESCRIPTOR* );
DWORD WINAPI BuildSecurityDescriptorW( PTRUSTEEW, PTRUSTEEW, ULONG, PEXPLICIT_ACCESS_W,
ULONG, PEXPLICIT_ACCESS_W,
PSECURITY_DESCRIPTOR, PULONG,
PSECURITY_DESCRIPTOR* );
#define BuildSecurityDescriptor WINELIB_NAME_AW(BuildSecurityDescriptor)
void WINAPI BuildTrusteeWithNameA( PTRUSTEEA, LPSTR ); void WINAPI BuildTrusteeWithNameA( PTRUSTEEA, LPSTR );
void WINAPI BuildTrusteeWithNameW( PTRUSTEEW, LPWSTR ); void WINAPI BuildTrusteeWithNameW( PTRUSTEEW, LPWSTR );
#define BuildTrusteeWithName WINELIB_NAME_AW(BuildTrusteeWithName) #define BuildTrusteeWithName WINELIB_NAME_AW(BuildTrusteeWithName)

1
include/winsvc.h
View File

@ -295,6 +295,7 @@ BOOL WINAPI GetServiceKeyNameA(SC_HANDLE,LPCSTR,LPSTR,LPDWORD);
BOOL WINAPI GetServiceKeyNameW(SC_HANDLE,LPCWSTR,LPWSTR,LPDWORD); BOOL WINAPI GetServiceKeyNameW(SC_HANDLE,LPCWSTR,LPWSTR,LPDWORD);
#define GetServiceKeyName WINELIB_NAME_AW(GetServiceKeyName) #define GetServiceKeyName WINELIB_NAME_AW(GetServiceKeyName)
SC_LOCK WINAPI LockServiceDatabase(SC_HANDLE); SC_LOCK WINAPI LockServiceDatabase(SC_HANDLE);
BOOL WINAPI NotifyBootConfigStatus(BOOL);
SC_HANDLE WINAPI OpenSCManagerA(LPCSTR,LPCSTR,DWORD); SC_HANDLE WINAPI OpenSCManagerA(LPCSTR,LPCSTR,DWORD);
SC_HANDLE WINAPI OpenSCManagerW(LPCWSTR,LPCWSTR,DWORD); SC_HANDLE WINAPI OpenSCManagerW(LPCWSTR,LPCWSTR,DWORD);
#define OpenSCManager WINELIB_NAME_AW(OpenSCManager) #define OpenSCManager WINELIB_NAME_AW(OpenSCManager)

4
tools/winapi/win32.api
View File

@ -111,10 +111,8 @@ PBOOL
PDWORD PDWORD
PEXPLICIT_ACCESSA PEXPLICIT_ACCESSA
PEXPLICIT_ACCESSA * PEXPLICIT_ACCESSA *
PEXPLICIT_ACCESS_A
PEXPLICIT_ACCESSW PEXPLICIT_ACCESSW
PEXPLICIT_ACCESSW * PEXPLICIT_ACCESSW *
PEXPLICIT_ACCESS_W
PGENERIC_MAPPING PGENERIC_MAPPING
PHANDLE PHANDLE
PHKEY PHKEY
@ -144,9 +142,7 @@ PTOKEN_GROUPS
PTRACE_GUID_REGISTRATION PTRACE_GUID_REGISTRATION
PTRACEHANDLE PTRACEHANDLE
PTRUSTEEA PTRUSTEEA
PTRUSTEE_A
PTRUSTEEW PTRUSTEEW
PTRUSTEE_W
PUCHAR PUCHAR
PULONG PULONG
PVOID PVOID