From f17f4e7d668cbf74b2079152818ff8e25130694e Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sat, 29 May 2010 02:28:37 +0000
Subject: [PATCH] 2010-05-29 04:28 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * utils/hbmk2/hbmk2.prg     ! Fixed silly variable
 initialization bug after last commit.

  * contrib/hbwin/wapi_shellapi.c
    ! Fixed WAPI_SHELLEXECUTE() having HB_PARSTRDEF() one
      position off.

  * examples/rddado/tests/access1.prg
    * Minor update. Still doesn't work.
---
 harbour/ChangeLog                         | 11 +++++++++++
 harbour/contrib/hbwin/wapi_shellapi.c     |  6 +++---
 harbour/examples/rddado/tests/access1.prg |  8 ++++----
 harbour/utils/hbmk2/hbmk2.prg             |  1 +
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 1bc077d80d..0b908a893d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,17 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-05-29 04:28 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    ! Fixed silly variable initialization bug after last commit.
+
+  * contrib/hbwin/wapi_shellapi.c
+    ! Fixed WAPI_SHELLEXECUTE() having HB_PARSTRDEF() one
+      position off.
+
+  * examples/rddado/tests/access1.prg
+    * Minor update. Still doesn't work.
+
 2010-05-28 17:27 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   + contrib/gtwvg/tests/demowvg.hbp
     + Project definition.
diff --git a/harbour/contrib/hbwin/wapi_shellapi.c b/harbour/contrib/hbwin/wapi_shellapi.c
index 6184f8c808..ca767c862e 100644
--- a/harbour/contrib/hbwin/wapi_shellapi.c
+++ b/harbour/contrib/hbwin/wapi_shellapi.c
@@ -68,10 +68,10 @@ HB_FUNC( WAPI_SHELLEXECUTE )
    void * hDirectory;
 
    hb_retnint( ( HB_PTRDIFF ) ShellExecute( ( HWND ) hb_parptr( 1 ),
-                                            HB_PARSTRDEF( 2, &hOperation , NULL ), /* edit, explore, open, print, play?, properties? */
-                                            HB_PARSTR( 3, &hFile      , NULL ),
+                                            HB_PARSTR( 2, &hOperation, NULL ), /* edit, explore, open, print, play?, properties? */
+                                            HB_PARSTRDEF( 3, &hFile, NULL ),
                                             HB_PARSTR( 4, &hParameters, NULL ),
-                                            HB_PARSTR( 5, &hDirectory , NULL ),
+                                            HB_PARSTR( 5, &hDirectory, NULL ),
                                             HB_ISNUM( 6 ) ? hb_parni( 6 ) : SW_SHOWNORMAL /* nShowCmd */ ) );
 
    hb_strfree( hOperation  );
diff --git a/harbour/examples/rddado/tests/access1.prg b/harbour/examples/rddado/tests/access1.prg
index 6c612d1ac4..b7407cd744 100644
--- a/harbour/examples/rddado/tests/access1.prg
+++ b/harbour/examples/rddado/tests/access1.prg
@@ -6,12 +6,12 @@
 
 REQUEST ADORDD
 
-function Main()
-
-   USE test.mdb VIA "ADORDD" TABLE "Tabla1"
+PROCEDURE Main()
+? hb_dirBase() + "test.mdb"
+   USE ( hb_dirBase() + "test.mdb" ) VIA "ADORDD" TABLE "Tabla1"
 
    Browse()
 
    USE
 
-return nil
+   RETURN
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 579162ef19..65221ad0cc 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -802,6 +802,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
    hbmk[ _HBMK_lHBCPPMM ] := .F.
    hbmk[ _HBMK_aVAR ] := {}
    hbmk[ _HBMK_hKEYHEADER ] := { => }
+   hbmk[ _HBMK_aREQPKG ] := {}
 
    hbmk[ _HBMK_lBLDFLGP ] := .F.
    hbmk[ _HBMK_lBLDFLGC ] := .F.