Headers diff for mpr.dll between 5.2.3790.3959-Windows 5.0 and 6.0.6002.18005-Windows 6.0 versions



 winnetwk.h (5.2.3790.3959-Windows 5.0)   winnetwk.h (6.0.6002.18005-Windows 6.0) 
skipping to change at line 26 skipping to change at line 26
Notes: Notes:
optional-notes optional-notes
--*/ --*/
#ifndef _WINNETWK_ #ifndef _WINNETWK_
#define _WINNETWK_ #define _WINNETWK_
#pragma once
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
// //
// Network types // Network types
// //
#define WNNC_NET_MSNET 0x00010000 #define WNNC_NET_MSNET 0x00010000
#define WNNC_NET_LANMAN 0x00020000 #define WNNC_NET_LANMAN 0x00020000
skipping to change at line 89 skipping to change at line 91
#define WNNC_NET_KNOWARE 0x002F0000 #define WNNC_NET_KNOWARE 0x002F0000
#define WNNC_NET_OBJECT_DIRE 0x00300000 #define WNNC_NET_OBJECT_DIRE 0x00300000
#define WNNC_NET_MASFAX 0x00310000 #define WNNC_NET_MASFAX 0x00310000
#define WNNC_NET_HOB_NFS 0x00320000 #define WNNC_NET_HOB_NFS 0x00320000
#define WNNC_NET_SHIVA 0x00330000 #define WNNC_NET_SHIVA 0x00330000
#define WNNC_NET_IBMAL 0x00340000 #define WNNC_NET_IBMAL 0x00340000
#define WNNC_NET_LOCK 0x00350000 #define WNNC_NET_LOCK 0x00350000
#define WNNC_NET_TERMSRV 0x00360000 #define WNNC_NET_TERMSRV 0x00360000
#define WNNC_NET_SRT 0x00370000 #define WNNC_NET_SRT 0x00370000
#define WNNC_NET_QUINCY 0x00380000 #define WNNC_NET_QUINCY 0x00380000
#define WNNC_NET_OPENAFS 0x00390000
#define WNNC_NET_AVID1 0X003A0000
#define WNNC_NET_DFS 0x003B0000
#define WNNC_NET_KWNP 0x003C0000
#define WNNC_NET_ZENWORKS 0x003D0000
#define WNNC_NET_DRIVEONWEB 0x003E0000
#define WNNC_NET_VMWARE 0x003F0000
#define WNNC_NET_RSFX 0x00400000
#define WNNC_NET_MFILES 0x00410000
#define WNNC_NET_MS_NFS 0x00420000
#define WNNC_NET_GOOGLE 0x00430000
#define WNNC_CRED_MANAGER 0xFFFF0000 #define WNNC_CRED_MANAGER 0xFFFF0000
// //
// Network Resources. // Network Resources.
// //
#define RESOURCE_CONNECTED 0x00000001 #define RESOURCE_CONNECTED 0x00000001
#define RESOURCE_GLOBALNET 0x00000002 #define RESOURCE_GLOBALNET 0x00000002
#define RESOURCE_REMEMBERED 0x00000003 #define RESOURCE_REMEMBERED 0x00000003
skipping to change at line 191 skipping to change at line 204
#define CONNECT_REDIRECT 0x00000080 #define CONNECT_REDIRECT 0x00000080
#define CONNECT_LOCALDRIVE 0x00000100 #define CONNECT_LOCALDRIVE 0x00000100
#define CONNECT_CURRENT_MEDIA 0x00000200 #define CONNECT_CURRENT_MEDIA 0x00000200
#define CONNECT_DEFERRED 0x00000400 #define CONNECT_DEFERRED 0x00000400
#define CONNECT_RESERVED 0xFF000000 #define CONNECT_RESERVED 0xFF000000
#endif /* WINVER >= 0x0400 */ #endif /* WINVER >= 0x0400 */
#if(WINVER >= 0x0500) #if(WINVER >= 0x0500)
#define CONNECT_COMMANDLINE 0x00000800 #define CONNECT_COMMANDLINE 0x00000800
#define CONNECT_CMD_SAVECRED 0x00001000 #define CONNECT_CMD_SAVECRED 0x00001000
#endif /* WINVER >= 0x0500 */ #endif /* WINVER >= 0x0500 */
#if(WINVER >= 0x0600)
#define CONNECT_CRED_RESET 0x00002000
#endif /* WINVER >= 0x0600 */
DWORD APIENTRY DWORD APIENTRY
WNetAddConnectionA( WNetAddConnectionA(
IN LPCSTR lpRemoteName, __in LPCSTR lpRemoteName,
IN LPCSTR lpPassword, __in_opt LPCSTR lpPassword,
IN LPCSTR lpLocalName __in_opt LPCSTR lpLocalName
); );
DWORD APIENTRY DWORD APIENTRY
WNetAddConnectionW( WNetAddConnectionW(
IN LPCWSTR lpRemoteName, __in LPCWSTR lpRemoteName,
IN LPCWSTR lpPassword, __in_opt LPCWSTR lpPassword,
IN LPCWSTR lpLocalName __in_opt LPCWSTR lpLocalName
); );
#ifdef UNICODE #ifdef UNICODE
#define WNetAddConnection WNetAddConnectionW #define WNetAddConnection WNetAddConnectionW
#else #else
#define WNetAddConnection WNetAddConnectionA #define WNetAddConnection WNetAddConnectionA
#endif // !UNICODE #endif // !UNICODE
DWORD APIENTRY DWORD APIENTRY
WNetAddConnection2A( WNetAddConnection2A(
IN LPNETRESOURCEA lpNetResource, __in LPNETRESOURCEA lpNetResource,
IN LPCSTR lpPassword, __in_opt LPCSTR lpPassword,
IN LPCSTR lpUserName, __in_opt LPCSTR lpUserName,
IN DWORD dwFlags __in DWORD dwFlags
); );
DWORD APIENTRY DWORD APIENTRY
WNetAddConnection2W( WNetAddConnection2W(
IN LPNETRESOURCEW lpNetResource, __in LPNETRESOURCEW lpNetResource,
IN LPCWSTR lpPassword, __in_opt LPCWSTR lpPassword,
IN LPCWSTR lpUserName, __in_opt LPCWSTR lpUserName,
IN DWORD dwFlags __in DWORD dwFlags
); );
#ifdef UNICODE #ifdef UNICODE
#define WNetAddConnection2 WNetAddConnection2W #define WNetAddConnection2 WNetAddConnection2W
#else #else
#define WNetAddConnection2 WNetAddConnection2A #define WNetAddConnection2 WNetAddConnection2A
#endif // !UNICODE #endif // !UNICODE
DWORD APIENTRY DWORD APIENTRY
WNetAddConnection3A( WNetAddConnection3A(
IN HWND hwndOwner, __in_opt HWND hwndOwner,
IN LPNETRESOURCEA lpNetResource, __in LPNETRESOURCEA lpNetResource,
IN LPCSTR lpPassword, __in_opt LPCSTR lpPassword,
IN LPCSTR lpUserName, __in_opt LPCSTR lpUserName,
IN DWORD dwFlags __in DWORD dwFlags
); );
DWORD APIENTRY DWORD APIENTRY
WNetAddConnection3W( WNetAddConnection3W(
IN HWND hwndOwner, __in_opt HWND hwndOwner,
IN LPNETRESOURCEW lpNetResource, __in LPNETRESOURCEW lpNetResource,
IN LPCWSTR lpPassword, __in_opt LPCWSTR lpPassword,
IN LPCWSTR lpUserName, __in_opt LPCWSTR lpUserName,
IN DWORD dwFlags __in DWORD dwFlags
); );
#ifdef UNICODE #ifdef UNICODE
#define WNetAddConnection3 WNetAddConnection3W #define WNetAddConnection3 WNetAddConnection3W
#else #else
#define WNetAddConnection3 WNetAddConnection3A #define WNetAddConnection3 WNetAddConnection3A
#endif // !UNICODE #endif // !UNICODE
DWORD APIENTRY DWORD APIENTRY
WNetCancelConnectionA( WNetCancelConnectionA(
IN LPCSTR lpName, __in LPCSTR lpName,
IN BOOL fForce __in BOOL fForce
); );
DWORD APIENTRY DWORD APIENTRY
WNetCancelConnectionW( WNetCancelConnectionW(
IN LPCWSTR lpName, __in LPCWSTR lpName,
IN BOOL fForce __in BOOL fForce
); );
#ifdef UNICODE #ifdef UNICODE
#define WNetCancelConnection WNetCancelConnectionW #define WNetCancelConnection WNetCancelConnectionW
#else #else
#define WNetCancelConnection WNetCancelConnectionA #define WNetCancelConnection WNetCancelConnectionA
#endif // !UNICODE #endif // !UNICODE
DWORD APIENTRY DWORD APIENTRY
WNetCancelConnection2A( WNetCancelConnection2A(
IN LPCSTR lpName, __in LPCSTR lpName,
IN DWORD dwFlags, __in DWORD dwFlags,
IN BOOL fForce __in BOOL fForce
); );
DWORD APIENTRY DWORD APIENTRY
WNetCancelConnection2W( WNetCancelConnection2W(
IN LPCWSTR lpName, __in LPCWSTR lpName,
IN DWORD dwFlags, __in DWORD dwFlags,
IN BOOL fForce __in BOOL fForce
); );
#ifdef UNICODE #ifdef UNICODE
#define WNetCancelConnection2 WNetCancelConnection2W #define WNetCancelConnection2 WNetCancelConnection2W
#else #else
#define WNetCancelConnection2 WNetCancelConnection2A #define WNetCancelConnection2 WNetCancelConnection2A
#endif // !UNICODE #endif // !UNICODE
DWORD APIENTRY DWORD APIENTRY
WNetGetConnectionA( WNetGetConnectionA(
IN LPCSTR lpLocalName, __in LPCSTR lpLocalName,
OUT LPSTR lpRemoteName, __out_ecount_opt(*lpnLength) LPSTR lpRemoteName,
IN OUT LPDWORD lpnLength __inout LPDWORD lpnLength
); );
DWORD APIENTRY DWORD APIENTRY
WNetGetConnectionW( WNetGetConnectionW(
IN LPCWSTR lpLocalName, __in LPCWSTR lpLocalName,
OUT LPWSTR lpRemoteName, __out_ecount_opt(*lpnLength) LPWSTR lpRemoteName,
IN OUT LPDWORD lpnLength __inout LPDWORD lpnLength
); );
#ifdef UNICODE #ifdef UNICODE
#define WNetGetConnection WNetGetConnectionW #define WNetGetConnection WNetGetConnectionW
#else #else
#define WNetGetConnection WNetGetConnectionA #define WNetGetConnection WNetGetConnectionA
#endif // !UNICODE #endif // !UNICODE
#if (_WIN32_WINNT >= _WIN32_WINNT_LONGHORN)
DWORD APIENTRY DWORD APIENTRY
WNetRestoreConnectionA( WNetRestoreSingleConnectionW(
IN HWND hwndParent, __in_opt HWND hwndParent,
IN LPCSTR lpDevice __in LPCWSTR lpDevice,
__in BOOL fUseUI
); );
#else
DWORD APIENTRY DWORD APIENTRY
WNetRestoreConnectionW( WNetRestoreConnectionW(
IN HWND hwndParent, __in_opt HWND hWnd,
IN LPCWSTR lpDevice __in LPCWSTR lpDevice
); );
#ifdef UNICODE
#define WNetRestoreConnection WNetRestoreConnectionW #endif
#else
#define WNetRestoreConnection WNetRestoreConnectionA
#endif // !UNICODE
#if(WINVER >= 0x0400) #if(WINVER >= 0x0400)
DWORD APIENTRY DWORD APIENTRY
WNetUseConnectionA( WNetUseConnectionA(
IN HWND hwndOwner, __in_opt HWND hwndOwner,
IN LPNETRESOURCEA lpNetResource, __in LPNETRESOURCEA lpNetResource,
IN LPCSTR lpPassword, __in_opt LPCSTR lpPassword,
IN LPCSTR lpUserID, __in_opt LPCSTR lpUserId,
IN DWORD dwFlags, __in DWORD dwFlags,
OUT LPSTR lpAccessName, __out_ecount_opt(*lpBufferSize) LPSTR lpAccessName,
IN OUT LPDWORD lpBufferSize, __inout_opt LPDWORD lpBufferSize,
OUT LPDWORD lpResult __out_opt LPDWORD lpResult
); );
DWORD APIENTRY DWORD APIENTRY
WNetUseConnectionW( WNetUseConnectionW(
IN HWND hwndOwner, __in_opt HWND hwndOwner,
IN LPNETRESOURCEW lpNetResource, __in LPNETRESOURCEW lpNetResource,
IN LPCWSTR lpPassword, __in_opt LPCWSTR lpPassword,
IN LPCWSTR lpUserID, __in_opt LPCWSTR lpUserId,
IN DWORD dwFlags, __in DWORD dwFlags,
OUT LPWSTR lpAccessName, __out_ecount_opt(*lpBufferSize) LPWSTR lpAccessName,
IN OUT LPDWORD lpBufferSize, __inout_opt LPDWORD lpBufferSize,
OUT LPDWORD lpResult __out_opt LPDWORD lpResult
); );
#ifdef UNICODE #ifdef UNICODE
#define WNetUseConnection WNetUseConnectionW #define WNetUseConnection WNetUseConnectionW
#else #else
#define WNetUseConnection WNetUseConnectionA #define WNetUseConnection WNetUseConnectionA
#endif // !UNICODE #endif // !UNICODE
#endif /* WINVER >= 0x0400 */ #endif /* WINVER >= 0x0400 */
// //
// Network Connection Dialogs. // Network Connection Dialogs.
// //
DWORD APIENTRY DWORD APIENTRY
WNetConnectionDialog( WNetConnectionDialog(
IN HWND hwnd, __in HWND hwnd,
IN DWORD dwType __in DWORD dwType
); );
DWORD APIENTRY DWORD APIENTRY
WNetDisconnectDialog( WNetDisconnectDialog(
IN HWND hwnd, __in HWND hwnd,
IN DWORD dwType __in DWORD dwType
); );
#if(WINVER >= 0x0400) #if(WINVER >= 0x0400)
typedef struct _CONNECTDLGSTRUCTA{ typedef struct _CONNECTDLGSTRUCTA{
DWORD cbStructure; /* size of this structure in bytes */ DWORD cbStructure; /* size of this structure in bytes */
HWND hwndOwner; /* owner window for the dialog */ HWND hwndOwner; /* owner window for the dialog */
LPNETRESOURCEA lpConnRes;/* Requested Resource info */ LPNETRESOURCEA lpConnRes;/* Requested Resource info */
DWORD dwFlags; /* flags (see below) */ DWORD dwFlags; /* flags (see below) */
DWORD dwDevNum; /* number of devices connected to */ DWORD dwDevNum; /* number of devices connected to */
} CONNECTDLGSTRUCTA, FAR *LPCONNECTDLGSTRUCTA; } CONNECTDLGSTRUCTA, FAR *LPCONNECTDLGSTRUCTA;
skipping to change at line 404 skipping to change at line 423
/* /*
* NOTE: Set at most ONE of the below flags. If neither flag is set, * NOTE: Set at most ONE of the below flags. If neither flag is set,
* then the persistence is set to whatever the user chose during * then the persistence is set to whatever the user chose during
* a previous connection * a previous connection
*/ */
#define CONNDLG_PERSIST 0x00000010 /* Force persistent connection */ #define CONNDLG_PERSIST 0x00000010 /* Force persistent connection */
#define CONNDLG_NOT_PERSIST 0x00000020 /* Force connection NOT persistent */ #define CONNDLG_NOT_PERSIST 0x00000020 /* Force connection NOT persistent */
DWORD APIENTRY DWORD APIENTRY
WNetConnectionDialog1A( WNetConnectionDialog1A(
IN OUT LPCONNECTDLGSTRUCTA lpConnDlgStruct __inout LPCONNECTDLGSTRUCTA lpConnDlgStruct
); );
DWORD APIENTRY DWORD APIENTRY
WNetConnectionDialog1W( WNetConnectionDialog1W(
IN OUT LPCONNECTDLGSTRUCTW lpConnDlgStruct __inout LPCONNECTDLGSTRUCTW lpConnDlgStruct
); );
#ifdef UNICODE #ifdef UNICODE
#define WNetConnectionDialog1 WNetConnectionDialog1W #define WNetConnectionDialog1 WNetConnectionDialog1W
#else #else
#define WNetConnectionDialog1 WNetConnectionDialog1A #define WNetConnectionDialog1 WNetConnectionDialog1A
#endif // !UNICODE #endif // !UNICODE
typedef struct _DISCDLGSTRUCTA{ typedef struct _DISCDLGSTRUCTA{
DWORD cbStructure; /* size of this structure in bytes */ DWORD cbStructure; /* size of this structure in bytes */
HWND hwndOwner; /* owner window for the dialog */ HWND hwndOwner; /* owner window for the dialog */
skipping to change at line 443 skipping to change at line 462
#else #else
typedef DISCDLGSTRUCTA DISCDLGSTRUCT; typedef DISCDLGSTRUCTA DISCDLGSTRUCT;
typedef LPDISCDLGSTRUCTA LPDISCDLGSTRUCT; typedef LPDISCDLGSTRUCTA LPDISCDLGSTRUCT;
#endif // UNICODE #endif // UNICODE
#define DISC_UPDATE_PROFILE 0x00000001 #define DISC_UPDATE_PROFILE 0x00000001
#define DISC_NO_FORCE 0x00000040 #define DISC_NO_FORCE 0x00000040
DWORD APIENTRY DWORD APIENTRY
WNetDisconnectDialog1A( WNetDisconnectDialog1A(
IN LPDISCDLGSTRUCTA lpConnDlgStruct __in LPDISCDLGSTRUCTA lpConnDlgStruct
); );
DWORD APIENTRY DWORD APIENTRY
WNetDisconnectDialog1W( WNetDisconnectDialog1W(
IN LPDISCDLGSTRUCTW lpConnDlgStruct __in LPDISCDLGSTRUCTW lpConnDlgStruct
); );
#ifdef UNICODE #ifdef UNICODE
#define WNetDisconnectDialog1 WNetDisconnectDialog1W #define WNetDisconnectDialog1 WNetDisconnectDialog1W
#else #else
#define WNetDisconnectDialog1 WNetDisconnectDialog1A #define WNetDisconnectDialog1 WNetDisconnectDialog1A
#endif // !UNICODE #endif // !UNICODE
#endif /* WINVER >= 0x0400 */ #endif /* WINVER >= 0x0400 */
// //
// Network Browsing. // Network Browsing.
// //
DWORD APIENTRY DWORD APIENTRY
WNetOpenEnumA( WNetOpenEnumA(
IN DWORD dwScope, __in DWORD dwScope,
IN DWORD dwType, __in DWORD dwType,
IN DWORD dwUsage, __in DWORD dwUsage,
IN LPNETRESOURCEA lpNetResource, __in_opt LPNETRESOURCEA lpNetResource,
OUT LPHANDLE lphEnum __out LPHANDLE lphEnum
); );
DWORD APIENTRY DWORD APIENTRY
WNetOpenEnumW( WNetOpenEnumW(
IN DWORD dwScope, __in DWORD dwScope,
IN DWORD dwType, __in DWORD dwType,
IN DWORD dwUsage, __in DWORD dwUsage,
IN LPNETRESOURCEW lpNetResource, __in_opt LPNETRESOURCEW lpNetResource,
OUT LPHANDLE lphEnum __out LPHANDLE lphEnum
); );
#ifdef UNICODE #ifdef UNICODE
#define WNetOpenEnum WNetOpenEnumW #define WNetOpenEnum WNetOpenEnumW
#else #else
#define WNetOpenEnum WNetOpenEnumA #define WNetOpenEnum WNetOpenEnumA
#endif // !UNICODE #endif // !UNICODE
DWORD APIENTRY DWORD APIENTRY
WNetEnumResourceA( WNetEnumResourceA(
IN HANDLE hEnum, __in HANDLE hEnum,
IN OUT LPDWORD lpcCount, __inout LPDWORD lpcCount,
OUT LPVOID lpBuffer, __out_bcount(*lpBufferSize) LPVOID lpBuffer,
IN OUT LPDWORD lpBufferSize __inout LPDWORD lpBufferSize
); );
DWORD APIENTRY DWORD APIENTRY
WNetEnumResourceW( WNetEnumResourceW(
IN HANDLE hEnum, __in HANDLE hEnum,
IN OUT LPDWORD lpcCount, __inout LPDWORD lpcCount,
OUT LPVOID lpBuffer, __out_bcount(*lpBufferSize) LPVOID lpBuffer,
IN OUT LPDWORD lpBufferSize __inout LPDWORD lpBufferSize
); );
#ifdef UNICODE #ifdef UNICODE
#define WNetEnumResource WNetEnumResourceW #define WNetEnumResource WNetEnumResourceW
#else #else
#define WNetEnumResource WNetEnumResourceA #define WNetEnumResource WNetEnumResourceA
#endif // !UNICODE #endif // !UNICODE
DWORD APIENTRY DWORD APIENTRY
WNetCloseEnum( WNetCloseEnum(
IN HANDLE hEnum __in HANDLE hEnum
); );
#if(WINVER >= 0x0400) #if(WINVER >= 0x0400)
DWORD APIENTRY DWORD APIENTRY
WNetGetResourceParentA( WNetGetResourceParentA(
IN LPNETRESOURCEA lpNetResource, __in LPNETRESOURCEA lpNetResource,
OUT LPVOID lpBuffer, __out_bcount(*lpcbBuffer) LPVOID lpBuffer,
IN OUT LPDWORD lpcbBuffer __inout LPDWORD lpcbBuffer
); );
DWORD APIENTRY DWORD APIENTRY
WNetGetResourceParentW( WNetGetResourceParentW(
IN LPNETRESOURCEW lpNetResource, __in LPNETRESOURCEW lpNetResource,
OUT LPVOID lpBuffer, __out_bcount(*lpcbBuffer) LPVOID lpBuffer,
IN OUT LPDWORD lpcbBuffer __inout LPDWORD lpcbBuffer
); );
#ifdef UNICODE #ifdef UNICODE
#define WNetGetResourceParent WNetGetResourceParentW #define WNetGetResourceParent WNetGetResourceParentW
#else #else
#define WNetGetResourceParent WNetGetResourceParentA #define WNetGetResourceParent WNetGetResourceParentA
#endif // !UNICODE #endif // !UNICODE
DWORD APIENTRY DWORD APIENTRY
WNetGetResourceInformationA( WNetGetResourceInformationA(
IN LPNETRESOURCEA lpNetResource, __in LPNETRESOURCEA lpNetResource,
OUT LPVOID lpBuffer, __out_bcount(*lpcbBuffer) LPVOID lpBuffer,
IN OUT LPDWORD lpcbBuffer, __inout LPDWORD lpcbBuffer,
OUT LPSTR *lplpSystem __deref_out LPSTR *lplpSystem
); );
DWORD APIENTRY DWORD APIENTRY
WNetGetResourceInformationW( WNetGetResourceInformationW(
IN LPNETRESOURCEW lpNetResource, __in LPNETRESOURCEW lpNetResource,
OUT LPVOID lpBuffer, __out_bcount(*lpcbBuffer) LPVOID lpBuffer,
IN OUT LPDWORD lpcbBuffer, __inout LPDWORD lpcbBuffer,
OUT LPWSTR *lplpSystem __deref_out LPWSTR *lplpSystem
); );
#ifdef UNICODE #ifdef UNICODE
#define WNetGetResourceInformation WNetGetResourceInformationW #define WNetGetResourceInformation WNetGetResourceInformationW
#else #else
#define WNetGetResourceInformation WNetGetResourceInformationA #define WNetGetResourceInformation WNetGetResourceInformationA
#endif // !UNICODE #endif // !UNICODE
#endif /* WINVER >= 0x0400 */ #endif /* WINVER >= 0x0400 */
// //
// Universal Naming. // Universal Naming.
skipping to change at line 588 skipping to change at line 607
#ifdef UNICODE #ifdef UNICODE
typedef REMOTE_NAME_INFOW REMOTE_NAME_INFO; typedef REMOTE_NAME_INFOW REMOTE_NAME_INFO;
typedef LPREMOTE_NAME_INFOW LPREMOTE_NAME_INFO; typedef LPREMOTE_NAME_INFOW LPREMOTE_NAME_INFO;
#else #else
typedef REMOTE_NAME_INFOA REMOTE_NAME_INFO; typedef REMOTE_NAME_INFOA REMOTE_NAME_INFO;
typedef LPREMOTE_NAME_INFOA LPREMOTE_NAME_INFO; typedef LPREMOTE_NAME_INFOA LPREMOTE_NAME_INFO;
#endif // UNICODE #endif // UNICODE
DWORD APIENTRY DWORD APIENTRY
WNetGetUniversalNameA( WNetGetUniversalNameA(
IN LPCSTR lpLocalPath, __in LPCSTR lpLocalPath,
IN DWORD dwInfoLevel, __in DWORD dwInfoLevel,
OUT LPVOID lpBuffer, __out_bcount(*lpBufferSize) LPVOID lpBuffer,
IN OUT LPDWORD lpBufferSize __inout LPDWORD lpBufferSize
); );
DWORD APIENTRY DWORD APIENTRY
WNetGetUniversalNameW( WNetGetUniversalNameW(
IN LPCWSTR lpLocalPath, __in LPCWSTR lpLocalPath,
IN DWORD dwInfoLevel, __in DWORD dwInfoLevel,
OUT LPVOID lpBuffer, __out_bcount(*lpBufferSize) LPVOID lpBuffer,
IN OUT LPDWORD lpBufferSize __inout LPDWORD lpBufferSize
); );
#ifdef UNICODE #ifdef UNICODE
#define WNetGetUniversalName WNetGetUniversalNameW #define WNetGetUniversalName WNetGetUniversalNameW
#else #else
#define WNetGetUniversalName WNetGetUniversalNameA #define WNetGetUniversalName WNetGetUniversalNameA
#endif // !UNICODE #endif // !UNICODE
// //
// Authentication and Logon/Logoff. // Authentication and Logon/Logoff.
// //
DWORD APIENTRY DWORD APIENTRY
WNetGetUserA( WNetGetUserA(
IN LPCSTR lpName, __in_opt LPCSTR lpName,
OUT LPSTR lpUserName, __out_ecount(*lpnLength) LPSTR lpUserName,
IN OUT LPDWORD lpnLength __inout LPDWORD lpnLength
); );
DWORD APIENTRY DWORD APIENTRY
WNetGetUserW( WNetGetUserW(
IN LPCWSTR lpName, __in_opt LPCWSTR lpName,
OUT LPWSTR lpUserName, __out_ecount(*lpnLength) LPWSTR lpUserName,
IN OUT LPDWORD lpnLength __inout LPDWORD lpnLength
); );
#ifdef UNICODE #ifdef UNICODE
#define WNetGetUser WNetGetUserW #define WNetGetUser WNetGetUserW
#else #else
#define WNetGetUser WNetGetUserA #define WNetGetUser WNetGetUserA
#endif // !UNICODE #endif // !UNICODE
// //
// Other. // Other.
// //
skipping to change at line 642 skipping to change at line 661
#if(WINVER >= 0x0400) #if(WINVER >= 0x0400)
#define WNFMT_MULTILINE 0x01 #define WNFMT_MULTILINE 0x01
#define WNFMT_ABBREVIATED 0x02 #define WNFMT_ABBREVIATED 0x02
#define WNFMT_INENUM 0x10 #define WNFMT_INENUM 0x10
#define WNFMT_CONNECTION 0x20 #define WNFMT_CONNECTION 0x20
#endif /* WINVER >= 0x0400 */ #endif /* WINVER >= 0x0400 */
#if(WINVER >= 0x0400) #if(WINVER >= 0x0400)
DWORD APIENTRY DWORD APIENTRY
WNetGetProviderNameA( WNetGetProviderNameA(
IN DWORD dwNetType, __in DWORD dwNetType,
OUT LPSTR lpProviderName, __out_ecount(*lpBufferSize) LPSTR lpProviderName,
IN OUT LPDWORD lpBufferSize __inout LPDWORD lpBufferSize
); );
DWORD APIENTRY DWORD APIENTRY
WNetGetProviderNameW( WNetGetProviderNameW(
IN DWORD dwNetType, __in DWORD dwNetType,
OUT LPWSTR lpProviderName, __out_ecount(*lpBufferSize) LPWSTR lpProviderName,
IN OUT LPDWORD lpBufferSize __inout LPDWORD lpBufferSize
); );
#ifdef UNICODE #ifdef UNICODE
#define WNetGetProviderName WNetGetProviderNameW #define WNetGetProviderName WNetGetProviderNameW
#else #else
#define WNetGetProviderName WNetGetProviderNameA #define WNetGetProviderName WNetGetProviderNameA
#endif // !UNICODE #endif // !UNICODE
typedef struct _NETINFOSTRUCT{ typedef struct _NETINFOSTRUCT{
DWORD cbStructure; DWORD cbStructure;
DWORD dwProviderVersion; DWORD dwProviderVersion;
skipping to change at line 675 skipping to change at line 694
DWORD dwPrinters; DWORD dwPrinters;
DWORD dwDrives; DWORD dwDrives;
} NETINFOSTRUCT, FAR *LPNETINFOSTRUCT; } NETINFOSTRUCT, FAR *LPNETINFOSTRUCT;
#define NETINFO_DLL16 0x00000001 /* Provider running as 16 bit Winnet Dri ver */ #define NETINFO_DLL16 0x00000001 /* Provider running as 16 bit Winnet Dri ver */
#define NETINFO_DISKRED 0x00000004 /* Provider requires disk redirections t o connect */ #define NETINFO_DISKRED 0x00000004 /* Provider requires disk redirections t o connect */
#define NETINFO_PRINTERRED 0x00000008 /* Provider requires printer redirection s to connect */ #define NETINFO_PRINTERRED 0x00000008 /* Provider requires printer redirection s to connect */
DWORD APIENTRY DWORD APIENTRY
WNetGetNetworkInformationA( WNetGetNetworkInformationA(
IN LPCSTR lpProvider, __in LPCSTR lpProvider,
OUT LPNETINFOSTRUCT lpNetInfoStruct __out LPNETINFOSTRUCT lpNetInfoStruct
); );
DWORD APIENTRY DWORD APIENTRY
WNetGetNetworkInformationW( WNetGetNetworkInformationW(
IN LPCWSTR lpProvider, __in LPCWSTR lpProvider,
OUT LPNETINFOSTRUCT lpNetInfoStruct __out LPNETINFOSTRUCT lpNetInfoStruct
); );
#ifdef UNICODE #ifdef UNICODE
#define WNetGetNetworkInformation WNetGetNetworkInformationW #define WNetGetNetworkInformation WNetGetNetworkInformationW
#else #else
#define WNetGetNetworkInformation WNetGetNetworkInformationA #define WNetGetNetworkInformation WNetGetNetworkInformationA
#endif // !UNICODE #endif // !UNICODE
//
// User Profiles.
//
typedef UINT (FAR PASCAL *PFNGETPROFILEPATHA) (
LPCSTR pszUsername,
LPSTR pszBuffer,
UINT cbBuffer
);
typedef UINT (FAR PASCAL *PFNGETPROFILEPATHW) (
LPCWSTR pszUsername,
LPWSTR pszBuffer,
UINT cbBuffer
);
#ifdef UNICODE
#define PFNGETPROFILEPATH PFNGETPROFILEPATHW
#else
#define PFNGETPROFILEPATH PFNGETPROFILEPATHA
#endif // !UNICODE
typedef UINT (FAR PASCAL *PFNRECONCILEPROFILEA) (
LPCSTR pszCentralFile,
LPCSTR pszLocalFile,
DWORD dwFlags
);
typedef UINT (FAR PASCAL *PFNRECONCILEPROFILEW) (
LPCWSTR pszCentralFile,
LPCWSTR pszLocalFile,
DWORD dwFlags
);
#ifdef UNICODE
#define PFNRECONCILEPROFILE PFNRECONCILEPROFILEW
#else
#define PFNRECONCILEPROFILE PFNRECONCILEPROFILEA
#endif // !UNICODE
#define RP_LOGON 0x01 /* if set, do for logon, else for logoff */
#define RP_INIFILE 0x02 /* if set, reconcile .INI file, else reg. hive *
/
//
// Policies.
//
typedef BOOL (FAR PASCAL *PFNPROCESSPOLICIESA) (
HWND hwnd,
LPCSTR pszPath,
LPCSTR pszUsername,
LPCSTR pszComputerName,
DWORD dwFlags
);
typedef BOOL (FAR PASCAL *PFNPROCESSPOLICIESW) (
HWND hwnd,
LPCWSTR pszPath,
LPCWSTR pszUsername,
LPCWSTR pszComputerName,
DWORD dwFlags
);
#ifdef UNICODE
#define PFNPROCESSPOLICIES PFNPROCESSPOLICIESW
#else
#define PFNPROCESSPOLICIES PFNPROCESSPOLICIESA
#endif // !UNICODE
#define PP_DISPLAYERRORS 0x01 /* if set, display error messages, else fail
silently if error */
#endif /* WINVER >= 0x0400 */ #endif /* WINVER >= 0x0400 */
// //
// Error handling. // Error handling.
// //
DWORD APIENTRY DWORD APIENTRY
WNetGetLastErrorA( WNetGetLastErrorA(
OUT LPDWORD lpError, __out LPDWORD lpError,
OUT LPSTR lpErrorBuf, __out_ecount(nErrorBufSize) LPSTR lpErrorBuf,
IN DWORD nErrorBufSize, __in DWORD nErrorBufSize,
OUT LPSTR lpNameBuf, __out_ecount(nNameBufSize) LPSTR lpNameBuf,
IN DWORD nNameBufSize __in DWORD nNameBufSize
); );
DWORD APIENTRY DWORD APIENTRY
WNetGetLastErrorW( WNetGetLastErrorW(
OUT LPDWORD lpError, __out LPDWORD lpError,
OUT LPWSTR lpErrorBuf, __out_ecount(nErrorBufSize) LPWSTR lpErrorBuf,
IN DWORD nErrorBufSize, __in DWORD nErrorBufSize,
OUT LPWSTR lpNameBuf, __out_ecount(nNameBufSize) LPWSTR lpNameBuf,
IN DWORD nNameBufSize __in DWORD nNameBufSize
); );
#ifdef UNICODE #ifdef UNICODE
#define WNetGetLastError WNetGetLastErrorW #define WNetGetLastError WNetGetLastErrorW
#else #else
#define WNetGetLastError WNetGetLastErrorA #define WNetGetLastError WNetGetLastErrorA
#endif // !UNICODE #endif // !UNICODE
// //
// STATUS CODES // STATUS CODES
// //
skipping to change at line 865 skipping to change at line 820
DWORD dwOptDataSize; DWORD dwOptDataSize;
} NETCONNECTINFOSTRUCT, *LPNETCONNECTINFOSTRUCT; } NETCONNECTINFOSTRUCT, *LPNETCONNECTINFOSTRUCT;
#define WNCON_FORNETCARD 0x00000001 #define WNCON_FORNETCARD 0x00000001
#define WNCON_NOTROUTED 0x00000002 #define WNCON_NOTROUTED 0x00000002
#define WNCON_SLOWLINK 0x00000004 #define WNCON_SLOWLINK 0x00000004
#define WNCON_DYNAMIC 0x00000008 #define WNCON_DYNAMIC 0x00000008
DWORD APIENTRY DWORD APIENTRY
MultinetGetConnectionPerformanceA( MultinetGetConnectionPerformanceA(
IN LPNETRESOURCEA lpNetResource, __in LPNETRESOURCEA lpNetResource,
OUT LPNETCONNECTINFOSTRUCT lpNetConnectInfoStruct __out LPNETCONNECTINFOSTRUCT lpNetConnectInfoStruct
); );
DWORD APIENTRY DWORD APIENTRY
MultinetGetConnectionPerformanceW( MultinetGetConnectionPerformanceW(
IN LPNETRESOURCEW lpNetResource, __in LPNETRESOURCEW lpNetResource,
OUT LPNETCONNECTINFOSTRUCT lpNetConnectInfoStruct __out LPNETCONNECTINFOSTRUCT lpNetConnectInfoStruct
); );
#ifdef UNICODE #ifdef UNICODE
#define MultinetGetConnectionPerformance MultinetGetConnectionPerformanceW #define MultinetGetConnectionPerformance MultinetGetConnectionPerformanceW
#else #else
#define MultinetGetConnectionPerformance MultinetGetConnectionPerformanceA #define MultinetGetConnectionPerformance MultinetGetConnectionPerformanceA
#endif // !UNICODE #endif // !UNICODE
#endif /* WINVER >= 0x0400 */ #endif /* WINVER >= 0x0400 */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
 End of changes. 50 change blocks. 
215 lines changed or deleted 168 lines changed or added

This html diff was produced by rfcdiff 1.41.