fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

See ChangeLog entry 19990908-00:05 EDT David G. Holm <dholm@jsd-llc.com>

Browse Source
This commit is contained in:
David G. Holm
1999-09-08 04:21:05 +00:00
parent 15ba2b0cd6
commit 86d76b4e7f
3 changed files with 26 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
harbour/ChangeLog
View File

@@ -1,3 +1,16 @@
19990908-00:05 EDT David G. Holm <dholm@jsd-llc.com>
* source/rtl/environ.c
! Version 1.43 added Windows code to detect the Windows version, but
it also replaced the DOS code to detect Windows with Windows code
to detect Windows. But Borland C 3.1 refuses to compile Windows code
when creating DOS programs and I suspect that other DOS compilers do
the same. So I restored version 1.42 and then put the Windows code
from version 1.43 back in the only place where it belongs.
- I removed the "95/98" designation from the Windows detection in DOS
mode, because that code should also be able to detect Windows 3.x.
* source/rtl/tget.prg
! Added missing ::Display() at end of ::Delete()
19990908-04:52 GMT+1 Victor Szel <info@szelvesz.hu>
* tests/working/rtl_test.prg
+ Some tests now are only included when compiled with Harbour, to skip

46
harbour/source/rtl/environ.c
View File

@@ -8,26 +8,13 @@
* __RUN()
*/
/* NOTE: Support for determining the window version by Luiz Rafael Culik
Culik@sl.conex.net
/* Note: The following #ifdef block for __IBMCPP__ must
be ahead of any and all #include statements!
*/
/* NOTE: The following #ifdef block for __IBMCPP__ must
be ahead of any and all #include statements! */
#ifdef __IBMCPP__
#define INCL_DOSMISC
#endif
/* NOTE: The following #ifdef block #including <windows.h> must
be ahead of any and all #include statements! */
#if defined(_Windows) || defined(_WIN32)
#if !defined(__CYGWIN__)
#include <windows.h>
#endif
#endif
#include "extend.h"
#include "errorapi.h"
#include "hbver.h"
@@ -99,7 +86,7 @@ HARBOUR HB_OS( void )
/* TODO: add MSVC support but MSVC cannot detect any OS except Windows! */
#if defined(__TURBOC__) || defined(__BORLANDC__) || defined(__MSC__) || defined(_MSC_VER)
#if defined(_Windows) || defined(_WIN32) || defined(__BORLANDC__) || defined(__MSC__) || defined(_MSC_VER) && !defined(__CYGWIN__)
#if defined(_Windows) || defined(_WIN32)
/* NOTE: Support for determining the window version by Luiz Rafael Culik
Culik@sl.conex.net
@@ -136,7 +123,6 @@ HARBOUR HB_OS( void )
break;
}
}
#else
#if defined(__MSC__) || defined(_MSC_VER)
if( _osmode == _WIN_MODE )
@@ -147,24 +133,16 @@ HARBOUR HB_OS( void )
hb_osletter = 0;
}
#else
OSVERSIONINFO osVer; // for GetVersionEx()
osVer.dwOSVersionInfoSize = sizeof(osVer);
if (GetVersionEx(&osVer)) {
if (osVer.dwPlatformId = VER_PLATFORM_WIN32_WINDOWS){
hb_osmajor = osVer.dwMajorVersion
hb_osminor = osVer.dwMinorVersion
hb_osletter = osVer.dwBuildNumber;
hb_os = "Windows 95/98";
/* detect Windows */
_AX = 0x160A;
geninterrupt( 0x2F );
if( _AX == 0 )
{
hb_osmajor = _BX / 256;
hb_osminor = _BX % 256;
hb_osletter = 0;
hb_os = "Windows";
}
if (osVer.dwPlatformId = VER_PLATFORM_WIN32_NT){
hb_osmajor = osVer.dwMajorVersion
hb_osminor = osVer.dwMinorVersion
hb_osletter = osVer.dwBuildNumber;
hb_os = "Windows NT";
}
}
#endif /* __MSC__ */
else
{

1
harbour/source/rtl/tget.prg
View File

@@ -741,6 +741,7 @@ METHOD _Delete() CLASS TGet
endcase
::Assign()
::Display()
return Self