$(AFSRM_EXEFILE): $(AFSRM_EXEOBJS) $(AFSRM_EXELIBS)
$(EXECONLINK)
+ $(_VC_MANIFEST_EMBED_EXE)
############################################################################
$(INSTALL_UTILS_DLLFILE) : $(OUT)\afs_setup_utils.obj $(DLLOBJS) $(DLLLIBS)
$(DLLGUILINK) -entry:DllEntryPoint /DEF:install_utils.def $(VCLIBS)
+ $(_VC_MANIFEST_EMBED_DLL)
$(DLLPREP)
$(COPY) $*.lib $(ILIBDIR)
$(DEL) $*.lib $*.exp
$(SERVER_UNINST_DLLFILE) : $(OUT)\s_afs_setup_utils.obj $(DLLOBJS) $(DLLLIBS)
$(DLLGUILINK) -entry:DllEntryPoint /DEF:server_uninst.def $(VCLIBS)
+ $(_VC_MANIFEST_EMBED_DLL)
$(DLLPREP)
$(COPY) $*.lib $(ILIBDIR)
$(DEL) $*.lib $*.exp
$(CLIENT_UNINST_DLLFILE) : $(OUT)\c_afs_setup_utils.obj $(DLLOBJS) $(DLLLIBS)
$(DLLGUILINK) -entry:DllEntryPoint /DEF:client_uninst.def $(VCLIBS)
+ $(_VC_MANIFEST_EMBED_DLL)
$(DLLPREP)
$(COPY) $*.lib $(ILIBDIR)
$(DEL) $*.lib $*.exp
$(CC_UNINST_DLLFILE) : $(OUT)\cc_afs_setup_utils.obj $(DLLOBJS) $(DLLLIBS)
$(DLLGUILINK) -entry:DllEntryPoint /DEF:cc_uninst.def $(VCLIBS)
+ $(_VC_MANIFEST_EMBED_DLL)
$(DLLPREP)
$(COPY) $*.lib $(ILIBDIR)
$(DEL) $*.lib $*.exp
$(LIGHT_CLIENT_UNINST_DLLFILE) : $(OUT)\lc_afs_setup_utils.obj $(DLLOBJS) $(DLLLIBS)
$(DLLGUILINK) -entry:DllEntryPoint /DEF:light_client_uninst.def $(VCLIBS)
+ $(_VC_MANIFEST_EMBED_DLL)
$(DLLPREP)
$(COPY) $*.lib $(ILIBDIR)
$(DEL) $*.lib $*.exp
$(DOCS_UNINST_DLLFILE) : $(OUT)\d_afs_setup_utils.obj $(DLLOBJS) $(DLLLIBS)
$(DLLGUILINK) -entry:DllEntryPoint /DEF:docs_uninst.def $(VCLIBS)
+ $(_VC_MANIFEST_EMBED_DLL)
$(DLLPREP)
$(COPY) $*.lib $(ILIBDIR)
$(DEL) $*.lib $*.exp
//
int AfsAdmSvr_Connect (
[in] STRING szClientAddress,
- [out] DWORD *pidClient,
+ [out] UINT_PTR *pidClient,
[out] ULONG *pStatus
);
// ...releases and invalidates the cookie representing the calling process.
//
int AfsAdmSvr_Disconnect (
- [in] DWORD idClient,
+ [in] UINT_PTR idClient,
[out] ULONG *pStatus
);
// library TaAfsAdmSvrClient.lib automatically handles this.)
//
int AfsAdmSvr_Ping (
- [in] DWORD idClient,
+ [in] UINT_PTR idClient,
[out] ULONG *pStatus
);
const DWORD csecAFSADMSVR_CLIENT_PING = (2L * 60L); // 2 minutes
// ...obtains information about the supplied credentials token.
//
int AfsAdmSvr_CrackCredentials (
- [in] DWORD idClient,
- [in] DWORD hCreds,
+ [in] UINT_PTR idClient,
+ [in] UINT_PTR hCreds,
[out] STRING pszCell,
[out] STRING pszUser,
[out] SYSTEMTIME *pstExpiration,
// if the user already has credentials in the cell, returns a nonzero
// token {hCreds}, suitable for use in AfsAdmSvr_OpenCell().
//
- DWORD AfsAdmSvr_GetCredentials (
- [in] DWORD idClient,
+ UINT_PTR AfsAdmSvr_GetCredentials (
+ [in] UINT_PTR idClient,
[in] STRING pszCell,
[out] ULONG *pStatus
);
// on behalf of the specified user. if successful, returns a nonzero
// token {hCreds}, suitable for use in AfsAdmSvr_OpenCell().
//
- DWORD AfsAdmSvr_SetCredentials (
- [in] DWORD idClient,
+ UINT_PTR AfsAdmSvr_SetCredentials (
+ [in] UINT_PTR idClient,
[in] STRING pszCell,
[in] STRING pszUser,
[in] STRING pszPassword,
// call with a Refresh request if necessary.
//
int AfsAdmSvr_PushCredentials (
- [in] DWORD idClient,
- [in] DWORD hCreds,
+ [in] UINT_PTR idClient,
+ [in] UINT_PTR hCreds,
[in] ASID idCell,
[out] ULONG *pStatus
);
// ...obtains the name of the primary cell used by the admin server
//
int AfsAdmSvr_GetLocalCell (
- [in] DWORD idClient,
+ [in] UINT_PTR idClient,
[out] STRING pszCellName,
[out] ULONG *pStatus
);
// ...translates an error code into a readable string
//
int AfsAdmSvr_ErrorCodeTranslate (
- [in] DWORD idClient,
+ [in] UINT_PTR idClient,
[in] ULONG code,
[in] LANGID idLanguage, // pass 0 for default language at server
[out] STRING pszErrorText,
// ...returns information about a particular operation in progress.
//
int AfsAdmSvr_GetAction (
- [in] DWORD idClient,
+ [in] UINT_PTR idClient,
[in] DWORD idAction,
[out] LPASACTION pAction,
[out] ULONG *pStatus
// a particular client and/or performed in a particular cell.
//
int AfsAdmSvr_GetActions (
- [in] DWORD idClient,
- [in] DWORD idClientSearch, // 0 to return for all clients
+ [in] UINT_PTR idClient,
+ [in] UINT_PTR idClientSearch, // 0 to return for all clients
[in] ASID idCellSearch, // 0 to return for all cells
[out] LPASACTIONLIST *ppList,
[out] ULONG *pStatus
// ...opens a cell for administration.
//
int AfsAdmSvr_OpenCell (
- [in] DWORD idClient,
- [in] DWORD hCreds,
+ [in] UINT_PTR idClient,
+ [in] UINT_PTR hCreds,
[in] STRING pszCellName,
[in] DWORD dwScopeFlags,
[out] ASID *pidCell,
// ...used by client to open a cell for administration.
//
int AfsAdmSvr_CloseCell (
- [in] DWORD idClient,
+ [in] UINT_PTR idClient,
[in] ASID idCell,
[out] ULONG *pStatus
);
// users named "b*" within a cell.
//
int AfsAdmSvr_FindObject (
- [in] DWORD idClient,
+ [in] UINT_PTR idClient,
[in] ASID idSearchScope,
[in] ASOBJTYPE ObjectType,
[in] AFSADMSVR_SEARCH_REFRESH SearchRefresh,
);
int AfsAdmSvr_FindObjects (
- [in] DWORD idClient,
+ [in] UINT_PTR idClient,
[in] ASID idSearchScope,
[in] ASOBJTYPE ObjectType,
[in] AFSADMSVR_SEARCH_REFRESH SearchRefresh,
// objects).
//
int AfsAdmSvr_GetObject (
- [in] DWORD idClient,
+ [in] UINT_PTR idClient,
[in] AFSADMSVR_GET_TYPE GetType,
[in] AFSADMSVR_GET_LEVEL GetLevel,
[in] ASID idObject,
- [in] DWORD verProperties, // can be 0 if not RETURN_IF_OUT_OF_DATE
+ [in] UINT_PTR verProperties, // can be 0 if not RETURN_IF_OUT_OF_DATE
[out] LPASOBJPROP pProperties,
[out] ULONG *pStatus
);
int AfsAdmSvr_GetObjects (
- [in] DWORD idClient,
+ [in] UINT_PTR idClient,
[in] AFSADMSVR_GET_TYPE GetType,
[in] AFSADMSVR_GET_LEVEL GetLevel,
[in] LPASIDLIST pListObjects, // lParam used as verProperties
// object or objects.
//
int AfsAdmSvr_RefreshObject (
- [in] DWORD idClient,
+ [in] UINT_PTR idClient,
[in] ASID idObject,
[out] ULONG *pStatus
);
int AfsAdmSvr_RefreshObjects (
- [in] DWORD idClient,
+ [in] UINT_PTR idClient,
[in] LPASIDLIST pListObjects,
[out] ULONG *pStatus
);
// ...returns a randomly-generated 8-byte encryption key
//
int AfsAdmSvr_GetRandomKey (
- [in] DWORD idClient,
+ [in] UINT_PTR idClient,
[in] ASID idCell,
[out] BYTE keyData[ ENCRYPTIONKEYLENGTH ],
[out] ULONG *pStatus
// ...changes a user account's properties.
//
int AfsAdmSvr_ChangeUser (
- [in] DWORD idClient,
+ [in] UINT_PTR idClient,
[in] ASID idCell,
[in] ASID idUser,
[in] LPAFSADMSVR_CHANGEUSER_PARAMS pChange,
// ...retrieves the list of groups to which a user or group belongs
//
int AfsAdmSvr_GetGroupMembership (
- [in] DWORD idClient,
+ [in] UINT_PTR idClient,
[in] ASID idCell,
[in] ASID idMember,
[out] LPASIDLIST *ppAsidList,
// ...retrieves the list of groups which a user or group owns
//
int AfsAdmSvr_GetGroupOwnership (
- [in] DWORD idClient,
+ [in] UINT_PTR idClient,
[in] ASID idCell,
[in] ASID idOwner,
[out] LPASIDLIST *ppAsidList,
// ...changes a PTS group's properties.
//
int AfsAdmSvr_ChangeGroup (
- [in] DWORD idClient,
+ [in] UINT_PTR idClient,
[in] ASID idCell,
[in] ASID idGroup,
[in] LPAFSADMSVR_CHANGEGROUP_PARAMS pChange,
// ...retrieves the list of users which belong to a group
//
int AfsAdmSvr_GetGroupMembers (
- [in] DWORD idClient,
+ [in] UINT_PTR idClient,
[in] ASID idCell,
[in] ASID idGroup,
[out] LPASIDLIST *ppAsidList,
// ...adds a member to the specified group
//
int AfsAdmSvr_AddGroupMember (
- [in] DWORD idClient,
+ [in] UINT_PTR idClient,
[in] ASID idCell,
[in] ASID idGroup,
[in] ASID idMember,
// ...removes a member from the specified group
//
int AfsAdmSvr_RemoveGroupMember (
- [in] DWORD idClient,
+ [in] UINT_PTR idClient,
[in] ASID idCell,
[in] ASID idGroup,
[in] ASID idMember,
// ...changes a group's name
//
int AfsAdmSvr_RenameGroup (
- [in] DWORD idClient,
+ [in] UINT_PTR idClient,
[in] ASID idCell,
[in] ASID idGroup,
[in] STRING szNewGroupName,
// ...creates a new PTS group
//
int AfsAdmSvr_CreateGroup (
- [in] DWORD idClient,
+ [in] UINT_PTR idClient,
[in] ASID idCell,
[in] LPAFSADMSVR_CREATEGROUP_PARAMS pCreate,
[out] ASID *pidGroup,
// ...deletes a PTS group
//
int AfsAdmSvr_DeleteGroup (
- [in] DWORD idClient,
+ [in] UINT_PTR idClient,
[in] ASID idCell,
[in] ASID idGroup,
[out] ULONG *pStatus
// pass a valid encryption key in {keyData}.
//
int AfsAdmSvr_SetUserPassword (
- [in] DWORD idClient,
+ [in] UINT_PTR idClient,
[in] ASID idCell,
[in] ASID idUser,
[in] int keyVersion,
// ...unlocks a user's account
//
int AfsAdmSvr_UnlockUser (
- [in] DWORD idClient,
+ [in] UINT_PTR idClient,
[in] ASID idCell,
[in] ASID idUser,
[out] ULONG *pStatus
// ...creates a new user account
//
int AfsAdmSvr_CreateUser (
- [in] DWORD idClient,
+ [in] UINT_PTR idClient,
[in] ASID idCell,
[in] LPAFSADMSVR_CREATEUSER_PARAMS pCreate,
[out] ASID *pidUser,
// ...deletes a user account
//
int AfsAdmSvr_DeleteUser (
- [in] DWORD idClient,
+ [in] UINT_PTR idClient,
[in] ASID idCell,
[in] ASID idUser,
[in] LPAFSADMSVR_DELETEUSER_PARAMS pDelete,
// ...changes a cell's properties.
//
int AfsAdmSvr_ChangeCell (
- [in] DWORD idClient,
+ [in] UINT_PTR idClient,
[in] ASID idCell,
[in] LPAFSADMSVR_CHANGECELL_PARAMS pChange,
[out] ULONG *pStatus
// ...changes the refresh rate for a specific cell
//
int AfsAdmSvr_SetRefreshRate (
- [in] DWORD idClient,
+ [in] UINT_PTR idClient,
[in] ASID idCell,
[in] ULONG cminRefreshRate,
[out] ULONG *pStatus
// ASID - Admin Server ID
// ...Type used for unique object identifiers throughout these adm
//
-typedef DWORD ASID, *LPASID;
+typedef UINT_PTR ASID, *LPASID;
// ASOBJTYPE - Admin Server Object Type
typedef struct {
ASACTIONTYPE Action; // The operation in progress
DWORD idAction; // Unique action identifier
- DWORD idClient; // Client which initiated the operation
+ UINT_PTR idClient; // Client which initiated the operation
ASID idCell; // Cell in which operation is occurring
DWORD csecActive; // Elapsed active time for operation
typedef struct {
ULONG dwID;
- ULONG ckStorageTotal;
- ULONG ckStorageFree;
- ULONG ckStorageAllocated;
+ UINT_PTR ckStorageTotal;
+ UINT_PTR ckStorageFree;
+ UINT_PTR ckStorageAllocated;
} ASOBJPROP_PARTITION, *LPASOBJPROP_PARTITION;
cpp_quote ("#ifndef AFSCLASS_H")
SYSTEMTIME timeLastBackup;
SYSTEMTIME timeCopyCreation;
ULONG nFiles;
- ULONG ckQuota;
- ULONG ckUsed;
+ UINT_PTR ckQuota;
+ UINT_PTR ckUsed;
FILESETTYPE FilesetType;
DWORD FilesetState;
} ASOBJPROP_VOLUME, *LPASOBJPROP_VOLUME;
STRING szName;
STRING szInstance;
STRING szPassword;
- int idUser;
+ UINT_PTR idUser;
BOOL fCreateKAS;
BOOL fCreatePTS;
} AFSADMSVR_CREATEUSER_PARAMS, *LPAFSADMSVR_CREATEUSER_PARAMS;
/app_config \
/I $(INCFILEDIR) \
/I . \
- /env win32 \
- /win32 \
/align 8 \
/pack 8 \
/W3 \
/WX \
- /no_robust \
/nologo
.SUFFIXES: .h .idl
$(EXEFILE) : $(EXEOBJS) $(EXELIBS)
$(EXECONLINK) $(VCLIBS)
+ $(_VC_MANIFEST_EMBED_EXE)
$(EXEPREP)
install : \
// ...obtains a cookie to represent the calling process. The cookie should
// be freed with AfsAdmSvr_Disconnect when the process disconnects.
//
-extern "C" int AfsAdmSvr_Connect (STRING szClientAddress, DWORD *pidClient, ULONG *pStatus)
+extern "C" int AfsAdmSvr_Connect (STRING szClientAddress, UINT_PTR *pidClient, ULONG *pStatus)
{
// Make sure AfsClass initialized properly. If it's already init'd,
// this won't hurt at all.
// Find a free CLIENTINFO structure for this caller
//
- if (!AfsAdmSvr_AttachClient (szClientAddress, pidClient, pStatus))
+ if (!AfsAdmSvr_AttachClient (szClientAddress, (PVOID *)pidClient, pStatus))
return FALSE;
Print (TEXT("Connected to client %s (ID 0x%08lX)"), AfsAdmSvr_GetClientName (*pidClient), *pidClient);
// seconds, lest the admin server think you've disconnected. (The
// client library TaAfsAdmSvrClient.lib automatically handles this.)
//
-extern "C" int AfsAdmSvr_Ping (DWORD idClient, ULONG *pStatus)
+extern "C" int AfsAdmSvr_Ping (UINT_PTR idClient, ULONG *pStatus)
{
AfsAdmSvr_Enter();
// AfsAdmSvr_Disconnect
// ...releases and invalidates the cookie representing the calling process.
//
-extern "C" int AfsAdmSvr_Disconnect (DWORD idClient, ULONG *pStatus)
+extern "C" int AfsAdmSvr_Disconnect (UINT_PTR idClient, ULONG *pStatus)
{
AfsAdmSvr_Enter();
// ...queries the specified AFS credentials token for its cell, user
// and expiration date.
//
-extern "C" int AfsAdmSvr_CrackCredentials (DWORD idClient, DWORD hCreds, STRING pszCell, STRING pszUser, SYSTEMTIME *pstExpiration, ULONG *pStatus)
+extern "C" int AfsAdmSvr_CrackCredentials (UINT_PTR idClient, UINT_PTR hCreds, STRING pszCell, STRING pszUser, SYSTEMTIME *pstExpiration, ULONG *pStatus)
{
ULONG status;
size_t iOp = AfsAdmSvr_BeginOperation (idClient);
// if the user already has credentials in the cell, returns a nonzero
// token {hCreds}, suitable for use in AfsAdmSvr_OpenCell().
//
-extern "C" DWORD AfsAdmSvr_GetCredentials (DWORD idClient, STRING pszCell, ULONG *pStatus)
+extern "C" UINT_PTR AfsAdmSvr_GetCredentials (UINT_PTR idClient, STRING pszCell, ULONG *pStatus)
{
ULONG status;
size_t iOp = AfsAdmSvr_BeginOperation (idClient);
const char *pszCellTest = (pszCell && *pszCell) ? (const char *)pszCell : NULL;
- PVOID hCreds = NULL;
- if (!afsclient_TokenGetExisting (pszCellTest, &hCreds, (afs_status_p)&status))
+ UINT_PTR hCreds = NULL;
+ if (!afsclient_TokenGetExisting (pszCellTest, (PVOID *)&hCreds, (afs_status_p)&status))
return FALSE_(status, pStatus, iOp);
AfsAdmSvr_EndOperation (iOp);
- return (DWORD)hCreds;
+ return hCreds;
}
// on behalf of the specified user. if successful, returns a nonzero
// token {hCreds}, suitable for use in AfsAdmSvr_OpenCell().
//
-extern "C" DWORD AfsAdmSvr_SetCredentials (DWORD idClient, STRING pszCell, STRING pszUser, STRING pszPassword, ULONG *pStatus)
+extern "C" UINT_PTR AfsAdmSvr_SetCredentials (UINT_PTR idClient, STRING pszCell, STRING pszUser, STRING pszPassword, ULONG *pStatus)
{
ULONG status;
size_t iOp = AfsAdmSvr_BeginOperation (idClient);
const char *pszCellSet = (pszCell && *pszCell) ? (const char *)pszCell : NULL;
- PVOID hCreds;
- if (!afsclient_TokenGetNew (pszCellSet, (const char *)pszUser, (const char *)pszPassword, &hCreds, (afs_status_p)&status))
+ UINT_PTR hCreds;
+ if (!afsclient_TokenGetNew (pszCellSet, (const char *)pszUser, (const char *)pszPassword, (PVOID *)&hCreds, (afs_status_p)&status))
return FALSE_(status,pStatus,iOp);
AfsAdmSvr_EndOperation (iOp);
- return (DWORD)hCreds;
+ return hCreds;
}
// when manipulating the specified cell. You should follow this
// call with a Refresh request if necessary.
//
-extern "C" int AfsAdmSvr_PushCredentials (DWORD idClient, DWORD hCreds, ASID idCell, ULONG *pStatus)
+extern "C" int AfsAdmSvr_PushCredentials (UINT_PTR idClient, UINT_PTR hCreds, ASID idCell, ULONG *pStatus)
{
ULONG status;
size_t iOp = AfsAdmSvr_BeginOperation (idClient);
// AfsAdmSvr_GetLocalCell
// ...obtains the name of the primary cell used by the admin server
//
-extern "C" int AfsAdmSvr_GetLocalCell (DWORD idClient, STRING pszCellName, ULONG *pStatus)
+extern "C" int AfsAdmSvr_GetLocalCell (UINT_PTR idClient, STRING pszCellName, ULONG *pStatus)
{
size_t iOp = AfsAdmSvr_BeginOperation (idClient);
// AfsAdmSvr_ErrorCodeTranslate
// ...translates an error code into an English string
//
-extern "C" int AfsAdmSvr_ErrorCodeTranslate (DWORD idClient, ULONG code, LANGID idLanguage, STRING pszErrorText, ULONG *pStatus)
+extern "C" int AfsAdmSvr_ErrorCodeTranslate (UINT_PTR idClient, ULONG code, LANGID idLanguage, STRING pszErrorText, ULONG *pStatus)
{
if (!AfsAppLib_TranslateError (pszErrorText, code, idLanguage))
return FALSE_(ERROR_INVALID_PARAMETER,pStatus);
// AfsAdmSvr_GetAction
// ...returns information about a particular operation in progress.
//
-extern "C" int AfsAdmSvr_GetAction (DWORD idClient, DWORD idAction, LPASACTION pAction, ULONG *pStatus)
+extern "C" int AfsAdmSvr_GetAction (UINT_PTR idClient, DWORD idAction, LPASACTION pAction, ULONG *pStatus)
{
Print (dlDETAIL, TEXT("Client 0x%08lX: GetAction (idAction=0x%08lX)"), idClient, idAction);
// be constrained to only including those operations initiated by
// a particular client and/or performed in a particular cell.
//
-extern "C" int AfsAdmSvr_GetActions (DWORD idClient, DWORD idClientSearch, ASID idCellSearch, LPASACTIONLIST *ppList, ULONG *pStatus)
+extern "C" int AfsAdmSvr_GetActions (UINT_PTR idClient, UINT_PTR idClientSearch, ASID idCellSearch, LPASACTIONLIST *ppList, ULONG *pStatus)
{
Print (dlDETAIL, TEXT("Client 0x%08lX: GetActions (idClientSearch=0x%08lX, idCellSearch=0x%08lX)"), idClient, idClientSearch, idCellSearch);
// AfsAdmSvr_OpenCell
// ...opens a cell for administration.
//
-extern "C" int AfsAdmSvr_OpenCell (DWORD idClient, DWORD hCreds, STRING pszCellName, DWORD dwScopeFlags, ASID *pidCell, ULONG *pStatus)
+extern "C" int AfsAdmSvr_OpenCell (UINT_PTR idClient, UINT_PTR hCreds, STRING pszCellName, DWORD dwScopeFlags, ASID *pidCell, ULONG *pStatus)
{
size_t iOp = AfsAdmSvr_BeginOperation (idClient);
return FALSE;
}
- Print (dlDETAIL, TEXT("Client 0x%08lX: OpenCell succeeded (idCell=0x%08lX)"), idClient, (DWORD)lpiCell);
+ Print (dlDETAIL, TEXT("Client 0x%08lX: OpenCell succeeded (idCell=0x%08lX)"), idClient, lpiCell);
*pidCell = (ASID)lpiCell;
AfsAdmSvr_EndOperation (iOp);
// AfsAdmSvr_CloseCell
// ...used by client to open a cell for administration.
//
-extern "C" int AfsAdmSvr_CloseCell (DWORD idClient, ASID idCell, ULONG *pStatus)
+extern "C" int AfsAdmSvr_CloseCell (UINT_PTR idClient, ASID idCell, ULONG *pStatus)
{
size_t iOp = AfsAdmSvr_BeginOperation (idClient);
// which match the specified criteria--all volumes on a partition,
// or all users named "b*" within a cell.
//
-extern "C" int AfsAdmSvr_FindObject (DWORD idClient, ASID idSearchScope, ASOBJTYPE ObjectType, AFSADMSVR_SEARCH_REFRESH SearchRefresh, STRING szName, ASID *pidObject, ULONG *pStatus)
+extern "C" int AfsAdmSvr_FindObject (UINT_PTR idClient, ASID idSearchScope, ASOBJTYPE ObjectType, AFSADMSVR_SEARCH_REFRESH SearchRefresh, STRING szName, ASID *pidObject, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-extern "C" int AfsAdmSvr_FindObjects (DWORD idClient, ASID idSearchScope, ASOBJTYPE ObjectType, AFSADMSVR_SEARCH_REFRESH SearchRefresh, STRING szPattern, LPAFSADMSVR_SEARCH_PARAMS pSearchParams, LPASIDLIST *ppList, ULONG *pStatus)
+extern "C" int AfsAdmSvr_FindObjects (UINT_PTR idClient, ASID idSearchScope, ASOBJTYPE ObjectType, AFSADMSVR_SEARCH_REFRESH SearchRefresh, STRING szPattern, LPAFSADMSVR_SEARCH_PARAMS pSearchParams, LPASIDLIST *ppList, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
// ...returns server-cached information about the specified object (or
// objects).
//
-extern "C" int AfsAdmSvr_GetObject (DWORD idClient, AFSADMSVR_GET_TYPE GetType, AFSADMSVR_GET_LEVEL GetLevel, ASID idObject, DWORD verProperties, LPASOBJPROP pProperties, ULONG *pStatus)
+extern "C" int AfsAdmSvr_GetObject (UINT_PTR idClient, AFSADMSVR_GET_TYPE GetType, AFSADMSVR_GET_LEVEL GetLevel, ASID idObject, UINT_PTR verProperties, LPASOBJPROP pProperties, ULONG *pStatus)
{
size_t iOp = AfsAdmSvr_BeginOperation (idClient);
}
-extern "C" int AfsAdmSvr_GetObjects (DWORD idClient, AFSADMSVR_GET_TYPE GetType, AFSADMSVR_GET_LEVEL GetLevel, LPASIDLIST pListObjects, LPASOBJPROPLIST *ppListObjectProperties, ULONG *pStatus)
+extern "C" int AfsAdmSvr_GetObjects (UINT_PTR idClient, AFSADMSVR_GET_TYPE GetType, AFSADMSVR_GET_LEVEL GetLevel, LPASIDLIST pListObjects, LPASOBJPROPLIST *ppListObjectProperties, ULONG *pStatus)
{
size_t iOp = AfsAdmSvr_BeginOperation (idClient);
// ...invalidates the server's cache of information about the specified
// object or objects.
//
-extern "C" int AfsAdmSvr_RefreshObject (DWORD idClient, ASID idObject, ULONG *pStatus)
+extern "C" int AfsAdmSvr_RefreshObject (UINT_PTR idClient, ASID idObject, ULONG *pStatus)
{
size_t iOp = AfsAdmSvr_BeginOperation (idClient);
}
-extern "C" int AfsAdmSvr_RefreshObjects (DWORD idClient, LPASIDLIST pListObjects, ULONG *pStatus)
+extern "C" int AfsAdmSvr_RefreshObjects (UINT_PTR idClient, LPASIDLIST pListObjects, ULONG *pStatus)
{
size_t iOp = AfsAdmSvr_BeginOperation (idClient);
// AfsAdmSvr_GetRandomKey
// ...returns a randomly-generated 8-byte encryption key
//
-extern "C" int AfsAdmSvr_GetRandomKey (DWORD idClient, ASID idCell, BYTE keyData[ ENCRYPTIONKEYLENGTH ], ULONG *pStatus)
+extern "C" int AfsAdmSvr_GetRandomKey (UINT_PTR idClient, ASID idCell, BYTE keyData[ ENCRYPTIONKEYLENGTH ], ULONG *pStatus)
{
if (!AfsAdmSvr_fIsValidClient (idClient))
return FALSE_(ERROR_INVALID_PARAMETER,pStatus);
// AfsAdmSvr_ChangeCell
// ...changes a cell's properties.
//
-extern "C" int AfsAdmSvr_ChangeCell (DWORD idClient, ASID idCell, LPAFSADMSVR_CHANGECELL_PARAMS pChange, ULONG *pStatus)
+extern "C" int AfsAdmSvr_ChangeCell (UINT_PTR idClient, ASID idCell, LPAFSADMSVR_CHANGECELL_PARAMS pChange, ULONG *pStatus)
{
ASACTION Action;
Action.Action = ACTION_CELL_CHANGE;
// AfsAdmSvr_SetRefreshRate
// ...changes the refresh rate for a specific cell
//
-extern "C" int AfsAdmSvr_SetRefreshRate (DWORD idClient, ASID idCell, ULONG cminRefreshRate, ULONG *pStatus)
+extern "C" int AfsAdmSvr_SetRefreshRate (UINT_PTR idClient, ASID idCell, ULONG cminRefreshRate, ULONG *pStatus)
{
if (!AfsAdmSvr_fIsValidClient (idClient))
return FALSE_(ERROR_INVALID_PARAMETER,pStatus);
*
*/
-BOOL ADMINAPI asc_AdminServerOpen (LPCTSTR pszAddress, DWORD *pidClient, ULONG *pStatus)
+BOOL ADMINAPI asc_AdminServerOpen (LPCTSTR pszAddress, UINT_PTR *pidClient, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ADMINAPI asc_AdminServerClose (DWORD idClient, ULONG *pStatus)
+BOOL ADMINAPI asc_AdminServerClose (UINT_PTR idClient, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
-BOOL ADMINAPI asc_CredentialsCrack (DWORD idClient, PVOID hCreds, LPTSTR pszCell, LPTSTR pszUser, SYSTEMTIME *pstExpiration, ULONG *pStatus)
+BOOL ADMINAPI asc_CredentialsCrack (UINT_PTR idClient, PVOID hCreds, LPTSTR pszCell, LPTSTR pszUser, SYSTEMTIME *pstExpiration, ULONG *pStatus)
{
BOOL rc = FALSE;
ULONG status = 0;
STRING szCell = TEXT("");
STRING szUser = TEXT("");
- if ((rc = AfsAdmSvr_CrackCredentials (idClient, (DWORD)hCreds, szCell, szUser, pstExpiration, &status)) != FALSE)
+ if ((rc = AfsAdmSvr_CrackCredentials (idClient, (UINT_PTR)hCreds, szCell, szUser, pstExpiration, &status)) != FALSE)
{
lstrcpy (pszCell, szCell);
lstrcpy (pszUser, szUser);
}
-PVOID ADMINAPI asc_CredentialsGet (DWORD idClient, LPCTSTR pszCell, ULONG *pStatus)
+UINT_PTR ADMINAPI asc_CredentialsGet (UINT_PTR idClient, LPCTSTR pszCell, ULONG *pStatus)
{
- PVOID rc = NULL;
+ UINT_PTR rc = 0;
ULONG status = 0;
RpcTryExcept
STRING szCell;
lstrcpy (szCell, pszCell);
- rc = (PVOID)AfsAdmSvr_GetCredentials (idClient, szCell, &status);
+ rc = AfsAdmSvr_GetCredentials (idClient, szCell, &status);
}
}
RpcExcept(1)
}
-PVOID ADMINAPI asc_CredentialsSet (DWORD idClient, LPCTSTR pszCell, LPCTSTR pszUser, LPCTSTR pszPassword, ULONG *pStatus)
+UINT_PTR ADMINAPI asc_CredentialsSet (UINT_PTR idClient, LPCTSTR pszCell, LPCTSTR pszUser, LPCTSTR pszPassword, ULONG *pStatus)
{
- PVOID rc = NULL;
+ UINT_PTR rc = 0;
ULONG status = 0;
RpcTryExcept
// encrypted socket, or something... can't just be pushing
// the user's unencrypted password across the wire.
- rc = (PVOID)AfsAdmSvr_SetCredentials (idClient, szCell, szUser, szPassword, &status);
+ rc = AfsAdmSvr_SetCredentials (idClient, szCell, szUser, szPassword, &status);
}
RpcExcept(1)
{
}
-BOOL ADMINAPI asc_CredentialsPush (DWORD idClient, PVOID hCreds, ASID idCell, ULONG *pStatus)
+BOOL ADMINAPI asc_CredentialsPush (UINT_PTR idClient, PVOID hCreds, ASID idCell, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
RpcTryExcept
{
- rc = AfsAdmSvr_PushCredentials (idClient, (DWORD)hCreds, idCell, &status);
+ rc = (AfsAdmSvr_PushCredentials (idClient, PtrToUlong(hCreds), idCell, &status)?TRUE:FALSE);
}
RpcExcept(1)
{
}
-BOOL ADMINAPI asc_LocalCellGet (DWORD idClient, LPTSTR pszCell, ULONG *pStatus)
+BOOL ADMINAPI asc_LocalCellGet (UINT_PTR idClient, LPTSTR pszCell, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ADMINAPI asc_ErrorCodeTranslate (DWORD idClient, ULONG code, LANGID idLanguage, STRING pszErrorText, ULONG *pStatus)
+BOOL ADMINAPI asc_ErrorCodeTranslate (UINT_PTR idClient, ULONG code, LANGID idLanguage, STRING pszErrorText, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ADMINAPI asc_CellOpen (DWORD idClient, PVOID hCreds, LPCTSTR pszCell, DWORD dwScope, ASID *pidCell, ULONG *pStatus)
+BOOL ADMINAPI asc_CellOpen (UINT_PTR idClient, PVOID hCreds, LPCTSTR pszCell, DWORD dwScope, ASID *pidCell, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
STRING szCell;
lstrcpy (szCell, pszCell);
- if ((rc = AfsAdmSvr_OpenCell (idClient, (DWORD)hCreds, szCell, dwScope, pidCell, &status)) != FALSE)
+ if ((rc = (AfsAdmSvr_OpenCell (idClient, PtrToUlong(hCreds), szCell, dwScope, pidCell, &status)?TRUE:FALSE)) != FALSE)
{
if (!CreateCellCache (*pidCell))
{
}
-BOOL ADMINAPI asc_CellClose (DWORD idClient, ASID idCell, ULONG *pStatus)
+BOOL ADMINAPI asc_CellClose (UINT_PTR idClient, ASID idCell, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ADMINAPI asc_ObjectFind (DWORD idClient, ASID idSearchScope, ASOBJTYPE ObjectType, LPCTSTR pszName, ASID *pidObject, ULONG *pStatus)
+BOOL ADMINAPI asc_ObjectFind (UINT_PTR idClient, ASID idSearchScope, ASOBJTYPE ObjectType, LPCTSTR pszName, ASID *pidObject, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ADMINAPI asc_ObjectFindMultiple (DWORD idClient, ASID idSearchScope, ASOBJTYPE ObjectType, LPCTSTR pszPattern, LPAFSADMSVR_SEARCH_PARAMS pSearchParams, LPASIDLIST *ppList, ULONG *pStatus)
+BOOL ADMINAPI asc_ObjectFindMultiple (UINT_PTR idClient, ASID idSearchScope, ASOBJTYPE ObjectType, LPCTSTR pszPattern, LPAFSADMSVR_SEARCH_PARAMS pSearchParams, LPASIDLIST *ppList, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ADMINAPI asc_ObjectPropertiesGet (DWORD idClient, AFSADMSVR_GET_LEVEL GetLevel, ASID idCell, ASID idObject, LPASOBJPROP pProperties, ULONG *pStatus)
+BOOL ADMINAPI asc_ObjectPropertiesGet (UINT_PTR idClient, AFSADMSVR_GET_LEVEL GetLevel, ASID idCell, ASID idObject, LPASOBJPROP pProperties, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ADMINAPI asc_ObjectPropertiesGetMultiple (DWORD idClient, AFSADMSVR_GET_LEVEL GetLevel, ASID idCell, LPASIDLIST pAsidList, LPASOBJPROPLIST *ppPropertiesList, ULONG *pStatus)
+BOOL ADMINAPI asc_ObjectPropertiesGetMultiple (UINT_PTR idClient, AFSADMSVR_GET_LEVEL GetLevel, ASID idCell, LPASIDLIST pAsidList, LPASOBJPROPLIST *ppPropertiesList, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ADMINAPI asc_ObjectListen (DWORD idClient, ASID idCell, ASID idObject, HWND hNotify, ULONG *pStatus)
+BOOL ADMINAPI asc_ObjectListen (UINT_PTR idClient, ASID idCell, ASID idObject, HWND hNotify, ULONG *pStatus)
{
if (!idObject)
{
}
-BOOL ADMINAPI asc_ObjectListenClear (DWORD idClient, HWND hNotify, ULONG *pStatus)
+BOOL ADMINAPI asc_ObjectListenClear (UINT_PTR idClient, HWND hNotify, ULONG *pStatus)
{
ClearObjectNotifications (hNotify);
return TRUE;
}
-BOOL ADMINAPI asc_ObjectListenMultiple (DWORD idClient, ASID idCell, LPASIDLIST pAsidList, HWND hNotify, ULONG *pStatus)
+BOOL ADMINAPI asc_ObjectListenMultiple (UINT_PTR idClient, ASID idCell, LPASIDLIST pAsidList, HWND hNotify, ULONG *pStatus)
{
if (!pAsidList)
{
}
-BOOL ADMINAPI asc_ObjectRefresh (DWORD idClient, ASID idCell, ASID idObject, ULONG *pStatus)
+BOOL ADMINAPI asc_ObjectRefresh (UINT_PTR idClient, ASID idCell, ASID idObject, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ADMINAPI asc_ObjectRefreshMultiple (DWORD idClient, ASID idCell, LPASIDLIST pAsidList, ULONG *pStatus)
+BOOL ADMINAPI asc_ObjectRefreshMultiple (UINT_PTR idClient, ASID idCell, LPASIDLIST pAsidList, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ADMINAPI asc_RandomKeyGet (DWORD idClient, ASID idCell, PBYTE key, ULONG *pStatus)
+BOOL ADMINAPI asc_RandomKeyGet (UINT_PTR idClient, ASID idCell, PBYTE key, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ADMINAPI asc_CellNameGet_Fast (DWORD idClient, ASID idCell, LPTSTR pszCell, ULONG *pStatus)
+BOOL ADMINAPI asc_CellNameGet_Fast (UINT_PTR idClient, ASID idCell, LPTSTR pszCell, ULONG *pStatus)
{
return asc_ObjectNameGet_Fast (idClient, idCell, idCell, pszCell, pStatus);
}
-BOOL ADMINAPI asc_ObjectNameGet_Fast (DWORD idClient, ASID idCell, ASID idObject, LPTSTR pszObject, ULONG *pStatus)
+BOOL ADMINAPI asc_ObjectNameGet_Fast (UINT_PTR idClient, ASID idCell, ASID idObject, LPTSTR pszObject, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ADMINAPI asc_ObjectTypeGet_Fast (DWORD idClient, ASID idCell, ASID idObject, ASOBJTYPE *pObjectType, ULONG *pStatus)
+BOOL ADMINAPI asc_ObjectTypeGet_Fast (UINT_PTR idClient, ASID idCell, ASID idObject, ASOBJTYPE *pObjectType, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ADMINAPI asc_ObjectPropertiesGet_Fast (DWORD idClient, ASID idCell, ASID idObject, LPASOBJPROP pProperties, ULONG *pStatus)
+BOOL ADMINAPI asc_ObjectPropertiesGet_Fast (UINT_PTR idClient, ASID idCell, ASID idObject, LPASOBJPROP pProperties, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ADMINAPI asc_ActionGet (DWORD idClient, DWORD idAction, LPASACTION pAction, ULONG *pStatus)
+BOOL ADMINAPI asc_ActionGet (UINT_PTR idClient, DWORD idAction, LPASACTION pAction, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ADMINAPI asc_ActionGetMultiple (DWORD idClient, DWORD idClientSearch, ASID idCellSearch, LPASACTIONLIST *ppList, ULONG *pStatus)
+BOOL ADMINAPI asc_ActionGetMultiple (UINT_PTR idClient, UINT_PTR idClientSearch, ASID idCellSearch, LPASACTIONLIST *ppList, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ADMINAPI asc_ActionListen (DWORD idClient, HWND hNotify, ULONG *pStatus)
+BOOL ADMINAPI asc_ActionListen (UINT_PTR idClient, HWND hNotify, ULONG *pStatus)
{
if (!SetActionNotification (hNotify, TRUE))
{
}
-BOOL ADMINAPI asc_ActionListenClear (DWORD idClient, HWND hNotify, ULONG *pStatus)
+BOOL ADMINAPI asc_ActionListenClear (UINT_PTR idClient, HWND hNotify, ULONG *pStatus)
{
if (!SetActionNotification (hNotify, FALSE))
{
*
*/
-BOOL ADMINAPI asc_AdminServerOpen (LPCTSTR pszAddress, DWORD *pidClient, ULONG *pStatus);
-BOOL ADMINAPI asc_AdminServerClose (DWORD idClient, ULONG *pStatus);
+BOOL ADMINAPI asc_AdminServerOpen (LPCTSTR pszAddress, UINT_PTR *pidClient, ULONG *pStatus);
+BOOL ADMINAPI asc_AdminServerClose (UINT_PTR idClient, ULONG *pStatus);
-BOOL ADMINAPI asc_CredentialsCrack (DWORD idClient, PVOID hCreds, LPTSTR pszCell, LPTSTR pszUser, SYSTEMTIME *pstExpiration, ULONG *pStatus);
-PVOID ADMINAPI asc_CredentialsGet (DWORD idClient, LPCTSTR pszCell, ULONG *pStatus);
-PVOID ADMINAPI asc_CredentialsSet (DWORD idClient, LPCTSTR pszCell, LPCTSTR pszUser, LPCTSTR pszPassword, ULONG *pStatus);
-BOOL ADMINAPI asc_CredentialsPush (DWORD idClient, PVOID hCreds, ASID idCel, ULONG *pStatus);
+BOOL ADMINAPI asc_CredentialsCrack (UINT_PTR idClient, PVOID hCreds, LPTSTR pszCell, LPTSTR pszUser, SYSTEMTIME *pstExpiration, ULONG *pStatus);
+UINT_PTR ADMINAPI asc_CredentialsGet (UINT_PTR idClient, LPCTSTR pszCell, ULONG *pStatus);
+UINT_PTR ADMINAPI asc_CredentialsSet (UINT_PTR idClient, LPCTSTR pszCell, LPCTSTR pszUser, LPCTSTR pszPassword, ULONG *pStatus);
+BOOL ADMINAPI asc_CredentialsPush (UINT_PTR idClient, PVOID hCreds, ASID idCel, ULONG *pStatus);
-BOOL ADMINAPI asc_LocalCellGet (DWORD idClient, LPTSTR pszCell, ULONG *pStatus);
-BOOL ADMINAPI asc_ErrorCodeTranslate (DWORD idClient, ULONG code, LANGID idLanguage, STRING pszErrorText, ULONG *pStatus);
+BOOL ADMINAPI asc_LocalCellGet (UINT_PTR idClient, LPTSTR pszCell, ULONG *pStatus);
+BOOL ADMINAPI asc_ErrorCodeTranslate (UINT_PTR idClient, ULONG code, LANGID idLanguage, STRING pszErrorText, ULONG *pStatus);
-BOOL ADMINAPI asc_CellOpen (DWORD idClient, PVOID hCreds, LPCTSTR pszCell, DWORD dwScope, ASID *pidCell, ULONG *pStatus);
-BOOL ADMINAPI asc_CellClose (DWORD idClient, ASID idCell, ULONG *pStatus);
-BOOL ADMINAPI asc_CellChange (DWORD idClient, ASID idCell, LPAFSADMSVR_CHANGECELL_PARAMS pChange, ULONG *pStatus);
-BOOL ADMINAPI asc_CellRefreshRateSet (DWORD idClient, ASID idCell, ULONG cminRefreshRate, ULONG *pStatus);
+BOOL ADMINAPI asc_CellOpen (UINT_PTR idClient, PVOID hCreds, LPCTSTR pszCell, DWORD dwScope, ASID *pidCell, ULONG *pStatus);
+BOOL ADMINAPI asc_CellClose (UINT_PTR idClient, ASID idCell, ULONG *pStatus);
+BOOL ADMINAPI asc_CellChange (UINT_PTR idClient, ASID idCell, LPAFSADMSVR_CHANGECELL_PARAMS pChange, ULONG *pStatus);
+BOOL ADMINAPI asc_CellRefreshRateSet (UINT_PTR idClient, ASID idCell, ULONG cminRefreshRate, ULONG *pStatus);
-BOOL ADMINAPI asc_ObjectFind (DWORD idClient, ASID idSearchScope, ASOBJTYPE ObjectType, LPCTSTR pszName, ASID *pidObject, ULONG *pStatus);
-BOOL ADMINAPI asc_ObjectFindMultiple (DWORD idClient, ASID idSearchScope, ASOBJTYPE ObjectType, LPCTSTR pszPattern, LPAFSADMSVR_SEARCH_PARAMS pSearchParams, LPASIDLIST *ppList, ULONG *pStatus);
-BOOL ADMINAPI asc_ObjectPropertiesGet (DWORD idClient, AFSADMSVR_GET_LEVEL GetLevel, ASID idCell, ASID idObject, LPASOBJPROP pProperties, ULONG *pStatus);
-BOOL ADMINAPI asc_ObjectPropertiesGetMultiple (DWORD idClient, AFSADMSVR_GET_LEVEL GetLevel, ASID idCell, LPASIDLIST pAsidList, LPASOBJPROPLIST *ppPropertiesList, ULONG *pStatus);
+BOOL ADMINAPI asc_ObjectFind (UINT_PTR idClient, ASID idSearchScope, ASOBJTYPE ObjectType, LPCTSTR pszName, ASID *pidObject, ULONG *pStatus);
+BOOL ADMINAPI asc_ObjectFindMultiple (UINT_PTR idClient, ASID idSearchScope, ASOBJTYPE ObjectType, LPCTSTR pszPattern, LPAFSADMSVR_SEARCH_PARAMS pSearchParams, LPASIDLIST *ppList, ULONG *pStatus);
+BOOL ADMINAPI asc_ObjectPropertiesGet (UINT_PTR idClient, AFSADMSVR_GET_LEVEL GetLevel, ASID idCell, ASID idObject, LPASOBJPROP pProperties, ULONG *pStatus);
+BOOL ADMINAPI asc_ObjectPropertiesGetMultiple (UINT_PTR idClient, AFSADMSVR_GET_LEVEL GetLevel, ASID idCell, LPASIDLIST pAsidList, LPASOBJPROPLIST *ppPropertiesList, ULONG *pStatus);
-BOOL ADMINAPI asc_ObjectRefresh (DWORD idClient, ASID idCell, ASID idObject, ULONG *pStatus);
-BOOL ADMINAPI asc_ObjectRefreshMultiple (DWORD idClient, ASID idCell, LPASIDLIST pAsidList, ULONG *pStatus);
+BOOL ADMINAPI asc_ObjectRefresh (UINT_PTR idClient, ASID idCell, ASID idObject, ULONG *pStatus);
+BOOL ADMINAPI asc_ObjectRefreshMultiple (UINT_PTR idClient, ASID idCell, LPASIDLIST pAsidList, ULONG *pStatus);
-BOOL ADMINAPI asc_RandomKeyGet (DWORD idClient, ASID idCell, PBYTE key, ULONG *pStatus);
+BOOL ADMINAPI asc_RandomKeyGet (UINT_PTR idClient, ASID idCell, PBYTE key, ULONG *pStatus);
-BOOL ADMINAPI asc_CellNameGet_Fast (DWORD idClient, ASID idCell, LPTSTR pszCell, ULONG *pStatus = NULL);
-BOOL ADMINAPI asc_ObjectNameGet_Fast (DWORD idClient, ASID idCell, ASID idObject, LPTSTR pszObjectName, ULONG *pStatus = NULL);
-BOOL ADMINAPI asc_ObjectTypeGet_Fast (DWORD idClient, ASID idCell, ASID idObject, ASOBJTYPE *pObjectType, ULONG *pStatus = NULL);
-BOOL ADMINAPI asc_ObjectPropertiesGet_Fast (DWORD idClient, ASID idCell, ASID idObject, LPASOBJPROP pProperties, ULONG *pStatus = NULL);
+BOOL ADMINAPI asc_CellNameGet_Fast (UINT_PTR idClient, ASID idCell, LPTSTR pszCell, ULONG *pStatus = NULL);
+BOOL ADMINAPI asc_ObjectNameGet_Fast (UINT_PTR idClient, ASID idCell, ASID idObject, LPTSTR pszObjectName, ULONG *pStatus = NULL);
+BOOL ADMINAPI asc_ObjectTypeGet_Fast (UINT_PTR idClient, ASID idCell, ASID idObject, ASOBJTYPE *pObjectType, ULONG *pStatus = NULL);
+BOOL ADMINAPI asc_ObjectPropertiesGet_Fast (UINT_PTR idClient, ASID idCell, ASID idObject, LPASOBJPROP pProperties, ULONG *pStatus = NULL);
void ADMINAPI asc_Enter (void);
void ADMINAPI asc_Leave (void);
*
*/
-BOOL ADMINAPI asc_ObjectListen (DWORD idClient, ASID idCell, ASID idObject, HWND hNotify, ULONG *pStatus);
-BOOL ADMINAPI asc_ObjectListenClear (DWORD idClient, HWND hNotify, ULONG *pStatus);
-BOOL ADMINAPI asc_ObjectListenMultiple (DWORD idClient, ASID idCell, LPASIDLIST pAsidList, HWND hNotify, ULONG *pStatus);
+BOOL ADMINAPI asc_ObjectListen (UINT_PTR idClient, ASID idCell, ASID idObject, HWND hNotify, ULONG *pStatus);
+BOOL ADMINAPI asc_ObjectListenClear (UINT_PTR idClient, HWND hNotify, ULONG *pStatus);
+BOOL ADMINAPI asc_ObjectListenMultiple (UINT_PTR idClient, ASID idCell, LPASIDLIST pAsidList, HWND hNotify, ULONG *pStatus);
-BOOL ADMINAPI asc_ActionGet (DWORD idClient, DWORD idAction, LPASACTION pAction, ULONG *pStatus);
-BOOL ADMINAPI asc_ActionGetMultiple (DWORD idClient, DWORD idClientSearch, ASID idCellSearch, LPASACTIONLIST *ppList, ULONG *pStatus);
-BOOL ADMINAPI asc_ActionListen (DWORD idClient, HWND hNotify, ULONG *pStatus);
-BOOL ADMINAPI asc_ActionListenClear (DWORD idClient, HWND hNotify, ULONG *pStatus);
+BOOL ADMINAPI asc_ActionGet (UINT_PTR idClient, DWORD idAction, LPASACTION pAction, ULONG *pStatus);
+BOOL ADMINAPI asc_ActionGetMultiple (UINT_PTR idClient, UINT_PTR idClientSearch, ASID idCellSearch, LPASACTIONLIST *ppList, ULONG *pStatus);
+BOOL ADMINAPI asc_ActionListen (UINT_PTR idClient, HWND hNotify, ULONG *pStatus);
+BOOL ADMINAPI asc_ActionListenClear (UINT_PTR idClient, HWND hNotify, ULONG *pStatus);
/*
*
*/
-BOOL ADMINAPI asc_UserChange (DWORD idClient, ASID idCell, ASID idUser, LPAFSADMSVR_CHANGEUSER_PARAMS pChange, ULONG *pStatus);
-BOOL ADMINAPI asc_UserPasswordSet (DWORD idClient, ASID idCell, ASID idUser, int keyVersion, LPCTSTR pkeyString, PBYTE pkeyData, ULONG *pStatus);
-BOOL ADMINAPI asc_UserUnlock (DWORD idClient, ASID idCell, ASID idUser, ULONG *pStatus);
-BOOL ADMINAPI asc_UserCreate (DWORD idClient, ASID idCell, LPAFSADMSVR_CREATEUSER_PARAMS pCreate, ASID *pidUser, ULONG *pStatus);
-BOOL ADMINAPI asc_UserDelete (DWORD idClient, ASID idCell, ASID idUser, LPAFSADMSVR_DELETEUSER_PARAMS pDelete, ULONG *pStatus);
+BOOL ADMINAPI asc_UserChange (UINT_PTR idClient, ASID idCell, ASID idUser, LPAFSADMSVR_CHANGEUSER_PARAMS pChange, ULONG *pStatus);
+BOOL ADMINAPI asc_UserPasswordSet (UINT_PTR idClient, ASID idCell, ASID idUser, int keyVersion, LPCTSTR pkeyString, PBYTE pkeyData, ULONG *pStatus);
+BOOL ADMINAPI asc_UserUnlock (UINT_PTR idClient, ASID idCell, ASID idUser, ULONG *pStatus);
+BOOL ADMINAPI asc_UserCreate (UINT_PTR idClient, ASID idCell, LPAFSADMSVR_CREATEUSER_PARAMS pCreate, ASID *pidUser, ULONG *pStatus);
+BOOL ADMINAPI asc_UserDelete (UINT_PTR idClient, ASID idCell, ASID idUser, LPAFSADMSVR_DELETEUSER_PARAMS pDelete, ULONG *pStatus);
/*
*
*/
-BOOL ADMINAPI asc_GroupChange (DWORD idClient, ASID idCell, ASID idGroup, LPAFSADMSVR_CHANGEGROUP_PARAMS pChange, ULONG *pStatus);
-BOOL ADMINAPI asc_GroupMembersGet (DWORD idClient, ASID idCell, ASID idGroup, LPASIDLIST *ppAsidList, ULONG *pStatus);
-BOOL ADMINAPI asc_GroupMemberAdd (DWORD idClient, ASID idCell, ASID idGroup, ASID idMember, ULONG *pStatus);
-BOOL ADMINAPI asc_GroupMemberRemove (DWORD idClient, ASID idCell, ASID idGroup, ASID idMember, ULONG *pStatus);
-BOOL ADMINAPI asc_GroupRename (DWORD idClient, ASID idCell, ASID idGroup, LPCTSTR pszNewName, ULONG *pStatus);
-BOOL ADMINAPI asc_GroupMembershipGet (DWORD idClient, ASID idCell, ASID idMember, LPASIDLIST *ppAsidList, ULONG *pStatus);
-BOOL ADMINAPI asc_GroupOwnershipGet (DWORD idClient, ASID idCell, ASID idOwner, LPASIDLIST *ppAsidList, ULONG *pStatus);
-BOOL ADMINAPI asc_GroupCreate (DWORD idClient, ASID idCell, LPAFSADMSVR_CREATEGROUP_PARAMS pCreate, ASID *pidGroup, ULONG *pStatus);
-BOOL ADMINAPI asc_GroupDelete (DWORD idClient, ASID idCell, ASID idGroup, ULONG *pStatus);
+BOOL ADMINAPI asc_GroupChange (UINT_PTR idClient, ASID idCell, ASID idGroup, LPAFSADMSVR_CHANGEGROUP_PARAMS pChange, ULONG *pStatus);
+BOOL ADMINAPI asc_GroupMembersGet (UINT_PTR idClient, ASID idCell, ASID idGroup, LPASIDLIST *ppAsidList, ULONG *pStatus);
+BOOL ADMINAPI asc_GroupMemberAdd (UINT_PTR idClient, ASID idCell, ASID idGroup, ASID idMember, ULONG *pStatus);
+BOOL ADMINAPI asc_GroupMemberRemove (UINT_PTR idClient, ASID idCell, ASID idGroup, ASID idMember, ULONG *pStatus);
+BOOL ADMINAPI asc_GroupRename (UINT_PTR idClient, ASID idCell, ASID idGroup, LPCTSTR pszNewName, ULONG *pStatus);
+BOOL ADMINAPI asc_GroupMembershipGet (UINT_PTR idClient, ASID idCell, ASID idMember, LPASIDLIST *ppAsidList, ULONG *pStatus);
+BOOL ADMINAPI asc_GroupOwnershipGet (UINT_PTR idClient, ASID idCell, ASID idOwner, LPASIDLIST *ppAsidList, ULONG *pStatus);
+BOOL ADMINAPI asc_GroupCreate (UINT_PTR idClient, ASID idCell, LPAFSADMSVR_CREATEGROUP_PARAMS pCreate, ASID *pidGroup, ULONG *pStatus);
+BOOL ADMINAPI asc_GroupDelete (UINT_PTR idClient, ASID idCell, ASID idGroup, ULONG *pStatus);
#endif // TAAFSADMSVRCLIENT_H
*
*/
-BOOL ValidateBinding (RPC_NS_HANDLE hBind, DWORD *pidClient, ULONG *pStatus);
+BOOL ValidateBinding (RPC_NS_HANDLE hBind, UINT_PTR *pidClient, ULONG *pStatus);
/*
*
*/
-BOOL ADMINAPI BindToAdminServer (LPCTSTR pszAddress, BOOL fWait, DWORD *pidClient, ULONG *pStatus)
+BOOL ADMINAPI BindToAdminServer (LPCTSTR pszAddress, BOOL fWait, UINT_PTR *pidClient, ULONG *pStatus)
{
RPC_STATUS status = 0;
}
-BOOL ADMINAPI UnbindFromAdminServer (DWORD idClient, ULONG *pStatus)
+BOOL ADMINAPI UnbindFromAdminServer (UINT_PTR idClient, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ValidateBinding (RPC_NS_HANDLE hBind, DWORD *pidClient, ULONG *pStatus)
+BOOL ValidateBinding (RPC_NS_HANDLE hBind, UINT_PTR *pidClient, ULONG *pStatus)
{
RPC_NS_HANDLE hBindOld = hBindTaAfsAdminSvr;
BOOL rc = FALSE;
*
*/
-BOOL ADMINAPI BindToAdminServer (LPCTSTR pszAddress, BOOL fWait, DWORD *pidClient, ULONG *pStatus);
-BOOL ADMINAPI UnbindFromAdminServer (DWORD idClient, ULONG *pStatus);
+BOOL ADMINAPI BindToAdminServer (LPCTSTR pszAddress, BOOL fWait, UINT_PTR *pidClient, ULONG *pStatus);
+BOOL ADMINAPI UnbindFromAdminServer (UINT_PTR idClient, ULONG *pStatus);
BOOL ADMINAPI ForkNewAdminServer (ULONG *pStatus);
LPCTSTR ADMINAPI ResolveAddress (LPCTSTR pszAddress);
}
-BOOL RefreshCachedProperties (DWORD idClient, ASID idCell, ASID idObject, AFSADMSVR_GET_LEVEL GetLevel, ULONG *pStatus)
+BOOL RefreshCachedProperties (UINT_PTR idClient, ASID idCell, ASID idObject, AFSADMSVR_GET_LEVEL GetLevel, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL RefreshCachedProperties (DWORD idClient, ASID idCell, LPASIDLIST pAsidList, AFSADMSVR_GET_LEVEL GetLevel, ULONG *pStatus)
+BOOL RefreshCachedProperties (UINT_PTR idClient, ASID idCell, LPASIDLIST pAsidList, AFSADMSVR_GET_LEVEL GetLevel, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
LPASOBJPROP GetCachedProperties (ASID idCell, ASID idObject);
-BOOL RefreshCachedProperties (DWORD idClient, ASID idCell, ASID idObject, AFSADMSVR_GET_LEVEL GetLevel, ULONG *pStatus);
-BOOL RefreshCachedProperties (DWORD idClient, ASID idCell, LPASIDLIST pAsidList, AFSADMSVR_GET_LEVEL GetLevel, ULONG *pStatus);
+BOOL RefreshCachedProperties (UINT_PTR idClient, ASID idCell, ASID idObject, AFSADMSVR_GET_LEVEL GetLevel, ULONG *pStatus);
+BOOL RefreshCachedProperties (UINT_PTR idClient, ASID idCell, LPASIDLIST pAsidList, AFSADMSVR_GET_LEVEL GetLevel, ULONG *pStatus);
#endif // TAAFSADMSVRCLIENTCACHE_H
*
*/
-BOOL ADMINAPI asc_CellChange (DWORD idClient, ASID idCell, LPAFSADMSVR_CHANGECELL_PARAMS pChange, ULONG *pStatus)
+BOOL ADMINAPI asc_CellChange (UINT_PTR idClient, ASID idCell, LPAFSADMSVR_CHANGECELL_PARAMS pChange, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ADMINAPI asc_CellRefreshRateSet (DWORD idClient, ASID idCell, ULONG cminRefreshRate, ULONG *pStatus)
+BOOL ADMINAPI asc_CellRefreshRateSet (UINT_PTR idClient, ASID idCell, ULONG cminRefreshRate, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
*
*/
-BOOL ADMINAPI asc_GroupChange (DWORD idClient, ASID idCell, ASID idGroup, LPAFSADMSVR_CHANGEGROUP_PARAMS pChange, ULONG *pStatus)
+BOOL ADMINAPI asc_GroupChange (UINT_PTR idClient, ASID idCell, ASID idGroup, LPAFSADMSVR_CHANGEGROUP_PARAMS pChange, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ADMINAPI asc_GroupMembersGet (DWORD idClient, ASID idCell, ASID idGroup, LPASIDLIST *ppAsidList, ULONG *pStatus)
+BOOL ADMINAPI asc_GroupMembersGet (UINT_PTR idClient, ASID idCell, ASID idGroup, LPASIDLIST *ppAsidList, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ADMINAPI asc_GroupMemberAdd (DWORD idClient, ASID idCell, ASID idGroup, ASID idMember, ULONG *pStatus)
+BOOL ADMINAPI asc_GroupMemberAdd (UINT_PTR idClient, ASID idCell, ASID idGroup, ASID idMember, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ADMINAPI asc_GroupMemberRemove (DWORD idClient, ASID idCell, ASID idGroup, ASID idMember, ULONG *pStatus)
+BOOL ADMINAPI asc_GroupMemberRemove (UINT_PTR idClient, ASID idCell, ASID idGroup, ASID idMember, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ADMINAPI asc_GroupRename (DWORD idClient, ASID idCell, ASID idGroup, LPCTSTR pszNewName, ULONG *pStatus)
+BOOL ADMINAPI asc_GroupRename (UINT_PTR idClient, ASID idCell, ASID idGroup, LPCTSTR pszNewName, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ADMINAPI asc_GroupMembershipGet (DWORD idClient, ASID idCell, ASID idMember, LPASIDLIST *ppAsidList, ULONG *pStatus)
+BOOL ADMINAPI asc_GroupMembershipGet (UINT_PTR idClient, ASID idCell, ASID idMember, LPASIDLIST *ppAsidList, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ADMINAPI asc_GroupOwnershipGet (DWORD idClient, ASID idCell, ASID idOwner, LPASIDLIST *ppAsidList, ULONG *pStatus)
+BOOL ADMINAPI asc_GroupOwnershipGet (UINT_PTR idClient, ASID idCell, ASID idOwner, LPASIDLIST *ppAsidList, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ADMINAPI asc_GroupCreate (DWORD idClient, ASID idCell, LPAFSADMSVR_CREATEGROUP_PARAMS pCreate, ASID *pidGroup, ULONG *pStatus)
+BOOL ADMINAPI asc_GroupCreate (UINT_PTR idClient, ASID idCell, LPAFSADMSVR_CREATEGROUP_PARAMS pCreate, ASID *pidGroup, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ADMINAPI asc_GroupDelete (DWORD idClient, ASID idCell, ASID idGroup, ULONG *pStatus)
+BOOL ADMINAPI asc_GroupDelete (UINT_PTR idClient, ASID idCell, ASID idGroup, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-void TestForNotifications (DWORD idClient, ASID idCell, ASID idObject)
+void TestForNotifications (UINT_PTR idClient, ASID idCell, ASID idObject)
{
if (l.pListeners)
{
BOOL AddObjectNotification (HWND hNotify, ASID idCell, ASID idObject);
void ClearObjectNotifications (HWND hNotify);
-void TestForNotifications (DWORD idClient, ASID idCell, ASID idObject = 0);
+void TestForNotifications (UINT_PTR idClient, ASID idCell, ASID idObject = 0);
void NotifyObjectListeners (ASID idCell, ASID idObject);
BOOL SetActionNotification (HWND hNotify, BOOL fSet);
static struct
{
HANDLE hPingThread;
- DWORD *adwClients;
+ UINT_PTR *adwClients;
size_t cdwClients;
HANDLE hCallbackThread;
*
*/
-void StartPingThread (DWORD idClient)
+void StartPingThread (UINT_PTR idClient)
{
asc_Enter();
}
-void StopPingThread (DWORD idClient)
+void StopPingThread (UINT_PTR idClient)
{
asc_Enter();
for (size_t ii = 0; ii < l.cdwClients; ++ii)
{
- DWORD idClient;
+ UINT_PTR idClient;
if ((idClient = l.adwClients[ ii ]) == 0)
continue;
*
*/
-void StartPingThread (DWORD idClient);
-void StopPingThread (DWORD idClient);
+void StartPingThread (UINT_PTR idClient);
+void StopPingThread (UINT_PTR idClient);
void StartCallbackThread (void);
void StopCallbackThread (void);
*
*/
-BOOL ADMINAPI asc_UserChange (DWORD idClient, ASID idCell, ASID idUser, LPAFSADMSVR_CHANGEUSER_PARAMS pChange, ULONG *pStatus)
+BOOL ADMINAPI asc_UserChange (UINT_PTR idClient, ASID idCell, ASID idUser, LPAFSADMSVR_CHANGEUSER_PARAMS pChange, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ADMINAPI asc_UserPasswordSet (DWORD idClient, ASID idCell, ASID idUser, int keyVersion, LPCTSTR pkeyString, PBYTE pkeyData, ULONG *pStatus)
+BOOL ADMINAPI asc_UserPasswordSet (UINT_PTR idClient, ASID idCell, ASID idUser, int keyVersion, LPCTSTR pkeyString, PBYTE pkeyData, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ADMINAPI asc_UserUnlock (DWORD idClient, ASID idCell, ASID idUser, ULONG *pStatus)
+BOOL ADMINAPI asc_UserUnlock (UINT_PTR idClient, ASID idCell, ASID idUser, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ADMINAPI asc_UserCreate (DWORD idClient, ASID idCell, LPAFSADMSVR_CREATEUSER_PARAMS pCreate, ASID *pidUser, ULONG *pStatus)
+BOOL ADMINAPI asc_UserCreate (UINT_PTR idClient, ASID idCell, LPAFSADMSVR_CREATEUSER_PARAMS pCreate, ASID *pidUser, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
}
-BOOL ADMINAPI asc_UserDelete (DWORD idClient, ASID idCell, ASID idUser, LPAFSADMSVR_DELETEUSER_PARAMS pDelete, ULONG *pStatus)
+BOOL ADMINAPI asc_UserDelete (UINT_PTR idClient, ASID idCell, ASID idUser, LPAFSADMSVR_DELETEUSER_PARAMS pDelete, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
typedef struct
{
BOOL fInUse;
- DWORD idClient;
+ UINT_PTR idClient;
LPASACTION pAction;
DWORD dwTickStart;
} OPERATION, *LPOPERATION;
*
*/
-BOOL AfsAdmSvr_fIsValidClient (DWORD idClient)
+BOOL AfsAdmSvr_fIsValidClient (UINT_PTR idClient)
{
BOOL rc = FALSE;
AfsAdmSvr_Enter();
for (size_t iClient = 0; !rc && iClient < l.cClientsAllocated; ++iClient)
{
- if (idClient == (DWORD)(l.aClients[ iClient ]))
+ if (idClient == (UINT_PTR)l.aClients[ iClient ])
{
if (l.aClients[ iClient ]->timeLastPing + cminREQ_CLIENT_PING > AfsAdmSvr_GetCurrentTime())
rc = TRUE;
}
-BOOL AfsAdmSvr_AttachClient (LPCTSTR pszName, DWORD *pidClient, ULONG *pStatus)
+BOOL AfsAdmSvr_AttachClient (LPCTSTR pszName, PVOID *pidClient, ULONG *pStatus)
{
AfsAdmSvr_Enter();
size_t iClient;
}
if (!REALLOC (l.aClients, l.cClientsAllocated, 1+iClient, cREALLOC_CLIENTS))
{
- *pidClient = 0;
+ *pidClient = NULL;
return FALSE;
}
if ((l.aClients[ iClient ] = New (CLIENTINFO)) == NULL)
{
- *pidClient = 0;
+ *pidClient = NULL;
return FALSE;
}
memset (l.aClients[ iClient ], 0x00, sizeof(CLIENTINFO));
if (!AfsAdmSvr_ResolveName (&l.aClients[ iClient ]->ipAddress, l.aClients[ iClient ]->szName))
memset (&l.aClients[ iClient ]->ipAddress, 0x00, sizeof(SOCKADDR_IN));
- *pidClient = (DWORD)(l.aClients[ iClient ]);
+ *pidClient = (PVOID)(l.aClients[ iClient ]);
AfsAdmSvr_Leave();
return TRUE;
}
-void AfsAdmSvr_DetachClient (DWORD idClient)
+void AfsAdmSvr_DetachClient (UINT_PTR idClient)
{
AfsAdmSvr_Enter();
size_t iClient;
for (iClient = 0; iClient < l.cClientsAllocated; ++iClient)
{
- if (idClient == (DWORD)(l.aClients[ iClient ]))
+ if (idClient == (UINT_PTR)(l.aClients[ iClient ]))
break;
}
if (iClient < l.cClientsAllocated)
}
-LPCTSTR AfsAdmSvr_GetClientName (DWORD idClient)
+LPCTSTR AfsAdmSvr_GetClientName (UINT_PTR idClient)
{
static TCHAR szName[ cchSTRING ];
LPCTSTR pszName = NULL;
for (size_t iClient = 0; !pszName && iClient < l.cClientsAllocated; ++iClient)
{
- if (idClient == (DWORD)(l.aClients[ iClient ]))
+ if (idClient == (UINT_PTR)(l.aClients[ iClient ]))
{
lstrcpy (szName, l.aClients[ iClient ]->szName);
pszName = szName;
}
-LPSOCKADDR_IN AfsAdmSvr_GetClientAddress (DWORD idClient)
+LPSOCKADDR_IN AfsAdmSvr_GetClientAddress (UINT_PTR idClient)
{
static SOCKADDR_IN ipAddress;
LPSOCKADDR_IN pAddress = NULL;
for (size_t iClient = 0; !pAddress && iClient < l.cClientsAllocated; ++iClient)
{
- if (idClient == (DWORD)(l.aClients[ iClient ]))
+ if (idClient == (UINT_PTR)(l.aClients[ iClient ]))
{
memcpy (&ipAddress, &l.aClients[ iClient ]->ipAddress, sizeof(SOCKADDR_IN));
pAddress = &ipAddress;
}
-void AfsAdmSvr_PingClient (DWORD idClient)
+void AfsAdmSvr_PingClient (UINT_PTR idClient)
{
AfsAdmSvr_Enter();
for (size_t iClient = 0; iClient < l.cClientsAllocated; ++iClient)
{
- if (idClient == (DWORD)(l.aClients[ iClient ]))
+ if (idClient == (UINT_PTR)(l.aClients[ iClient ]))
{
l.aClients[ iClient ]->timeLastPing = AfsAdmSvr_GetCurrentTime();
}
return FALSE;
}
+PVOID NULL_ (ULONG status, ULONG *pStatus, size_t iOp)
+{
+ if (pStatus)
+ *pStatus = status;
+ if (iOp != (size_t)-2)
+ AfsAdmSvr_EndOperation (iOp);
+ return NULL;
+}
+
+PVOID Leave_NULL_ (ULONG status, ULONG *pStatus, size_t iOp)
+{
+ AfsAdmSvr_Leave();
+ if (pStatus)
+ *pStatus = status;
+ if (iOp != (size_t)-2)
+ AfsAdmSvr_EndOperation (iOp);
+ return NULL;
+}
+
BOOL TRUE_ (ULONG *pStatus, size_t iOp)
{
if (pStatus)
if (l.aClients[ iClient ]->timeLastPing + cminREQ_CLIENT_PING <= AfsAdmSvr_GetCurrentTime())
{
Print (dlCONNECTION, "Client 0x%08lX idle for too long; detaching", l.aClients[ iClient ]);
- AfsAdmSvr_DetachClient ((DWORD)l.aClients[ iClient ]);
+ AfsAdmSvr_DetachClient ((UINT_PTR)l.aClients[ iClient ]);
}
}
}
-size_t AfsAdmSvr_BeginOperation (DWORD idClient, LPASACTION pAction)
+size_t AfsAdmSvr_BeginOperation (UINT_PTR idClient, LPASACTION pAction)
{
AfsAdmSvr_Enter();
}
-LPASACTIONLIST AfsAdmSvr_GetOperations (DWORD idClientSearch, ASID idCellSearch)
+LPASACTIONLIST AfsAdmSvr_GetOperations (UINT_PTR idClientSearch, ASID idCellSearch)
{
LPASACTIONLIST pList = AfsAdmSvr_CreateActionList();
AfsAdmSvr_Enter();
- for (size_t iOp = 0; iOp < l.cOperationsAllocated; ++iOp)
+ for (WORD iOp = 0; iOp < l.cOperationsAllocated; ++iOp)
{
if (!l.aOperations[ iOp ].fInUse)
continue;
if (!l.aOperations[ iOp ].pAction)
continue;
- if (idClientSearch && (idClientSearch != l.aOperations[ iOp ].pAction->idClient))
+ if (idClientSearch && ((UINT_PTR)idClientSearch != l.aOperations[ iOp ].pAction->idClient))
continue;
if (idCellSearch && (idCellSearch != l.aOperations[ iOp ].pAction->idCell))
continue;
DWORD WINAPI AfsAdmSvr_AutoOpen_ThreadProc (PVOID lp)
{
- DWORD dwScope = (DWORD)lp;
+ DWORD dwScope = PtrToUlong(lp);
ULONG status;
if (!l.fOperational)
void AfsAdmSvr_Shutdown (void);
void AfsAdmSvr_EnableAutoShutdown (BOOL fEnable);
-size_t AfsAdmSvr_BeginOperation (DWORD idClient, LPASACTION pAction = NULL);
+size_t AfsAdmSvr_BeginOperation (UINT_PTR idClient, LPASACTION pAction = NULL);
void AfsAdmSvr_EndOperation (size_t iOp);
BOOL AfsAdmSvr_GetOperation (DWORD idAction, LPASACTION pAction);
-LPASACTIONLIST AfsAdmSvr_GetOperations (DWORD idClientSearch = 0, ASID idCellSearch = 0);
+LPASACTIONLIST AfsAdmSvr_GetOperations (UINT_PTR idClientSearch = 0, ASID idCellSearch = 0);
void AfsAdmSvr_Action_StartRefresh (ASID idScope);
void AfsAdmSvr_Action_StopRefresh (ASID idScope);
-BOOL AfsAdmSvr_fIsValidClient (DWORD idClient);
-BOOL AfsAdmSvr_AttachClient (LPCTSTR pszName, DWORD *pidClient, ULONG *pStatus);
-void AfsAdmSvr_DetachClient (DWORD idClient);
-LPCTSTR AfsAdmSvr_GetClientName (DWORD idClient);
-LPSOCKADDR_IN AfsAdmSvr_GetClientAddress (DWORD idClient);
-void AfsAdmSvr_PingClient (DWORD idClient);
+BOOL AfsAdmSvr_fIsValidClient (UINT_PTR idClient);
+BOOL AfsAdmSvr_AttachClient (LPCTSTR pszName, PVOID *pidClient, ULONG *pStatus);
+void AfsAdmSvr_DetachClient (UINT_PTR idClient);
+LPCTSTR AfsAdmSvr_GetClientName (UINT_PTR idClient);
+LPSOCKADDR_IN AfsAdmSvr_GetClientAddress (UINT_PTR idClient);
+void AfsAdmSvr_PingClient (UINT_PTR idClient);
BOOL FALSE_ (ULONG status, ULONG *pStatus, size_t iOp = (size_t)-2);
BOOL Leave_FALSE_ (ULONG status, ULONG *pStatus, size_t iOp = (size_t)-2);
+PVOID NULL_ (ULONG status, ULONG *pStatus, size_t iOp = (size_t)-2);
+PVOID Leave_NULL_ (ULONG status, ULONG *pStatus, size_t iOp = (size_t)-2);
BOOL TRUE_ (ULONG *pStatus, size_t iOp = (size_t)-2);
BOOL Leave_TRUE_ (ULONG *pStatus, size_t iOp = (size_t)-2);
// AfsAdmSvr_ChangeGroup
// ...changes a group account's properties.
//
-extern "C" int AfsAdmSvr_ChangeGroup (DWORD idClient, ASID idCell, ASID idGroup, LPAFSADMSVR_CHANGEGROUP_PARAMS pChange, ULONG *pStatus)
+extern "C" int AfsAdmSvr_ChangeGroup (UINT_PTR idClient, ASID idCell, ASID idGroup, LPAFSADMSVR_CHANGEGROUP_PARAMS pChange, ULONG *pStatus)
{
ASACTION Action;
Action.Action = ACTION_GROUP_CHANGE;
// AfsAdmSvr_GetGroupMembers
// ...retrieves the list of users which belong to a group
//
-extern "C" int AfsAdmSvr_GetGroupMembers (DWORD idClient, ASID idCell, ASID idGroup, LPASIDLIST *ppAsidList, ULONG *pStatus)
+extern "C" int AfsAdmSvr_GetGroupMembers (UINT_PTR idClient, ASID idCell, ASID idGroup, LPASIDLIST *ppAsidList, ULONG *pStatus)
{
size_t iOp = AfsAdmSvr_BeginOperation (idClient);
// AfsAdmSvr_GetGroupMembership
// ...retrieves the list of groups to which a user or group belongs
//
-extern "C" int AfsAdmSvr_GetGroupMembership (DWORD idClient, ASID idCell, ASID idMember, LPASIDLIST *ppAsidList, ULONG *pStatus)
+extern "C" int AfsAdmSvr_GetGroupMembership (UINT_PTR idClient, ASID idCell, ASID idMember, LPASIDLIST *ppAsidList, ULONG *pStatus)
{
size_t iOp = AfsAdmSvr_BeginOperation (idClient);
// AfsAdmSvr_GetGroupOwnership
// ...retrieves the list of groups which a user owns
//
-extern "C" int AfsAdmSvr_GetGroupOwnership (DWORD idClient, ASID idCell, ASID idOwner, LPASIDLIST *ppAsidList, ULONG *pStatus)
+extern "C" int AfsAdmSvr_GetGroupOwnership (UINT_PTR idClient, ASID idCell, ASID idOwner, LPASIDLIST *ppAsidList, ULONG *pStatus)
{
size_t iOp = AfsAdmSvr_BeginOperation (idClient);
// AfsAdmSvr_AddGroupMember
// ...adds a member to the specified group
//
-extern "C" int AfsAdmSvr_AddGroupMember (DWORD idClient, ASID idCell, ASID idGroup, ASID idMember, ULONG *pStatus)
+extern "C" int AfsAdmSvr_AddGroupMember (UINT_PTR idClient, ASID idCell, ASID idGroup, ASID idMember, ULONG *pStatus)
{
ASACTION Action;
Action.Action = ACTION_GROUP_MEMBER_ADD;
// AfsAdmSvr_RemoveGroupMember
// ...removes a member from the specified group
//
-extern "C" int AfsAdmSvr_RemoveGroupMember (DWORD idClient, ASID idCell, ASID idGroup, ASID idMember, ULONG *pStatus)
+extern "C" int AfsAdmSvr_RemoveGroupMember (UINT_PTR idClient, ASID idCell, ASID idGroup, ASID idMember, ULONG *pStatus)
{
ASACTION Action;
Action.Action = ACTION_GROUP_MEMBER_REMOVE;
// AfsAdmSvr_RenameGroup
// ...changes a group's name
//
-extern "C" int AfsAdmSvr_RenameGroup (DWORD idClient, ASID idCell, ASID idGroup, STRING szNewGroupName, ULONG *pStatus)
+extern "C" int AfsAdmSvr_RenameGroup (UINT_PTR idClient, ASID idCell, ASID idGroup, STRING szNewGroupName, ULONG *pStatus)
{
ASACTION Action;
Action.Action = ACTION_GROUP_RENAME;
// AfsAdmSvr_CreateGroup
// ...creates a new PTS group
//
-extern "C" int AfsAdmSvr_CreateGroup (DWORD idClient, ASID idCell, LPAFSADMSVR_CREATEGROUP_PARAMS pCreate, ASID *pidGroup, ULONG *pStatus)
+extern "C" int AfsAdmSvr_CreateGroup (UINT_PTR idClient, ASID idCell, LPAFSADMSVR_CREATEGROUP_PARAMS pCreate, ASID *pidGroup, ULONG *pStatus)
{
ASACTION Action;
Action.Action = ACTION_GROUP_CREATE;
// AfsAdmSvr_DeleteGroup
// ...deletes a PTS group
//
-extern "C" int AfsAdmSvr_DeleteGroup (DWORD idClient, ASID idCell, ASID idGroup, ULONG *pStatus)
+extern "C" int AfsAdmSvr_DeleteGroup (UINT_PTR idClient, ASID idCell, ASID idGroup, ULONG *pStatus)
{
ASACTION Action;
Action.Action = ACTION_GROUP_DELETE;
// Parse the command-line
//
- DWORD dwAutoScope = AFSADMSVR_SCOPE_VOLUMES | AFSADMSVR_SCOPE_USERS;
+ UINT_PTR dwAutoScope = AFSADMSVR_SCOPE_VOLUMES | AFSADMSVR_SCOPE_USERS;
for (--argc,++argv; argc; --argc,++argv)
{
memcpy (&pProperties->u.VolumeProperties.timeLastBackup, &fs.timeLastBackup, sizeof(SYSTEMTIME));
memcpy (&pProperties->u.VolumeProperties.timeCopyCreation, &fs.timeCopyCreation, sizeof(SYSTEMTIME));
pProperties->u.VolumeProperties.nFiles = fs.nFiles;
- pProperties->u.VolumeProperties.ckQuota = fs.ckQuota;
- pProperties->u.VolumeProperties.ckUsed = fs.ckUsed;
+ pProperties->u.VolumeProperties.ckQuota = (UINT_PTR)fs.ckQuota;
+ pProperties->u.VolumeProperties.ckUsed = (UINT_PTR)fs.ckUsed;
pProperties->u.VolumeProperties.FilesetType = fs.Type;
pProperties->u.VolumeProperties.FilesetState = fs.State;
}
break;
default:
- return (LPASOBJPROP)FALSE_(ERROR_INVALID_PARAMETER,pStatus);
+ return (LPASOBJPROP)NULL_(ERROR_INVALID_PARAMETER,pStatus);
}
LPASOBJPROP pCurrentProperties;
if ((pCurrentProperties = (LPASOBJPROP)((LPIDENT)idObject)->GetUserParam()) == NULL)
{
- return (LPASOBJPROP)FALSE_(ERROR_NOT_ENOUGH_MEMORY,pStatus);
+ return (LPASOBJPROP)NULL_(ERROR_NOT_ENOUGH_MEMORY,pStatus);
}
return pCurrentProperties;
// AfsAdmSvr_ChangeUser
// ...changes a user account's properties.
//
-extern "C" int AfsAdmSvr_ChangeUser (DWORD idClient, ASID idCell, ASID idUser, LPAFSADMSVR_CHANGEUSER_PARAMS pChange, ULONG *pStatus)
+extern "C" int AfsAdmSvr_ChangeUser (UINT_PTR idClient, ASID idCell, ASID idUser, LPAFSADMSVR_CHANGEUSER_PARAMS pChange, ULONG *pStatus)
{
ASACTION Action;
Action.Action = ACTION_USER_CHANGE;
// string in {keyString} to encrypt the specified string; otherwise,
// pass a valid encryption key in {keyData}.
//
-extern "C" int AfsAdmSvr_SetUserPassword (DWORD idClient, ASID idCell, ASID idUser, int keyVersion, STRING keyString, BYTE keyData[ ENCRYPTIONKEYLENGTH ], ULONG *pStatus)
+extern "C" int AfsAdmSvr_SetUserPassword (UINT_PTR idClient, ASID idCell, ASID idUser, int keyVersion, STRING keyString, BYTE keyData[ ENCRYPTIONKEYLENGTH ], ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status = 0;
// AfsAdmSvr_UnlockUser
// ...unlocks a user's account
//
-extern "C" int AfsAdmSvr_UnlockUser (DWORD idClient, ASID idCell, ASID idUser, ULONG *pStatus)
+extern "C" int AfsAdmSvr_UnlockUser (UINT_PTR idClient, ASID idCell, ASID idUser, ULONG *pStatus)
{
ASACTION Action;
Action.Action = ACTION_USER_UNLOCK;
// AfsAdmSvr_CreateUser
// ...creates a new user account
//
-extern "C" int AfsAdmSvr_CreateUser (DWORD idClient, ASID idCell, LPAFSADMSVR_CREATEUSER_PARAMS pCreate, ASID *pidUser, ULONG *pStatus)
+extern "C" int AfsAdmSvr_CreateUser (UINT_PTR idClient, ASID idCell, LPAFSADMSVR_CREATEUSER_PARAMS pCreate, ASID *pidUser, ULONG *pStatus)
{
ASACTION Action;
Action.Action = ACTION_USER_CREATE;
// AfsAdmSvr_DeleteUser
// ...deletes a user's account
//
-extern "C" int AfsAdmSvr_DeleteUser (DWORD idClient, ASID idCell, ASID idUser, LPAFSADMSVR_DELETEUSER_PARAMS pDelete, ULONG *pStatus)
+extern "C" int AfsAdmSvr_DeleteUser (UINT_PTR idClient, ASID idCell, ASID idUser, LPAFSADMSVR_DELETEUSER_PARAMS pDelete, ULONG *pStatus)
{
ASACTION Action;
Action.Action = ACTION_USER_DELETE;
DLLFILE = $(DESTDIR)\root.server\usr\afs\bin\TaAfsAppLib.dll
-!IF ("$(AFSVER_CL)"<"1400")
+!IF ($(AFSVER_CL) < 1400)
DEFFILE = TaAfsAppLib.def
!ELSE
DEFFILE = TaAfsAppLib2005.def
# AfsAppLib needs to use an explicit .DEF file to get its entry points public
-LOCALLINKFLAGS = $(LOCALLINKFLAGS) /DEF:$(DEFFILE)
+#LOCALLINKFLAGS = $(LOCALLINKFLAGS) /DEF:$(DEFFILE)
+LOCALLINKFLAGS = $(LOCALLINKFLAGS)
# Also, AfsAppLib has a specific DLL entry-point which should be used
$(DLLFILE) : $(DLLOBJS) $(DLLLIBS)
$(DLLGUILINK) $(LOCALLINKFLAGS) $(VCLIBS)
+ $(_VC_MANIFEST_EMBED_DLL)
$(DLLPREP)
$(COPY) $*.lib $(ILIBDIR)
$(DEL) $*.lib $*.exp
}
if (oldProc)
- return CallWindowProc ((WNDPROC)oldProc, hWnd, msg, wp, lp);
+ return (CallWindowProc ((WNDPROC)oldProc, hWnd, msg, wp, lp)==NULL?FALSE:TRUE);
else
- return DefWindowProc (hWnd, msg, wp, lp);
+ return (DefWindowProc (hWnd, msg, wp, lp)==NULL?FALSE:TRUE);
}
// be used to obtain the client id which the administrative
// server has assigned to this process.
//
-EXPORTED DWORD AfsAppLib_GetAdminServerClientID (void);
+EXPORTED UINT_PTR AfsAppLib_GetAdminServerClientID (void);
/*
int idsPrompt; // [in] string ID for Edit prompt
int idsNone; // [in] string ID for checkbox (or 0)
LPCELLLIST lpcl; // [in] from AfsAppLib_GetCellList()
- PVOID hCreds; // [in] credentials for enumeration
+ UINT_PTR hCreds; // [in] credentials for enumeration
} BROWSEDLG_PARAMS, *LPBROWSEDLG_PARAMS;
EXPORTED BOOL AfsAppLib_ShowBrowseDialog (LPBROWSEDLG_PARAMS lpp);
// ...obtains information about the specified credentials cookie.
// returns TRUE if the data could be successfully parsed.
//
-EXPORTED BOOL AfsAppLib_CrackCredentials (PVOID hCreds, LPTSTR pszCell = NULL, LPTSTR pszUser = NULL, LPSYSTEMTIME pst = NULL, ULONG *pStatus = NULL);
+EXPORTED BOOL AfsAppLib_CrackCredentials (UINT_PTR hCreds, LPTSTR pszCell = NULL, LPTSTR pszUser = NULL, LPSYSTEMTIME pst = NULL, ULONG *pStatus = NULL);
// AfsAppLib_GetCredentials
// ...returns nonzero if the calling process has AFS credentials within
// a token handle which can be supplied to the AFS administrative
// functions.
//
-EXPORTED PVOID AfsAppLib_GetCredentials (LPCTSTR pszCell = NULL, ULONG *pStatus = NULL);
+EXPORTED UINT_PTR AfsAppLib_GetCredentials (LPCTSTR pszCell = NULL, ULONG *pStatus = NULL);
// AfsAppLib_SetCredentials
// ...obtains new credentials for the calling process; performs no UI.
// If successful, returns a nonzero token handle which can be
// supplied to the AFS administrative functions.
//
-EXPORTED PVOID AfsAppLib_SetCredentials (LPCTSTR pszCell, LPCTSTR pszUser, LPCTSTR pszPassword, ULONG *pStatus = NULL);
+EXPORTED UINT_PTR AfsAppLib_SetCredentials (LPCTSTR pszCell, LPCTSTR pszUser, LPCTSTR pszPassword, ULONG *pStatus = NULL);
// AfsAppLib_IsUserAdmin
// ...queries the KAS database for a particular cell to determine
// The hCreds passed in should be for an admin, or for the user
// being queried.
//
-EXPORTED BOOL AfsAppLib_IsUserAdmin (PVOID hCreds, LPTSTR pszUser);
+EXPORTED BOOL AfsAppLib_IsUserAdmin (UINT_PTR hCreds, LPTSTR pszUser);
// AfsAppLib_ShowOpenCellDialog
// ...presents a dialog which allows the user to select a cell,
LPCELLLIST lpcl; // [in] from AfsAppLib_GetCellList()
BADCREDSDLG_PARAMS bcdp; // [in] params for bad creds dialog
TCHAR szCell[ cchNAME ]; // [out] selected cell
- PVOID hCreds; // [out] credentials in cell
+ UINT_PTR hCreds; // [out] credentials in cell
} OPENCELLDLG_PARAMS, *LPOPENCELLDLG_PARAMS;
EXPORTED BOOL AfsAppLib_ShowOpenCellDialog (LPOPENCELLDLG_PARAMS lpp);
BADCREDSDLG_PARAMS bcdp; // [in] params for bad creds dialog
TCHAR szIdentity[ cchNAME ]; // [out] current DCE identity in szCell
TCHAR szPassword[ cchNAME ]; // [out] password entered (or "")
- PVOID hCreds; // [in out] credentials in cell
+ UINT_PTR hCreds; // [in out] credentials in cell
} CREDENTIALSDLG_PARAMS, *LPCREDENTIALSDLG_PARAMS;
EXPORTED BOOL AfsAppLib_ShowCredentialsDialog (LPCREDENTIALSDLG_PARAMS lpp);
//
typedef struct
{
- PVOID hCreds; // [in] credentials to query
+ UINT_PTR hCreds; // [in] credentials to query
BOOL fShowWarning; // [in] TRUE to present warning dialog
BADCREDSDLG_PARAMS bcdp; // [in] params for bad creds dialog
} CHECKCREDS_PARAMS, *LPCHECKCREDS_PARAMS;
// the integer indices used by the Get/SetWindowLong routines,
// and can grow windows' data-space as necessary.
//
-EXPORTED DWORD GetWindowData (HWND hWnd, LPTSTR pszField);
-EXPORTED DWORD SetWindowData (HWND hWnd, LPTSTR pszField, DWORD dwNewData);
+EXPORTED UINT_PTR GetWindowData (HWND hWnd, LPTSTR pszField);
+EXPORTED UINT_PTR SetWindowData (HWND hWnd, LPTSTR pszField, UINT_PTR dwNewData);
/*
static struct
{
BOOL fUseAdminServer;
- DWORD idAdminServerClient;
+ UINT_PTR idAdminServerClient;
} l = {0, 0};
}
-DWORD AfsAppLib_GetAdminServerClientID (void)
+UINT_PTR AfsAppLib_GetAdminServerClientID (void)
{
return (l.fUseAdminServer) ? l.idAdminServerClient : 0;
}
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_AdminServerOpen (LPCTSTR pszAddress, DWORD *pidClient, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_AdminServerOpen (LPCTSTR pszAddress, UINT_PTR *pidClient, ULONG *pStatus)
{
return asc_AdminServerOpen (pszAddress, pidClient, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_AdminServerClose (DWORD idClient, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_AdminServerClose (UINT_PTR idClient, ULONG *pStatus)
{
return asc_AdminServerClose (idClient, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_CredentialsCrack (DWORD idClient, PVOID hCreds, LPTSTR pszCell, LPTSTR pszUser, SYSTEMTIME *pstExpiration, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_CredentialsCrack (UINT_PTR idClient, PVOID hCreds, LPTSTR pszCell, LPTSTR pszUser, SYSTEMTIME *pstExpiration, ULONG *pStatus)
{
return asc_CredentialsCrack (idClient, hCreds, pszCell, pszUser, pstExpiration, pStatus);
}
-EXPORTED PVOID ADMINAPI AfsAppLib_asc_CredentialsGet (DWORD idClient, LPCTSTR pszCell, ULONG *pStatus)
+EXPORTED UINT_PTR ADMINAPI AfsAppLib_asc_CredentialsGet (UINT_PTR idClient, LPCTSTR pszCell, ULONG *pStatus)
{
return asc_CredentialsGet (idClient, pszCell, pStatus);
}
-EXPORTED PVOID ADMINAPI AfsAppLib_asc_CredentialsSet (DWORD idClient, LPCTSTR pszCell, LPCTSTR pszUser, LPCTSTR pszPassword, ULONG *pStatus)
+EXPORTED UINT_PTR ADMINAPI AfsAppLib_asc_CredentialsSet (UINT_PTR idClient, LPCTSTR pszCell, LPCTSTR pszUser, LPCTSTR pszPassword, ULONG *pStatus)
{
return asc_CredentialsSet (idClient, pszCell, pszUser, pszPassword, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_CredentialsPush (DWORD idClient, PVOID hCreds, ASID idCell, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_CredentialsPush (UINT_PTR idClient, PVOID hCreds, ASID idCell, ULONG *pStatus)
{
return asc_CredentialsPush (idClient, hCreds, idCell, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_LocalCellGet (DWORD idClient, LPTSTR pszCell, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_LocalCellGet (UINT_PTR idClient, LPTSTR pszCell, ULONG *pStatus)
{
return asc_LocalCellGet (idClient, pszCell, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ErrorCodeTranslate (DWORD idClient, ULONG code, LANGID idLanguage, STRING pszErrorText, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ErrorCodeTranslate (UINT_PTR idClient, ULONG code, LANGID idLanguage, STRING pszErrorText, ULONG *pStatus)
{
return asc_ErrorCodeTranslate (idClient, code, idLanguage, pszErrorText, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ActionGet (DWORD idClient, DWORD idAction, LPASACTION pAction, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ActionGet (UINT_PTR idClient, DWORD idAction, LPASACTION pAction, ULONG *pStatus)
{
return asc_ActionGet (idClient, idAction, pAction, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ActionGetMultiple (DWORD idClient, DWORD idClientSearch, ASID idCellSearch, LPASACTIONLIST *ppList, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ActionGetMultiple (UINT_PTR idClient, UINT_PTR idClientSearch, ASID idCellSearch, LPASACTIONLIST *ppList, ULONG *pStatus)
{
return asc_ActionGetMultiple (idClient, idClientSearch, idCellSearch, ppList, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ActionListen (DWORD idClient, HWND hNotify, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ActionListen (UINT_PTR idClient, HWND hNotify, ULONG *pStatus)
{
return asc_ActionListen (idClient, hNotify, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ActionListenClear (DWORD idClient, HWND hNotify, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ActionListenClear (UINT_PTR idClient, HWND hNotify, ULONG *pStatus)
{
return asc_ActionListenClear (idClient, hNotify, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_CellOpen (DWORD idClient, PVOID hCreds, LPCTSTR pszCell, DWORD dwScope, ASID *pidCell, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_CellOpen (UINT_PTR idClient, PVOID hCreds, LPCTSTR pszCell, DWORD dwScope, ASID *pidCell, ULONG *pStatus)
{
return asc_CellOpen (idClient, hCreds, pszCell, dwScope, pidCell, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_CellClose (DWORD idClient, ASID idCell, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_CellClose (UINT_PTR idClient, ASID idCell, ULONG *pStatus)
{
return asc_CellClose (idClient, idCell, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_CellChange (DWORD idClient, ASID idCell, LPAFSADMSVR_CHANGECELL_PARAMS pChange, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_CellChange (UINT_PTR idClient, ASID idCell, LPAFSADMSVR_CHANGECELL_PARAMS pChange, ULONG *pStatus)
{
return asc_CellChange (idClient, idCell, pChange, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_CellRefreshRateSet (DWORD idClient, ASID idCell, LONG cminRefreshRate, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_CellRefreshRateSet (UINT_PTR idClient, ASID idCell, LONG cminRefreshRate, ULONG *pStatus)
{
return asc_CellRefreshRateSet (idClient, idCell, cminRefreshRate, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectFind (DWORD idClient, ASID idSearchScope, ASOBJTYPE ObjectType, LPCTSTR pszName, ASID *pidObject, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectFind (UINT_PTR idClient, ASID idSearchScope, ASOBJTYPE ObjectType, LPCTSTR pszName, ASID *pidObject, ULONG *pStatus)
{
return asc_ObjectFind (idClient, idSearchScope, ObjectType, pszName, pidObject, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectFindMultiple (DWORD idClient, ASID idSearchScope, ASOBJTYPE ObjectType, LPCTSTR pszPattern, LPAFSADMSVR_SEARCH_PARAMS pSearchParams, LPASIDLIST *ppList, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectFindMultiple (UINT_PTR idClient, ASID idSearchScope, ASOBJTYPE ObjectType, LPCTSTR pszPattern, LPAFSADMSVR_SEARCH_PARAMS pSearchParams, LPASIDLIST *ppList, ULONG *pStatus)
{
return asc_ObjectFindMultiple (idClient, idSearchScope, ObjectType, pszPattern, pSearchParams, ppList, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectPropertiesGet (DWORD idClient, AFSADMSVR_GET_LEVEL GetLevel, ASID idCell, ASID idObject, LPASOBJPROP pProperties, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectPropertiesGet (UINT_PTR idClient, AFSADMSVR_GET_LEVEL GetLevel, ASID idCell, ASID idObject, LPASOBJPROP pProperties, ULONG *pStatus)
{
return asc_ObjectPropertiesGet (idClient, GetLevel, idCell, idObject, pProperties, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectPropertiesGetMultiple (DWORD idClient, AFSADMSVR_GET_LEVEL GetLevel, ASID idCell, LPASIDLIST pAsidList, LPASOBJPROPLIST *ppPropertiesList, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectPropertiesGetMultiple (UINT_PTR idClient, AFSADMSVR_GET_LEVEL GetLevel, ASID idCell, LPASIDLIST pAsidList, LPASOBJPROPLIST *ppPropertiesList, ULONG *pStatus)
{
return asc_ObjectPropertiesGetMultiple (idClient, GetLevel, idCell, pAsidList, ppPropertiesList, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectListen (DWORD idClient, ASID idCell, ASID idObject, HWND hNotify, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectListen (UINT_PTR idClient, ASID idCell, ASID idObject, HWND hNotify, ULONG *pStatus)
{
return asc_ObjectListen (idClient, idCell, idObject, hNotify, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectListenClear (DWORD idClient, HWND hNotify, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectListenClear (UINT_PTR idClient, HWND hNotify, ULONG *pStatus)
{
return asc_ObjectListenClear (idClient, hNotify, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectListenMultiple (DWORD idClient, ASID idCell, LPASIDLIST pAsidList, HWND hNotify, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectListenMultiple (UINT_PTR idClient, ASID idCell, LPASIDLIST pAsidList, HWND hNotify, ULONG *pStatus)
{
return asc_ObjectListenMultiple (idClient, idCell, pAsidList, hNotify, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectRefresh (DWORD idClient, ASID idCell, ASID idObject, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectRefresh (UINT_PTR idClient, ASID idCell, ASID idObject, ULONG *pStatus)
{
return asc_ObjectRefresh (idClient, idCell, idObject, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectRefreshMultiple (DWORD idClient, ASID idCell, LPASIDLIST pAsidList, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectRefreshMultiple (UINT_PTR idClient, ASID idCell, LPASIDLIST pAsidList, ULONG *pStatus)
{
return asc_ObjectRefreshMultiple (idClient, idCell, pAsidList, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_RandomKeyGet (DWORD idClient, ASID idCell, PBYTE pkey, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_RandomKeyGet (UINT_PTR idClient, ASID idCell, PBYTE pkey, ULONG *pStatus)
{
return asc_RandomKeyGet (idClient, idCell, pkey, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_CellNameGet_Fast (DWORD idClient, ASID idCell, LPTSTR pszCell, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_CellNameGet_Fast (UINT_PTR idClient, ASID idCell, LPTSTR pszCell, ULONG *pStatus)
{
return asc_CellNameGet_Fast (idClient, idCell, pszCell, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectNameGet_Fast (DWORD idClient, ASID idCell, ASID idObject, LPTSTR pszObject, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectNameGet_Fast (UINT_PTR idClient, ASID idCell, ASID idObject, LPTSTR pszObject, ULONG *pStatus)
{
return asc_ObjectNameGet_Fast (idClient, idCell, idObject, pszObject, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectTypeGet_Fast (DWORD idClient, ASID idCell, ASID idObject, ASOBJTYPE *pObjectType, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectTypeGet_Fast (UINT_PTR idClient, ASID idCell, ASID idObject, ASOBJTYPE *pObjectType, ULONG *pStatus)
{
return asc_ObjectTypeGet_Fast (idClient, idCell, idObject, pObjectType, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectPropertiesGet_Fast (DWORD idClient, ASID idCell, ASID idObject, LPASOBJPROP pProperties, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectPropertiesGet_Fast (UINT_PTR idClient, ASID idCell, ASID idObject, LPASOBJPROP pProperties, ULONG *pStatus)
{
return asc_ObjectPropertiesGet_Fast (idClient, idCell, idObject, pProperties, pStatus);
}
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_UserChange (DWORD idClient, ASID idCell, ASID idUser, LPAFSADMSVR_CHANGEUSER_PARAMS pChange, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_UserChange (UINT_PTR idClient, ASID idCell, ASID idUser, LPAFSADMSVR_CHANGEUSER_PARAMS pChange, ULONG *pStatus)
{
return asc_UserChange (idClient, idCell, idUser, pChange, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_UserPasswordSet (DWORD idClient, ASID idCell, ASID idUser, int keyVersion, LPCTSTR pkeyString, PBYTE pkeyData, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_UserPasswordSet (UINT_PTR idClient, ASID idCell, ASID idUser, int keyVersion, LPCTSTR pkeyString, PBYTE pkeyData, ULONG *pStatus)
{
return asc_UserPasswordSet (idClient, idCell, idUser, keyVersion, pkeyString, pkeyData, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_UserUnlock (DWORD idClient, ASID idCell, ASID idUser, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_UserUnlock (UINT_PTR idClient, ASID idCell, ASID idUser, ULONG *pStatus)
{
return asc_UserUnlock (idClient, idCell, idUser, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_UserCreate (DWORD idClient, ASID idCell, LPAFSADMSVR_CREATEUSER_PARAMS pCreate, ASID *pidUser, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_UserCreate (UINT_PTR idClient, ASID idCell, LPAFSADMSVR_CREATEUSER_PARAMS pCreate, ASID *pidUser, ULONG *pStatus)
{
return asc_UserCreate (idClient, idCell, pCreate, pidUser, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_UserDelete (DWORD idClient, ASID idCell, ASID idUser, LPAFSADMSVR_DELETEUSER_PARAMS pDelete, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_UserDelete (UINT_PTR idClient, ASID idCell, ASID idUser, LPAFSADMSVR_DELETEUSER_PARAMS pDelete, ULONG *pStatus)
{
return asc_UserDelete (idClient, idCell, idUser, pDelete, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupChange (DWORD idClient, ASID idCell, ASID idGroup, LPAFSADMSVR_CHANGEGROUP_PARAMS pChange, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupChange (UINT_PTR idClient, ASID idCell, ASID idGroup, LPAFSADMSVR_CHANGEGROUP_PARAMS pChange, ULONG *pStatus)
{
return asc_GroupChange (idClient, idCell, idGroup, pChange, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupMembersGet (DWORD idClient, ASID idCell, ASID idGroup, LPASIDLIST *ppAsidList, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupMembersGet (UINT_PTR idClient, ASID idCell, ASID idGroup, LPASIDLIST *ppAsidList, ULONG *pStatus)
{
return asc_GroupMembersGet (idClient, idCell, idGroup, ppAsidList, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupMemberAdd (DWORD idClient, ASID idCell, ASID idGroup, ASID idMember, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupMemberAdd (UINT_PTR idClient, ASID idCell, ASID idGroup, ASID idMember, ULONG *pStatus)
{
return asc_GroupMemberAdd (idClient, idCell, idGroup, idMember, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupMemberRemove (DWORD idClient, ASID idCell, ASID idGroup, ASID idMember, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupMemberRemove (UINT_PTR idClient, ASID idCell, ASID idGroup, ASID idMember, ULONG *pStatus)
{
return asc_GroupMemberRemove (idClient, idCell, idGroup, idMember, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupRename (DWORD idClient, ASID idCell, ASID idGroup, LPCTSTR pszNewName, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupRename (UINT_PTR idClient, ASID idCell, ASID idGroup, LPCTSTR pszNewName, ULONG *pStatus)
{
return asc_GroupRename (idClient, idCell, idGroup, pszNewName, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupOwnershipGet (DWORD idClient, ASID idCell, ASID idMember, LPASIDLIST *ppAsidList, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupOwnershipGet (UINT_PTR idClient, ASID idCell, ASID idMember, LPASIDLIST *ppAsidList, ULONG *pStatus)
{
return asc_GroupOwnershipGet (idClient, idCell, idMember, ppAsidList, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupMembershipGet (DWORD idClient, ASID idCell, ASID idOwner, LPASIDLIST *ppAsidList, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupMembershipGet (UINT_PTR idClient, ASID idCell, ASID idOwner, LPASIDLIST *ppAsidList, ULONG *pStatus)
{
return asc_GroupMembershipGet (idClient, idCell, idOwner, ppAsidList, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupCreate (DWORD idClient, ASID idCell, LPAFSADMSVR_CREATEGROUP_PARAMS pCreate, ASID *pidGroup, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupCreate (UINT_PTR idClient, ASID idCell, LPAFSADMSVR_CREATEGROUP_PARAMS pCreate, ASID *pidGroup, ULONG *pStatus)
{
return asc_GroupCreate (idClient, idCell, pCreate, pidGroup, pStatus);
}
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupDelete (DWORD idClient, ASID idCell, ASID idGroup, ULONG *pStatus)
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupDelete (UINT_PTR idClient, ASID idCell, ASID idGroup, ULONG *pStatus)
{
return asc_GroupDelete (idClient, idCell, idGroup, pStatus);
}
EXPORTED BOOL ADMINAPI AfsAppLib_asc_ActionListTest (LPASACTIONLIST *ppList, DWORD idAction, LPASACTION pAction = NULL);
EXPORTED BOOL ADMINAPI AfsAppLib_asc_ActionListFree (LPASACTIONLIST *ppList);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_AdminServerOpen (LPCTSTR pszAddress, DWORD *pidClient, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_AdminServerClose (DWORD idClient, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_AdminServerOpen (LPCTSTR pszAddress, UINT_PTR *pidClient, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_AdminServerClose (UINT_PTR idClient, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_CredentialsCrack (DWORD idClient, PVOID hCreds, LPTSTR pszCell, LPTSTR pszUser, SYSTEMTIME *pstExpiration, ULONG *pStatus);
-EXPORTED PVOID ADMINAPI AfsAppLib_asc_CredentialsGet (DWORD idClient, LPCTSTR pszCell, ULONG *pStatus);
-EXPORTED PVOID ADMINAPI AfsAppLib_asc_CredentialsSet (DWORD idClient, LPCTSTR pszCell, LPCTSTR pszUser, LPCTSTR pszPassword, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_CredentialsPush (DWORD idClient, PVOID hCreds, ASID idCell, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_CredentialsCrack (UINT_PTR idClient, PVOID hCreds, LPTSTR pszCell, LPTSTR pszUser, SYSTEMTIME *pstExpiration, ULONG *pStatus);
+EXPORTED UINT_PTR ADMINAPI AfsAppLib_asc_CredentialsGet (UINT_PTR idClient, LPCTSTR pszCell, ULONG *pStatus);
+EXPORTED UINT_PTR ADMINAPI AfsAppLib_asc_CredentialsSet (UINT_PTR idClient, LPCTSTR pszCell, LPCTSTR pszUser, LPCTSTR pszPassword, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_CredentialsPush (UINT_PTR idClient, PVOID hCreds, ASID idCell, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_LocalCellGet (DWORD idClient, LPTSTR pszCell, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ErrorCodeTranslate (DWORD idClient, ULONG code, LANGID idLanguage, STRING pszErrorText, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_LocalCellGet (UINT_PTR idClient, LPTSTR pszCell, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ErrorCodeTranslate (UINT_PTR idClient, ULONG code, LANGID idLanguage, STRING pszErrorText, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ActionGet (DWORD idClient, DWORD idAction, LPASACTION pAction, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ActionGetMultiple (DWORD idClient, DWORD idClientSearch, ASID idCellSearch, LPASACTIONLIST *ppList, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ActionListen (DWORD idClient, HWND hNotify, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ActionListenClear (DWORD idClient, HWND hNotify, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ActionGet (UINT_PTR idClient, DWORD idAction, LPASACTION pAction, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ActionGetMultiple (UINT_PTR idClient, UINT_PTR idClientSearch, ASID idCellSearch, LPASACTIONLIST *ppList, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ActionListen (UINT_PTR idClient, HWND hNotify, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ActionListenClear (UINT_PTR idClient, HWND hNotify, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_CellOpen (DWORD idClient, PVOID hCreds, LPCTSTR pszCell, DWORD dwScope, ASID *pidCell, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_CellClose (DWORD idClient, ASID idCell, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_CellChange (DWORD idClient, ASID idCell, LPAFSADMSVR_CHANGECELL_PARAMS pChange, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_CellRefreshRateSet (DWORD idClient, ASID idCell, LONG cminRefreshRate, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_CellOpen (UINT_PTR idClient, PVOID hCreds, LPCTSTR pszCell, DWORD dwScope, ASID *pidCell, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_CellClose (UINT_PTR idClient, ASID idCell, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_CellChange (UINT_PTR idClient, ASID idCell, LPAFSADMSVR_CHANGECELL_PARAMS pChange, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_CellRefreshRateSet (UINT_PTR idClient, ASID idCell, LONG cminRefreshRate, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectFind (DWORD idClient, ASID idSearchScope, ASOBJTYPE ObjectType, LPCTSTR pszName, ASID *pidObject, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectFindMultiple (DWORD idClient, ASID idSearchScope, ASOBJTYPE ObjectType, LPCTSTR pszPattern, LPAFSADMSVR_SEARCH_PARAMS pSearchParams, LPASIDLIST *ppList, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectPropertiesGet (DWORD idClient, AFSADMSVR_GET_LEVEL GetLevel, ASID idCell, ASID idObject, LPASOBJPROP pProperties, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectPropertiesGetMultiple (DWORD idClient, AFSADMSVR_GET_LEVEL GetLevel, ASID idCell, LPASIDLIST pAsidList, LPASOBJPROPLIST *ppPropertiesList, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectFind (UINT_PTR idClient, ASID idSearchScope, ASOBJTYPE ObjectType, LPCTSTR pszName, ASID *pidObject, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectFindMultiple (UINT_PTR idClient, ASID idSearchScope, ASOBJTYPE ObjectType, LPCTSTR pszPattern, LPAFSADMSVR_SEARCH_PARAMS pSearchParams, LPASIDLIST *ppList, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectPropertiesGet (UINT_PTR idClient, AFSADMSVR_GET_LEVEL GetLevel, ASID idCell, ASID idObject, LPASOBJPROP pProperties, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectPropertiesGetMultiple (UINT_PTR idClient, AFSADMSVR_GET_LEVEL GetLevel, ASID idCell, LPASIDLIST pAsidList, LPASOBJPROPLIST *ppPropertiesList, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectListen (DWORD idClient, ASID idCell, ASID idObject, HWND hNotify, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectListenClear (DWORD idClient, HWND hNotify, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectListenMultiple (DWORD idClient, ASID idCell, LPASIDLIST pAsidList, HWND hNotify, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectListen (UINT_PTR idClient, ASID idCell, ASID idObject, HWND hNotify, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectListenClear (UINT_PTR idClient, HWND hNotify, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectListenMultiple (UINT_PTR idClient, ASID idCell, LPASIDLIST pAsidList, HWND hNotify, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectRefresh (DWORD idClient, ASID idCell, ASID idObject, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectRefreshMultiple (DWORD idClient, ASID idCell, LPASIDLIST pAsidList, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectRefresh (UINT_PTR idClient, ASID idCell, ASID idObject, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectRefreshMultiple (UINT_PTR idClient, ASID idCell, LPASIDLIST pAsidList, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_RandomKeyGet (DWORD idClient, ASID idCell, PBYTE pkey, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_RandomKeyGet (UINT_PTR idClient, ASID idCell, PBYTE pkey, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_CellNameGet_Fast (DWORD idClient, ASID idCell, LPTSTR pszCell, ULONG *pStatus = NULL);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectNameGet_Fast (DWORD idClient, ASID idCell, ASID idObject, LPTSTR pszObject, ULONG *pStatus = NULL);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectTypeGet_Fast (DWORD idClient, ASID idCell, ASID idObject, ASOBJTYPE *pObjectType, ULONG *pStatus = NULL);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectPropertiesGet_Fast (DWORD idClient, ASID idCell, ASID idObject, LPASOBJPROP pProperties, ULONG *pStatus = NULL);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_CellNameGet_Fast (UINT_PTR idClient, ASID idCell, LPTSTR pszCell, ULONG *pStatus = NULL);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectNameGet_Fast (UINT_PTR idClient, ASID idCell, ASID idObject, LPTSTR pszObject, ULONG *pStatus = NULL);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectTypeGet_Fast (UINT_PTR idClient, ASID idCell, ASID idObject, ASOBJTYPE *pObjectType, ULONG *pStatus = NULL);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_ObjectPropertiesGet_Fast (UINT_PTR idClient, ASID idCell, ASID idObject, LPASOBJPROP pProperties, ULONG *pStatus = NULL);
EXPORTED void ADMINAPI AfsAppLib_asc_Enter (void);
EXPORTED void ADMINAPI AfsAppLib_asc_Leave (void);
EXPORTED LPCRITICAL_SECTION ADMINAPI AfsAppLib_asc_GetCriticalSection (void);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_UserChange (DWORD idClient, ASID idCell, ASID idUser, LPAFSADMSVR_CHANGEUSER_PARAMS pChange, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_UserPasswordSet (DWORD idClient, ASID idCell, ASID idUser, int keyVersion, LPCTSTR pkeyString, PBYTE pkeyData, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_UserUnlock (DWORD idClient, ASID idCell, ASID idUser, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_UserCreate (DWORD idClient, ASID idCell, LPAFSADMSVR_CREATEUSER_PARAMS pCreate, ASID *pidUser, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_UserDelete (DWORD idClient, ASID idCell, ASID idUser, LPAFSADMSVR_DELETEUSER_PARAMS pDelete, ULONG *pStatus);
-
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupChange (DWORD idClient, ASID idCell, ASID idGroup, LPAFSADMSVR_CHANGEGROUP_PARAMS pChange, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupMembersGet (DWORD idClient, ASID idCell, ASID idGroup, LPASIDLIST *ppAsidList, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupMemberAdd (DWORD idClient, ASID idCell, ASID idGroup, ASID idMember, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupMemberRemove (DWORD idClient, ASID idCell, ASID idGroup, ASID idMember, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupRename (DWORD idClient, ASID idCell, ASID idGroup, LPCTSTR pszNewName, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupMembershipGet (DWORD idClient, ASID idCell, ASID idMember, LPASIDLIST *ppAsidList, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupOwnershipGet (DWORD idClient, ASID idCell, ASID idOwner, LPASIDLIST *ppAsidList, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupCreate (DWORD idClient, ASID idCell, LPAFSADMSVR_CREATEGROUP_PARAMS pCreate, ASID *pidGroup, ULONG *pStatus);
-EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupDelete (DWORD idClient, ASID idCell, ASID idGroup, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_UserChange (UINT_PTR idClient, ASID idCell, ASID idUser, LPAFSADMSVR_CHANGEUSER_PARAMS pChange, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_UserPasswordSet (UINT_PTR idClient, ASID idCell, ASID idUser, int keyVersion, LPCTSTR pkeyString, PBYTE pkeyData, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_UserUnlock (UINT_PTR idClient, ASID idCell, ASID idUser, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_UserCreate (UINT_PTR idClient, ASID idCell, LPAFSADMSVR_CREATEUSER_PARAMS pCreate, ASID *pidUser, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_UserDelete (UINT_PTR idClient, ASID idCell, ASID idUser, LPAFSADMSVR_DELETEUSER_PARAMS pDelete, ULONG *pStatus);
+
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupChange (UINT_PTR idClient, ASID idCell, ASID idGroup, LPAFSADMSVR_CHANGEGROUP_PARAMS pChange, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupMembersGet (UINT_PTR idClient, ASID idCell, ASID idGroup, LPASIDLIST *ppAsidList, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupMemberAdd (UINT_PTR idClient, ASID idCell, ASID idGroup, ASID idMember, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupMemberRemove (UINT_PTR idClient, ASID idCell, ASID idGroup, ASID idMember, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupRename (UINT_PTR idClient, ASID idCell, ASID idGroup, LPCTSTR pszNewName, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupMembershipGet (UINT_PTR idClient, ASID idCell, ASID idMember, LPASIDLIST *ppAsidList, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupOwnershipGet (UINT_PTR idClient, ASID idCell, ASID idOwner, LPASIDLIST *ppAsidList, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupCreate (UINT_PTR idClient, ASID idCell, LPAFSADMSVR_CREATEGROUP_PARAMS pCreate, ASID *pidGroup, ULONG *pStatus);
+EXPORTED BOOL ADMINAPI AfsAppLib_asc_GroupDelete (UINT_PTR idClient, ASID idCell, ASID idGroup, ULONG *pStatus);
/*
* Then, note that AfsAppLib remaps all the asc_* routines to call their
int idsNone;
LPCELLLIST lpcl;
- PVOID hCreds;
+ UINT_PTR hCreds;
} BROWSEDIALOGPARAMS, *LPBROWSEDIALOGPARAMS;
void DlgProc_Browse_StopSearch (BROWSEDIALOGPARAMS *pbdp);
DWORD _stdcall DlgProc_Browse_ThreadProc (LPARAM lp);
-void EnumeratePrincipalsRemotely (LPBROWSEDIALOGPARAMS pbdp, DWORD idClient);
+void EnumeratePrincipalsRemotely (LPBROWSEDIALOGPARAMS pbdp, UINT_PTR idClient);
void EnumeratePrincipalsLocally (LPBROWSEDIALOGPARAMS pbdp);
if (msg == WM_INITDIALOG)
{
- SetWindowLong (hDlg, DWL_USER, lp);
+ SetWindowLongPtr (hDlg, DWLP_USER, lp);
}
- if ((pbdp = (BROWSEDIALOGPARAMS *)GetWindowLong (hDlg, DWL_USER)) != NULL)
+ if ((pbdp = (BROWSEDIALOGPARAMS *)GetWindowLongPtr (hDlg, DWLP_USER)) != NULL)
{
switch (msg)
{
PostMessage (pbdp->hDlg, WM_THREADSTART, 0, 0);
- DWORD idClient;
+ UINT_PTR idClient;
if ((idClient = AfsAppLib_GetAdminServerClientID()) != 0)
{
EnumeratePrincipalsRemotely (pbdp, idClient);
CopyStringToAnsi (szCellA, pbdp->szCell);
PVOID hCell;
- if (afsclient_CellOpen (szCellA, pbdp->hCreds, &hCell, (afs_status_p)&status))
+ if (afsclient_CellOpen (szCellA, (PVOID)pbdp->hCreds, &hCell, (afs_status_p)&status))
{
// Enumerate the principals recognized by KAS.
//
}
-void EnumeratePrincipalsRemotely (LPBROWSEDIALOGPARAMS pbdp, DWORD idClient)
+void EnumeratePrincipalsRemotely (LPBROWSEDIALOGPARAMS pbdp, UINT_PTR idClient)
{
ULONG status;
// Open the relevant cell
//
ASID idCell;
- if (asc_CellOpen (idClient, pbdp->hCreds, pbdp->szThreadCell, AFSADMSVR_SCOPE_USERS, &idCell, &status))
+ if (asc_CellOpen (idClient, (PVOID)pbdp->hCreds, pbdp->szThreadCell, AFSADMSVR_SCOPE_USERS, &idCell, &status))
{
// Obtain a list of ASIDs from the admin server, each representing
// a principal which we want to show.
return TRUE;
if (msg == WM_INITDIALOG)
- SetWindowLong (hDlg, DWL_USER, lp);
+ SetWindowLongPtr (hDlg, DWLP_USER, lp);
LPBROWSESETDLG_PARAMS lpp;
- if ((lpp = (LPBROWSESETDLG_PARAMS)GetWindowLong (hDlg, DWL_USER)) != NULL)
+ if ((lpp = (LPBROWSESETDLG_PARAMS)GetWindowLongPtr (hDlg, DWLP_USER)) != NULL)
{
switch (msg)
{
*
*/
-#define dwCOVER_SIGNATURE 0xC0E0C0E0 // SetWindowLong(hDlgCover,DWL_USER,#)
+#define dwCOVER_SIGNATURE 0xC0E0C0E0 // SetWindowLongPtr(hDlgCover,DWLP_USER,#)
typedef struct // COVERPARAMS
{
{
if (!lstrcmp (szClassName, TEXT("#32770"))) // WC_DIALOG
{
- if (GetWindowLong (hChild, DWL_USER) == dwCOVER_SIGNATURE)
+ if (GetWindowLongPtr (hChild, DWLP_USER) == dwCOVER_SIGNATURE)
{
DestroyWindow (hChild);
break;
(LPARAM)lp);
ShowWindow (hCover, TRUE);
- SetWindowLong (hCover, DWL_USER, dwCOVER_SIGNATURE);
+ SetWindowLongPtr (hCover, DWLP_USER, dwCOVER_SIGNATURE);
FreeString (lpcp->pszDesc);
FreeString (lpcp->pszButton);
*
*/
-BOOL AfsAppLib_CrackCredentials (PVOID hCreds, LPTSTR pszCell, LPTSTR pszUser, LPSYSTEMTIME pst, ULONG *pStatus)
+BOOL AfsAppLib_CrackCredentials (UINT_PTR hCreds, LPTSTR pszCell, LPTSTR pszUser, LPSYSTEMTIME pst, ULONG *pStatus)
{
BOOL rc = FALSE;
ULONG status = 0;
- DWORD idClient;
+ UINT_PTR idClient;
if ((idClient = AfsAppLib_GetAdminServerClientID()) != 0)
{
- rc = asc_CredentialsCrack (idClient, hCreds, pszCell, pszUser, pst, &status);
+ rc = asc_CredentialsCrack (idClient, (PVOID) hCreds, pszCell, pszUser, pst, &status);
}
else
if (OpenClientLibrary())
unsigned long dateExpire;
int fHasKasToken;
- if (afsclient_TokenQuery (hCreds, &dateExpire, szUserA, szUser2A, szCellA, &fHasKasToken, (afs_status_p)&status))
+ if (afsclient_TokenQuery ((PVOID)hCreds, &dateExpire, szUserA, szUser2A, szCellA, &fHasKasToken, (afs_status_p)&status))
{
rc = TRUE;
CopyAnsiToString (pszUser, szUserA);
}
-PVOID AfsAppLib_GetCredentials (LPCTSTR pszCell, ULONG *pStatus)
+UINT_PTR AfsAppLib_GetCredentials (LPCTSTR pszCell, ULONG *pStatus)
{
- PVOID hCreds = NULL;
+ UINT_PTR hCreds = 0;
ULONG status = 0;
- DWORD idClient;
+ UINT_PTR idClient;
if ((idClient = AfsAppLib_GetAdminServerClientID()) != 0)
{
hCreds = asc_CredentialsGet (idClient, pszCell, &status);
{
LPSTR pszCellA = StringToAnsi (pszCell);
- afsclient_TokenGetExisting (pszCellA, &hCreds, (afs_status_p)&status);
+ afsclient_TokenGetExisting (pszCellA, (PVOID *)&hCreds, (afs_status_p)&status);
FreeString (pszCellA, pszCell);
CloseClientLibrary();
}
-PVOID AfsAppLib_SetCredentials (LPCTSTR pszCell, LPCTSTR pszUser, LPCTSTR pszPassword, ULONG *pStatus)
+UINT_PTR AfsAppLib_SetCredentials (LPCTSTR pszCell, LPCTSTR pszUser, LPCTSTR pszPassword, ULONG *pStatus)
{
- PVOID hCreds = NULL;
+ UINT_PTR hCreds = 0;
ULONG status = 0;
- DWORD idClient;
+ UINT_PTR idClient;
if ((idClient = AfsAppLib_GetAdminServerClientID()) != 0)
{
hCreds = asc_CredentialsSet (idClient, pszCell, pszUser, pszPassword, &status);
CopyStringToAnsi (szUserA, pszUser);
CopyStringToAnsi (szPasswordA, pszPassword);
- afsclient_TokenGetNew (szCellA, szUserA, szPasswordA, &hCreds, (afs_status_p)&status);
+ afsclient_TokenGetNew (szCellA, szUserA, szPasswordA, (PVOID *)&hCreds, (afs_status_p)&status);
CloseClientLibrary();
}
{
LPOPENCELLDLG_PARAMS lpp;
if (msg == WM_INITDIALOG)
- SetWindowLong (hDlg, DWL_USER, lp);
+ SetWindowLongPtr (hDlg, DWLP_USER, lp);
- if ((lpp = (LPOPENCELLDLG_PARAMS)GetWindowLong (hDlg, DWL_USER)) != NULL)
+ if ((lpp = (LPOPENCELLDLG_PARAMS)GetWindowLongPtr (hDlg, DWLP_USER)) != NULL)
{
if (lpp->hookproc)
{
LPOPENCELL_ONCELL_PARAMS lpp;
if ((lpp = (LPOPENCELL_ONCELL_PARAMS)lp) != NULL)
{
- PVOID hCreds = AfsAppLib_GetCredentials (lpp->szCell);
- lpp->fGotCreds = AfsAppLib_CrackCredentials (hCreds, lpp->szCell, lpp->szUser, &lpp->stExpire);
+ UINT_PTR hCreds = AfsAppLib_GetCredentials (lpp->szCell);
+ lpp->fGotCreds = AfsAppLib_CrackCredentials (hCreds, lpp->szCell, lpp->szUser, &lpp->stExpire)?TRUE:FALSE;
lpp->fValidCreds = FALSE;
if (lpp->fGotCreds && AfsAppLib_IsTimeInFuture (&lpp->stExpire))
{
LPCREDENTIALSDLG_PARAMS lpp;
if (msg == WM_INITDIALOG)
- SetWindowLong (hDlg, DWL_USER, lp);
+ SetWindowLongPtr (hDlg, DWLP_USER, lp);
- if ((lpp = (LPCREDENTIALSDLG_PARAMS)GetWindowLong (hDlg, DWL_USER)) != NULL)
+ if ((lpp = (LPCREDENTIALSDLG_PARAMS)GetWindowLongPtr (hDlg, DWLP_USER)) != NULL)
{
if (lpp->hookproc)
{
*
*/
+
+BOOL AfsAppLib_IsUserAdmin (UINT_PTR hCreds, LPTSTR pszUser)
+{
+#ifndef USE_KASERVER
+ return TRUE;
+#else
+ BOOL rc = FALSE;
+ afs_status_t status;
+
+ UINT_PTR idClient;
+ if ((idClient = AfsAppLib_GetAdminServerClientID()) != 0)
+ {
+ TCHAR szCell[ cchRESOURCE ];
+ TCHAR szUser[ cchRESOURCE ];
+ SYSTEMTIME stExpire;
+ if (asc_CredentialsCrack (idClient, hCreds, szCell, szUser, &stExpire, (ULONG*)&status))
+ {
+ ASID idCell;
+ if (asc_CellOpen (idClient, hCreds, szCell, AFSADMSVR_SCOPE_USERS, &idCell, (ULONG*)&status))
+ {
+ ASID idUser;
+ if (asc_ObjectFind (idClient, idCell, TYPE_USER, pszUser, &idUser, (ULONG*)&status))
+ {
+ ASOBJPROP Info;
+ if (asc_ObjectPropertiesGet (idClient, GET_ALL_DATA, idCell, idUser, &Info, (ULONG*)&status))
+ {
+ if (Info.u.UserProperties.fHaveKasInfo)
+ {
+ rc = Info.u.UserProperties.KASINFO.fIsAdmin;
+ }
+ }
+ }
+ asc_CellClose (idClient, idCell, (ULONG*)&status);
+ }
+ }
+ }
+ else if (OpenClientLibrary())
+ {
+ if (OpenKasLibrary())
+ {
+ char szUserA[ cchRESOURCE ], szUser2A[ cchRESOURCE ];
+ char szCellA[ cchRESOURCE ];
+ unsigned long dateExpire;
+ int fHasKasToken;
+
+ if (afsclient_TokenQuery (hCreds, &dateExpire, szUserA, szUser2A, szCellA, &fHasKasToken, (afs_status_p)&status))
+ {
+ PVOID hCell;
+ if (afsclient_CellOpen (szCellA, hCreds, &hCell, &status))
+ {
+ kas_identity_t Identity;
+ memset (&Identity, 0x00, sizeof(Identity));
+ CopyStringToAnsi (Identity.principal, pszUser);
+
+ kas_principalEntry_t Entry;
+ if (kas_PrincipalGet (hCell, NULL, &Identity, &Entry, &status))
+ {
+ if (Entry.adminSetting == KAS_ADMIN)
+ rc = TRUE;
+ }
+
+ afsclient_CellClose (hCell, (afs_status_p)&status);
+ }
+ }
+
+ CloseKasLibrary();
+ }
+
+ CloseClientLibrary();
+ }
+
+ return rc;
+#endif /* USE_KASERVER */
+}
+
+
typedef struct
{
BADCREDSDLG_PARAMS bcdp;
{
LPREALBADCREDSDLG_PARAMS lpp;
if (msg == WM_INITDIALOG)
- SetWindowLong (hDlg, DWL_USER, lp);
- if ((lpp = (LPREALBADCREDSDLG_PARAMS)GetWindowLong (hDlg, DWL_USER)) != NULL)
+ SetWindowLongPtr (hDlg, DWLP_USER, lp);
+ if ((lpp = (LPREALBADCREDSDLG_PARAMS)GetWindowLongPtr (hDlg, DWLP_USER)) != NULL)
{
if (lpp->bcdp.hookproc)
{
void AfsAppLib_CheckForExpiredCredentials (LPCREDENTIALSDLG_PARAMS lpp)
{
- static PVOID hCredsPrevious = NULL;
+ static UINT_PTR hCredsPrevious = 0;
static BOOL fHadGoodCredentials;
TCHAR szCell[ cchNAME ];
SYSTEMTIME stExpire;
BOOL fHaveCredentials;
- fHaveCredentials = AfsAppLib_CrackCredentials (lpp->hCreds, szCell, szUser, &stExpire);
+ fHaveCredentials = AfsAppLib_CrackCredentials (lpp->hCreds, szCell, szUser, &stExpire)?TRUE:FALSE;
if (hCredsPrevious && (hCredsPrevious != lpp->hCreds))
{
}
-BOOL AfsAppLib_IsUserAdmin (PVOID hCreds, LPTSTR pszUser)
-{
-#ifndef USE_KASERVER
- return TRUE;
-#else
- BOOL rc = FALSE;
- afs_status_t status;
-
- DWORD idClient;
- if ((idClient = AfsAppLib_GetAdminServerClientID()) != 0)
- {
- TCHAR szCell[ cchRESOURCE ];
- TCHAR szUser[ cchRESOURCE ];
- SYSTEMTIME stExpire;
- if (asc_CredentialsCrack (idClient, hCreds, szCell, szUser, &stExpire, (ULONG*)&status))
- {
- ASID idCell;
- if (asc_CellOpen (idClient, hCreds, szCell, AFSADMSVR_SCOPE_USERS, &idCell, (ULONG*)&status))
- {
- ASID idUser;
- if (asc_ObjectFind (idClient, idCell, TYPE_USER, pszUser, &idUser, (ULONG*)&status))
- {
- ASOBJPROP Info;
- if (asc_ObjectPropertiesGet (idClient, GET_ALL_DATA, idCell, idUser, &Info, (ULONG*)&status))
- {
- if (Info.u.UserProperties.fHaveKasInfo)
- {
- rc = Info.u.UserProperties.KASINFO.fIsAdmin;
- }
- }
- }
- asc_CellClose (idClient, idCell, (ULONG*)&status);
- }
- }
- }
- else if (OpenClientLibrary())
- {
- if (OpenKasLibrary())
- {
- char szUserA[ cchRESOURCE ], szUser2A[ cchRESOURCE ];
- char szCellA[ cchRESOURCE ];
- unsigned long dateExpire;
- int fHasKasToken;
-
- if (afsclient_TokenQuery (hCreds, &dateExpire, szUserA, szUser2A, szCellA, &fHasKasToken, (afs_status_p)&status))
- {
- PVOID hCell;
- if (afsclient_CellOpen (szCellA, hCreds, &hCell, &status))
- {
- kas_identity_t Identity;
- memset (&Identity, 0x00, sizeof(Identity));
- CopyStringToAnsi (Identity.principal, pszUser);
-
- kas_principalEntry_t Entry;
- if (kas_PrincipalGet (hCell, NULL, &Identity, &Entry, &status))
- {
- if (Entry.adminSetting == KAS_ADMIN)
- rc = TRUE;
- }
-
- afsclient_CellClose (hCell, (afs_status_p)&status);
- }
- }
-
- CloseKasLibrary();
- }
-
- CloseClientLibrary();
- }
-
- return rc;
-#endif /* USE_KASERVER */
-}
-
}
-extern "C" BOOLEAN _stdcall DllEntryPoint (HANDLE hInst, DWORD dwReason, PVOID pReserved)
+EXPORTED extern "C" BOOLEAN _stdcall DllEntryPoint (HANDLE hInst, DWORD dwReason, PVOID pReserved)
{
switch (dwReason)
{
PROGRESSDISPLAY::~PROGRESSDISPLAY (void)
{
m_fFinished = TRUE;
- SetWindowLong (m_hWnd, DWL_USER, (LONG)0);
+ SetWindowLongPtr (m_hWnd, DWLP_USER, (LONG)0);
DeleteCriticalSection (&m_cs);
if (m_fCreatedWindow)
DestroyWindow (m_hWnd);
void PROGRESSDISPLAY::Init (HWND hWnd)
{
- SetWindowLong (hWnd, DWL_USER, (LONG)this);
+ SetWindowLongPtr (hWnd, DWLP_USER, (LONG)this);
Subclass_AddHook (hWnd, PROGRESSDISPLAY::ProgressDisplay_HookProc);
m_msgFinish = 0;
LPPROGRESSDISPLAY ppd = NULL;
try {
- if ((ppd = (LPPROGRESSDISPLAY)(GetWindowLong (hWnd, DWL_USER))) != NULL) {
+ if ((ppd = (LPPROGRESSDISPLAY)(GetWindowLongPtr (hWnd, DWLP_USER))) != NULL) {
if (ppd->m_hWnd != hWnd)
ppd = NULL;
}
static struct
{
HWND hWnd;
- DWORD *adwData;
+ UINT_PTR *adwData;
size_t cdwData;
} *aWindows = NULL;
static size_t cWindows = 0;
}
-DWORD GetWindowData (HWND hWnd, LPTSTR pszField)
+UINT_PTR GetWindowData (HWND hWnd, LPTSTR pszField)
{
- DWORD rc = 0;
+ UINT_PTR rc = 0;
if (pcsData == NULL)
{
}
-DWORD SetWindowData (HWND hWnd, LPTSTR pszField, DWORD dwNewData)
+UINT_PTR SetWindowData (HWND hWnd, LPTSTR pszField, UINT_PTR dwNewData)
{
- DWORD rc = 0;
+ UINT_PTR rc = 0;
if (pcsData == NULL)
{
LPWIZARD pWiz = NULL;
try {
- if ((pWiz = (LPWIZARD)GetWindowLong (hWnd, DWL_USER)) != NULL)
+ if ((pWiz = (LPWIZARD)GetWindowLongPtr (hWnd, DWLP_USER)) != NULL)
{
if ( (pWiz->m_hWnd != hWnd) && (pWiz->m_hBkg != hWnd) )
pWiz = NULL;
BOOL CALLBACK WIZARD::Template_DlgProc (HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
{
if (msg == WM_INITDIALOG)
- SetWindowLong (hWnd, DWL_USER, lp);
+ SetWindowLongPtr (hWnd, DWLP_USER, lp);
- LPWIZARD pWiz = (LPWIZARD)GetWindowLong (hWnd, DWL_USER);
+ LPWIZARD pWiz = (LPWIZARD)GetWindowLongPtr (hWnd, DWLP_USER);
switch (msg)
{
BOOL CALLBACK WIZARD::Background_DlgProc (HWND hBkg, UINT msg, WPARAM wp, LPARAM lp)
{
if (msg == WM_INITDIALOG)
- SetWindowLong (hBkg, DWL_USER, lp);
+ SetWindowLongPtr (hBkg, DWLP_USER, lp);
- LPWIZARD pWiz = (LPWIZARD)GetWindowLong (hBkg, DWL_USER);
+ LPWIZARD pWiz = (LPWIZARD)GetWindowLongPtr (hBkg, DWLP_USER);
switch (msg)
{
{
WNDCLASS wc;
GetClassInfo (THIS_HINST, TEXT("LISTBOX"), &wc);
- procListbox = (LONG)wc.lpfnWndProc;
+ procListbox = PtrToLong(wc.lpfnWndProc);
wc.style = CS_GLOBALCLASS;
wc.lpfnWndProc = (WNDPROC)CheckListProc;
BOOL CALLBACK CheckListProc (HWND hList, UINT msg, WPARAM wp, LPARAM lp)
{
- switch (msg)
+ HRESULT hResult;
+
+ switch (msg)
{
case WM_CREATE:
Subclass_AddHook (GetParent(hList), CheckList_DialogProc);
if (procListbox)
{
ReleaseCapture ();
- CallWindowProc ((WNDPROC)procListbox, hList, WM_LBUTTONDOWN, wp, lp);
- CallWindowProc ((WNDPROC)procListbox, hList, WM_LBUTTONUP, wp, lp);
+ CallWindowProc ((WNDPROC)LongToPtr(procListbox), hList, WM_LBUTTONDOWN, wp, lp);
+ CallWindowProc ((WNDPROC)LongToPtr(procListbox), hList, WM_LBUTTONUP, wp, lp);
SetCapture (hList);
}
return TRUE;
}
if (procListbox)
- return CallWindowProc ((WNDPROC)procListbox, hList, msg, wp, lp);
+ hResult = CallWindowProc ((WNDPROC)LongToPtr(procListbox), hList, msg, wp, lp);
else
- return DefWindowProc (hList, msg, wp, lp);
+ hResult = DefWindowProc (hList, msg, wp, lp);
+
+ return (hResult?TRUE:FALSE);
}
BOOL CheckList_OnGetHit (HWND hList, WPARAM wp, LPARAM lp)
{
- return (BOOL)GetWindowLong (hList, GWL_USERDATA);
+ return (BOOL)GetWindowLongPtr (hList, GWLP_USERDATA);
}
BOOL CheckList_OnSetHit (HWND hList, WPARAM wp, LPARAM lp)
{
int iItem = (int)wp;
- SetWindowLong (hList, GWL_USERDATA, iItem);
+ SetWindowLongPtr (hList, GWLP_USERDATA, iItem);
return TRUE;
}
if (iTab < aPropSheets[ii].psh->cTabs)
{
aPropSheets[ii].psh->aTabs[iTab].hDlg = hDlg;
- BOOL rc = CallWindowProc ((WNDPROC)(aPropSheets[ ii ].psh->aTabs[ iTab ].dlgproc), hDlg, msg, wp, lp);
+ BOOL rc = (CallWindowProc ((WNDPROC)(aPropSheets[ ii ].psh->aTabs[ iTab ].dlgproc), hDlg, msg, wp, lp)?TRUE:FALSE);
switch (msg)
{
if ((hp = CreatePropertySheetPage (&psp)) == 0)
return FALSE;
- if (!REALLOC( psh->sh.phpage, psh->sh.nPages, 1+psh->sh.nPages, 1))
+ size_t size = psh->sh.nPages;
+ if (!REALLOC( psh->sh.phpage, size, 1+psh->sh.nPages, 1))
return FALSE;
+ psh->sh.nPages = (UINT) size;
if (!REALLOC( psh->aTabs, psh->cTabs, psh->sh.nPages, 1))
return FALSE;
typedef class EXPORTED HASHLISTKEY HASHLISTKEY, *LPHASHLISTKEY;
typedef class EXPORTED ENUMERATION ENUMERATION, ENUM, *LPENUMERATION, *LPENUM;
-typedef DWORD HASHVALUE;
+typedef UINT_PTR HASHVALUE;
typedef BOOL (CALLBACK * LPHASHFUNC_COMPAREOBJECTDATA)(LPHASHLISTKEY pKey, PVOID pObject, PVOID pData);
typedef HASHVALUE (CALLBACK * LPHASHFUNC_HASHOBJECT)(LPHASHLISTKEY pKey, PVOID pObject);
typedef HASHVALUE (CALLBACK * LPHASHFUNC_HASHDATA)(LPHASHLISTKEY pKey, PVOID pData);
$(DLLFILE) : $(DLLOBJS)
$(DLLRESLINK)
+ $(_VC_MANIFEST_EMBED_DLL)
$(DLLPREP)
install : $(DLLFILE)
fRegistered = TRUE;
wc.style = CS_HREDRAW | CS_VREDRAW;
- wc.lpfnWndProc = SplitterWndProc;
+ wc.lpfnWndProc = (WNDPROC)SplitterWndProc;
wc.cbClsExtra = 0;
wc.cbWndExtra = sizeof(SplitterData *);
wc.hInstance = THIS_HINST;
if (aTargets[ iTarget ].nHooksActive == 1)
{
- aTargets[ iTarget ].procOrig = (PVOID)GetWindowLong (hTarget, GWL_WNDPROC);
- SetWindowLong (hTarget, GWL_WNDPROC, (LONG)Subclass_WndProc);
+ aTargets[ iTarget ].procOrig = (PVOID)GetWindowLongPtr (hTarget, GWLP_WNDPROC);
+ SetWindowLongPtr (hTarget, GWLP_WNDPROC, PtrToLong(Subclass_WndProc));
}
return TRUE;
aTargets[ iTarget ].nHooksActive --;
if (aTargets[ iTarget ].nHooksActive == 0)
{
- SetWindowLong (aTargets[ iTarget ].hTarget, GWL_WNDPROC, (LONG)aTargets[ iTarget ].procOrig);
+ SetWindowLongPtr (aTargets[ iTarget ].hTarget, GWLP_WNDPROC, (LONG)aTargets[ iTarget ].procOrig);
memset (&aTargets[ iTarget ], 0x00, sizeof(aTargets[ iTarget ]));
}
}
$(EXEFILE) : $(EXEOBJS) $(EXELIBS)
$(EXEGUILINK) comctl32.lib shell32.lib
+ $(_VC_MANIFEST_EMBED_EXE)
$(EXEPREP)
test : $(EXEFILE)
;
DWORD cbWrite;
DWORD cbWrote;
- if ((cbWrite = pszNext - psz) != 0)
+ if ((cbWrite = (DWORD)(pszNext - psz)) != 0)
WriteFile (fh, psz, cbWrite, &cbWrote, NULL);
WriteFile (fh, TEXT("\r\n"), 2, &cbWrote, NULL);
psz = (*pszNext == TEXT('\r')) ? (2+pszNext) : (*pszNext == TEXT('\n')) ? (1+pszNext) : NULL;
}
-LPIDENT AfsClass_CreateUser (LPIDENT lpiCell, LPTSTR pszUserName, LPTSTR pszInstance, LPTSTR pszPassword, int idUser, BOOL fCreateKAS, BOOL fCreatePTS, ULONG *pStatus)
+LPIDENT AfsClass_CreateUser (LPIDENT lpiCell, LPTSTR pszUserName, LPTSTR pszInstance, LPTSTR pszPassword, UINT_PTR idUser, BOOL fCreateKAS, BOOL fCreatePTS, ULONG *pStatus)
{
BOOL rc = TRUE;
ULONG status;
WORKERPACKET wp;
wp.wpPtsUserCreate.hCell = hCell;
wp.wpPtsUserCreate.pszUser = szUserName;
- wp.wpPtsUserCreate.idUser = idUser;
+ wp.wpPtsUserCreate.idUser = (int) idUser;
AfsClass_Leave();
#define MASK_USERPROP_aaGroupsOwned 0x00001000
#define MASK_USERPROP_aaMembership 0x00002000
-LPIDENT AfsClass_CreateUser (LPIDENT lpiCell, LPTSTR pszUserName, LPTSTR pszInstance, LPTSTR pszPassword, int idUser = 0, BOOL fCreateKAS = TRUE, BOOL fCreatePTS = TRUE, ULONG *pStatus = NULL);
+LPIDENT AfsClass_CreateUser (LPIDENT lpiCell, LPTSTR pszUserName, LPTSTR pszInstance, LPTSTR pszPassword, UINT_PTR idUser = 0, BOOL fCreateKAS = TRUE, BOOL fCreatePTS = TRUE, ULONG *pStatus = NULL);
BOOL AfsClass_SetUserProperties (LPIDENT lpiUser, LPUSERPROPERTIES pProperties, ULONG *pStatus = NULL);
BOOL AfsClass_SetUserPassword (LPIDENT lpiUser, int keyVersion, LPTSTR pszPassword, ULONG *pStatus = NULL);
BOOL AfsClass_SetUserPassword (LPIDENT lpiUser, int keyVersion, LPENCRYPTIONKEY pKey, ULONG *pStatus = NULL);
}
-ULONG AGGREGATE::CalculateAllocation (BOOL fNotify)
+size_t AGGREGATE::CalculateAllocation (BOOL fNotify)
{
- ULONG ckAllocated = 0;
+ size_t ckAllocated = 0;
for (LPENUM pEnum = m_lFilesets->FindFirst(); pEnum; pEnum = pEnum->FindNext())
{
typedef struct
{
ULONG dwID;
- ULONG ckStorageTotal;
- ULONG ckStorageFree;
- ULONG ckStorageAllocated;
+ size_t ckStorageTotal;
+ size_t ckStorageFree;
+ size_t ckStorageAllocated;
} AGGREGATESTATUS, *LPAGGREGATESTATUS;
class AGGREGATE
~AGGREGATE (void);
void SendDeleteNotifications (void);
- ULONG CalculateAllocation (BOOL fNotify);
+ size_t CalculateAllocation (BOOL fNotify);
static BOOL CALLBACK AGGREGATE::KeyFilesetName_Compare (LPHASHLISTKEY pKey, PVOID pObject, PVOID pData);
static HASHVALUE CALLBACK AGGREGATE::KeyFilesetName_HashObject (LPHASHLISTKEY pKey, PVOID pObject);
}
}
- size_t nServersToRefresh = 0;
+ ULONG nServersToRefresh = 0;
HENUM hEnum;
for (LPSERVER lpServer = ServerFindFirst (&hEnum); lpServer; lpServer = ServerFindNext (&hEnum))
{
char szTemp[40];
if (HIWORD(addr) == 0x0000)
- wsprintf (szTemp, "0x%04X", (ushort)LOWORD(addr));
+ wsprintf (szTemp, "0x%04X", (ushort)LOWORD(PtrToLong(addr)));
else
- wsprintf (szTemp, "0x%08lX", (LONG)addr);
+ wsprintf (szTemp, "0x%08lX", PtrToLong(addr));
return (*this << szTemp);
}
Debugstr & Debugstr::operator<< (size_t l)
{
char szTemp[40];
- _ltoa (l, szTemp, 10);
+ _ltoa ((LONG)l, szTemp, 10);
return (*this << szTemp);
}
gy = minY;
gcY = 0;
- GetTextExtentPoint (hdc, gdata[gcY], strlen(gdata[gcY]), &siz);
+ GetTextExtentPoint (hdc, gdata[gcY], (int)strlen(gdata[gcY]), &siz);
r2.top = gy;
r2.bottom = gy + tm.tmHeight;
if (fRecord)
{
- GetTextExtentPoint (hdc, gdata[gcY+1], strlen(gdata[gcY+1]), &siz);
+ GetTextExtentPoint (hdc, gdata[gcY+1], (int)strlen(gdata[gcY+1]), &siz);
r2.top = gy +tm.tmHeight;
r2.bottom = gy +tm.tmHeight +tm.tmHeight;
{
SIZE siz;
- TextOut (hdc, gx, gy, psz, strlen(psz));
+ TextOut (hdc, gx, gy, psz, (int)strlen(psz));
if (fRec)
strcat (gdata[gcY], psz);
- GetTextExtentPoint (hdc, psz, strlen(psz), &siz);
+ GetTextExtentPoint (hdc, psz, (int)strlen(psz), &siz);
gx += (ushort)siz.cx;
- gcX += strlen(psz);
+ gcX += (int)strlen(psz);
}
*
*/
-LONG APIENTRY Debugstr::DebugWndProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
+LRESULT APIENTRY Debugstr::DebugWndProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
ushort x, y, cX, cY;
Debugstr (void);
~Debugstr (void);
- static long APIENTRY DebugWndProc (HWND, UINT, WPARAM, LPARAM);
+ static LRESULT APIENTRY DebugWndProc (HWND, UINT, WPARAM, LPARAM);
void OutString (char *str, BOOL fRecord);
DWORD WINAPI SERVER::CanTalkToServer_ThreadProc (PVOID lp)
{
- int idSection = (int)lp;
+ int idSection = PtrToInt(lp);
// Until we post a notification saying that we've entered
// a section, we don't need to worry about the aRefSec[] entry
//
DWORD dwThreadID;
HANDLE hThread;
- if ((hThread = CreateThread (NULL, 0, (LPTHREAD_START_ROUTINE)CanTalkToServer_ThreadProc, (PVOID)idSection, 0, &dwThreadID)) == NULL)
+ if ((hThread = CreateThread (NULL, 0, (LPTHREAD_START_ROUTINE)CanTalkToServer_ThreadProc, IntToPtr(idSection), 0, &dwThreadID)) == NULL)
{
EnterCriticalSection (pcsRefSec);
aRefSec[ idSection ].fInUse = FALSE;
//
pst->wDayOfWeek = (WORD)(-1); // daily until proven otherwise
- for (size_t ii = 0; ii < 7; ++ii)
+ for (WORD ii = 0; ii < 7; ++ii)
{
if (!lstrncmpi (apszDays[ii], pszTime, 3))
{
{
LPSTR pszVolumeA = StringToAnsi (lpwp->wpVosVolumeCreate.pszVolume);
- if ((*lpVosVolumeCreate)(lpwp->wpVosVolumeCreate.hCell, lpwp->wpVosVolumeCreate.hServer, NULL, lpwp->wpVosVolumeCreate.idPartition, pszVolumeA, lpwp->wpVosVolumeCreate.ckQuota, (unsigned int *)&lpwp->wpVosVolumeCreate.idVolume, &status))
+ if ((*lpVosVolumeCreate)(lpwp->wpVosVolumeCreate.hCell, lpwp->wpVosVolumeCreate.hServer, NULL, lpwp->wpVosVolumeCreate.idPartition, pszVolumeA, (unsigned int)lpwp->wpVosVolumeCreate.ckQuota, (unsigned int *)&lpwp->wpVosVolumeCreate.idVolume, &status))
status = 0;
FreeString (pszVolumeA, lpwp->wpVosVolumeCreate.pszVolume);
case wtaskVosVolumeQuotaChange:
{
- if ((*lpVosVolumeQuotaChange)(lpwp->wpVosVolumeQuotaChange.hCell, lpwp->wpVosVolumeQuotaChange.hServer, NULL, lpwp->wpVosVolumeQuotaChange.idPartition, lpwp->wpVosVolumeQuotaChange.idVolume, lpwp->wpVosVolumeQuotaChange.ckQuota, &status))
+ if ((*lpVosVolumeQuotaChange)(lpwp->wpVosVolumeQuotaChange.hCell, lpwp->wpVosVolumeQuotaChange.hServer, NULL, lpwp->wpVosVolumeQuotaChange.idPartition, lpwp->wpVosVolumeQuotaChange.idVolume, (unsigned int)lpwp->wpVosVolumeQuotaChange.ckQuota, &status))
status = 0;
break;
}
PVOID hServer; // [in] token from VosServerOpen()
int idPartition; // [in] partition ID
LPTSTR pszVolume; // [in] volume name
- ULONG ckQuota; // [in] initial quota
+ size_t ckQuota; // [in] initial quota
VOLUMEID idVolume; // [out] volume ID
} wpVosVolumeCreate;
PVOID hServer; // [in] token from VosServerOpen()
int idPartition; // [in] partition ID
VOLUMEID idVolume; // [in] id of read/write volume
- ULONG ckQuota; // [in] new quota
+ size_t ckQuota; // [in] new quota
} wpVosVolumeQuotaChange;
struct {
$(C2OBJ) -I$(RX) $**
$(IDLFILES):afsrpc.idl
- midl $(MIDL_FLAGS) /no_robust $(AFSDEV_AUXMIDLFLAGS) /app_config $?
+ midl $(MIDL_FLAGS) $(AFSDEV_AUXMIDLFLAGS) /app_config $?
RPCOBJS = $(OUT)\ifs_rpc.obj
/Zp4 \
/cpp_cmd $(cc) \
/cpp_opt "-E" \
- /no_robust \
/nologo
.SUFFIXES: .h .idl
$(CONF_DLLFILE): $(CONFOBJS) $(OUT)\libafsconf.res $(CONF_DLLLIBS)
$(DLLGUILINK) -def:libafsconf.def dnsapi.lib mpr.lib
+ $(_VC_MANIFEST_EMBED_DLL)
$(DLLPREP)
$(COPY) $*.lib $(ILIBDIR)
$(DEL) $*.lib $*.exp
$(LOGON_DLLFILE): $(LOGON_DLLOBJS) $(LOGON_DLLLIBS)
$(DLLGUILINK) $(LOGONLINKFLAGS) -def:afslogon.def $(LOGON_DLLSDKLIBS)
+ $(_VC_MANIFEST_EMBED_DLL)
$(DLLPREP)
$(COPY) $*.lib $(DESTDIR)\lib
$(DEL) $*.lib $*.exp
# klog.exe
$(EXEDIR)\klog.exe: $(OUT)\cklog.obj $(OUT)\klog.res $(EXELIBS)
$(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib
+ $(_VC_MANIFEST_EMBED_EXE)
$(EXEPREP)
# tokens.exe
$(EXEDIR)\tokens.exe: $(OUT)\ctokens.obj $(OUT)\tokens.res $(EXELIBS)
$(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib
+ $(_VC_MANIFEST_EMBED_EXE)
$(EXEPREP)
# unlog.exe
$(EXEDIR)\unlog.exe: $(OUT)\cunlog.obj $(OUT)\unlog.res $(EXELIBS)
$(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib
+ $(_VC_MANIFEST_EMBED_EXE)
$(EXEPREP)
# afscpcc.exe
$(EXEDIR)\afscpcc.exe: $(OUT)\afscpcc.obj $(OUT)\afscpcc.res $(LOGON_DLLLIBS)
$(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib
+ $(_VC_MANIFEST_EMBED_EXE)
$(EXEPREP)
$(AFSD_EXEFILE): $(OUT)\afsd.obj $(AFSDOBJS) $(OUT)\afsd.res $(RXOBJS) $(AFSD_EXELIBS)
$(EXEGUILINK) $(AFSD_SDKLIBS)
+ $(_VC_MANIFEST_EMBED_EXE)
$(EXEPREP)
# afsd_service.exe
$(EXEDIR)\afsd_service.exe: $(OUT)\afsd_service.obj $(AFSDOBJS) $(OUT)\afsd_service.res $(RXOBJS) $(AFSD_EXELIBS)
$(EXECONLINK) $(AFSD_SDKLIBS) /MAP /LARGEADDRESSAWARE
+ $(_VC_MANIFEST_EMBED_EXE)
$(EXEPREP)
# fs.exe
$(EXEDIR)\fs.exe: $(FSOBJS) $(OUT)\fs.res $(EXELIBS)
$(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib
+ $(_VC_MANIFEST_EMBED_EXE)
$(EXEPREP)
# cmdebug.exe
$(EXEDIR)\cmdebug.exe: $(CMDBGOBJS) $(OUT)\cmdebug.res $(EXELIBS2)
$(EXECONLINK) $(EXELIBS2) dnsapi.lib mpr.lib iphlpapi.lib rpcrt4.lib
+ $(_VC_MANIFEST_EMBED_EXE)
$(EXEPREP)
# symlink.exe
$(EXEDIR)\symlink.exe: $(SLOBJS) $(OUT)\symlink.res $(EXELIBS)
$(EXECONLINK) dnsapi.lib mpr.lib iphlpapi.lib
+ $(_VC_MANIFEST_EMBED_EXE)
$(EXEPREP)
# afsshare.exe
$(EXEDIR)\afsshare.exe: $(OUT)\afsshare.obj $(OUT)\afsshare.res
$(EXECONLINK)
+ $(_VC_MANIFEST_EMBED_EXE)
$(EXEPREP)
# afsdacl.exe
$(EXEDIR)\afsdacl.exe: $(OUT)\afsdacl.obj $(OUT)\afsdacl.res
$(EXECONLINK)
+ $(_VC_MANIFEST_EMBED_EXE)
$(EXEPREP)
# kpasswd.exe - built in kauth, but rebuild here to make pthread-based,
$(DESTDIR)\bin\kpasswd.exe: $(KPASSWD_OBJS) $(KPASSWD_LIBS)
$(DEL) $(DESTDIR)\bin\kpasswd.exe
$(EXECONLINK)
+ $(_VC_MANIFEST_EMBED_EXE)
$(EXEPREP)
void afs_exit();
+extern void afsi_log(char *pattern, ...);
+
/* globals from the base afsd */
extern int cm_logChunkSize;
0, // must be zero
REG_EXPAND_SZ, // value type
(LPBYTE) szBuf, // pointer to value data
- strlen(szBuf) + 1)) // length of value data
+ (DWORD)strlen(szBuf) + 1)) // length of value data
{
bRet = FALSE;
break;
return FALSE;
}
pc = strrchr(pszShareName, SLASH);
- if ((pc == NULL) || ((dwServerSize = pc - pszShareName) < 3))
+ if ((pc == NULL) || ((dwServerSize = (DWORD)(pc - pszShareName)) < 3))
{
LogEvent(EVENTLOG_ERROR_TYPE, MSG_FLUSH_BAD_SHARE_NAME,
pszShareName, NULL);
GetDateFormat(LOCALE_SYSTEM_DEFAULT, 0, NULL, NULL, d, sizeof(d));
StringCbPrintfA(u, sizeof(u), "%s %s: %s\n", d, t, s);
if (afsi_file != INVALID_HANDLE_VALUE)
- WriteFile(afsi_file, u, strlen(u), &zilch, NULL);
+ WriteFile(afsi_file, u, (DWORD)strlen(u), &zilch, NULL);
#ifdef NOTSERVICE
printf("%s", u);
#endif
} else {
if (afsi_file != INVALID_HANDLE_VALUE)
- WriteFile(afsi_file, s, strlen(s), &zilch, NULL);
+ WriteFile(afsi_file, s, (DWORD)strlen(s), &zilch, NULL);
}
}
GetTimeFormat(LOCALE_SYSTEM_DEFAULT, 0, NULL, NULL, u, sizeof(u));
StringCbCatA(t, sizeof(t), ": Create log file\n");
StringCbCatA(u, sizeof(u), ": Created log file\n");
- WriteFile(afsi_file, t, strlen(t), &zilch, NULL);
- WriteFile(afsi_file, u, strlen(u), &zilch, NULL);
+ WriteFile(afsi_file, t, (DWORD)strlen(t), &zilch, NULL);
+ WriteFile(afsi_file, u, (DWORD)strlen(u), &zilch, NULL);
p = "PATH=";
code = GetEnvironmentVariable("PATH", NULL, 0);
path = malloc(code);
code = GetEnvironmentVariable("PATH", path, code);
- WriteFile(afsi_file, p, strlen(p), &zilch, NULL);
- WriteFile(afsi_file, path, strlen(path), &zilch, NULL);
- WriteFile(afsi_file, "\n", 1, &zilch, NULL);
+ WriteFile(afsi_file, p, (DWORD)strlen(p), &zilch, NULL);
+ WriteFile(afsi_file, path, (DWORD)strlen(path), &zilch, NULL);
+ WriteFile(afsi_file, "\n", (DWORD)1, &zilch, NULL);
free(path);
/* Initialize C RTL Code Page conversion functions */
}
if ( !bNameFound ) {
- int size = strlen(cm_NetbiosName) + 2;
+ size_t size = strlen(cm_NetbiosName) + 2;
if ( !pHostNames ) {
pHostNames = malloc(size);
dwSize = 1;
*pName = '\0'; /* add a second nul terminator */
dwType = REG_MULTI_SZ;
- dwSize += strlen(cm_NetbiosName) + 1;
+ dwSize += (DWORD)strlen(cm_NetbiosName) + 1;
RegSetValueEx( hkMSV10, "BackConnectionHostNames", 0, dwType, pHostNames, dwSize);
if ( RegOpenKeyEx( HKEY_LOCAL_MACHINE,
int afsd_InitCM(char **reasonP)
{
osi_uid_t debugID;
- DWORD cacheBlocks;
+ afs_uint64 cacheBlocks;
DWORD cacheSize;
long logChunkSize;
DWORD stats;
/* setup and enable debug log */
afsd_logp = osi_LogCreate("afsd", traceBufSize);
- afsi_log("osi_LogCreate log addr %x", (int)afsd_logp);
+ afsi_log("osi_LogCreate log addr %x", PtrToUlong(afsd_logp));
if ((TraceOption & 0x8)
#ifdef DEBUG
|| 1
cm_mountRoot, &cm_mountRootLen);
if (code == ERROR_SUCCESS) {
afsi_log("Mount root %s", cm_mountRoot);
- cm_mountRootLen = strlen(cm_mountRoot);
+ cm_mountRootLen = (DWORD)strlen(cm_mountRoot);
} else {
StringCbCopyA(cm_mountRoot, sizeof(cm_mountRoot), "/afs");
cm_mountRootLen = 4;
osi_panic(buf, __FILE__, __LINE__);
}
- cacheBlocks = (cacheSize * 1024) / CM_CONFIGDEFAULT_BLOCKSIZE;
+ cacheBlocks = ((afs_uint64)cacheSize * 1024) / CM_CONFIGDEFAULT_BLOCKSIZE;
/* get network related info */
cm_noIPAddr = CM_MAXINTERFACE_ADDR;
*/
cm_initParams.nChunkFiles = 0;
cm_initParams.nStatCaches = stats;
- cm_initParams.nDataCaches = cacheBlocks;
+ cm_initParams.nDataCaches = (afs_uint32)(cacheBlocks > 0xFFFFFFFF ? 0xFFFFFFFF : cacheBlocks);
cm_initParams.nVolumeCaches = stats/2;
cm_initParams.firstChunkSize = cm_chunkSize;
cm_initParams.otherChunkSize = cm_chunkSize;
nullServerSecurityClassp = rxnull_NewServerSecurityObject();
serverp = rx_NewService(0, 1, "AFS", &nullServerSecurityClassp, 1,
RXAFSCB_ExecuteRequest);
- afsi_log("rx_NewService addr %x", (int)serverp);
+ afsi_log("rx_NewService addr %x", PtrToUlong(serverp));
if (serverp == NULL) {
*reasonP = "unknown error";
return -1;
nullServerSecurityClassp = rxnull_NewServerSecurityObject();
serverp = rx_NewService(0, RX_STATS_SERVICE_ID, "rpcstats",
&nullServerSecurityClassp, 1, RXSTATS_ExecuteRequest);
- afsi_log("rx_NewService addr %x", (int)serverp);
+ afsi_log("rx_NewService addr %x", PtrToUlong(serverp));
if (serverp == NULL) {
*reasonP = "unknown error";
return -1;
if (code == 0 && !cm_freelanceEnabled)
{
cm_data.rootCellp = cm_GetCell(rootCellName, CM_FLAG_CREATE);
- afsi_log("cm_GetCell addr %x", (int)cm_data.rootCellp);
+ afsi_log("cm_GetCell addr %x", PtrToUlong(cm_data.rootCellp));
if (cm_data.rootCellp == NULL)
{
*reasonP = "can't find root cell in afsdcell.ini";
void afsd_printStack(HANDLE hThread, CONTEXT *c)
{
+#if defined(_X86_)
HANDLE hProcess = GetCurrentProcess();
int frameNum;
+#if defined(_AMD64_)
+ DWORD64 offset;
+#elif defined(_X86_)
DWORD offset;
+#endif
DWORD symOptions;
char functionName[MAXNAMELEN];
#if defined (_ALPHA_) || defined (_MIPS_) || defined (_PPC_)
#error The STACKFRAME initialization in afsd_printStack() for this platform
#error must be properly configured
+#elif defined(_AMD64_)
+ s.AddrPC.Offset = 0;
+ s.AddrPC.Mode = AddrModeFlat;
+ s.AddrFrame.Offset = 0;
+ s.AddrFrame.Mode = AddrModeFlat;
#else
s.AddrPC.Offset = c->Eip;
s.AddrPC.Mode = AddrModeFlat;
SymCleanup(hProcess);
GlobalFree(pSym);
+#endif /* _X86_ */
}
#ifdef _DEBUG
_CrtSetBreakAlloc(*afsd_crtDbgBreakCurrent);
}
#endif
-
+#if defined(_X86)
ep->ContextRecord->Eip++;
+#endif
return EXCEPTION_CONTINUE_EXECUTION;
}
else
char tbuffer[512];
char *ptbuf[1];
HANDLE h;
- int i;
if (filep)
sprintf(tbuffer, "Error at file %s, line %d: %s",
#endif /* JUMP */
HMODULE hHookDll;
HMODULE hAdvApi32;
- int cnt;
#ifdef _DEBUG
_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF /*| _CRTDBG_CHECK_ALWAYS_DF*/ |
{
char *matchString; /* for matching against */
char *buf, *buf_pos; /* filling buffer to length, currently at buf_pos */
- ULONG length;
+ ULONG_PTR length;
ULONG count; /* number of entries packed so far */
};
typedef struct readdir_context readdir_context_t;
unless network fails (it loops properly). */
ifs_CheckAcl(cm_scache_t *scp, ULONG access, ULONG *granted)
{
- long outRights, code;
+ long code;
cm_req_t req;
cm_InitReq(&req);
cm_InitReq(&req);
- len = wcslen(name)+20; /* characters *should* map 1<->1, but in case */
+ len = (short)wcslen(name)+20; /* characters *should* map 1<->1, but in case */
buffer = malloc(len);
code = ifs_ConvertFileName(name, -1, buffer, len);
if (code)
cm_InitReq(&req);
- len = wcslen(name)+20; /* characters *should* map 1<->1, but in case */
+ len = (short)wcslen(name)+20; /* characters *should* map 1<->1, but in case */
buffer = malloc(len);
code = ifs_ConvertFileName(name, -1, buffer, len);
if (code)
/* FIXFIX: this code may not catch over-quota errors, because the end
* of the file is not written to the server by the time this returns. */
/* truncate or extend file, in cache and on server */
-uc_trunc(ULONG fid, LARGE_INTEGER size)
+long uc_trunc(ULONG fid, LARGE_INTEGER size)
{
- ULONG code, gr;
+ ULONG code;
cm_scache_t *scp;
cm_req_t req;
- osi_hyper_t oldLen, writePos;
- long written;
+ osi_hyper_t oldLen;
scp = ifs_FindScp(fid);
if (!scp)
return IFSL_BAD_INPUT;
/* we have already checked permissions in the kernel; but, if we do not
- * have access as this userp, code will fail in rpc layer.
- */
+ * have access as this userp, code will fail in rpc layer.
+ */
cm_InitReq(&req);
lock_ObtainMutex(&(scp->mx));
}
/* read data from a file */
-uc_read(ULONG fid, LARGE_INTEGER offset, ULONG length, ULONG *read, char *data)
+long uc_read(ULONG fid, LARGE_INTEGER offset, ULONG length, ULONG *read, char *data)
{
ULONG code;
cm_scache_t *scp;
- cm_req_t req;
*read = 0;
/* write data to a file */
uc_write(ULONG fid, LARGE_INTEGER offset, ULONG length, ULONG *written, char *data)
{
- ULONG code, gr;
+ ULONG code;
cm_scache_t *scp;
scp = ifs_FindScp(fid);
{
int code;
cm_req_t req;
- cm_attr_t attr;
- wchar_t *buf;
char *curdir, *curfile, *newdir, *newfile;
cm_scache_t *dscp1, *dscp2, *scp;
char b1[MAX_PATH], b2[MAX_PATH], b3[MAX_PATH];
- ULONG fid2;
-
code = !(scp = ifs_FindScp(fid));
if (!code)
{
strcat(b3, "\\");
strcat(b3, b2);
+ // TODO: Must convert b3 to type WCHAR*
uc_namei(b3, new_fid);
}
else
{
- code = ifs_ConvertFileName(curr, -1, b1, MAX_PATH);
- code = uc_namei(b1, new_fid);
+ code = uc_namei(curr, new_fid);
}
ifs_InternalClose(&dscp2);
}
else
{
- code = ifs_ConvertFileName(curr, -1, b1, MAX_PATH);
- code = uc_namei(b1, new_fid);
+ code = uc_namei(curr, new_fid);
}
ifs_InternalClose(&dscp1);
}
ifs_ReaddirCallback(cm_scache_t *scp, cm_dirEntry_t *entry, void *param, osi_hyper_t *offset)
{
readdir_context_t *context;
- ULONG name_len, gr;
+ ULONG name_len;
readdir_data_t *info;
char short_name[14], *endp;
ULONG code;
context = param;
- name_len = strlen(entry->name);
+ name_len = (ULONG) strlen(entry->name);
info = (readdir_data_t *)context->buf_pos;
if (context->length - (context->buf_pos - context->buf) < sizeof(readdir_data_t) + name_len * sizeof(WCHAR) + sizeof(LARGE_INTEGER))
cm_Gen8Dot3Name(entry, short_name, &endp);
*endp = '\0';
- info->short_name_length = sizeof(WCHAR)*((t=MultiByteToWideChar(CP_UTF8, 0, short_name, -1, info->short_name, 14))?t-1:0);
+ info->short_name_length = (CCHAR)sizeof(WCHAR)*((t=MultiByteToWideChar(CP_UTF8, 0, short_name, -1, info->short_name, 14))?t-1:0);
info->name_length = sizeof(WCHAR)*((t=MultiByteToWideChar(CP_UTF8, 0, entry->name, -1, info->name, 600))?t-1:0);
context->buf_pos = ((char*)info) + sizeof(readdir_data_t) + info->name_length;
return 0;
}
-uc_readdir(ULONG fid, LARGE_INTEGER cookie_in, WCHAR *filter, ULONG *count, char *data, ULONG *len)
+long uc_readdir(ULONG fid, LARGE_INTEGER cookie_in, WCHAR *filter, ULONG *count, char *data, ULONG_PTR *len)
{
ULONG code;
char buffer[2048];
uc_close(ULONG fid)
{
- ULONG code;
cm_scache_t *scp;
cm_req_t req;
scp_status_t *prev, *curr;
{
char buffer[2048];
long code;
- cm_scache_t *scp, *dscp;
+ cm_scache_t *dscp;
char *dirp, *filep;
unsigned char removed;
cm_req_t req;
- scp_status_t *st;
cm_InitReq(&req);
}
-int uc_ioctl_write(ULONG length, char *data, ULONG *key)
+int uc_ioctl_write(ULONG length, char *data, ULONG_PTR *key)
{
- int code;
- cm_req_t req;
smb_ioctl_t *iop;
iop = malloc(sizeof(smb_ioctl_t));
memcpy(iop->inDatap + iop->inCopied, data, length);
iop->inCopied += length;
- *key = (ULONG)iop;
+ *key = (ULONG_PTR)iop;
return 0;
}
-int uc_ioctl_read(ULONG key, ULONG *length, char *data)
+int uc_ioctl_read(ULONG_PTR key, ULONG *length, char *data)
{
- int code;
- cm_req_t req;
smb_ioctl_t *iop;
iop = key;
ifs_TransactRpc(char *outbuf, int outlen, char *inbuf, int *inlen)
{
HANDLE hf;
- int ret;
- DWORD err, read = 0;
+ DWORD read = 0;
DWORD inmax;
if (!outbuf || !inbuf)
HANDLE pipe;
DWORD written;
unsigned char *bufIn, *bufOut;
- DWORD lenIn, lenOut, status;
- DWORD err;
+ DWORD lenIn;
rpc_t rpc;
BOOL st;
/* ...and write it back */
st = WriteFile(pipe, rpc.out_buf, rpc.out_pos - rpc.out_buf, &written, NULL);
if (!st)
- if (GetLastError() == ERROR_INVALID_HANDLE)
- break;
- else
- continue;
- }
+ if (GetLastError() == ERROR_INVALID_HANDLE)
+ break;
+ else
+ continue;
+ }
- return 1;
+ return (DWORD)1;
}
static LPWORD
lpwAlign( LPWORD lpIn )
{
- ULONG ul;
+ ULONG_PTR ul;
- ul = (ULONG) lpIn;
+ ul = (ULONG_PTR) lpIn;
ul += 3;
ul >>=2;
ul <<=2;
lpdit->dwExtendedStyle = 0;
lpdit->x = 10;
lpdit->y = 10 + i * 14;
- lpdit->cx = strlen(ptext[i]) * 4 + 10;
+ lpdit->cx = (short)strlen(ptext[i]) * 4 + 10;
lpdit->cy = 14;
lpdit->id = ID_TEXT + i; // text identifier
}
for ( i=0, pwid = 0; i<tb_cnt; i++) {
- if ( pwid < strlen(tb[i].label) )
- pwid = strlen(tb[i].label);
+ int len = (int)strlen(tb[i].label);
+ if ( pwid < len )
+ pwid = len;
}
for ( i=0; i<tb_cnt; i++) {
static int
multi_field_dialog(HWND hParent, char * preface, int n, struct textField tb[])
{
- HINSTANCE hInst = 0;
+ HINSTANCE hInst = 0;
int maxwidth = 0;
int numlines = 0;
int len;
*p++ = '\0';
}
if ( strlen(plines[numlines-1]) > maxwidth )
- maxwidth = strlen(plines[numlines-1]);
+ maxwidth = (int)strlen(plines[numlines-1]);
}
for ( i=0;i<n;i++ ) {
- len = strlen(tb[i].label) + 1 + (tb[i].len > 40 ? 40 : tb[i].len);
+ len = (int)strlen(tb[i].label) + 1 + (tb[i].len > 40 ? 40 : tb[i].len);
if ( maxwidth < len )
maxwidth = len;
}
- return(MultiInputDialog(hInst, hParent, plines, numlines, maxwidth, n, tb));
+ return(MultiInputDialog(hInst, hParent, plines, numlines, maxwidth, n, tb)?1:0);
}
static krb5_error_code KRB5_CALLCONV
HWND hParent = (HWND)data;
if (name)
- nlen = strlen(name)+2;
+ nlen = (int)strlen(name)+2;
if (banner)
- blen = strlen(banner)+2;
+ blen = (int)strlen(banner)+2;
tb = (struct textField *) malloc(sizeof(struct textField) * num_prompts);
if ( tb != NULL ) {
ok = multi_field_dialog(hParent,(char *)banner,num_prompts,tb);
if ( ok ) {
for ( i=0; i < num_prompts; i++ )
- prompts[i].reply->length = strlen(prompts[i].reply->data);
+ prompts[i].reply->length = (unsigned int)strlen(prompts[i].reply->data);
} else
errcode = -2;
}
/* First try service/cell@REALM */
if (code = pkrb5_build_principal(ctx, &increds.server,
- strlen(RealmName),
+ (int)strlen(RealmName),
RealmName,
ServiceName,
CellName,
pkrb5_free_principal(ctx,increds.server);
increds.server = 0;
code = pkrb5_build_principal(ctx, &increds.server,
- strlen(RealmName),
+ (int)strlen(RealmName),
RealmName,
ServiceName,
0);
pkrb5_free_principal(ctx,increds.server);
increds.server = 0;
code = pkrb5_build_principal(ctx, &increds.server,
- strlen(RealmName),
+ (int)strlen(RealmName),
RealmName,
ServiceName,
CellName,
pkrb5_free_principal(ctx,increds.server);
increds.server = 0;
code = pkrb5_build_principal(ctx, &increds.server,
- strlen(RealmName),
+ (int)strlen(RealmName),
RealmName,
ServiceName,
0);
char * p;
strcat(aclient.name, ".");
p = aclient.name + strlen(aclient.name);
- len = min(k5creds->client->data[1].length,MAXKTCNAMELEN - strlen(aclient.name) - 1);
+ len = min(k5creds->client->data[1].length,MAXKTCNAMELEN - (int)strlen(aclient.name) - 1);
strncpy(p, k5creds->client->data[1].data, len);
p[len] = '\0';
}
strcpy(aclient.cell, realm_of_cell);
- len = min(k5creds->client->realm.length,strlen(realm_of_cell));
+ len = min(k5creds->client->realm.length,(int)strlen(realm_of_cell));
/* For Khimaira, always append the realm name */
if ( 1 /* strncmp(realm_of_cell, k5creds->client->realm.data, len) */ ) {
char * p;
strcat(aclient.name, "@");
p = aclient.name + strlen(aclient.name);
- len = min(k5creds->client->realm.length,MAXKTCNAMELEN - strlen(aclient.name) - 1);
+ len = min(k5creds->client->realm.length,MAXKTCNAMELEN - (int)strlen(aclient.name) - 1);
strncpy(p, k5creds->client->realm.data, len);
p[len] = '\0';
}
realm = afs_realm_of_cell(ctx, cellconfig); // do not free
- code = pkrb5_build_principal(ctx, &principal, strlen(realm),
+ code = pkrb5_build_principal(ctx, &principal, (int)strlen(realm),
realm, PROBE_USERNAME, NULL, NULL);
if ( code ) goto cleanup;
szUser[*dwSize-1] = '\0';
success = 1;
}
- *dwSize = strlen(pname);
+ *dwSize = (DWORD)strlen(pname);
cleanup:
if (pname)
int
KFW_AFS_copy_system_file_to_default_cache(char * filename)
{
- DWORD count;
char cachename[264] = "FILE:";
- HANDLE hFile;
krb5_context ctx = 0;
krb5_error_code code;
krb5_principal princ = 0;
len ++;
wuname = malloc(len * sizeof(WCHAR));
- MultiByteToWideChar(CP_ACP,0,opt->smbName,-1,wuname,len*sizeof(WCHAR));
+ MultiByteToWideChar(CP_ACP,0,opt->smbName,-1,wuname,(int)(len*sizeof(WCHAR)));
DebugEvent("Username is set for [%S]", wuname);
DebugEvent("After expanding env strings [%S]", regscript);
if(wcsstr(regscript, L"%s")) {
- dwSize += len * sizeof(WCHAR); /* make room for username expansion */
+ dwSize += (DWORD)(len * sizeof(WCHAR)); /* make room for username expansion */
regexuscript = (WCHAR *) LocalAlloc(LMEM_FIXED, dwSize);
hr = StringCbPrintfW(regexuscript, dwSize, regscript, wuname);
} else {
GetSecurityLogonSessionData(HANDLE hToken, PSECURITY_LOGON_SESSION_DATA * ppSessionData)
{
NTSTATUS Status = 0;
- HANDLE TokenHandle;
TOKEN_STATISTICS Stats;
DWORD ReqLen;
BOOL Success;
return FALSE;
*ppSessionData = NULL;
-#if 0
- Success = OpenProcessToken( HANDLE GetCurrentProcess(), TOKEN_QUERY, &TokenHandle );
- if ( !Success )
- return FALSE;
-#endif
-
Success = GetTokenInformation( hToken, TokenStatistics, &Stats, sizeof(TOKEN_STATISTICS), &ReqLen );
-#if 0
- CloseHandle( TokenHandle );
-#endif
if ( !Success )
return FALSE;
VOID KFW_Logon_Event( PWLX_NOTIFICATION_INFO pInfo )
{
- DWORD code;
-
WCHAR szUserW[128] = L"";
char szUserA[128] = "";
- char szClient[MAX_PATH];
char szPath[MAX_PATH] = "";
char szLogonId[128] = "";
- NETRESOURCE nr;
- DWORD res;
- DWORD gle;
- DWORD dwSize;
- DWORD dwDisp;
- DWORD dwType;
DWORD count;
- VOID * ticketData;
char filename[256];
char commandline[512];
STARTUPINFO startupinfo;
int
main(int argc, char **argv) {
- BOOL res;
HKEY hkSubmounts;
HKEY hkParameters;
char mountRoot[64]="/afs";
else
mountstring = argv[2];
- if (RegSetValueEx(hkSubmounts, argv[1], 0, REG_EXPAND_SZ, mountstring, strlen(mountstring)+1)) {
+ if (RegSetValueEx(hkSubmounts, argv[1], 0, REG_EXPAND_SZ, mountstring, (DWORD)strlen(mountstring)+1)) {
fprintf(stderr,"Submount Set failure for [%s]: %lX",
argv[1], GetLastError());
RegCloseKey(hkSubmounts);
if (feof(stdin)) return EOF; /* EOF on input, nothing read */
else return -2; /* I don't think this can happen */
}
- l = strlen (s);
+ l = (int)strlen (s);
if (l && (s[l-1] == '\n')) s[--l] = 0;
return l;
}
int VL_GetEntryByNameN(struct rx_connection *, char *, struct nvldbentry *);
/* from .xg file */
-extern StartRXAFS_FetchData (struct rx_call *,
+int StartRXAFS_FetchData (struct rx_call *,
struct AFSFid *Fid,
afs_int32 Pos,
afs_int32 Length);
-extern EndRXAFS_FetchData (struct rx_call *,
+int EndRXAFS_FetchData (struct rx_call *,
struct AFSFetchStatus *OutStatus,
struct AFSCallBack *CallBack,
struct AFSVolSync *Sync);
-extern RXAFS_FetchACL(struct rx_connection *,
+int RXAFS_FetchACL(struct rx_connection *,
struct AFSFid *Fid,
struct AFSOpaque *AccessList,
struct AFSFetchStatus *OutStatus,
struct AFSVolSync *Sync);
-extern RXAFS_FetchStatus (struct rx_connection *,
+int RXAFS_FetchStatus (struct rx_connection *,
struct AFSFid *Fid,
struct AFSFetchStatus *OutStatus,
struct AFSCallBack *CallBack,
struct AFSFetchStatus *OutStatus,
struct AFSVolSync *Sync);
+int StartRXAFS_FetchData64(struct rx_call *z_call,
+ struct AFSFid * Fid,
+ afs_int64 Pos,
+ afs_int64 Length);
+
+int EndRXAFS_FetchData64(struct rx_call *z_call,
+ struct AFSFetchStatus * OutStatus,
+ struct AFSCallBack * CallBack,
+ struct AFSVolSync * Sync);
+
+afs_int32 SRXAFS_FetchData64(struct rx_call *z_call,
+ struct AFSFid * Fid,
+ afs_int64 Pos,
+ afs_int64 Length,
+ struct AFSFetchStatus * OutStatus,
+ struct AFSCallBack * CallBack,
+ struct AFSVolSync * Sync);
+
+int StartRXAFS_StoreData64(struct rx_call *z_call,
+ struct AFSFid * Fid,
+ struct AFSStoreStatus * InStatus,
+ afs_uint64 Pos,
+ afs_uint64 Length,
+ afs_uint64 FileLength);
+
+int EndRXAFS_StoreData64(struct rx_call *z_call,
+ struct AFSFetchStatus * OutStatus,
+ struct AFSVolSync * Sync);
+
+afs_int32 SRXAFS_StoreData64(struct rx_call *z_call,
+ struct AFSFid * Fid,
+ struct AFSStoreStatus * InStatus,
+ afs_uint64 Pos,
+ afs_uint64 Length,
+ afs_uint64 FileLength,
+ struct AFSFetchStatus * OutStatus,
+ struct AFSVolSync * Sync);
+
int RXAFS_StoreACL (struct rx_connection *,
struct AFSFid *Fid,
struct AFSOpaque *AccessList,
extern long cm_FindACLCache(struct cm_scache *scp, struct cm_user *userp, long *rightsp);
-static cm_aclent_t *GetFreeACLEnt(void);
+static cm_aclent_t *GetFreeACLEnt(cm_scache_t * scp);
extern long cm_AddACLCache(struct cm_scache *scp, struct cm_user *userp, long rights);
bp = cm_data.buf_allp;
bp->refCount++;
lock_ReleaseWrite(&buf_globalLock);
- nAtOnce = (long)sqrt(cm_data.buf_nbuffers);
+ nAtOnce = (long)sqrt((double)cm_data.buf_nbuffers);
while (buf_ShutdownFlag == 0) {
#ifndef DJGPP
i = SleepEx(5000, 1);
buf_ValidateBuffers(void)
{
cm_buf_t * bp, *bpf, *bpa, *bpb;
- afs_uint32 countb = 0, countf = 0, counta = 0;
+ afs_uint64 countb = 0, countf = 0, counta = 0;
if (cm_data.buf_freeListp == NULL && cm_data.buf_freeListEndp != NULL ||
cm_data.buf_freeListp != NULL && cm_data.buf_freeListEndp == NULL) {
/* initialize the buffer package; called with no locks
* held during the initialization phase.
*/
-long buf_Init(int newFile, cm_buf_ops_t *opsp, long nbuffers)
+long buf_Init(int newFile, cm_buf_ops_t *opsp, afs_uint64 nbuffers)
{
static osi_once_t once;
cm_buf_t *bp;
/* add nbuffers to the buffer pool, if possible.
* Called with no locks held.
*/
-long buf_AddBuffers(long nbuffers)
+long buf_AddBuffers(afs_uint64 nbuffers)
{
#ifndef DJGPP
/* The size of a virtual cache cannot be changed after it has
/* interface to set the number of buffers to an exact figure.
* Called with no locks held.
*/
-long buf_SetNBuffers(long nbuffers)
+long buf_SetNBuffers(afs_uint64 nbuffers)
{
if (nbuffers < 10)
return CM_ERROR_INVAL;
if ( bp->flags & CM_BUF_WAITING ) {
bp->waitCount++;
bp->waitRequests++;
- osi_Log1(afsd_logp, "buf_WaitIO CM_BUF_WAITING already set for 0x%x", bp);
+ osi_Log1(afsd_logp, "buf_WaitIO CM_BUF_WAITING already set for 0x%p", bp);
} else {
- osi_Log1(afsd_logp, "buf_WaitIO CM_BUF_WAITING set for 0x%x", bp);
+ osi_Log1(afsd_logp, "buf_WaitIO CM_BUF_WAITING set for 0x%p", bp);
bp->flags |= CM_BUF_WAITING;
bp->waitCount = bp->waitRequests = 1;
}
- osi_SleepM((long) bp, &bp->mx);
+ osi_SleepM((LONG_PTR)bp, &bp->mx);
lock_ObtainMutex(&bp->mx);
- osi_Log1(afsd_logp, "buf_WaitIO conflict wait done for 0x%x", bp);
+ osi_Log1(afsd_logp, "buf_WaitIO conflict wait done for 0x%p", bp);
bp->waitCount--;
if (bp->waitCount == 0) {
- osi_Log1(afsd_logp, "buf_WaitIO CM_BUF_WAITING reset for 0x%x", bp);
+ osi_Log1(afsd_logp, "buf_WaitIO CM_BUF_WAITING reset for 0x%p", bp);
bp->flags &= ~CM_BUF_WAITING;
bp->waitRequests = 0;
}
if ( scp ) {
lock_ObtainMutex(&scp->mx);
if (scp->flags & CM_SCACHEFLAG_WAITING) {
- osi_Log1(afsd_logp, "buf_WaitIO waking scp 0x%x", scp);
- osi_Wakeup((long)&scp->flags);
+ osi_Log1(afsd_logp, "buf_WaitIO waking scp 0x%p", scp);
+ osi_Wakeup((LONG_PTR)&scp->flags);
}
lock_ReleaseMutex(&scp->mx);
}
* the I/O to complete. Do so.
*/
if (bp->flags & CM_BUF_WAITING) {
- osi_Log1(afsd_logp, "buf_WaitIO Waking bp 0x%x", bp);
- osi_Wakeup((long) bp);
+ osi_Log1(afsd_logp, "buf_WaitIO Waking bp 0x%p", bp);
+ osi_Wakeup((LONG_PTR) bp);
}
- osi_Log1(afsd_logp, "WaitIO finished wait for bp 0x%x", (long) bp);
+ osi_Log1(afsd_logp, "WaitIO finished wait for bp 0x%p", bp);
}
/* code to drop reference count while holding buf_globalLock */
while ((bp->flags & CM_BUF_DIRTY) == CM_BUF_DIRTY) {
lock_ReleaseMutex(&bp->mx);
- osi_Log1(afsd_logp, "buf_LockedCleanAsync starts I/O on 0x%x", bp);
+ osi_Log1(afsd_logp, "buf_LockedCleanAsync starts I/O on 0x%p", bp);
code = (*cm_buf_opsp->Writep)(&bp->fid, &bp->offset,
cm_data.buf_blockSize, 0, bp->userp,
reqp);
- osi_Log2(afsd_logp, "buf_LockedCleanAsync I/O on 0x%x, done=%d", bp, code);
+ osi_Log2(afsd_logp, "buf_LockedCleanAsync I/O on 0x%p, done=%d", bp, code);
lock_ObtainMutex(&bp->mx);
if (code)
*/
if (bp->flags & CM_BUF_WAITING) {
/* turn off flags and wakeup users */
- osi_Log1(buf_logp, "buf_WaitIO Waking bp 0x%x", bp);
- osi_Wakeup((long) bp);
+ osi_Log1(buf_logp, "buf_WaitIO Waking bp 0x%p", bp);
+ osi_Wakeup((LONG_PTR) bp);
}
}
* have any lock conflicts, so we can grab the buffer lock out of
* order in the locking hierarchy.
*/
- osi_Log2( buf_logp, "buf_Recycle recycles 0x%x, off 0x%x",
+ osi_Log2( buf_logp, "buf_Recycle recycles 0x%p, off 0x%x",
bp, bp->offset.LowPart);
osi_assert(bp->refCount == 0);
*/
lock_ReleaseMutex(&bp->mx);
*bufpp = bp;
- osi_Log3(buf_logp, "buf_GetNew returning bp 0x%x for file 0x%x, offset 0x%x",
- bp, (long) scp, offsetp->LowPart);
+ osi_Log3(buf_logp, "buf_GetNew returning bp 0x%p for file 0x%p, offset 0x%x",
+ bp, scp, offsetp->LowPart);
return 0;
}
bp->flags |= CM_BUF_ERROR;
bp->flags &= ~CM_BUF_READING;
if (bp->flags & CM_BUF_WAITING) {
- osi_Log1(buf_logp, "buf_Get Waking bp 0x%x", bp);
- osi_Wakeup((long) bp);
+ osi_Log1(buf_logp, "buf_Get Waking bp 0x%p", bp);
+ osi_Wakeup((LONG_PTR) bp);
}
lock_ReleaseMutex(&bp->mx);
buf_Release(bp);
}
bp->flags &= ~CM_BUF_READING;
if (bp->flags & CM_BUF_WAITING) {
- osi_Log1(buf_logp, "buf_Get Waking bp 0x%x", bp);
- osi_Wakeup((long) bp);
+ osi_Log1(buf_logp, "buf_Get Waking bp 0x%p", bp);
+ osi_Wakeup((LONG_PTR) bp);
}
}
}
lock_ReleaseWrite(&buf_globalLock);
- osi_Log3(buf_logp, "buf_Get returning bp 0x%x for file 0x%x, offset 0x%x",
- bp, (long) scp, offsetp->LowPart);
+ osi_Log3(buf_logp, "buf_Get returning bp 0x%p for file 0x%p, offset 0x%x",
+ bp, scp, offsetp->LowPart);
#ifdef TESTING
buf_ValidateBufQueues();
#endif /* TESTING */
osi_assert(bp->magic == CM_BUF_MAGIC);
osi_assert(bp->refCount > 0);
- osi_Log1(buf_logp, "buf_SetDirty 0x%x", bp);
+ osi_Log1(buf_logp, "buf_SetDirty 0x%p", bp);
/* set dirty bit */
bp->flags |= CM_BUF_DIRTY;
/* called without global lock being held, reserves buffers for callers
* that need more than one held (not locked) at once.
*/
-void buf_ReserveBuffers(long nbuffers)
+void buf_ReserveBuffers(afs_uint64 nbuffers)
{
lock_ObtainWrite(&buf_globalLock);
while (1) {
if (cm_data.buf_reservedBufs + nbuffers > cm_data.buf_maxReservedBufs) {
cm_data.buf_reserveWaiting = 1;
osi_Log1(buf_logp, "buf_ReserveBuffers waiting for %d bufs", nbuffers);
- osi_SleepW((long) &cm_data.buf_reservedBufs, &buf_globalLock);
+ osi_SleepW((LONG_PTR) &cm_data.buf_reservedBufs, &buf_globalLock);
lock_ObtainWrite(&buf_globalLock);
}
else {
lock_ReleaseWrite(&buf_globalLock);
}
-int buf_TryReserveBuffers(long nbuffers)
+int buf_TryReserveBuffers(afs_uint64 nbuffers)
{
int code;
/* called without global lock held, releases reservation held by
* buf_ReserveBuffers.
*/
-void buf_UnreserveBuffers(long nbuffers)
+void buf_UnreserveBuffers(afs_uint64 nbuffers)
{
lock_ObtainWrite(&buf_globalLock);
cm_data.buf_reservedBufs -= nbuffers;
if (cm_data.buf_reserveWaiting) {
cm_data.buf_reserveWaiting = 0;
- osi_Wakeup((long) &cm_data.buf_reservedBufs);
+ osi_Wakeup((LONG_PTR) &cm_data.buf_reservedBufs);
}
lock_ReleaseWrite(&buf_globalLock);
}
StringCbPrintfA(output, sizeof(output), "%s - dumping buf_HashTable - buf_hashSize=%d\n",
cookie, cm_data.buf_hashSize);
- WriteFile(outputFile, output, strlen(output), &zilch, NULL);
+ WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
for (i = 0; i < cm_data.buf_hashSize; i++)
{
StringCbPrintfA(output, sizeof(output), "vnode=%d, unique=%d), size=%d refCount=%d\n",
cookie, (void *)bp, i, bp->fid.cell, bp->fid.volume,
bp->fid.vnode, bp->fid.unique, bp->size, bp->refCount);
- WriteFile(outputFile, output, strlen(output), &zilch, NULL);
+ WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
}
}
}
StringCbPrintfA(output, sizeof(output), "%s - Done dumping buf_HashTable.\n", cookie);
- WriteFile(outputFile, output, strlen(output), &zilch, NULL);
+ WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
if (lock)
lock_ReleaseRead(&buf_globalLock);
/* global locks */
extern osi_rwlock_t buf_globalLock;
-extern long buf_Init(int newFile, cm_buf_ops_t *, long nbuffers);
+extern long buf_Init(int newFile, cm_buf_ops_t *, afs_uint64 nbuffers);
extern void buf_Shutdown(void);
extern long buf_CleanAndReset(void);
-extern void buf_ReserveBuffers(long);
+extern void buf_ReserveBuffers(afs_uint64);
-extern int buf_TryReserveBuffers(long);
+extern int buf_TryReserveBuffers(afs_uint64);
-extern void buf_UnreserveBuffers(long);
+extern void buf_UnreserveBuffers(afs_uint64);
#ifdef TESTING
extern void buf_ValidateBufQueues(void);
extern long buf_FlushCleanPages(cm_scache_t *scp, cm_user_t *userp,
cm_req_t *reqp);
-extern long buf_SetNBuffers(long nbuffers);
+extern long buf_SetNBuffers(afs_uint64 nbuffers);
extern long buf_ValidateBuffers(void);
{
cm_HoldSCacheNoLock(scp);
lock_ReleaseWrite(&cm_scacheLock);
- osi_Log4(afsd_logp, "RevokeCallback Discarding SCache scp 0x%x vol %u vn %u uniq %u",
+ osi_Log4(afsd_logp, "RevokeCallback Discarding SCache scp 0x%p vol %u vn %u uniq %u",
scp, scp->fid.volume, scp->fid.vnode, scp->fid.unique);
lock_ObtainMutex(&scp->mx);
cm_DiscardSCache(scp);
cm_HoldSCacheNoLock(scp);
lock_ReleaseWrite(&cm_scacheLock);
lock_ObtainMutex(&scp->mx);
- osi_Log4(afsd_logp, "RevokeVolumeCallback Discarding SCache scp 0x%x vol %u vn %u uniq %u",
+ osi_Log4(afsd_logp, "RevokeVolumeCallback Discarding SCache scp 0x%p vol %u vn %u uniq %u",
scp, scp->fid.volume, scp->fid.vnode, scp->fid.unique);
cm_DiscardSCache(scp);
lock_ReleaseMutex(&scp->mx);
if (scp->cbExpires > 0 && scp->cbServerp != NULL) {
/* we have a callback, now decide if we should clear it */
if (scp->cbServerp == tsp || tsp == NULL) {
- osi_Log4(afsd_logp, "InitCallbackState Discarding SCache scp 0x%x vol %u vn %u uniq %u",
+ osi_Log4(afsd_logp, "InitCallbackState Discarding SCache scp 0x%p vol %u vn %u uniq %u",
scp, scp->fid.volume, scp->fid.vnode, scp->fid.unique);
cm_DiscardSCache(scp);
discarded = 1;
afs_MarshallCacheConfig(callerVersion, &cm_initParams, t_config);
*serverVersion = AFS_CLIENT_RETRIEVAL_FIRST_EDITION;
- *configCount = allocsize;
+#ifdef DEBUG
+#ifndef SIZE_MAX
+#define SIZE_MAX sizeof(afs_int32)
+#endif
+ osi_assert(allocsize < SIZE_MAX);
+#endif
+ *configCount = (afs_uint32)allocsize;
config->cacheConfig_val = t_config;
- config->cacheConfig_len = allocsize/sizeof(afs_uint32);
+ config->cacheConfig_len = (*configCount)/sizeof(afs_uint32);
MUTEX_EXIT(&callp->lock);
return 0;
(revp->flags & CM_RACINGFLAG_CANCELALL))) {
/* this one matches */
osi_Log4(afsd_logp,
- "Racing revoke scp 0x%x old cbc %d rev cbc %d cur cbc %d",
+ "Racing revoke scp 0x%p old cbc %d rev cbc %d cur cbc %d",
scp,
cbrp->callbackCount, revp->callbackCount,
cm_callbackCount);
cm_fid_t sfid;
struct rx_connection * callp;
- osi_Log4(afsd_logp, "GetCallback scp 0x%x cell %d vol %d flags %lX",
+ osi_Log4(afsd_logp, "GetCallback scp 0x%p cell %d vol %d flags %lX",
scp, scp->fid.cell, scp->fid.volume, flags);
#ifdef AFS_FREELANCE_CLIENT
cm_AFSFidFromFid(&tfid, &scp->fid);
while (1) {
if (!mustCall && cm_HaveCallback(scp)) {
- osi_Log3(afsd_logp, "GetCallback Complete scp 0x%x cell %d vol %d",
+ osi_Log3(afsd_logp, "GetCallback Complete scp 0x%p cell %d vol %d",
scp, scp->fid.cell, scp->fid.volume);
return 0;
}
lock_ReleaseMutex(&scp->mx);
/* now make the RPC */
- osi_Log4(afsd_logp, "CALL FetchStatus scp 0x%x cell %d vol %d uniq %d",
- (long) scp, scp->fid.cell, scp->fid.volume, scp->fid.unique);
+ osi_Log4(afsd_logp, "CALL FetchStatus scp 0x%p cell %d vol %d uniq %d",
+ scp, scp->fid.cell, scp->fid.volume, scp->fid.unique);
do {
code = cm_Conn(&sfid, userp, reqp, &connp);
if (code)
&cbr, code));
code = cm_MapRPCError(code, reqp);
if (code)
- osi_Log4(afsd_logp, "CALL FetchStatus FAILURE code 0x%x scp 0x%x cell %d vol %d",
- code, (long) scp, scp->fid.cell, scp->fid.volume);
+ osi_Log4(afsd_logp, "CALL FetchStatus FAILURE code 0x%x scp 0x%p cell %d vol %d",
+ code, scp, scp->fid.cell, scp->fid.volume);
else
- osi_Log4(afsd_logp, "CALL FetchStatus SUCCESS scp 0x%x cell %d vol %d uniq %d",
- (long) scp, scp->fid.cell, scp->fid.volume, scp->fid.unique);
+ osi_Log4(afsd_logp, "CALL FetchStatus SUCCESS scp 0x%p cell %d vol %d uniq %d",
+ scp, scp->fid.cell, scp->fid.volume, scp->fid.unique);
lock_ObtainMutex(&scp->mx);
if (code == 0) {
/* now check to see if we got an error */
if (code) {
- osi_Log2(afsd_logp, "GetCallback Failed code 0x%x scp 0x%x -->",code, scp);
+ osi_Log2(afsd_logp, "GetCallback Failed code 0x%x scp 0x%p -->",code, scp);
osi_Log4(afsd_logp, " cell %d vol %d vn %d uniq %d",
scp->fid.cell, scp->fid.volume, scp->fid.vnode, scp->fid.unique);
return code;
{
int i;
cm_scache_t *scp;
- unsigned long now;
+ time_t now;
osi_Log0(afsd_logp, "CheckCBExpiration");
cm_HoldSCacheNoLock(scp);
if (scp->cbExpires > 0 && (scp->cbServerp == NULL || now > scp->cbExpires)) {
lock_ReleaseWrite(&cm_scacheLock);
- osi_Log4(afsd_logp, "Callback Expiration Discarding SCache scp 0x%x vol %u vn %u uniq %u",
+ osi_Log4(afsd_logp, "Callback Expiration Discarding SCache scp 0x%p vol %u vn %u uniq %u",
scp, scp->fid.volume, scp->fid.vnode, scp->fid.unique);
lock_ObtainMutex(&scp->mx);
cm_DiscardSCache(scp);
typedef struct cm_callbackRequest {
long callbackCount; /* callback count at start of the request */
- unsigned long startTime; /* time when we started the call */
+ time_t startTime; /* time when we started the call */
struct cm_server *serverp; /* server we really got the callback from */
} cm_callbackRequest_t;
strcpy(cellNamep, AFSDIR_CLIENT_ETC_DIRPATH);
/* add trailing backslash, if required */
- tlen = strlen(cellNamep);
+ tlen = (int)strlen(cellNamep);
if (cellNamep[tlen-1] != '\\')
strcat(cellNamep, "\\");
#else
cm_configFile_t *cm_CommonOpen(char *namep, char *rwp)
{
- char wdir[256];
+ char wdir[256];
long tlen;
FILE *tfilep;
#if !defined(DJGPP) && !defined(AFS_WIN95_ENV)
strcpy(wdir, AFSDIR_CLIENT_ETC_DIRPATH);
- /* add trailing backslash, if required */
- tlen = strlen(wdir);
- if (wdir[tlen-1] != '\\') strcat(wdir, "\\");
+ /* add trailing backslash, if required */
+ tlen = (long)(strlen(wdir));
+ if (wdir[tlen-1] != '\\') strcat(wdir, "\\");
#else
#ifdef DJGPP
- strcpy(wdir,cm_confDir);
+ strcpy(wdir,cm_confDir);
#else
- DWORD dwSize;
- char *afsconf_path;
+ DWORD dwSize;
+ char *afsconf_path;
- dwSize = GetEnvironmentVariable("AFSCONF", NULL, 0);
- afsconf_path = malloc(dwSize);
- dwSize = GetEnvironmentVariable("AFSCONF", afsconf_path, dwSize);
+ dwSize = GetEnvironmentVariable("AFSCONF", NULL, 0);
+ afsconf_path = malloc(dwSize);
+ dwSize = GetEnvironmentVariable("AFSCONF", afsconf_path, dwSize);
- if (!afsconf_path)
- strcpy(wdir, AFSDIR_CLIENT_ETC_DIRPATH);
- else {
- strcpy(wdir, afsconf_path);
- free(afsconf_path);
- }
+ if (!afsconf_path)
+ strcpy(wdir, AFSDIR_CLIENT_ETC_DIRPATH);
+ else {
+ strcpy(wdir, afsconf_path);
+ free(afsconf_path);
+ }
#endif /* !DJGPP */
- strcat(wdir,"/");
+ strcat(wdir,"/");
#endif /* DJGPP || WIN95 */
- strcat(wdir, namep);
+ strcat(wdir, namep);
- tfilep = fopen(wdir, rwp);
+ tfilep = fopen(wdir, rwp);
- return ((cm_configFile_t *) tfilep);
-}
+ return ((cm_configFile_t *) tfilep);
+}
#ifndef DJGPP
long cm_WriteConfigString(char *labelp, char *valuep)
{
- DWORD code, dummyDisp;
- HKEY parmKey;
+ DWORD code, dummyDisp;
+ HKEY parmKey;
- code = RegCreateKeyEx(HKEY_LOCAL_MACHINE, AFSREG_CLT_SVC_PARAM_SUBKEY,
- 0, "container", 0, KEY_SET_VALUE, NULL,
- &parmKey, &dummyDisp);
- if (code != ERROR_SUCCESS)
- return -1;
+ code = RegCreateKeyEx(HKEY_LOCAL_MACHINE, AFSREG_CLT_SVC_PARAM_SUBKEY,
+ 0, "container", 0, KEY_SET_VALUE, NULL,
+ &parmKey, &dummyDisp);
+ if (code != ERROR_SUCCESS)
+ return -1;
- code = RegSetValueEx(parmKey, labelp, 0, REG_SZ,
- valuep, strlen(valuep) + 1);
- RegCloseKey (parmKey);
- if (code != ERROR_SUCCESS)
- return -1;
+ code = RegSetValueEx(parmKey, labelp, 0, REG_SZ,
+ valuep, (DWORD)strlen(valuep) + 1);
+ RegCloseKey (parmKey);
+ if (code != ERROR_SUCCESS)
+ return (long)-1;
- return 0;
+ return (long)0;
}
#endif /* !DJGPP */
strcpy(wdir, AFSDIR_CLIENT_ETC_DIRPATH);
/* add trailing backslash, if required */
- tlen = strlen(wdir);
+ tlen = (int)strlen(wdir);
if (wdir[tlen-1] != '\\') strcat(wdir, "\\");
#else
#ifdef DJGPP
strcpy(wdir, AFSDIR_CLIENT_ETC_DIRPATH);
/* add trailing backslash, if required */
- tlen = strlen(wdir);
+ tlen = (int)strlen(wdir);
if (wdir[tlen-1] != '\\') strcat(wdir, "\\");
#else
#ifdef DJGPP
osi_rwlock_t cm_connLock;
long RDRtimeout = CM_CONN_DEFAULTRDRTIMEOUT;
-long ConnDeadtimeout = CM_CONN_CONNDEADTIME;
-long HardDeadtimeout = CM_CONN_HARDDEADTIME;
+unsigned short ConnDeadtimeout = CM_CONN_CONNDEADTIME;
+unsigned short HardDeadtimeout = CM_CONN_HARDDEADTIME;
#define LANMAN_WKS_PARAM_KEY "SYSTEM\\CurrentControlSet\\Services\\lanmanworkstation\\parameters"
#define LANMAN_WKS_SESSION_TIMEOUT "SessTimeout"
long timeUsed, timeLeft;
long code;
- osi_Log2(afsd_logp, "cm_Analyze connp 0x%x, code 0x%x",
- (long) connp, errorCode);
+ osi_Log2(afsd_logp, "cm_Analyze connp 0x%p, code 0x%x",
+ connp, errorCode);
/* no locking required, since connp->serverp never changes after
* creation */
lock_ReleaseMutex(&userp->mx);
/* return this pointer to our caller */
- osi_Log1(afsd_logp, "cm_ConnByServer returning conn 0x%x", (long) tcp);
+ osi_Log1(afsd_logp, "cm_ConnByServer returning conn 0x%p", tcp);
*connpp = tcp;
return 0;
#define CM_CONN_CONNDEADTIME 60
#define CM_CONN_HARDDEADTIME 120
-extern long ConnDeadtimeout;
-extern long HardDeadtimeout;
+extern unsigned short ConnDeadtimeout;
+extern unsigned short HardDeadtimeout;
typedef struct cm_conn {
struct cm_conn *nextp; /* locked by cm_connLock */
lock_ObtainWrite(&cm_daemonLock);
while (daemon_ShutdownFlag == 0) {
if (!cm_bkgListEndp) {
- osi_SleepW((long) &cm_bkgListp, &cm_daemonLock);
+ osi_SleepW((LONG_PTR)&cm_bkgListp, &cm_daemonLock);
lock_ObtainWrite(&cm_daemonLock);
continue;
}
cm_bkgListEndp = rp;
lock_ReleaseWrite(&cm_daemonLock);
- osi_Wakeup((long) &cm_bkgListp);
+ osi_Wakeup((LONG_PTR) &cm_bkgListp);
}
static int
/* periodic check daemon */
void cm_Daemon(long parm)
{
- unsigned long now;
- unsigned long lastLockCheck;
- unsigned long lastVolCheck;
- unsigned long lastCBExpirationCheck;
- unsigned long lastDownServerCheck;
- unsigned long lastUpServerCheck;
- unsigned long lastTokenCacheCheck;
+ time_t now;
+ time_t lastLockCheck;
+ time_t lastVolCheck;
+ time_t lastCBExpirationCheck;
+ time_t lastDownServerCheck;
+ time_t lastUpServerCheck;
+ time_t lastTokenCacheCheck;
char thostName[200];
unsigned long code;
struct hostent *thp;
callp = rx_NewCall(rxconnp);
rx_PutConnection(rxconnp);
- osi_Log4(afsd_logp, "CALL StoreData scp 0x%x, offset 0x%x:%08x, length 0x%x",
- (long) scp, biod.offset.HighPart, biod.offset.LowPart, nbytes);
+ osi_Log4(afsd_logp, "CALL StoreData scp 0x%p, offset 0x%x:%08x, length 0x%x",
+ scp, biod.offset.HighPart, biod.offset.LowPart, nbytes);
code = StartRXAFS_StoreData(callp, &tfid, &inStatus,
biod.offset.LowPart, nbytes, truncPos);
/* write out wbytes of data from bufferp */
temp = rx_Write(callp, bufferp, wbytes);
if (temp != wbytes) {
- osi_Log3(afsd_logp, "rx_Write failed bp 0x%x, %d != %d",bufp,temp,wbytes);
+ osi_Log3(afsd_logp, "rx_Write failed bp 0x%p, %d != %d",bufp,temp,wbytes);
code = -1;
break;
} else {
- osi_Log2(afsd_logp, "rx_Write succeeded bp 0x%x, %d",bufp,temp);
+ osi_Log2(afsd_logp, "rx_Write succeeded bp 0x%p, %d",bufp,temp);
}
nbytes -= wbytes;
} /* while more bytes to write */
} /* if RPC started successfully */
else {
- osi_Log2(afsd_logp, "StartRXAFS_StoreData scp 0x%x failed (%lX)",scp,code);
+ osi_Log2(afsd_logp, "StartRXAFS_StoreData scp 0x%p failed (%lX)",scp,code);
}
if (code == 0) {
code = EndRXAFS_StoreData(callp, &outStatus, &volSync);
if (code)
- osi_Log2(afsd_logp, "EndRXAFS_StoreData scp 0x%x failed (%lX)",scp,code);
+ osi_Log2(afsd_logp, "EndRXAFS_StoreData scp 0x%p failed (%lX)",scp,code);
}
code = rx_EndCall(callp, code);
code = cm_MapRPCError(code, reqp);
if (code)
- osi_Log2(afsd_logp, "CALL StoreData FAILURE scp 0x%x, code 0x%x", scp, code);
+ osi_Log2(afsd_logp, "CALL StoreData FAILURE scp 0x%p, code 0x%x", scp, code);
else
- osi_Log1(afsd_logp, "CALL StoreData SUCCESS scp 0x%x", scp);
+ osi_Log1(afsd_logp, "CALL StoreData SUCCESS scp 0x%p", scp);
/* now, clean up our state */
lock_ObtainMutex(&scp->mx);
return 0;
}
-int cm_InitDCache(int newFile, long chunkSize, long nbuffers)
+int cm_InitDCache(int newFile, long chunkSize, afs_uint64 nbuffers)
{
lock_InitializeMutex(&cm_bufGetMutex, "buf_Get mutex");
return buf_Init(newFile, &cm_bufOps, nbuffers);
toffset.HighPart = p2;
length = p3;
- osi_Log4(afsd_logp, "Starting BKG store scp 0x%x, offset 0x%x:%08x, length 0x%x", scp, p2, p1, p3);
+ osi_Log4(afsd_logp, "Starting BKG store scp 0x%p, offset 0x%x:%08x, length 0x%x", scp, p2, p1, p3);
cm_BufWrite(&scp->fid, &toffset, length, /* flags */ 0, userp, &req);
base.HighPart = p2;
length = p3;
- osi_Log2(afsd_logp, "Starting BKG prefetch scp 0x%x, base 0x%x", scp, p1);
+ osi_Log2(afsd_logp, "Starting BKG prefetch scp 0x%p, base 0x%x", scp, p1);
code = buf_Get(scp, &base, &bp);
if (code)
return; /* can't find something to prefetch */
- osi_Log2(afsd_logp, "BKG Prefetch request vp 0x%x, base 0x%x",
+ osi_Log2(afsd_logp, "BKG Prefetch request scp 0x%p, base 0x%x",
scp, realBase.LowPart);
cm_QueueBKGRequest(scp, cm_BkgPrefetch, realBase.LowPart,
/* turn off writing and wakeup users */
if (isStore) {
if (bufp->flags & CM_BUF_WAITING) {
- osi_Log2(afsd_logp, "cm_ReleaseBIOD Waking [scp 0x%x] bp 0x%x", scp, bufp);
- osi_Wakeup((long) bufp);
+ osi_Log2(afsd_logp, "cm_ReleaseBIOD Waking [scp 0x%p] bp 0x%p", scp, bufp);
+ osi_Wakeup((LONG_PTR) bufp);
}
bufp->flags &= ~(CM_BUF_WRITING | CM_BUF_DIRTY);
}
callp = rx_NewCall(rxconnp);
rx_PutConnection(rxconnp);
- osi_Log3(afsd_logp, "CALL FetchData scp 0x%x, off 0x%x, size 0x%x",
- (long) scp, biod.offset.LowPart, biod.length);
+ osi_Log3(afsd_logp, "CALL FetchData scp 0x%p, off 0x%x, size 0x%x",
+ scp, biod.offset.LowPart, biod.length);
code = StartRXAFS_FetchData(callp, &tfid, biod.offset.LowPart,
biod.length);
tbufp->cmFlags |= CM_BUF_CMFULLYFETCHED;
lock_ObtainMutex(&scp->mx);
if (scp->flags & CM_SCACHEFLAG_WAITING) {
- osi_Log1(afsd_logp, "CM GetBuffer Waking scp 0x%x", scp);
- osi_Wakeup((long) &scp->flags);
+ osi_Log1(afsd_logp, "CM GetBuffer Waking scp 0x%p", scp);
+ osi_Wakeup((LONG_PTR) &scp->flags);
}
if (cpffp && !*cpffp && !osi_QPrev(&qdp->q)) {
*cpffp = 1;
* all of the rest of the pages.
*/
/* bytes fetched */
- rbytes = bufferp - tbufp->datap;
+ osi_assert((bufferp - tbufp->datap) < LONG_MAX);
+ rbytes = (long) (bufferp - tbufp->datap);
+
/* bytes left to zero */
rbytes = cm_data.buf_blockSize - rbytes;
while(qdp) {
extern long cm_StoreMini(cm_scache_t *scp, cm_user_t *userp, cm_req_t *reqp);
-extern int cm_InitDCache(int newFile, long chunkSize, long nbuffers);
+extern int cm_InitDCache(int newFile, long chunkSize, afs_uint64 nbuffers);
extern int cm_HaveBuffer(struct cm_scache *, struct cm_buf *, int haveBufLocked);
/* compute how many 32 byte entries an AFS 3 dir requires for storing
* the specified name.
*/
-cm_NameEntries(char *namep, size_t *lenp)
+long cm_NameEntries(char *namep, long *lenp)
{
- int i;
+ long i;
- i = strlen(namep);
- if (lenp) *lenp = i;
- return 1+((i+16)>>5);
-}
+ i = (long)strlen(namep);
+ if (lenp) *lenp = i;
+ return 1+((i+16)>>5);
+}
} cm_dirPage1_t;
#endif /* UNUSED */
-extern int cm_NameEntries(char *namep, size_t *lenp);
+extern long cm_NameEntries(char *namep, long *lenp);
#endif /* __CM_DIR_ENV__ */
#include <windns.h>
#define DNSAPI_ENV
#endif
+#include <errno.h>
/*extern void afsi_log(char *pattern, ...);*/
-extern int errno;
static char dns_addr[30];
#ifdef DJGPP
extern char cm_confDir[];
/* we are migrating to the registry */
sprintf(szIndex,"%d",dwIndex++);
dwType = REG_SZ;
- dwSize = strlen(line) + 1;
+ dwSize = (DWORD)strlen(line) + 1;
RegSetValueEx( hkFreelance, szIndex, 0, dwType, line, dwSize);
}
#endif
if (RegQueryValueEx( hkFreelance, szIndex, 0, &dwType, szMount, &dwSize) != ERROR_SUCCESS) {
/* found an unused value */
dwType = REG_SZ;
- dwSize = strlen(line) + 1;
+ dwSize = (DWORD)strlen(line) + 1;
RegSetValueEx( hkFreelance, szIndex, 0, dwType, line, dwSize);
break;
} else {
- int len = strlen(filename);
+ int len = (int)strlen(filename);
if ( dwType == REG_SZ && !strncmp(filename, szMount, len) &&
(szMount[len] == '%' || szMount[len] == '#')) {
/* Replace the existing value */
dwType = REG_SZ;
- dwSize = strlen(line) + 1;
+ dwSize = (DWORD)strlen(line) + 1;
RegSetValueEx( hkFreelance, szIndex, 0, dwType, line, dwSize);
break;
}
if (RegQueryValueEx( hkFreelanceSymlinks, szIndex, 0, &dwType, szLink, &dwSize) != ERROR_SUCCESS) {
/* found an unused value */
dwType = REG_SZ;
- dwSize = strlen(line) + 1;
+ dwSize = (DWORD)strlen(line) + 1;
RegSetValueEx( hkFreelanceSymlinks, szIndex, 0, dwType, line, dwSize);
break;
} else {
- int len = strlen(filename);
+ int len = (int)strlen(filename);
if ( dwType == REG_SZ && !strncmp(filename, szLink, len) && szLink[len] == ':') {
/* Replace the existing value */
dwType = REG_SZ;
- dwSize = strlen(line) + 1;
+ dwSize = (DWORD)strlen(line) + 1;
RegSetValueEx( hkFreelanceSymlinks, szIndex, 0, dwType, line, dwSize);
break;
}
long cm_ParseIoctlPath(smb_ioctl_t *ioctlp, cm_user_t *userp, cm_req_t *reqp,
cm_scache_t **scpp)
{
- long code, length;
+ long code;
cm_scache_t *substRootp;
- char * relativePath = ioctlp->inDatap, absRoot[MAX_PATH];
- wchar_t absRoot_w[MAX_PATH];
- HANDLE rootDir;
-
+ char * relativePath = ioctlp->inDatap;
+#ifdef AFSIFS
+ char * absRoot[MAX_PATH];
+ long length;
+ wchar_t absRoot_w[MAX_PATH];
+ HANDLE rootDir;
+#endif
osi_Log1(afsd_logp, "cm_ParseIoctlPath %s", osi_LogSaveString(afsd_logp,relativePath));
/* This is usually the file name, but for StatMountPoint it is the path. */
}
/* # of bytes of path */
- code = strlen(ioctlp->inDatap) + 1;
+ code = (long)strlen(ioctlp->inDatap) + 1;
ioctlp->inDatap += code;
/* This is usually nothing, but for StatMountPoint it is the file name. */
{
long temp;
- temp = strlen(ioctlp->inDatap) + 1;
+ temp = (long) strlen(ioctlp->inDatap) + 1;
ioctlp->inDatap += temp;
}
}
/* # of bytes of path */
- code = strlen(ioctlp->inDatap) + 1;
+ code = (long)strlen(ioctlp->inDatap) + 1;
ioctlp->inDatap += code;
/* and return success */
if (code) return code;
/* skip over return data */
- tlen = strlen(ioctlp->outDatap) + 1;
+ tlen = (int)strlen(ioctlp->outDatap) + 1;
ioctlp->outDatap += tlen;
/* and return success */
fid.Unique = scp->fid.unique;
do {
acl.AFSOpaque_val = ioctlp->inDatap;
- acl.AFSOpaque_len = strlen(ioctlp->inDatap)+1;
+ acl.AFSOpaque_len = (u_int)strlen(ioctlp->inDatap)+1;
code = cm_Conn(&scp->fid, userp, &req, &connp);
if (code) continue;
long cm_IoctlSetCacheSize(struct smb_ioctl *ioctlp, struct cm_user *userp)
{
- long temp;
+ afs_uint64 temp;
long code;
cm_SkipIoctlPath(ioctlp);
cp2 = ioctlp->inDatap;
for ( cp=ioctlp->inDatap, count = 0; count < setSysName; count++ ) {
/* won't go past end of ioctlp->inDatap since maxsysname*num < ioctlp->inDatap length */
- t = strlen(cp);
+ t = (int)strlen(cp);
if (t >= MAXSYSNAME || t <= 0)
return EINVAL;
/* check for names that can shoot us in the foot */
/* inname gets first entry in case we're being a translator */
/* (we are never a translator) */
- t = strlen(ioctlp->inDatap);
+ t = (int)strlen(ioctlp->inDatap);
memcpy(inname, ioctlp->inDatap, t + 1);
ioctlp->inDatap += t + 1;
num = count;
if (!cm_sysNameList[count])
osi_panic("cm_IoctlSysName: no cm_sysNameList entry to write\n",
__FILE__, __LINE__);
- t = strlen(cp);
+ t = (int)strlen(cp);
StringCbCopyA(cm_sysNameList[count], MAXSYSNAME, cp);
cp += t + 1;
}
if ( !(*sysnamelist)[count] )
osi_panic("cm_IoctlSysName: no cm_sysNameList entry to read\n",
__FILE__, __LINE__);
- t = strlen((*sysnamelist)[count]);
+ t = (int)strlen((*sysnamelist)[count]);
if (t >= MAXSYSNAME)
osi_panic("cm_IoctlSysName: sysname entry garbled\n",
__FILE__, __LINE__);
(strlen(&afspath[strlen(cm_mountRoot)])) ?
&afspath[strlen(cm_mountRoot)]:"/",
(strlen(&afspath[strlen(cm_mountRoot)])) ?
- strlen(&afspath[strlen(cm_mountRoot)])+1:2);
+ (DWORD)strlen(&afspath[strlen(cm_mountRoot)])+1:2);
RegCloseKey( hkSubmounts );
StringCbCopyA(ioctlp->outDatap, 999999, submountreqp);
git://git.openafs.org / openafs.git / commitdiff
