[ros-diffs] [janderwald] 30798: - pass the directory of the target application in - should fix bug 2849 See issue #2849 for more details.

[janderwald at svn.reactos.org]

Author: janderwald
Date: Tue Nov 27 01:18:50 2007
New Revision: 30798

URL: http://svn.reactos.org/svn/reactos?rev=30798&view=rev
Log:
- pass the directory of the target application in
- should fix bug 2849
See issue #2849 for more details.

Modified:
    trunk/reactos/dll/win32/shell32/dialogs.c

Modified: trunk/reactos/dll/win32/shell32/dialogs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs.c?rev=30798&r1=30797&r2=30798&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/dialogs.c (original)
+++ trunk/reactos/dll/win32/shell32/dialogs.c Tue Nov 27 01:18:50 2007
@@ -119,7 +119,7 @@
 static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     {
     int ic ;
-    char *psz, szMsg[256] ;
+    char *psz, *pdir, szMsg[256];
     static RUNFILEDLGPARAMS *prfdp = NULL ;
 
     switch (message)
@@ -144,8 +144,16 @@
                         {
                         psz = HeapAlloc( GetProcessHeap(), 0, (ic + 2) );
                         GetWindowTextA (htxt, psz, ic + 1) ;
-
-                        if (ShellExecuteA(NULL, "open", psz, NULL, NULL, SW_SHOWNORMAL) < (HINSTANCE)33)
+                        pdir = HeapAlloc(  GetProcessHeap(), 0, (ic + 2) );
+                        if (pdir)
+                            {
+                            char * ptr;
+                            strcpy(pdir, psz);
+                            ptr = strrchr(pdir, '\\');
+                            if(ptr)
+                                ptr[0] = '\0';
+                            }
+                        if (ShellExecuteA(NULL, "open", psz, NULL, pdir, SW_SHOWNORMAL) < (HINSTANCE)33)
                             {
                             char *pszSysMsg = NULL ;
                             FormatMessageA (
@@ -161,11 +169,13 @@
                             MessageBoxA (hwnd, szMsg, "Nix", MB_OK | MB_ICONEXCLAMATION) ;
 
                             HeapFree(GetProcessHeap(), 0, psz);
+                            HeapFree(GetProcessHeap(), 0, pdir);
                             SendMessageA (htxt, CB_SETEDITSEL, 0, MAKELPARAM (0, -1)) ;
                             return TRUE ;
                             }
                         FillList (htxt, psz) ;
                         HeapFree(GetProcessHeap(), 0, psz);
+                        HeapFree(GetProcessHeap(), 0, pdir);
                         EndDialog (hwnd, 0) ;
                         }
                     }