2011-01-08 11:40 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

* src/vm/cmdarg.c * Formatting. * package/winuni/mpkg_win_uni.nsi + Added TOFIX to recent HBIDE shortcut addition. It should only be there if HBIDE component was selected. - Disabled HBIDE icon until a proper solution is found. * contrib/hbct/ctnet.c ! NETRMTNAME(): Fixed along the patch sent by vbdasc. Please test it. * contrib/hbmxml/3rd/minixml/config.h ! Space at EOL.
2011-01-08 10:41:31 +00:00
parent cb9a4d5af8
commit 6efb55a2c1
5 changed files with 44 additions and 21 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,22 @@
   The license applies to all entries newer than 2009-04-28.
 */

+2011-01-08 11:40 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * src/vm/cmdarg.c
+    * Formatting.
+
+  * package/winuni/mpkg_win_uni.nsi
+    + Added TOFIX to recent HBIDE shortcut addition.
+      It should only be there if HBIDE component was selected.
+    - Disabled HBIDE icon until a proper solution is found.
+
+  * contrib/hbct/ctnet.c
+    ! NETRMTNAME(): Fixed along the patch sent by vbdasc.
+      Please test it.
+
+  * contrib/hbmxml/3rd/minixml/config.h
+    ! Space at EOL.
+
 2011-01-08 03:27 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
  * harbour/src/rtl/filesys.c
    + added new macros HB_WIN_IOREAD_LIMIT and HB_WIN_IOWRITE_LIMIT
@@ -29,7 +45,7 @@
    + Added: dock-widget populated .ui to manage code formatting.

  * contrib/hbide/setup.ui
-    + Added: <Setup><hbIDE Setup><Formatting> page which contains slots 
+    + Added: <Setup><hbIDE Setup><Formatting> page which contains slots
        to define hbFormat specific settings ( work-in-progress ).

  * contrib/hbide/hbide.hbp
@@ -38,8 +54,8 @@
           : format.ui

  * contrib/hbide/ideactions.prg
-    + Implemented: <Edit><Format><Format Source> menu prompt which 
-        invokes "Formatting" dock-widget at the right hosting all 
+    + Implemented: <Edit><Format><Format Source> menu prompt which
+        invokes "Formatting" dock-widget at the right hosting all
        attributes of a tearable dock-widget as usual.
  * contrib/hbide/idedocks.prg
  * contrib/hbide/idemain.prg
@@ -50,17 +66,17 @@
    + Added: "Formatting Manger" class to handle formatting steps.

  + contrib/hbide/thbformt.prg
-    + Added: Stripped version of utils/hbformat/hbFormat.prg which 
+    + Added: Stripped version of utils/hbformat/hbFormat.prg which
        will be placed as a lib in contrib/hbformat once its functionality
        gets matured. I have added few more methods which are scheduled
-        to be implemented in hbIDE interface. As of current, its 
-        working is exactly the same as original taking use of default 
+        to be implemented in hbIDE interface. As of current, its
+        working is exactly the same as original taking use of default
        swtches.

-     hbIDE will now onwards be able to format sources on the fly and 
+     hbIDE will now onwards be able to format sources on the fly and
     with visual interface to present the formatted source for review
-     before swapping it into current editing instance. Right now it just 
-     displays the source for review. I will be waiting groups comments 
+     before swapping it into current editing instance. Right now it just
+     displays the source for review. I will be waiting groups comments
     before proceeding which direction it should take.

     Also note that currently formatting is done with default switches.
@@ -93,7 +109,7 @@
 2011-01-07 15:30 UTC+0200 Petr Chornyj (myorg63 at mail.ru)
  * contrib/hbmxml/hbmxml.c
  * contrib/hbmxml/tests/test.prg
-    + Added mxmlLoadFile()/mxmlSaveFile functions 
+    + Added mxmlLoadFile()/mxmlSaveFile functions

 2011-01-07 10:18 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
  * harbour/src/vm/cmdarg.c
@@ -123,7 +139,7 @@
    ! Modified: the behaviour of XbpDialog():close callback slot.
      It was returning logical while it was supposed to return nothing.
      Now it is responsibility of the programmer to handle xbeP_Close
-      event in its main event loop and act according to the context 
+      event in its main event loop and act according to the context
      of :close callback slot.
  * contrib/hbide/ideactions.prg
    + Added: <Find in Files> option in <Edit> menu.
--- a/harbour/contrib/hbct/ctnet.c
+++ b/harbour/contrib/hbct/ctnet.c
@@ -185,11 +185,17 @@ HB_FUNC( NETRMTNAME )

   TCHAR lpRemoteDevice[ 128 ];
   DWORD dwLen = HB_SIZEOFARRAY( lpRemoteDevice );
+   DWORD dwSize = 0;
+   LPCTSTR lpLocalName = HB_PARSTRDEF( 1, &hLocalDev, NULL );

-   if( WNetGetConnection( HB_PARSTRDEF( 1, &hLocalDev, NULL ),
-                          lpRemoteDevice,
-                          &dwLen ) == NO_ERROR )
-      HB_RETSTRLEN( lpRemoteDevice, ( HB_SIZE ) dwLen );
+   WNetGetConnection( lpLocalName,
+                      lpRemoteDevice,
+                      &dwSize );
+
+   if( ( dwSize <= dwLen ) && ( WNetGetConnection( lpLocalName,
+                                                   lpRemoteDevice,
+                                                   &dwSize ) == NO_ERROR ) )
+      HB_RETSTRLEN( lpRemoteDevice, ( HB_SIZE ) dwSize );
   else
      hb_retc_null();

--- a/harbour/contrib/hbmxml/3rd/minixml/config.h
+++ b/harbour/contrib/hbmxml/3rd/minixml/config.h
@@ -24,7 +24,7 @@
 #define _CRT_SECURE_NO_WARNINGS

 #include "hbdefs.h"
-#include "hb_io.h"    
+#include "hb_io.h"

 #if defined ( _MSC_VER )
 #define close      _close
--- a/harbour/package/winuni/mpkg_win_uni.nsi
+++ b/harbour/package/winuni/mpkg_win_uni.nsi
@@ -356,9 +356,10 @@ Section "Start Menu and Desktop icons" hb_shortcuts
  CreateShortCut  "$SMPROGRAMS\Harbour Project $%HB_VM%\Harbour Project (Command line).lnk" "cmd.exe" "/k cd $INSTDIR\bin" "cmd.exe" 0
  CreateShortCut  "$SMPROGRAMS\Harbour Project $%HB_VM%\Harbour Project.lnk" "$INSTDIR" "" "$INSTDIR" 0
  CreateShortCut  "$SMPROGRAMS\Harbour Project $%HB_VM%\hbrun.lnk" "$INSTDIR\bin\hbrun.exe" "-v" "$INSTDIR\bin\hbrun.exe" 0
-!ifndef PKG_NO_IDE
-  CreateShortCut  "$SMPROGRAMS\Harbour Project $%HB_VM%\hbide.lnk" "$INSTDIR\bin\hbide.exe" "" "$INSTDIR\bin\hbide.exe" 0
-!endif
+  ; TOFIX: Only create this shortcut, if 'hb_ide' component was enabled at install time (or when the target filename exists)
+;!ifndef PKG_NO_IDE
+;  CreateShortCut  "$SMPROGRAMS\Harbour Project $%HB_VM%\hbide.lnk" "$INSTDIR\bin\hbide.exe" "" "$INSTDIR\bin\hbide.exe" 0
+;!endif
  CreateDirectory "$SMPROGRAMS\Harbour Project $%HB_VM%\Links"
  WriteINIStr     "$SMPROGRAMS\Harbour Project $%HB_VM%\Links\Homepage.url"                   "InternetShortcut" "URL" "http://harbour-project.org/"
  WriteINIStr     "$SMPROGRAMS\Harbour Project $%HB_VM%\Links\Sourceforge Page.url"           "InternetShortcut" "URL" "http://sourceforge.net/projects/harbour-project/"
--- a/harbour/src/vm/cmdarg.c
+++ b/harbour/src/vm/cmdarg.c
@@ -553,9 +553,9 @@ HB_U32 hb_cmdargProcessVM( int * pCancelKey, int * pCancelKeyEx )
   if( iHandles > 20 )
   {
      #if defined( __WATCOMC__ )
-         #if defined(HB_OS_OS2)
+         #if defined( HB_OS_OS2 )
            DosSetMaxFH( iHandles );
-         #elif defined(HB_OS_DOS)
+         #elif defined( HB_OS_DOS )
            _grow_handles( iHandles );
         #endif
      #endif