--- mstools/h/winnetwk.h	2018/08/09 18:20:29	1.1
+++ mstools/h/winnetwk.h	2018/08/09 18:23:01	1.1.1.3
@@ -45,6 +45,10 @@ Revision History:
 #ifndef _WINNETWK_
 #define _WINNETWK_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 //
 // RESOURCE ENUMERATION
 //
@@ -56,14 +60,23 @@ Revision History:
 #define RESOURCETYPE_ANY        0x00000000
 #define RESOURCETYPE_DISK       0x00000001
 #define RESOURCETYPE_PRINT      0x00000002
+#define RESOURCETYPE_UNKNOWN    0xFFFFFFFF
 
 #define RESOURCEUSAGE_CONNECTABLE   0x00000001
 #define RESOURCEUSAGE_CONTAINER     0x00000002
 #define RESOURCEUSAGE_RESERVED      0x80000000
 
+#define RESOURCEDISPLAYTYPE_GENERIC        0x00000000
+#define RESOURCEDISPLAYTYPE_DOMAIN         0x00000001
+#define RESOURCEDISPLAYTYPE_SERVER         0x00000002
+#define RESOURCEDISPLAYTYPE_SHARE          0x00000003
+#define RESOURCEDISPLAYTYPE_FILE           0x00000004
+#define RESOURCEDISPLAYTYPE_GROUP          0x00000005
+
 typedef struct  _NETRESOURCEA {
     DWORD    dwScope;
     DWORD    dwType;
+    DWORD    dwDisplayType;
     DWORD    dwUsage;
     LPSTR    lpLocalName;
     LPSTR    lpRemoteName;
@@ -73,6 +86,7 @@ typedef struct  _NETRESOURCEA {
 typedef struct  _NETRESOURCEW {
     DWORD    dwScope;
     DWORD    dwType;
+    DWORD    dwDisplayType;
     DWORD    dwUsage;
     LPWSTR   lpLocalName;
     LPWSTR   lpRemoteName;
@@ -80,11 +94,11 @@ typedef struct  _NETRESOURCEW {
     LPWSTR   lpProvider;
 }NETRESOURCEW, *LPNETRESOURCEW;
 #ifdef UNICODE
-#define NETRESOURCE NETRESOURCEW
-#define LPNETRESOURCE LPNETRESOURCEW
+typedef NETRESOURCEW NETRESOURCE;
+typedef LPNETRESOURCEW LPNETRESOURCE;
 #else
-#define NETRESOURCE NETRESOURCEA
-#define LPNETRESOURCE LPNETRESOURCEA
+typedef NETRESOURCEA NETRESOURCE;
+typedef LPNETRESOURCEA LPNETRESOURCE;
 #endif // UNICODE
 
 
@@ -107,9 +121,9 @@ WNetAddConnectionW (
      LPWSTR   lpLocalName
     );
 #ifdef UNICODE
-#define WNetAddConnection WNetAddConnectionW
+#define WNetAddConnection  WNetAddConnectionW
 #else
-#define WNetAddConnection WNetAddConnectionA
+#define WNetAddConnection  WNetAddConnectionA
 #endif // !UNICODE
 
 
@@ -128,9 +142,9 @@ WNetAddConnection2W (
      DWORD          dwFlags
     );
 #ifdef UNICODE
-#define WNetAddConnection2 WNetAddConnection2W
+#define WNetAddConnection2  WNetAddConnection2W
 #else
-#define WNetAddConnection2 WNetAddConnection2A
+#define WNetAddConnection2  WNetAddConnection2A
 #endif // !UNICODE
 
 DWORD APIENTRY
@@ -144,9 +158,9 @@ WNetCancelConnectionW (
      BOOL    fForce
     );
 #ifdef UNICODE
-#define WNetCancelConnection WNetCancelConnectionW
+#define WNetCancelConnection  WNetCancelConnectionW
 #else
-#define WNetCancelConnection WNetCancelConnectionA
+#define WNetCancelConnection  WNetCancelConnectionA
 #endif // !UNICODE
 
 DWORD APIENTRY
@@ -162,9 +176,9 @@ WNetCancelConnection2W (
      BOOL    fForce
     );
 #ifdef UNICODE
-#define WNetCancelConnection2 WNetCancelConnection2W
+#define WNetCancelConnection2  WNetCancelConnection2W
 #else
-#define WNetCancelConnection2 WNetCancelConnection2A
+#define WNetCancelConnection2  WNetCancelConnection2A
 #endif // !UNICODE
 
 
@@ -181,9 +195,9 @@ WNetGetConnectionW (
      LPDWORD lpnLength
     );
 #ifdef UNICODE
-#define WNetGetConnection WNetGetConnectionW
+#define WNetGetConnection  WNetGetConnectionW
 #else
-#define WNetGetConnection WNetGetConnectionA
+#define WNetGetConnection  WNetGetConnectionA
 #endif // !UNICODE
 
 
@@ -204,9 +218,9 @@ WNetOpenEnumW (
      LPHANDLE       lphEnum
     );
 #ifdef UNICODE
-#define WNetOpenEnum WNetOpenEnumW
+#define WNetOpenEnum  WNetOpenEnumW
 #else
-#define WNetOpenEnum WNetOpenEnumA
+#define WNetOpenEnum  WNetOpenEnumA
 #endif // !UNICODE
 
 DWORD APIENTRY
@@ -224,9 +238,9 @@ WNetEnumResourceW (
      LPDWORD lpBufferSize
     );
 #ifdef UNICODE
-#define WNetEnumResource WNetEnumResourceW
+#define WNetEnumResource  WNetEnumResourceW
 #else
-#define WNetEnumResource WNetEnumResourceA
+#define WNetEnumResource  WNetEnumResourceA
 #endif // !UNICODE
 
 DWORD APIENTRY
@@ -251,13 +265,13 @@ WNetGetUserW (
      LPDWORD  lpnLength
     );
 #ifdef UNICODE
-#define WNetGetUser WNetGetUserW
+#define WNetGetUser  WNetGetUserW
 #else
-#define WNetGetUser WNetGetUserA
+#define WNetGetUser  WNetGetUserA
 #endif // !UNICODE
 
 //
-//  BROWSE DIALOG
+//  BROWSE DIALOGS
 // 
 
 DWORD APIENTRY WNetConnectionDialog(
@@ -265,6 +279,11 @@ DWORD APIENTRY WNetConnectionDialog(
     DWORD dwType
     );
 
+DWORD APIENTRY WNetDisconnectDialog(
+    HWND  hwnd,
+    DWORD dwType
+    );
+
 //
 //  ERRORS
 // 
@@ -286,9 +305,9 @@ WNetGetLastErrorW (
      DWORD      nNameBufSize
     );
 #ifdef UNICODE
-#define WNetGetLastError WNetGetLastErrorW
+#define WNetGetLastError  WNetGetLastErrorW
 #else
-#define WNetGetLastError WNetGetLastErrorA
+#define WNetGetLastError  WNetGetLastErrorA
 #endif // !UNICODE
 
 //
@@ -339,4 +358,8 @@ WNetGetLastErrorW (
 
 #define WN_NO_ERROR		   NO_ERROR
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif  // _WINNETWK_