#include "wx/intl.h"
#include <ctype.h>
-#include <direct.h>
+#ifdef __EMX__
+#include <dirent.h>
+#endif
#include "wx/log.h"
#include <errno.h>
#include <stdarg.h>
-#define INCL_DOS
-#define INCL_PM
-#define INCL_GPI
-#include <os2.h>
#define PURE_32
+
+#ifndef __EMX__
#include <upm.h>
#include <netcons.h>
#include <netbios.h>
+#endif
static const wxChar WX_SECTION[] = _T("wxWindows");
static const wxChar eHOSTNAME[] = _T("HostName");
char zServer[256];
char zComputer[256];
unsigned long ulLevel = 0;
- unsigned char* zBuffer;
- unsigned long ulBuffer;
- unsigned long* pulTotalAvail;
+ unsigned char* zBuffer = NULL;
+ unsigned long ulBuffer = 256;
+ unsigned long* pulTotalAvail = NULL;
NetBios32GetInfo( (const unsigned char*)zServer
,(const unsigned char*)zComputer
, int nType
)
{
+#ifndef __EMX__
long lrc;
// UPM procs return 0 on success
lrc = U32ELOCU((unsigned char*)zBuf, (unsigned long *)&nType);
if (lrc == 0) return TRUE;
+#endif
return FALSE;
}
int wxKill(
long lPid
-, int nSig
+, wxSignal eSig
+, wxKillError* peError
)
{
return((int)::DosKillProcess(0, (PID)lPid));
SData.PgmName = zShell;
sInputs = "/C " + rCommand;
- SData.PgmInputs = NULL; //(BYTE*)sInputs.c_str();
+ SData.PgmInputs = (BYTE*)sInputs.c_str();
SData.TermQ = 0;
SData.Environment = 0;
SData.InheritOpt = SSF_INHERTOPT_SHELL;
SData.ObjectBuffLen = (ULONG)sizeof(achObjBuf);
rc = ::DosStartSession(&SData, &ulSessID, &vPid);
- if (rc == 0)
+ if (rc == 0 || rc == 457) // NO_ERROR or SMG_START_IN_BACKGROUND
{
PTIB ptib;
PPIB ppib;
}
// 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;
return (long)lSize;
}
+// ----------------------------------------------------------------------------
+// env vars
+// ----------------------------------------------------------------------------
+
+bool wxGetEnv(const wxString& var, wxString *value)
+{
+ // wxGetenv is defined as getenv()
+ wxChar *p = wxGetenv(var);
+ if ( !p )
+ return FALSE;
+
+ if ( value )
+ {
+ *value = p;
+ }
+
+ return TRUE;
+}
+
+bool wxSetEnv(const wxString& variable, const wxChar *value)
+{
+#if defined(HAVE_SETENV)
+ return setenv(variable.mb_str(), value ? wxString(value).mb_str().data()
+ : NULL, 1 /* overwrite */) == 0;
+#elif defined(HAVE_PUTENV)
+ wxString s = variable;
+ if ( value )
+ s << _T('=') << value;
+
+ // transform to ANSI
+ const char *p = s.mb_str();
+
+ // the string will be free()d by libc
+ char *buf = (char *)malloc(strlen(p) + 1);
+ strcpy(buf, p);
+
+ return putenv(buf) == 0;
+#else // no way to set an env var
+ return FALSE;
+#endif
+}
+
+
// Sleep for nSecs seconds. Attempt a Windows implementation using timers.
static bool inTimer = FALSE;
unsigned long ulMilliseconds
)
{
- ::DosSleep(ulMilliseconds);
+ ::DosSleep(ulMilliseconds/1000l);
}
void wxSleep(
, 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];
+#ifndef __EMX__
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)
sUser1 = _T("");
}
}
+#endif
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;
}
+void wxDisplaySizeMM(
+ int* pWidth
+, int* pHeight
+)
+{
+ HPS hpsScreen;
+ HDC hdcScreen;
+
+ hpsScreen = ::WinGetScreenPS(HWND_DESKTOP);
+ hdcScreen = ::GpiQueryDevice(hpsScreen);
+
+ if (pWidth)
+ ::DevQueryCaps( hdcScreen
+ ,CAPS_HORIZONTAL_RESOLUTION
+ ,1L
+ ,(PLONG)pWidth
+ );
+ if (pHeight)
+ ::DevQueryCaps( hdcScreen
+ ,CAPS_VERTICAL_RESOLUTION
+ ,1L
+ ,(PLONG)pHeight
+ );
+}
+
+void wxClientDisplayRect(int *x, int *y, int *width, int *height)
+{
+ // This is supposed to return desktop dimensions minus any window
+ // manager panels, menus, taskbars, etc. If there is a way to do that
+ // for this platform please fix this function, otherwise it defaults
+ // to the entire desktop.
+ if (x) *x = 0;
+ if (y) *y = 0;
+ wxDisplaySize(width, height);
+}
+
+
bool wxDirExists(
const wxString& rDir
)
return ::WinQueryWindowUShort((HWND)hWnd, QWS_ID);
}
+wxString WXDLLEXPORT wxPMErrorToStr(
+ ERRORID vError
+)
+{
+ wxString sError;
+
+ //
+ // Remove the high order byte -- it is useless
+ //
+ vError &= 0x0000ffff;
+ switch(vError)
+ {
+ case PMERR_INVALID_HWND:
+ sError = wxT("Invalid window handle specified");
+ break;
+
+ case PMERR_INVALID_FLAG:
+ sError = wxT("Invalid flag bit set");
+ break;
+
+ case PMERR_NO_MSG_QUEUE:
+ sError = wxT("No message queue available");
+ break;
+
+ case PMERR_INVALID_PARM:
+ sError = wxT("Parameter contained invalid data");
+ break;
+
+ case PMERR_INVALID_PARAMETERS:
+ sError = wxT("Parameter value is out of range");
+ break;
+
+ case PMERR_PARAMETER_OUT_OF_RANGE:
+ sError = wxT("Parameter value is out of range");
+ break;
+
+ case PMERR_INVALID_INTEGER_ATOM:
+ sError = wxT("Not a valid atom");
+ break;
+
+ case PMERR_INVALID_HATOMTBL:
+ sError = wxT("Atom table handle is invalid");
+ break;
+
+ case PMERR_INVALID_ATOM_NAME:
+ sError = wxT("Not a valid atom name");
+ break;
+
+ case PMERR_ATOM_NAME_NOT_FOUND:
+ sError = wxT("Valid name format, but cannot find name in atom table");
+ break;
+
+ default:
+ sError = wxT("Unknown error");
+ }
+ return(sError);
+} // end of wxPMErrorToStr
+
+void wxDrawBorder(
+ HPS hPS
+, RECTL& rRect
+, WXDWORD dwStyle
+)
+{
+ POINTL vPoint[2];
+
+ vPoint[0].x = rRect.xLeft;
+ vPoint[0].y = rRect.yBottom;
+ ::GpiMove(hPS, &vPoint[0]);
+ if (dwStyle & wxSIMPLE_BORDER ||
+ dwStyle & wxSTATIC_BORDER)
+ {
+ vPoint[1].x = rRect.xRight - 1;
+ vPoint[1].y = rRect.yTop - 1;
+ ::GpiBox( hPS
+ ,DRO_OUTLINE
+ ,&vPoint[1]
+ ,0L
+ ,0L
+ );
+ }
+ if (dwStyle & wxSUNKEN_BORDER)
+ {
+ LINEBUNDLE vLineBundle;
+
+ vLineBundle.lColor = 0x00FFFFFF; // WHITE
+ vLineBundle.usMixMode = FM_OVERPAINT;
+ vLineBundle.fxWidth = 2;
+ vLineBundle.lGeomWidth = 2;
+ vLineBundle.usType = LINETYPE_SOLID;
+ vLineBundle.usEnd = 0;
+ vLineBundle.usJoin = 0;
+ ::GpiSetAttrs( hPS
+ ,PRIM_LINE
+ ,LBB_COLOR | LBB_MIX_MODE | LBB_WIDTH | LBB_GEOM_WIDTH | LBB_TYPE
+ ,0L
+ ,&vLineBundle
+ );
+ vPoint[1].x = rRect.xRight - 1;
+ vPoint[1].y = rRect.yTop - 1;
+ ::GpiBox( hPS
+ ,DRO_OUTLINE
+ ,&vPoint[1]
+ ,0L
+ ,0L
+ );
+ vPoint[0].x = rRect.xLeft + 1;
+ vPoint[0].y = rRect.yBottom + 1;
+ ::GpiMove(hPS, &vPoint[0]);
+ vPoint[1].x = rRect.xRight - 2;
+ vPoint[1].y = rRect.yTop - 2;
+ ::GpiBox( hPS
+ ,DRO_OUTLINE
+ ,&vPoint[1]
+ ,0L
+ ,0L
+ );
+
+ vLineBundle.lColor = 0x00000000; // BLACK
+ vLineBundle.usMixMode = FM_OVERPAINT;
+ vLineBundle.fxWidth = 2;
+ vLineBundle.lGeomWidth = 2;
+ vLineBundle.usType = LINETYPE_SOLID;
+ vLineBundle.usEnd = 0;
+ vLineBundle.usJoin = 0;
+ ::GpiSetAttrs( hPS
+ ,PRIM_LINE
+ ,LBB_COLOR | LBB_MIX_MODE | LBB_WIDTH | LBB_GEOM_WIDTH | LBB_TYPE
+ ,0L
+ ,&vLineBundle
+ );
+ vPoint[0].x = rRect.xLeft + 2;
+ vPoint[0].y = rRect.yBottom + 2;
+ ::GpiMove(hPS, &vPoint[0]);
+ vPoint[1].x = rRect.xLeft + 2;
+ vPoint[1].y = rRect.yTop - 3;
+ ::GpiLine(hPS, &vPoint[1]);
+ vPoint[1].x = rRect.xRight - 3;
+ vPoint[1].y = rRect.yTop - 3;
+ ::GpiLine(hPS, &vPoint[1]);
+
+ vPoint[0].x = rRect.xLeft + 3;
+ vPoint[0].y = rRect.yBottom + 3;
+ ::GpiMove(hPS, &vPoint[0]);
+ vPoint[1].x = rRect.xLeft + 3;
+ vPoint[1].y = rRect.yTop - 4;
+ ::GpiLine(hPS, &vPoint[1]);
+ vPoint[1].x = rRect.xRight - 4;
+ vPoint[1].y = rRect.yTop - 4;
+ ::GpiLine(hPS, &vPoint[1]);
+ }
+ if (dwStyle & wxDOUBLE_BORDER)
+ {
+ LINEBUNDLE vLineBundle;
+
+ vLineBundle.lColor = 0x00FFFFFF; // WHITE
+ vLineBundle.usMixMode = FM_OVERPAINT;
+ vLineBundle.fxWidth = 2;
+ vLineBundle.lGeomWidth = 2;
+ vLineBundle.usType = LINETYPE_SOLID;
+ vLineBundle.usEnd = 0;
+ vLineBundle.usJoin = 0;
+ ::GpiSetAttrs( hPS
+ ,PRIM_LINE
+ ,LBB_COLOR | LBB_MIX_MODE | LBB_WIDTH | LBB_GEOM_WIDTH | LBB_TYPE
+ ,0L
+ ,&vLineBundle
+ );
+ vPoint[1].x = rRect.xRight - 1;
+ vPoint[1].y = rRect.yTop - 1;
+ ::GpiBox( hPS
+ ,DRO_OUTLINE
+ ,&vPoint[1]
+ ,0L
+ ,0L
+ );
+ vLineBundle.lColor = 0x00000000; // WHITE
+ vLineBundle.usMixMode = FM_OVERPAINT;
+ vLineBundle.fxWidth = 2;
+ vLineBundle.lGeomWidth = 2;
+ vLineBundle.usType = LINETYPE_SOLID;
+ vLineBundle.usEnd = 0;
+ vLineBundle.usJoin = 0;
+ ::GpiSetAttrs( hPS
+ ,PRIM_LINE
+ ,LBB_COLOR | LBB_MIX_MODE | LBB_WIDTH | LBB_GEOM_WIDTH | LBB_TYPE
+ ,0L
+ ,&vLineBundle
+ );
+ vPoint[0].x = rRect.xLeft + 2;
+ vPoint[0].y = rRect.yBottom + 2;
+ ::GpiMove(hPS, &vPoint[0]);
+ vPoint[1].x = rRect.xRight - 2;
+ vPoint[1].y = rRect.yTop - 2;
+ ::GpiBox( hPS
+ ,DRO_OUTLINE
+ ,&vPoint[1]
+ ,0L
+ ,0L
+ );
+ vLineBundle.lColor = 0x00FFFFFF; // BLACK
+ vLineBundle.usMixMode = FM_OVERPAINT;
+ vLineBundle.fxWidth = 2;
+ vLineBundle.lGeomWidth = 2;
+ vLineBundle.usType = LINETYPE_SOLID;
+ vLineBundle.usEnd = 0;
+ vLineBundle.usJoin = 0;
+ ::GpiSetAttrs( hPS
+ ,PRIM_LINE
+ ,LBB_COLOR | LBB_MIX_MODE | LBB_WIDTH | LBB_GEOM_WIDTH | LBB_TYPE
+ ,0L
+ ,&vLineBundle
+ );
+ vPoint[0].x = rRect.xLeft + 3;
+ vPoint[0].y = rRect.yBottom + 3;
+ ::GpiMove(hPS, &vPoint[0]);
+ vPoint[1].x = rRect.xRight - 3;
+ vPoint[1].y = rRect.yTop - 3;
+ ::GpiBox( hPS
+ ,DRO_OUTLINE
+ ,&vPoint[1]
+ ,0L
+ ,0L
+ );
+ }
+ if (dwStyle & wxRAISED_BORDER)
+ {
+ LINEBUNDLE vLineBundle;
+
+ vLineBundle.lColor = 0x00000000; // BLACK
+ vLineBundle.usMixMode = FM_OVERPAINT;
+ vLineBundle.fxWidth = 2;
+ vLineBundle.lGeomWidth = 2;
+ vLineBundle.usType = LINETYPE_SOLID;
+ vLineBundle.usEnd = 0;
+ vLineBundle.usJoin = 0;
+ ::GpiSetAttrs( hPS
+ ,PRIM_LINE
+ ,LBB_COLOR | LBB_MIX_MODE | LBB_WIDTH | LBB_GEOM_WIDTH | LBB_TYPE
+ ,0L
+ ,&vLineBundle
+ );
+ vPoint[1].x = rRect.xRight - 1;
+ vPoint[1].y = rRect.yTop - 1;
+ ::GpiBox( hPS
+ ,DRO_OUTLINE
+ ,&vPoint[1]
+ ,0L
+ ,0L
+ );
+ vPoint[0].x = rRect.xLeft + 1;
+ vPoint[0].y = rRect.yBottom + 1;
+ ::GpiMove(hPS, &vPoint[0]);
+ vPoint[1].x = rRect.xRight - 2;
+ vPoint[1].y = rRect.yTop - 2;
+ ::GpiBox( hPS
+ ,DRO_OUTLINE
+ ,&vPoint[1]
+ ,0L
+ ,0L
+ );
+
+ vLineBundle.lColor = 0x00FFFFFF; // WHITE
+ vLineBundle.usMixMode = FM_OVERPAINT;
+ vLineBundle.fxWidth = 2;
+ vLineBundle.lGeomWidth = 2;
+ vLineBundle.usType = LINETYPE_SOLID;
+ vLineBundle.usEnd = 0;
+ vLineBundle.usJoin = 0;
+ ::GpiSetAttrs( hPS
+ ,PRIM_LINE
+ ,LBB_COLOR | LBB_MIX_MODE | LBB_WIDTH | LBB_GEOM_WIDTH | LBB_TYPE
+ ,0L
+ ,&vLineBundle
+ );
+ vPoint[0].x = rRect.xLeft + 2;
+ vPoint[0].y = rRect.yBottom + 2;
+ ::GpiMove(hPS, &vPoint[0]);
+ vPoint[1].x = rRect.xLeft + 2;
+ vPoint[1].y = rRect.yTop - 3;
+ ::GpiLine(hPS, &vPoint[1]);
+ vPoint[1].x = rRect.xRight - 3;
+ vPoint[1].y = rRect.yTop - 3;
+ ::GpiLine(hPS, &vPoint[1]);
+
+ vPoint[0].x = rRect.xLeft + 3;
+ vPoint[0].y = rRect.yBottom + 3;
+ ::GpiMove(hPS, &vPoint[0]);
+ vPoint[1].x = rRect.xLeft + 3;
+ vPoint[1].y = rRect.yTop - 4;
+ ::GpiLine(hPS, &vPoint[1]);
+ vPoint[1].x = rRect.xRight - 4;
+ vPoint[1].y = rRect.yTop - 4;
+ ::GpiLine(hPS, &vPoint[1]);
+ }
+} // end of wxDrawBorder
+
projects / wxWidgets.git / blobdiff