#define INCL_PM
#define INCL_GPI
#include <os2.h>
-#include<netdb.h>
#define PURE_32
#include <upm.h>
#include <netcons.h>
#if wxUSE_NET_API
char zServer[256];
char zComputer[256];
- unsigned short nLevel = 0;
- unsigned char* zBuffer;
- unsigned short nBuffer;
- unsigned short* pnTotalAvail;
-
- NetBiosGetInfo( (const unsigned char*)zServer
- ,(const unsigned char*)zComputer
- ,nLevel
- ,zBuffer
- ,nBuffer
- ,pnTotalAvail
- );
+ unsigned long ulLevel = 0;
+ unsigned char* zBuffer = NULL;
+ unsigned long ulBuffer = 256;
+ unsigned long* pulTotalAvail = NULL;
+
+ NetBios32GetInfo( (const unsigned char*)zServer
+ ,(const unsigned char*)zComputer
+ ,ulLevel
+ ,zBuffer
+ ,ulBuffer
+ ,pulTotalAvail
+ );
strcpy(zBuf, zServer);
#else
wxChar* zSysname;
// Get user ID e.g. jacs
bool wxGetUserId(
wxChar* zBuf
-, int nMaxSize
+, int nType
)
{
- return(U32ELOCL((unsigned char*)zBuf, (unsigned long *)&nMaxSize));
+ long lrc;
+ // UPM procs return 0 on success
+ lrc = U32ELOCU((unsigned char*)zBuf, (unsigned long *)&nType);
+ if (lrc == 0) return TRUE;
+ return FALSE;
}
bool wxGetUserName(
const wxString& rCommand
)
{
- wxChar* zShell;
-
- if ((zShell = wxGetenv(_T("COMSPEC"))) == NULL)
- zShell = _T("\\CMD.EXE");
-
+ wxChar* zShell = _T("CMD.EXE");
+ wxString sInputs;
wxChar zTmp[255];
+ STARTDATA SData = {0};
+ PSZ PgmTitle = "Command Shell";
+ APIRET rc;
+ PID vPid = 0;
+ ULONG ulSessID = 0;
+ UCHAR achObjBuf[256] = {0}; //error data if DosStart fails
+ RESULTCODES vResult;
+
+ SData.Length = sizeof(STARTDATA);
+ SData.Related = SSF_RELATED_INDEPENDENT;
+ SData.FgBg = SSF_FGBG_FORE;
+ SData.TraceOpt = SSF_TRACEOPT_NONE;
+ SData.PgmTitle = PgmTitle;
+ SData.PgmName = zShell;
+
+ sInputs = "/C " + rCommand;
+ SData.PgmInputs = (BYTE*)sInputs.c_str();
+ SData.TermQ = 0;
+ SData.Environment = 0;
+ SData.InheritOpt = SSF_INHERTOPT_SHELL;
+ SData.SessionType = SSF_TYPE_WINDOWABLEVIO;
+ SData.IconFile = 0;
+ SData.PgmHandle = 0;
+ SData.PgmControl = SSF_CONTROL_VISIBLE | SSF_CONTROL_MAXIMIZE;
+ SData.InitXPos = 30;
+ SData.InitYPos = 40;
+ SData.InitXSize = 200;
+ SData.InitYSize = 140;
+ SData.Reserved = 0;
+ SData.ObjectBuffer = (char*)achObjBuf;
+ SData.ObjectBuffLen = (ULONG)sizeof(achObjBuf);
+
+ rc = ::DosStartSession(&SData, &ulSessID, &vPid);
+ if (rc == 0 || rc == 457) // NO_ERROR or SMG_START_IN_BACKGROUND
+ {
+ PTIB ptib;
+ PPIB ppib;
- if (rCommand != "")
- wxSprintf( zTmp
- ,"%s /c %s"
- ,zShell
- ,WXSTRINGCAST rCommand
- );
- else
- wxStrcpy(zTmp, zShell);
+ ::DosGetInfoBlocks(&ptib, &ppib);
- return (wxExecute((wxChar*)zTmp, FALSE) != 0);
+ ::DosWaitChild( DCWA_PROCESS
+ ,DCWW_WAIT
+ ,&vResult
+ ,&ppib->pib_ulpid
+ ,vPid
+ );
+ }
+ return (rc != 0);
}
// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
-long wxGetFreeMemory(
- void* pMemptr
-)
+long wxGetFreeMemory()
{
+ void* pMemptr = NULL;
ULONG lSize;
ULONG lMemFlags;
APIRET rc;
, const wxString& rTitle
)
{
+ wxBuffer = new wxChar[256];
wxSprintf(wxBuffer, "%s\nContinue?", WXSTRINGCAST rMsg);
if (::WinMessageBox( HWND_DESKTOP
,NULL
,0
,MB_ICONEXCLAMATION | MB_YESNO
) == MBID_YES)
+ delete[] wxBuffer;
wxExit();
}
)
{
ULONG ulSysInfo[QSV_MAX] = {0};
-
- if (::DosQuerySysInfo( 1L
- ,QSV_MAX
- ,(PVOID)ulSysInfo
- ,sizeof(ULONG) * QSV_MAX
- ))
+ APIRET ulrc;
+
+ ulrc = ::DosQuerySysInfo( 1L
+ ,QSV_MAX
+ ,(PVOID)ulSysInfo
+ ,sizeof(ULONG) * QSV_MAX
+ );
+ if (ulrc == 0L)
{
*pMajorVsn = ulSysInfo[QSV_VERSION_MAJOR];
+ *pMajorVsn = *pMajorVsn/10;
*pMinorVsn = ulSysInfo[QSV_VERSION_MINOR];
return wxWINDOWS_OS2;
}
, const wxString& rFile
)
{
- HAB hab;
- HINI hIni;
+ HAB hab = 0;
+ HINI hIni = 0;
if (rFile != "")
{
, const wxString& rFile
)
{
- HAB hab;
- HINI hIni;
- static const wxChar zDefunkt[] = _T("$$default");
+ HAB hab = 0;
+ HINI hIni = 0;
+ wxChar zDefunkt[] = _T("$$default");
+ char zBuf[1000];
if (rFile != "")
{
,(PSZ)WXSTRINGCAST rSection
,(PSZ)WXSTRINGCAST rEntry
,(PSZ)zDefunkt
- ,(void*)wxBuffer
+ ,(PVOID)zBuf
,1000
);
- if (n == 0L || wxStrcmp(wxBuffer, zDefunkt) == 0)
+ if (zBuf == NULL)
return FALSE;
+ if (n == 0L || wxStrcmp(zBuf, zDefunkt) == 0)
+ return FALSE;
+ zBuf[n-1] = '\0';
}
else
return FALSE;
,(PSZ)WXSTRINGCAST rSection
,(PSZ)WXSTRINGCAST rEntry
,(PSZ)zDefunkt
- ,(void*)wxBuffer
+ ,(PVOID)zBuf
,1000
);
- if (n == 0L || wxStrcmp(wxBuffer, zDefunkt) == 0)
+ if (zBuf == NULL)
+ return FALSE;
+ if (n == 0L || wxStrcmp(zBuf, zDefunkt) == 0)
return FALSE;
+ zBuf[n-1] = '\0';
}
- if (*ppValue)
- delete[] (*ppValue);
- *ppValue = copystring(wxBuffer);
+ strcpy((char*)*ppValue, zBuf);
return TRUE;
}
)
{
wxChar* zStr = NULL;
+
+ zStr = new wxChar[1000];
bool bSucc = wxGetResource( rSection
,rEntry
,(wxChar **)&zStr
delete[] zStr;
return TRUE;
}
- else return FALSE;
+ else
+ {
+ delete[] zStr;
+ return FALSE;
+ }
}
bool wxGetResource(
)
{
wxChar* zStr = NULL;
+
+ zStr = new wxChar[1000];
bool bSucc = wxGetResource( rSection
,rEntry
,(wxChar **)&zStr
delete[] zStr;
return TRUE;
}
- else return FALSE;
+ else
+ {
+ delete[] zStr;
+ return FALSE;
+ }
}
bool wxGetResource(
)
{
wxChar* zStr = NULL;
+
+ zStr = new wxChar[1000];
bool bSucc = wxGetResource( rSection
,rEntry
,(wxChar **)&zStr
delete[] zStr;
return TRUE;
}
- else return FALSE;
+ else
+ {
+ delete[] zStr;
+ return FALSE;
+ }
}
#endif // wxUSE_RESOURCES
wxChar* zHome;
wxString sUser1(rUser);
+ wxBuffer = new wxChar[256];
if (sUser1 != _T(""))
{
wxChar zTmp[64];
if ((zHome = wxGetenv(_T("TMP"))) != NULL ||
(zHome = wxGetenv(_T("TMPDIR"))) != NULL ||
(zHome = wxGetenv(_T("TEMP"))) != NULL)
+ delete[] wxBuffer;
return *zHome ? zHome : (wxChar*)_T("\\");
}
if (wxStricmp(zTmp, WXSTRINGCAST sUser1) == 0)
}
}
if (sUser1 == _T(""))
+ {
if ((zHome = wxGetenv(_T("HOME"))) != NULL)
{
wxStrcpy(wxBuffer, zHome);
Unix2DosFilename(wxBuffer);
- return wxBuffer;
+ wxStrcpy(zHome, wxBuffer);
+ delete[] wxBuffer;
+ return zHome;
}
- return NULL; // No home known!
+ }
+ delete[] wxBuffer;
+ return NULL; // No home known!
}
// Check whether this window wants to process messages, e.g. Stop button
if(pWnd)
{
QMSG vMsg;
- HAB hab;
- HWND hwndFilter;
+ HAB hab = 0;
+ HWND hwndFilter = NULLHANDLE;
HWND hwndWin= (HWND) pWnd->GetHWND();
while(::WinPeekMsg(hab, &vMsg, hwndFilter, 0, 0, PM_REMOVE))
{
HPS hpsScreen;
HDC hdcScreen;
+ LONG lWidth;
+ LONG lHeight;
hpsScreen = ::WinGetScreenPS(HWND_DESKTOP);
hdcScreen = ::GpiQueryDevice(hpsScreen);
- ::DevQueryCaps(hdcScreen, CAPS_WIDTH, 1L, (PLONG)pWidth);
- ::DevQueryCaps(hdcScreen, CAPS_HEIGHT, 1L, (PLONG)pHeight);
+ ::DevQueryCaps(hdcScreen, CAPS_WIDTH, 1L, &lWidth);
+ ::DevQueryCaps(hdcScreen, CAPS_HEIGHT, 1L, &lHeight);
DevCloseDC(hdcScreen);
+ *pWidth = (int)lWidth;
+ *pHeight = (int)lHeight;
}
bool wxDirExists(
projects / wxWidgets.git / blobdiff