Headers diff for resutils.dll between 6.0.6001.18000-Windows 6.0 and 6.1.7600.16385-Windows 7.0 versions

resapi.h (6.0.6001.18000-Windows 6.0)		resapi.h (6.1.7600.16385-Windows 7.0)

skipping to change at line 87		skipping to change at line 87
//		//
// Define a RESOURCE_HANDLE		// Define a RESOURCE_HANDLE
//		//

typedef HANDLE RESOURCE_HANDLE;		typedef HANDLE RESOURCE_HANDLE;

//		//
// Define the Resource Status structure.		// Define the Resource Status structure.
//		//


		#define ClusterResourceCannotComeOnlineOnThisNode ( CLUSTER_RESOURCE_STATE ) ( C
		lusterResourcePending - 1 )
		#define ClusterResourceCannotComeOnlineOnAnyNode ( CLUSTER_RESOURCE_STATE ) ( C
		lusterResourcePending - 2 )

typedef struct RESOURCE_STATUS {		typedef struct RESOURCE_STATUS {
CLUSTER_RESOURCE_STATE ResourceState;		CLUSTER_RESOURCE_STATE ResourceState;
DWORD CheckPoint;		DWORD CheckPoint;
DWORD WaitHint;		DWORD WaitHint;
HANDLE EventHandle;		HANDLE EventHandle;
} RESOURCE_STATUS, *PRESOURCE_STATUS;		} RESOURCE_STATUS, *PRESOURCE_STATUS;

#define ResUtilInitializeResourceStatus( _resource_status_ ) \		#define ResUtilInitializeResourceStatus( _resource_status_ ) \
ZeroMemory( _resource_status_, sizeof(RESOURCE_STATUS) )		ZeroMemory( _resource_status_, sizeof(RESOURCE_STATUS) )


skipping to change at line 260		skipping to change at line 263
//		//
#if _MSC_VER >= 1200		#if _MSC_VER >= 1200
#pragma warning(push)		#pragma warning(push)
#endif		#endif
#pragma warning( disable : 4201 ) // nonstandard extension used : nameless struc t/union		#pragma warning( disable : 4201 ) // nonstandard extension used : nameless struc t/union
typedef struct CLRES_FUNCTION_TABLE {		typedef struct CLRES_FUNCTION_TABLE {
DWORD TableSize;		DWORD TableSize;
DWORD Version;		DWORD Version;
union {		union {
CLRES_V1_FUNCTIONS V1Functions;		CLRES_V1_FUNCTIONS V1Functions;

};		} DUMMYUNIONNAME;
} CLRES_FUNCTION_TABLE, *PCLRES_FUNCTION_TABLE;		} CLRES_FUNCTION_TABLE, *PCLRES_FUNCTION_TABLE;
#if _MSC_VER >= 1200		#if _MSC_VER >= 1200
#pragma warning(pop)		#pragma warning(pop)
#else		#else
#pragma warning( default : 4201 ) // nonstandard extension used : nameless struc t/union		#pragma warning( default : 4201 ) // nonstandard extension used : nameless struc t/union
#endif		#endif

//		//
// Define the Resource DLL Startup routine. This is the only routine		// Define the Resource DLL Startup routine. This is the only routine
// that should be exported from a resource DLL.		// that should be exported from a resource DLL.

skipping to change at line 316		skipping to change at line 319
LPWSTR Name; // Property name		LPWSTR Name; // Property name
LPWSTR KeyName; // Name of value in cluster database		LPWSTR KeyName; // Name of value in cluster database
DWORD Format; // Format: REG_SZ, REG_DWORD, etc.		DWORD Format; // Format: REG_SZ, REG_DWORD, etc.
union {		union {
DWORD_PTR DefaultPtr;		DWORD_PTR DefaultPtr;
DWORD Default; // Default value		DWORD Default; // Default value
LPVOID lpDefault;		LPVOID lpDefault;
PRESUTIL_LARGEINT_DATA LargeIntData;		PRESUTIL_LARGEINT_DATA LargeIntData;
PRESUTIL_ULARGEINT_DATA ULargeIntData;		PRESUTIL_ULARGEINT_DATA ULargeIntData;
PRESUTIL_FILETIME_DATA FileTimeData;		PRESUTIL_FILETIME_DATA FileTimeData;

};		} DUMMYUNIONNAME;
DWORD Minimum; // Minimum value		DWORD Minimum; // Minimum value
DWORD Maximum; // Maximum value		DWORD Maximum; // Maximum value
DWORD Flags; // Flags for this item		DWORD Flags; // Flags for this item
#define RESUTIL_PROPITEM_READ_ONLY 0x00000001 // Property is read-only		#define RESUTIL_PROPITEM_READ_ONLY 0x00000001 // Property is read-only
#define RESUTIL_PROPITEM_REQUIRED 0x00000002 // Property is required		#define RESUTIL_PROPITEM_REQUIRED 0x00000002 // Property is required
#define RESUTIL_PROPITEM_SIGNED 0x00000004 // Numeric property is signed (d efaults to unsigned)		#define RESUTIL_PROPITEM_SIGNED 0x00000004 // Numeric property is signed (d efaults to unsigned)

DWORD Offset; // Byte offset to value in parameter block		DWORD Offset; // Byte offset to value in parameter block
// Assumes MULTI_SZ and BINARY parameters		// Assumes MULTI_SZ and BINARY parameters
// are LPWSTRs followed by DWORDs for length		// are LPWSTRs followed by DWORDs for length

skipping to change at line 1443		skipping to change at line 1446
);		);

DWORD		DWORD
WINAPI		WINAPI
ClusWorkerCreate(		ClusWorkerCreate(
OUT PCLUS_WORKER lpWorker,		OUT PCLUS_WORKER lpWorker,
IN PWORKER_START_ROUTINE lpStartAddress,		IN PWORKER_START_ROUTINE lpStartAddress,
IN PVOID lpParameter		IN PVOID lpParameter
);		);


typedef DWORD		typedef DWORD
(WINAPI * PCLUSAPI_CLUS_WORKER_CREATE)(		(WINAPI * PCLUSAPI_CLUS_WORKER_CREATE)(
OUT PCLUS_WORKER lpWorker,		OUT PCLUS_WORKER lpWorker,
IN PWORKER_START_ROUTINE lpStartAddress,		IN PWORKER_START_ROUTINE lpStartAddress,
IN PVOID lpParameter		IN PVOID lpParameter
);		);

BOOL		BOOL
WINAPI		WINAPI
ClusWorkerCheckTerminate(		ClusWorkerCheckTerminate(
IN PCLUS_WORKER lpWorker		IN PCLUS_WORKER lpWorker

skipping to change at line 1757		skipping to change at line 1760
} CLUSTER_ROLE_STATE;		} CLUSTER_ROLE_STATE;

__success(return >= 0) // != ClusterRoleUnknown		__success(return >= 0) // != ClusterRoleUnknown
CLUSTER_ROLE_STATE		CLUSTER_ROLE_STATE
WINAPI		WINAPI
ResUtilGetClusterRoleState(		ResUtilGetClusterRoleState(
__in HCLUSTER hCluster,		__in HCLUSTER hCluster,
__in CLUSTER_ROLE eClusterRole		__in CLUSTER_ROLE eClusterRole
);		);


		// TODO: should we implement versioning here like ClusApi - maybe overkill for n
		ow.
		BOOL
		WINAPI
		ClusterIsPathOnSharedVolume(
		__in LPCWSTR lpszPathName
		);

		typedef BOOL
		(WINAPI * PCLUSTER_IS_PATH_ON_SHARED_VOLUME)(
		__in LPCWSTR lpszPathName
		);

		BOOL
		WINAPI
		ClusterGetVolumePathName(
		__in LPCWSTR lpszFileName,
		__out LPWSTR lpszVolumePathName,
		__in DWORD cchBufferLength
		);

		typedef BOOL
		(WINAPI * PCLUSTER_GET_VOLUME_PATH_NAME)(
		__in LPCWSTR lpszFileName,
		__out LPWSTR lpszVolumePathName,
		__in DWORD cchBufferLength
		);

		BOOL
		WINAPI
		ClusterGetVolumeNameForVolumeMountPoint(
		__in LPCWSTR lpszVolumeMountPoint,
		__out LPWSTR lpszVolumeName,
		__in DWORD cchBufferLength
		);

		typedef BOOL
		(WINAPI * PCLUSTER_GET_VOLUME_NAME_FOR_VOLUME_MOUNT_POINT)(
		__in LPCWSTR lpszVolumeMountPoint,
		__out LPWSTR lpszVolumeName,
		__in DWORD cchBufferLength
		);

		DWORD
		WINAPI
		ClusterPrepareSharedVolumeForBackup(
		__in LPCWSTR lpszFileName,
		__out LPWSTR lpszVolumePathName,
		__inout LPDWORD lpcchVolumePathName,
		__out LPWSTR lpszVolumeName,
		__inout LPDWORD lpcchVolumeName
		);

		typedef DWORD
		(WINAPI * PCLUSTER_PREPARE_SHARED_VOLUME_FOR_BACKUP)(
		__in LPCWSTR lpszFileName,
		__out LPWSTR lpszVolumePathName,
		__inout LPDWORD lpcchVolumePathName,
		__out LPWSTR lpszVolumeName,
		__inout LPDWORD lpcchVolumeName
		);

		DWORD
		WINAPI
		ClusterClearBackupStateForSharedVolume(
		__in LPCWSTR lpszVolumePathName
		);

		typedef DWORD
		(WINAPI * PCLUSTER_CLEAR_BACKUP_STATE_FOR_SHARED_VOLUME)(
		__in LPCWSTR lpszVolumePathName
		);

#ifdef __cplusplus		#ifdef __cplusplus
}		}
#endif		#endif

#endif // ifdef _RESAPI_DEFINES_		#endif // ifdef _RESAPI_DEFINES_

End of changes. 5 change blocks.
3 lines changed or deleted		81 lines changed or added

This html diff was produced by rfcdiff 1.41.