Changeset 4394

Timestamp:

Oct 2, 2000, 11:23:05 PM (25 years ago)

Author:

phaller

Message:

.

Location:

trunk

Files:

• include/win/options.h (modified) (3 diffs)
• src/wnetap32/lanman.h (added)
• src/wnetap32/lmwksta.h (deleted)
• src/wnetap32/netapi32.def (modified) (2 diffs)
• src/wnetap32/oslibnet.cpp (modified) (2 diffs)
• src/wnetap32/oslibnet.h (modified) (1 diff)
• src/wnetap32/wnetap32.cpp (modified) (4 diffs)

trunk/include/win/options.h ¶

@@ -1 @@
-/* $Id: options.h,v 1.4 2000-04-29 18:25:03 sandervl Exp $ */
+/* $Id: options.h,v 1.5 2000-10-02 21:23:05 phaller Exp $ */
 
 /*
@@ -85 +85 @@
 
 /* Odin profile functions */
-
+/* Odin profile name in KERNEL32.DLL directory */
+#define ODINININAME "ODIN.INI"
 #define ODINCOLORS        "COLORS"
 #define ODINDIRECTORIES   "DEVDIRECTORIES"
 #define ODINCUSTOMIZATION "CUSTOMIZATION"
 
-int WINAPI PROFILE_GetOdinIniString(LPCSTR section,LPCSTR key_name,LPCSTR def,LPCSTR buffer,int len);
+int WINAPI PROFILE_GetOdinIniString(LPCSTR section,LPCSTR key_name,LPCSTR def,LPSTR buffer,UINT len);
 int WINAPI PROFILE_SetOdinIniString(LPCSTR section,LPCSTR key_name,LPCSTR value);
 int WINAPI PROFILE_GetOdinIniInt(LPCSTR section,LPCSTR key_name,int def);
@@ -97 +98 @@
 int WINAPI PROFILE_SetOdinIniBool(LPCSTR section,LPCSTR key_name,int value);
 int WINAPI PROFILE_SaveOdinIni(void);
+int WINAPI PROFILE_LoadOdinIni(void);
+void WINAPI WriteOutProfiles(void);
+
+//INT WINAPI GetPrivateProfileStringA(LPCSTR section, LPCSTR entry,
+//                                          LPCSTR def_val, LPSTR buffer,
+//                                          UINT len, LPCSTR filename);
 
 /* Version functions */

trunk/src/wnetap32/netapi32.def ¶

@@ -1 @@
-; $Id: netapi32.def,v 1.2 2000-10-02 13:03:01 phaller Exp $
+; $Id: netapi32.def,v 1.3 2000-10-02 21:19:11 phaller Exp $
 
 LIBRARY WNETAP32 INITINSTANCE
@@ -5 +5 @@
 
 IMPORTS
-    Net32WkstaGetInfo = NETAPI32.146
-    Net32WkstaSetInfo = NETAPI32.147
+    Net32StatisticsGet2 = NETAPI32.125
+    Net32WkstaGetInfo   = NETAPI32.146
+    Net32WkstaSetInfo   = NETAPI32.147
 
 EXPORTS

trunk/src/wnetap32/oslibnet.cpp ¶

@@ -28 +28 @@
 #include <wksta.h>
 #include <neterr.h>
+#include <netstats.h>
 
 
@@ -222 +223 @@
                     unsigned long       * pulTotalAvail) 
 {
-  APIRET rc = Net32WkstaGetInfo(pszServer, ulLevel, pbBuffer, ulBuffer, pulTotalAvail);
-  return error2WinError(rc);
+  USHORT sel = RestoreOS2FS();
+  
+  APIRET rc = error2WinError(Net32WkstaGetInfo(pszServer, ulLevel, pbBuffer, ulBuffer, pulTotalAvail));
+  SetFS(sel);
+  return rc;
 }
 
 
+/*****************************************************************************
+ * Name      : NET_API_STATUS OSLibNetStatisticsGet
+ * Purpose   :
+ * Parameters: 
+ * Variables :
+ * Result    :
+ * Remark    :
+ * Status    : UNTESTED STUB
+ *
+ * Author    : Patrick Haller 2000/01/10 01:42
+ *****************************************************************************/
+
+DWORD OSLibNetStatisticsGet(const unsigned char * pszServer,
+                            const unsigned char * pszService,
+                            unsigned long         ulReserved,
+                            unsigned long         ulLevel,
+                            unsigned long         flOptions,
+                            unsigned char       * pbBuffer,
+                            unsigned long         ulBuffer,
+                            unsigned long       * pulTotalAvail)
+{
+  USHORT sel = RestoreOS2FS();
+  APIRET rc = error2WinError(Net32StatisticsGet2(pszServer,
+                                  pszService,
+                                  ulReserved,
+                                  ulLevel,
+                                  flOptions,
+                                  pbBuffer,
+                                  ulBuffer,
+                                  pulTotalAvail));
+  SetFS(sel);
+  return rc;
+}

trunk/src/wnetap32/oslibnet.h ¶

@@ -18 +18 @@
                     unsigned long       * pulTotalAvail);
 
+DWORD OSLibNetStatisticsGet(const unsigned char * pszServer,
+                            const unsigned char * pszService,
+                            unsigned long         ulReserved,
+                            unsigned long         ulLevel,
+                            unsigned long         flOptions,
+                            unsigned char       * pbBuffer,
+                            unsigned long         ulBuffer,
+                            unsigned long       * pulTotalAvail);
+
 #endif

trunk/src/wnetap32/wnetap32.cpp ¶

@@ -1 @@
-/* $Id: wnetap32.cpp,v 1.11 2000-10-02 14:04:08 phaller Exp $ */
+/* $Id: wnetap32.cpp,v 1.12 2000-10-02 21:19:12 phaller Exp $ */
 
 /*
@@ -31 +31 @@
 #include <odin.h>
 #include <odinwrap.h>
-#include <os2sel.h>
 #include <os2win.h>
 #include <misc.h>
 #include <heapstring.h>
+#include <string.h>
 
 #include "oslibnet.h"
-#include "lmwksta.h"
+#include "lanman.h"
 
 ODINDEBUGCHANNEL(WNETAP32-WNETAP32)
@@ -4397 +4397 @@
  *****************************************************************************/
 
+void UL2LI(PLARGE_INTEGER pli, ULONG ul)
+{
+  pli->LowPart = ul;
+  pli->HighPart = 0;
+}
+
+void LOHI2LI(PLARGE_INTEGER pli, ULONG lo, ULONG hi)
+{
+  pli->LowPart = lo;
+  pli->HighPart = hi;
+}
+
+
 ODINFUNCTION5(NET_API_STATUS,OS2NetStatisticsGet,LPWSTR,  lpServerName,
                                                  LPWSTR,  lpService,
@@ -4403 +4416 @@
                                                  LPBYTE*, bufptr)
 {
-  dprintf(("NETAPI32: NetUseStatisticsGet not implemented\n"));
-
-  return (NERR_BASE);
-}
-
-
+  // Note: as we use the static addresses of the strings
+  // for a faster comparsion, the compiler may NOT
+  // merge duplicate static const strings.
+  static LPSTR SERVICE_SERVER       = "SERVER";
+  static LPSTR SERVICE_REQUESTER_NT = "REQUESTER";
+  static LPSTR SERVICE_REQUESTER_LM = "REQUESTER";
+  static LPSTR SERVICE_UNKNOWN      = "UNKNOWN";
+  
+  // Convert servername to ASCII
+  // Convert service name to ASCII AND OS/2-Pendant
+  // OS/2 only allowes "SERVER" and "REQUESTER"
+  char *asciiServername = NULL;
+  if (lpServerName) asciiServername = UnicodeToAsciiString(lpServerName);
+  
+  // server remains
+  LPSTR lpstrOS2Service = NULL;
+  if (lpService != NULL)
+    if (lstrcmpiW((LPCWSTR)L"WORKSTATION",      (LPCWSTR)lpService) == 0) lpstrOS2Service = (LPSTR)SERVICE_REQUESTER_NT;
+    else
+    if (lstrcmpW((LPCWSTR)L"LanmanWorkstation", (LPCWSTR)lpService) == 0) lpstrOS2Service = (LPSTR)SERVICE_REQUESTER_LM;
+    else
+    if (lstrcmpiW((LPCWSTR)L"SERVER",           (LPCWSTR)lpService) == 0) lpstrOS2Service = (LPSTR)SERVICE_SERVER;
+    else
+    if (lstrcmpW((LPCWSTR)L"LanmanServer",      (LPCWSTR)lpService) == 0) lpstrOS2Service = (LPSTR)SERVICE_SERVER;
+    else
+    lpstrOS2Service = (LPSTR)SERVICE_UNKNOWN;  // to prevent crashes in NETAPI
+  
+  // Note: The Win32 docs say nothing about "LanmanWorkstation"
+  // Probably this is a request for the LANMAN-Workstation specific data?
+#ifdef DEBUG
+  {
+    char *asciiService = UnicodeToAsciiString(lpService);
+    dprintf(("WINMM: NetStatisticsGet server=[%s], service=[%s]\n",
+             asciiServername,
+             asciiService));
+    FreeAsciiString(asciiService);
+  }
+#endif
+  
+  
+  // @@@PH convert information modes!
+  int iOS2Level = dwLevel;     // both must be 0
+  int iOS2Options = dwOptions; // seems to be identical
+  
+  ULONG  ulBytesAvailable;
+  DWORD  rc;
+  
+  // determine required size of buffer
+  char pOS2Buffer[4096];
+  rc = OSLibNetStatisticsGet((const unsigned char*)asciiServername,
+                             (const unsigned char*)lpstrOS2Service,
+                             0,
+                             iOS2Level,
+                             iOS2Options,
+                             (unsigned char*)pOS2Buffer,
+                             sizeof(pOS2Buffer),
+                             &ulBytesAvailable);
+  
+  if (asciiServername) FreeAsciiString(asciiServername);
+  
+  // convert the structures
+  switch (dwLevel)
+  {
+    case 0:
+      // Note: address comparsion is valid :)
+      if (lpstrOS2Service == SERVICE_REQUESTER_NT)
+      {
+        PSTAT_WORKSTATION_NT_0 pstw0;
+        struct stat_workstation_0 *pOS2stw0 = (struct stat_workstation_0 *)pOS2Buffer;
+
+        // calculate new size for target buffer
+        rc = OS2NetApiBufferAllocate(sizeof(STAT_WORKSTATION_NT_0), (LPVOID*)&pstw0);
+        if (!rc)
+        {
+          // buffer is zeroed?
+          //memset(pstw0, 0, sizeof(STAT_WORKSTATION_0));
+
+          UL2LI  (&pstw0->StatisticsStartTime, pOS2stw0->stw0_start);
+          LOHI2LI(&pstw0->BytesReceived,       pOS2stw0->stw0_bytesrcvd_r_lo, pOS2stw0->stw0_bytesrcvd_r_hi);
+          pstw0->SmbsReceived;
+          pstw0->PagingReadBytesRequested;
+          pstw0->NonPagingReadBytesRequested;
+          pstw0->CacheReadBytesRequested;
+          pstw0->NetworkReadBytesRequested;
+          LOHI2LI(&pstw0->BytesTransmitted,    pOS2stw0->stw0_bytessent_r_lo, pOS2stw0->stw0_bytessent_r_hi);
+          pstw0->SmbsTransmitted;
+          pstw0->PagingWriteBytesRequested;
+          pstw0->NonPagingWriteBytesRequested;
+          pstw0->CacheWriteBytesRequested;
+          pstw0->NetworkWriteBytesRequested;
+          
+          pstw0->InitiallyFailedOperations;
+          pstw0->FailedCompletionOperations;
+          pstw0->ReadOperations;
+          pstw0->RandomReadOperations;
+          pstw0->ReadSmbs;
+          pstw0->LargeReadSmbs;
+          pstw0->SmallReadSmbs;
+          pstw0->WriteOperations;
+          pstw0->RandomWriteOperations;
+          pstw0->WriteSmbs;
+          pstw0->LargeWriteSmbs;
+          pstw0->SmallWriteSmbs;
+          pstw0->RawReadsDenied;
+          pstw0->RawWritesDenied;
+          
+          pstw0->NetworkErrors;
+          pstw0->Sessions                   = pOS2stw0->stw0_sesstart;
+          pstw0->FailedSessions             = pOS2stw0->stw0_sessfailcon;
+          pstw0->Reconnects                 = pOS2stw0->stw0_autorec;
+          pstw0->CoreConnects;
+          pstw0->Lanman20Connects;
+          pstw0->Lanman21Connects;
+          pstw0->LanmanNtConnects;
+          pstw0->ServerDisconnects;
+          pstw0->HungSessions               = pOS2stw0->stw0_sessbroke;
+          pstw0->UseCount                   = pOS2stw0->stw0_uses;
+          pstw0->FailedUseCount             = pOS2stw0->stw0_usefail;
+          pstw0->CurrentCommands;
+        }
+        // the caller is responsible for freeing the memory!
+        *bufptr = (LPBYTE)pstw0;
+      }
+      else
+      if (lpstrOS2Service == SERVICE_REQUESTER_LM)
+      {
+        // LanmanWorkstation !
+        PSTAT_WORKSTATION_LM_0 pstw0;
+        struct stat_workstation_0 *pOS2stw0 = (struct stat_workstation_0 *)pOS2Buffer;
+
+        // calculate new size for target buffer
+        rc = OS2NetApiBufferAllocate(sizeof(STAT_WORKSTATION_LM_0), (LPVOID*)&pstw0);
+        if (!rc)
+        {
+          // Note: the really nice thing is, the lanman structures are
+          // exactly identical between OS/2 and NT ... :)
+          memcpy(pstw0,
+                 pOS2stw0,
+                 sizeof(STAT_WORKSTATION_LM_0));
+        }
+        
+        // the caller is responsible for freeing the memory!
+        *bufptr = (LPBYTE)pstw0;
+      }
+      else
+      if (lpstrOS2Service == SERVICE_SERVER)
+      {
+        // SERVER !
+        PSTAT_SERVER_0 psts0;
+        struct stat_server_0 *pOS2sts0 = (struct stat_server_0 *)pOS2Buffer;
+
+        // calculate new size for target buffer
+        rc = OS2NetApiBufferAllocate(sizeof(STAT_SERVER_0), (LPVOID*)&psts0);
+        if (!rc)
+        {
+          // Note: the really nice thing is, the server structures are
+          // exactly identical between OS/2 and NT ... :)
+          memcpy(psts0,
+                 pOS2sts0,
+                 sizeof(STAT_SERVER_0));
+        }
+        
+        // the caller is responsible for freeing the memory!
+        *bufptr = (LPBYTE)psts0;
+      }
+    
+    break;
+  }
+  
+  return (rc);
+}
+
+