Process/thread work and API fix into network APIs

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index 1b441d1cef9187bff79cfe7e97c6613b84cb0395..12f65cee2a1a264cdfc7fa4d5c5748a8b3de04a3 100644 (file)
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -65,17 +65,17 @@ bool wxGetHostName(
 #if wxUSE_NET_API
     char                            zServer[256];
     char                            zComputer[256];
 #if wxUSE_NET_API
     char                            zServer[256];
     char                            zComputer[256];

-    unsigned short                  nLevel = 0;
+    unsigned long                   ulLevel = 0;

     unsigned char*                  zBuffer;
     unsigned char*                  zBuffer;

-    unsigned short                  nBuffer;
-    unsigned short*                 pnTotalAvail;
+    unsigned long                   ulBuffer;
+    unsigned long*                  pulTotalAvail;

 
     NetBios32GetInfo( (const unsigned char*)zServer
                      ,(const unsigned char*)zComputer
 
     NetBios32GetInfo( (const unsigned char*)zServer
                      ,(const unsigned char*)zComputer

-                     ,nLevel
+                     ,ulLevel

                      ,zBuffer
                      ,zBuffer

-                     ,nBuffer
-                     ,pnTotalAvail
+                     ,ulBuffer
+                     ,pulTotalAvail

                     );
     strcpy(zBuf, zServer);
 #else
                     );
     strcpy(zBuf, zServer);
 #else


@@ -160,7 +160,7 @@ bool wxShell(
     SData.PgmTitle = PgmTitle;
     SData.PgmName  = zShell;
 
     SData.PgmTitle = PgmTitle;
     SData.PgmName  = zShell;
 

-//    sInputs = "/C " + rCommand;
+    sInputs = "/C " + rCommand;

     SData.PgmInputs     = NULL; //(BYTE*)sInputs.c_str();
     SData.TermQ         = 0;
     SData.Environment   = 0;
     SData.PgmInputs     = NULL; //(BYTE*)sInputs.c_str();
     SData.TermQ         = 0;
     SData.Environment   = 0;

diff --git a/src/os2/utilsexc.cpp b/src/os2/utilsexc.cpp
index 03e82eb1d829101f4ca369d6f7f1cdc03d9ca7f8..1ebf11803466b6645ab7dd6af2f2d22d4739c0d0 100644 (file)
--- a/src/os2/utilsexc.cpp
+++ b/src/os2/utilsexc.cpp
@@ -247,17 +247,17 @@ bool wxGetFullHostName(
 #if wxUSE_NET_API
     char                            zServer[256];
     char                            zComputer[256];
 #if wxUSE_NET_API
     char                            zServer[256];
     char                            zComputer[256];

-    unsigned short                  nLevel = 0;
+    unsigned long                   ulLevel = 0;

     unsigned char*                  zBuffer;
     unsigned char*                  zBuffer;

-    unsigned short                  nBuffer;
-    unsigned short*                 pnTotalAvail;
+    unsigned long                   ulBuffer;
+    unsigned long*                  pulTotalAvail;

 
     NetBios32GetInfo( (const unsigned char*)zServer
                      ,(const unsigned char*)zComputer
 
     NetBios32GetInfo( (const unsigned char*)zServer
                      ,(const unsigned char*)zComputer

-                     ,nLevel
+                     ,ulLevel

                      ,zBuffer
                      ,zBuffer

-                     ,nBuffer
-                     ,pnTotalAvail
+                     ,ulBuffer
+                     ,pulTotalAvail

                     );
     strncpy(zBuf, zComputer, nMaxSize);
     zBuf[nMaxSize] = _T('\0');
                     );
     strncpy(zBuf, zComputer, nMaxSize);
     zBuf[nMaxSize] = _T('\0');