wine/ tools/winapi/win32.api include/winsvc.h ...
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Nov 21 06:06:00 CST 2005
ChangeSet ID: 21365
CVSROOT: /opt/cvs-commit
Module name: wine
Changes by: julliard at winehq.org 2005/11/21 06:06:00
Modified files:
tools/winapi : win32.api
include : winsvc.h aclapi.h
dlls/advapi32 : security.c advapi32.spec
Log message:
Vincent Béron <vberon at mecano.gme.usherb.ca>
Add/correct prototypes for some already defined functions in
advapi32. Correct spec file entry for GetSecurityInfoExW.
Patch: http://cvs.winehq.org/patch.py?id=21365
Old revision New revision Changes Path
1.55 1.56 +0 -4 wine/tools/winapi/win32.api
1.22 1.23 +1 -0 wine/include/winsvc.h
1.8 1.9 +16 -0 wine/include/aclapi.h
1.117 1.118 +18 -18 wine/dlls/advapi32/security.c
1.80 1.81 +1 -1 wine/dlls/advapi32/advapi32.spec
Index: wine/tools/winapi/win32.api
diff -u -p wine/tools/winapi/win32.api:1.55 wine/tools/winapi/win32.api:1.56
--- wine/tools/winapi/win32.api:1.55 21 Nov 2005 12: 6: 0 -0000
+++ wine/tools/winapi/win32.api 21 Nov 2005 12: 6: 0 -0000
@@ -111,10 +111,8 @@ PBOOL
PDWORD
PEXPLICIT_ACCESSA
PEXPLICIT_ACCESSA *
-PEXPLICIT_ACCESS_A
PEXPLICIT_ACCESSW
PEXPLICIT_ACCESSW *
-PEXPLICIT_ACCESS_W
PGENERIC_MAPPING
PHANDLE
PHKEY
@@ -144,9 +142,7 @@ PTOKEN_GROUPS
PTRACE_GUID_REGISTRATION
PTRACEHANDLE
PTRUSTEEA
-PTRUSTEE_A
PTRUSTEEW
-PTRUSTEE_W
PUCHAR
PULONG
PVOID
Index: wine/include/winsvc.h
diff -u -p wine/include/winsvc.h:1.22 wine/include/winsvc.h:1.23
--- wine/include/winsvc.h:1.22 21 Nov 2005 12: 6: 0 -0000
+++ wine/include/winsvc.h 21 Nov 2005 12: 6: 0 -0000
@@ -295,6 +295,7 @@ BOOL WINAPI GetServiceKeyNameA(SC
BOOL WINAPI GetServiceKeyNameW(SC_HANDLE,LPCWSTR,LPWSTR,LPDWORD);
#define GetServiceKeyName WINELIB_NAME_AW(GetServiceKeyName)
SC_LOCK WINAPI LockServiceDatabase(SC_HANDLE);
+BOOL WINAPI NotifyBootConfigStatus(BOOL);
SC_HANDLE WINAPI OpenSCManagerA(LPCSTR,LPCSTR,DWORD);
SC_HANDLE WINAPI OpenSCManagerW(LPCWSTR,LPCWSTR,DWORD);
#define OpenSCManager WINELIB_NAME_AW(OpenSCManager)
Index: wine/include/aclapi.h
diff -u -p wine/include/aclapi.h:1.8 wine/include/aclapi.h:1.9
--- wine/include/aclapi.h:1.8 21 Nov 2005 12: 6: 0 -0000
+++ wine/include/aclapi.h 21 Nov 2005 12: 6: 0 -0000
@@ -35,6 +35,12 @@ DWORD WINAPI GetExplicitEntriesFromAclW(
DWORD WINAPI GetSecurityInfo( HANDLE, SE_OBJECT_TYPE, SECURITY_INFORMATION,
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,
PSID*, PSID*, PACL*, PACL*, PSECURITY_DESCRIPTOR*);
DWORD WINAPI GetNamedSecurityInfoW(LPWSTR, SE_OBJECT_TYPE, SECURITY_INFORMATION,
@@ -66,6 +72,16 @@ TRUSTEE_TYPE WINAPI GetTrusteeTypeA( PTR
TRUSTEE_TYPE WINAPI GetTrusteeTypeW( PTRUSTEEW );
#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 BuildTrusteeWithNameW( PTRUSTEEW, LPWSTR );
#define BuildTrusteeWithName WINELIB_NAME_AW(BuildTrusteeWithName)
Index: wine/dlls/advapi32/security.c
diff -u -p wine/dlls/advapi32/security.c:1.117 wine/dlls/advapi32/security.c:1.118
--- wine/dlls/advapi32/security.c:1.117 21 Nov 2005 12: 6: 0 -0000
+++ wine/dlls/advapi32/security.c 21 Nov 2005 12: 6: 0 -0000
@@ -637,15 +637,15 @@ GetLengthSid (PSID pSid)
* Failure: nonzero error code from Winerror.h
*/
DWORD WINAPI BuildSecurityDescriptorA(
- IN PTRUSTEE_A pOwner,
- IN PTRUSTEE_A pGroup,
- IN DWORD cCountOfAccessEntries,
- IN PEXPLICIT_ACCESS_A pListOfAccessEntries,
- IN DWORD cCountOfAuditEntries,
- IN PEXPLICIT_ACCESS_A pListofAuditEntries,
+ IN PTRUSTEEA pOwner,
+ IN PTRUSTEEA pGroup,
+ IN ULONG cCountOfAccessEntries,
+ IN PEXPLICIT_ACCESSA pListOfAccessEntries,
+ IN ULONG cCountOfAuditEntries,
+ IN PEXPLICIT_ACCESSA pListofAuditEntries,
IN PSECURITY_DESCRIPTOR pOldSD,
- IN OUT PDWORD lpdwBufferLength,
- OUT PSECURITY_DESCRIPTOR pNewSD)
+ IN OUT PULONG lpdwBufferLength,
+ OUT PSECURITY_DESCRIPTOR* pNewSD)
{
FIXME("(%p,%p,%ld,%p,%ld,%p,%p,%p,%p) stub!\n",pOwner,pGroup,
cCountOfAccessEntries,pListOfAccessEntries,cCountOfAuditEntries,
@@ -660,15 +660,15 @@ DWORD WINAPI BuildSecurityDescriptorA(
* See BuildSecurityDescriptorA.
*/
DWORD WINAPI BuildSecurityDescriptorW(
- IN PTRUSTEE_W pOwner,
- IN PTRUSTEE_W pGroup,
- IN DWORD cCountOfAccessEntries,
- IN PEXPLICIT_ACCESS_W pListOfAccessEntries,
- IN DWORD cCountOfAuditEntries,
- IN PEXPLICIT_ACCESS_W pListofAuditEntries,
+ IN PTRUSTEEW pOwner,
+ IN PTRUSTEEW pGroup,
+ IN ULONG cCountOfAccessEntries,
+ IN PEXPLICIT_ACCESSW pListOfAccessEntries,
+ IN ULONG cCountOfAuditEntries,
+ IN PEXPLICIT_ACCESSW pListofAuditEntries,
IN PSECURITY_DESCRIPTOR pOldSD,
- IN OUT PDWORD lpdwBufferLength,
- OUT PSECURITY_DESCRIPTOR pNewSD)
+ IN OUT PULONG lpdwBufferLength,
+ OUT PSECURITY_DESCRIPTOR* pNewSD)
{
FIXME("(%p,%p,%ld,%p,%ld,%p,%p,%p,%p) stub!\n",pOwner,pGroup,
cCountOfAccessEntries,pListOfAccessEntries,cCountOfAuditEntries,
@@ -1616,9 +1616,9 @@ SynchronizeWindows31FilesAndWindowsNTReg
* x1 []
*/
BOOL WINAPI
-NotifyBootConfigStatus( DWORD x1 )
+NotifyBootConfigStatus( BOOL x1 )
{
- FIXME("(0x%08lx):stub\n",x1);
+ FIXME("(0x%08d):stub\n",x1);
return 1;
}
Index: wine/dlls/advapi32/advapi32.spec
diff -u -p wine/dlls/advapi32/advapi32.spec:1.80 wine/dlls/advapi32/advapi32.spec:1.81
--- wine/dlls/advapi32/advapi32.spec:1.80 21 Nov 2005 12: 6: 0 -0000
+++ wine/dlls/advapi32/advapi32.spec 21 Nov 2005 12: 6: 0 -0000
@@ -273,7 +273,7 @@
@ stdcall GetSecurityDescriptorSacl (ptr ptr ptr ptr)
@ stdcall GetSecurityInfo (long long long ptr ptr ptr ptr ptr)
# @ 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 GetServiceDisplayNameW(ptr wstr ptr ptr)
@ stdcall GetServiceKeyNameA(long str ptr ptr)
More information about the wine-cvs
mailing list