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

2010-02-18 18:57 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* src/vm/cmdarg.c
    ! Fixed formatting.
    ! Fixed to enclose newly added code in {} block, otherwise
      it breaks with C compiler.
    - Deleted OS/2 specific guard in code section which is not
      anymore active to OS/2.

  * examples/gtwvw/hbgtwvw.h
    ! Fixed to not override manually set WINVER.
    ! Fixed to not set _WIN32_WINNT.
This commit is contained in:
Viktor Szakats
2010-02-18 17:58:49 +00:00
parent df7e8e09a1
commit d19b1b3d2b
3 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
harbour/ChangeLog
View File

@@ -17,6 +17,18 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-02-18 18:57 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* src/vm/cmdarg.c
! Fixed formatting.
! Fixed to enclose newly added code in {} block, otherwise
it breaks with C compiler.
- Deleted OS/2 specific guard in code section which is not
anymore active to OS/2.
* examples/gtwvw/hbgtwvw.h
! Fixed to not override manually set WINVER.
! Fixed to not set _WIN32_WINNT.
2010-02-18 18:45 UTC+0100 Maurilio Longo (maurilio.longo@libero.it)
* src/vm/cmdarg.c
! fixed OS/2 was displaying the path of the first .exe with name equal

8
harbour/examples/gtwvw/hbgtwvw.h
View File

@@ -68,8 +68,12 @@
#define TTS_BALLOON 0x40 // added by MAG
#define WINVER 0x0500
#define _WIN32_WINNT 0x0500
#ifndef GRADIENT_FILL_RECT_H
#define GRADIENT_FILL_RECT_H 0x00000000
#endif
#ifndef TPM_RECURSE
#define TPM_RECURSE 0x0001L
#endif
#ifndef _WIN32_IE
#define _WIN32_IE 0x0400

27
harbour/src/vm/cmdarg.c
View File

@@ -156,16 +156,18 @@ void hb_cmdargUpdate( void )
}
#elif defined( HB_OS_OS2 )
PPIB ppib = NULL;
APIRET ulrc;
{
PPIB ppib = NULL;
APIRET ulrc;
ulrc = DosGetInfoBlocks( NULL, &ppib );
if ( ulrc == NO_ERROR ) {
ulrc = DosQueryModuleName( ppib->pib_hmte,
HB_SIZEOFARRAY( s_szAppName ),
s_szAppName );
if ( ulrc == NO_ERROR ) {
s_argv[ 0 ] = s_szAppName;
ulrc = DosGetInfoBlocks( NULL, &ppib );
if( ulrc == NO_ERROR )
{
ulrc = DosQueryModuleName( ppib->pib_hmte,
HB_SIZEOFARRAY( s_szAppName ),
s_szAppName );
if( ulrc == NO_ERROR )
s_argv[ 0 ] = s_szAppName;
}
}
#else
@@ -174,7 +176,7 @@ void hb_cmdargUpdate( void )
PHB_FNAME pFName = hb_fsFNameSplit( s_argv[ 0 ] );
HB_BOOL fInPath = HB_FALSE;
if( !pFName->szPath )
if( ! pFName->szPath )
{
char * pszPATH = hb_getenv( "PATH" );
@@ -184,11 +186,6 @@ void hb_cmdargUpdate( void )
hb_fsAddSearchPath( pszPATH, &pSearchPath );
pNextPath = pSearchPath;
# ifdef HB_OS_OS2
if( !pFName->szExtension )
pFName->szExtension = ".exe";
# endif
while( pNextPath )
{
pFName->szPath = pNextPath->szPath;