Changeset 6673 for trunk/src

Timestamp:

Sep 7, 2001, 12:56:40 AM (24 years ago)

Author:

phaller

Message:

.

File:

• trunk/src/wnetap32/server.cpp (modified) (3 diffs)

trunk/src/wnetap32/server.cpp

@@ -1 @@
-/* $Id: server.cpp,v 1.1 2001-09-06 22:23:40 phaller Exp $ */
+/* $Id: server.cpp,v 1.2 2001-09-06 22:56:40 phaller Exp $ */
 
 /*
@@ -41 +41 @@
  * Module Global Variables                                                  *
  ****************************************************************************/
+
+//
+// The platform ID indicates the levels to use for platform-specific
+// information.
+//
+
+#define PLATFORM_ID_DOS 300
+#define PLATFORM_ID_OS2 400
+#define PLATFORM_ID_NT  500
+#define PLATFORM_ID_OSF 600
+#define PLATFORM_ID_VMS 700
+
+
+#define SV_TYPE_WORKSTATION         0x00000001
+#define SV_TYPE_SERVER              0x00000002
+#define SV_TYPE_SQLSERVER           0x00000004
+#define SV_TYPE_DOMAIN_CTRL         0x00000008
+#define SV_TYPE_DOMAIN_BAKCTRL      0x00000010
+#define SV_TYPE_TIME_SOURCE         0x00000020
+#define SV_TYPE_AFP                 0x00000040
+#define SV_TYPE_NOVELL              0x00000080
+#define SV_TYPE_DOMAIN_MEMBER       0x00000100
+#define SV_TYPE_PRINTQ_SERVER       0x00000200
+#define SV_TYPE_DIALIN_SERVER       0x00000400
+#define SV_TYPE_XENIX_SERVER        0x00000800
+#define SV_TYPE_SERVER_UNIX         SV_TYPE_XENIX_SERVER
+#define SV_TYPE_NT                  0x00001000
+#define SV_TYPE_WFW                 0x00002000
+#define SV_TYPE_SERVER_MFPN         0x00004000
+#define SV_TYPE_SERVER_NT           0x00008000
+#define SV_TYPE_POTENTIAL_BROWSER   0x00010000
+#define SV_TYPE_BACKUP_BROWSER      0x00020000
+#define SV_TYPE_MASTER_BROWSER      0x00040000
+#define SV_TYPE_DOMAIN_MASTER       0x00080000
+#define SV_TYPE_SERVER_OSF          0x00100000
+#define SV_TYPE_SERVER_VMS          0x00200000
+#define SV_TYPE_WINDOWS             0x00400000  /* Windows95 and above */
+#define SV_TYPE_DFS                 0x00800000  /* Root of a DFS tree */
+#define SV_TYPE_CLUSTER_NT          0x01000000  /* NT Cluster */
+#define SV_TYPE_DCE                 0x10000000  /* IBM DSS (Directory and Security Services) or equivalent */
+#define SV_TYPE_ALTERNATE_XPORT     0x20000000  /* return list for alternate transport */
+#define SV_TYPE_LOCAL_LIST_ONLY     0x40000000  /* Return local list only */
+#define SV_TYPE_DOMAIN_ENUM         0x80000000
+#define SV_TYPE_ALL                 0xFFFFFFFF  /* handy for NetServerEnum2 */
+
+
+static DWORD mapServerTypeToPlatform(DWORD dwServerType)
+{
+  switch(dwServerType)
+  {
+    case SV_TYPE_NT:
+    case SV_TYPE_SERVER_NT:
+    case SV_TYPE_POTENTIAL_BROWSER:
+    case SV_TYPE_BACKUP_BROWSER:
+    case SV_TYPE_MASTER_BROWSER:
+    case SV_TYPE_WINDOWS:
+    case SV_TYPE_CLUSTER_NT:
+      return PLATFORM_ID_NT;
+
+    case SV_TYPE_SERVER_OSF:
+      return PLATFORM_ID_OSF;
+
+    case SV_TYPE_SERVER_VMS:
+      return PLATFORM_ID_VMS;
+
+    default:
+      return PLATFORM_ID_OS2;
+  }
+
+  // who uses PLATFORM_ID_DOS these days ? :)
+}
 
 
@@ -158 +229 @@
   if (asciiServername) FreeAsciiString(asciiServername);
   if (asciiDomain)     FreeAsciiString(asciiDomain);
-  
-  // convert the structures
-  switch (dwLevel)
+
+  if (!rc)
   {
-    case 100:
+      // pass on the total number of entries available
+      *lpdwTotalEntries = ulEntriesTotal;
+
+    // convert the structures
+    switch (dwLevel)
     {
-        PSERVER_INFO_100 psiw0;
-        struct server_info_1 *pOS2ssi1 = (struct server_info_1 *)pOS2Buffer;
-        ULONG ulConvertedEntries = 0;
-        ULONG ulSpace = 0;
-        ULONG ulAllocated = 0;
-        ULONG ulEntriesConvertable = 0;
-        BOOLEAN flagMoreData = FALSE;
-        
-        // allocate as much memory as required or
-        // the amount specified in "prefmaxlen"
-        
-        // we need to calculate the overall size of all returned entries
-        for (ULONG i = 0;
-             i < *lpdwEntriesRead;
-             i++)
-        {
-            ulSpace += sizeof(SERVER_INFO_100);
-            ulSpace += (strlen( (const char*) pOS2ssi1->sv1_name) + 1) * 2;
-
-            // count how many entries we can convert
-            if (ulSpace < prefmaxlen)
-                ulEntriesConvertable++;
-            else
-                flagMoreData = TRUE;
-        }
-        // ulSpace now contains the number of bytes required for the overall structure
-        // ulEntriesConvertable contains the number of entries that fit in the target buffer
-
-        ulAllocated = min(ulSpace, prefmaxlen);
-        
-        // reset the structure pointer
-        pOS2ssi1 = (struct server_info_1 *)pOS2Buffer;
-
-        rc = OS2NetApiBufferAllocate(ulAllocated, (LPVOID*)&psiw0);
-        if (!rc)
-        {
-            // zero out the memory
-            memset(psiw0, 0, ulAllocated);
-
-                        // set data pointer "behind" the converted entries
-            // that's where the strings are placed
-            PBYTE pbData = (PBYTE)psiw0 + ulEntriesConvertable * sizeof(PSERVER_INFO_100);
-
-            for (;
-                 ulConvertedEntries < ulEntriesConvertable;
-                 ulConvertedEntries++)
-                {
-                 // convert that single structure
-                 psiw0->sv100_platform_id = 0; // @@@PH unavailable?
-                 lstrcpyAtoW((LPWSTR)pbData, (LPCSTR)pOS2ssi1->sv1_name );
-                 psiw0->sv100_name = (LPWSTR)pbData;
-
-                 // advance to next free data slot
-                 pbData += (strlen( (const char*)pOS2ssi1->sv1_name ) + 1) * 2;
-          
-                 // skip to the next entry
-                 pOS2ssi1++;
-                 psiw0++;
-                }
-        }
-        
-        // write back actual number of converted entries
-        // (as place fits in the target buffer)
-        *lpdwEntriesRead = ulConvertedEntries;
-
-        // check if there would have been more data
-        if (flagMoreData)
-            rc = ERROR_MORE_DATA_W;
-
-        break;
+      case 100:
+      {
+          PSERVER_INFO_100 psiw0;
+          struct server_info_1 *pOS2ssi1 = (struct server_info_1 *)pOS2Buffer;
+          ULONG ulConvertedEntries = 0;
+          ULONG ulSpace = 0;
+          ULONG ulAllocated = 0;
+          ULONG ulEntriesConvertable = 0;
+          BOOLEAN flagMoreData = FALSE;
+          
+          // allocate as much memory as required or
+          // the amount specified in "prefmaxlen"
+          
+          // we need to calculate the overall size of all returned entries
+          for (ULONG i = 0;
+               i < ulEntriesRead;
+               i++)
+          {
+              ulSpace += sizeof(SERVER_INFO_100);
+              ulSpace += (strlen( (const char*) pOS2ssi1->sv1_name) + 1) * 2;
+  
+              // count how many entries we can convert
+              if (ulSpace < prefmaxlen)
+                  ulEntriesConvertable++;
+              else
+                  flagMoreData = TRUE;
+          }
+          // ulSpace now contains the number of bytes required for the overall structure
+          // ulEntriesConvertable contains the number of entries that fit in the target buffer
+  
+          ulAllocated = min(ulSpace, prefmaxlen);
+          
+          // reset the structure pointer
+          pOS2ssi1 = (struct server_info_1 *)pOS2Buffer;
+  
+          rc = OS2NetApiBufferAllocate(ulAllocated, (LPVOID*)&psiw0);
+          if (!rc)
+          {
+              // zero out the memory
+              memset(psiw0, 0, ulAllocated);
+  
+                          // set data pointer "behind" the converted entries
+              // that's where the strings are placed
+              PBYTE pbData = (PBYTE)psiw0 + ulEntriesConvertable * sizeof(SERVER_INFO_100);
+  
+              for (;
+                   ulConvertedEntries < ulEntriesConvertable;
+                   ulConvertedEntries++)
+                  {
+                   // convert that single structure
+                   psiw0->sv100_platform_id = mapServerTypeToPlatform(pOS2ssi1->sv1_type);
+                   lstrcpyAtoW((LPWSTR)pbData, (LPCSTR)pOS2ssi1->sv1_name );
+                   psiw0->sv100_name = (LPWSTR)pbData;
+  
+                   // advance to next free data slot
+                   pbData += (strlen( (const char*)pOS2ssi1->sv1_name ) + 1) * 2;
+            
+                   // skip to the next entry
+                   pOS2ssi1++;
+                   psiw0++;
+                  }
+          }
+          
+          // write back actual number of converted entries
+          // (as place fits in the target buffer)
+          *lpdwEntriesRead = ulConvertedEntries;
+  
+          // check if there would have been more data
+          if (flagMoreData)
+              rc = ERROR_MORE_DATA_W;
+  
+          break;
+      }
+  
+  
+      case 101:
+      {
+          PSERVER_INFO_101 psiw1;
+          struct server_info_1 *pOS2ssi1 = (struct server_info_1 *)pOS2Buffer;
+          ULONG ulConvertedEntries = 0;
+          ULONG ulSpace = 0;
+          ULONG ulAllocated = 0;
+          ULONG ulEntriesConvertable = 0;
+          BOOLEAN flagMoreData = FALSE;
+          
+          // allocate as much memory as required or
+          // the amount specified in "prefmaxlen"
+          
+          // we need to calculate the overall size of all returned entries
+          for (ULONG i = 0;
+               i < ulEntriesRead;
+               i++)
+          {
+              ulSpace += sizeof(SERVER_INFO_101);
+              ulSpace += (strlen( (const char*)pOS2ssi1->sv1_name ) + 1) * 2;
+              ulSpace += (strlen( (const char*)pOS2ssi1->sv1_comment ) + 1) * 2;
+  
+              // count how many entries we can convert
+              if (ulSpace < prefmaxlen)
+                  ulEntriesConvertable++;
+              else
+                  flagMoreData = TRUE;
+          }
+          // ulSpace now contains the number of bytes required for the overall structure
+          // ulEntriesConvertable contains the number of entries that fit in the target buffer
+  
+          ulAllocated = min(ulSpace, prefmaxlen);
+          
+          // reset the structure pointer
+          pOS2ssi1 = (struct server_info_1 *)pOS2Buffer;
+  
+          rc = OS2NetApiBufferAllocate(ulAllocated, (LPVOID*)&psiw1);
+          if (!rc)
+          {
+              // zero out the memory
+              memset(psiw1, 0, ulAllocated);
+  
+                          // set data pointer "behind" the converted entries
+              // that's where the strings are placed
+              PBYTE pbData = (PBYTE)psiw1 + ulEntriesConvertable * sizeof(SERVER_INFO_101);
+  
+              for (;
+                   ulConvertedEntries < ulEntriesConvertable;
+                   ulConvertedEntries++)
+                  {
+                   // convert that single structure
+                   psiw1->sv101_platform_id = mapServerTypeToPlatform(pOS2ssi1->sv1_type);
+                   lstrcpyAtoW((LPWSTR)pbData, (LPCSTR)pOS2ssi1->sv1_name);
+                   psiw1->sv101_name = (LPWSTR)pbData;
+                   pbData += (strlen( (const char*)pOS2ssi1->sv1_name ) + 1) * 2;
+  
+                   lstrcpyAtoW((LPWSTR)pbData, (LPCSTR)pOS2ssi1->sv1_comment);
+                   psiw1->sv101_comment = (LPWSTR)pbData;
+                   pbData += (strlen( (const char*)pOS2ssi1->sv1_comment ) + 1) * 2;
+  
+                   psiw1->sv101_version_major = pOS2ssi1->sv1_version_major;
+                   psiw1->sv101_version_minor = pOS2ssi1->sv1_version_minor;
+                   psiw1->sv101_type = pOS2ssi1->sv1_type;
+  
+                   // skip to the next entry
+                   pOS2ssi1++;
+                   psiw1++;
+                  }
+          }
+          
+          // write back actual number of converted entries
+          // (as place fits in the target buffer)
+          *lpdwEntriesRead = ulConvertedEntries;
+  
+          // check if there would have been more data
+          if (flagMoreData)
+              rc = ERROR_MORE_DATA_W;
+  
+          break;
+      }
     }
-
-
-    case 101:
-    {
-        PSERVER_INFO_101 psiw1;
-        struct server_info_1 *pOS2ssi1 = (struct server_info_1 *)pOS2Buffer;
-        ULONG ulConvertedEntries = 0;
-        ULONG ulSpace = 0;
-        ULONG ulAllocated = 0;
-        ULONG ulEntriesConvertable = 0;
-        BOOLEAN flagMoreData = FALSE;
-        
-        // allocate as much memory as required or
-        // the amount specified in "prefmaxlen"
-        
-        // we need to calculate the overall size of all returned entries
-        for (ULONG i = 0;
-             i < *lpdwEntriesRead;
-             i++)
-        {
-            ulSpace += sizeof(SERVER_INFO_101);
-            ulSpace += (strlen( (const char*)pOS2ssi1->sv1_name ) + 1) * 2;
-            ulSpace += (strlen( (const char*)pOS2ssi1->sv1_comment ) + 1) * 2;
-
-            // count how many entries we can convert
-            if (ulSpace < prefmaxlen)
-                ulEntriesConvertable++;
-            else
-                flagMoreData = TRUE;
-        }
-        // ulSpace now contains the number of bytes required for the overall structure
-        // ulEntriesConvertable contains the number of entries that fit in the target buffer
-
-        ulAllocated = min(ulSpace, prefmaxlen);
-        
-        // reset the structure pointer
-        pOS2ssi1 = (struct server_info_1 *)pOS2Buffer;
-
-        rc = OS2NetApiBufferAllocate(ulAllocated, (LPVOID*)&psiw1);
-        if (!rc)
-        {
-            // zero out the memory
-            memset(psiw1, 0, ulAllocated);
-
-                        // set data pointer "behind" the converted entries
-            // that's where the strings are placed
-            PBYTE pbData = (PBYTE)psiw1 + ulEntriesConvertable * sizeof(PSERVER_INFO_101);
-
-            for (;
-                 ulConvertedEntries < ulEntriesConvertable;
-                 ulConvertedEntries++)
-                {
-                 // convert that single structure
-                 psiw1->sv101_platform_id = 0; // @@@PH unavailable?
-                 lstrcpyAtoW((LPWSTR)pbData, (LPCSTR)pOS2ssi1->sv1_name);
-                 psiw1->sv101_name = (LPWSTR)pbData;
-                 pbData += (strlen( (const char*)pOS2ssi1->sv1_name ) + 1) * 2;
-
-                 lstrcpyAtoW((LPWSTR)pbData, (LPCSTR)pOS2ssi1->sv1_comment);
-                 psiw1->sv101_comment = (LPWSTR)pbData;
-                 pbData += (strlen( (const char*)pOS2ssi1->sv1_comment ) + 1) * 2;
-
-                 psiw1->sv101_version_major = pOS2ssi1->sv1_version_major;
-                 psiw1->sv101_version_minor = pOS2ssi1->sv1_version_minor;
-                 psiw1->sv101_type = pOS2ssi1->sv1_type;
-
-                 // skip to the next entry
-                 pOS2ssi1++;
-                 psiw1++;
-                }
-        }
-        
-        // write back actual number of converted entries
-        // (as place fits in the target buffer)
-        *lpdwEntriesRead = ulConvertedEntries;
-
-        // check if there would have been more data
-        if (flagMoreData)
-            rc = ERROR_MORE_DATA_W;
-
-        break;
-    }
-
-
   }
   
   return (rc);
-  
 }