[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.3.0-116-g3dc4817

by Andre Heinecke cvs at cvs.gnupg.org
Thu Mar 3 17:13:21 CET 2016


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".

The branch, master has been updated
       via  3dc4817cdd6c56d43cf56276b8f80b3c465b7956 (commit)
      from  7b431cd807b158db354514632e5a7c09433e88fc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3dc4817cdd6c56d43cf56276b8f80b3c465b7956
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Mar 3 17:10:39 2016 +0100

    Remove parameter handling in Destkopshellrun
    
    * src/desktopshellrun.cpp (DesktopShellRun): Don't handle parameters.
    
    --
    Using the stack for additional parameters is too ticklish as we
    don't really know what else is on the stack in such a complex project.
    
    So we remove the param handlign altogether as this are not neccessary
    for gpg4win.

diff --git a/src/desktopshellrun.cpp b/src/desktopshellrun.cpp
index 4ef8a9e..dad4d9a 100644
--- a/src/desktopshellrun.cpp
+++ b/src/desktopshellrun.cpp
@@ -131,8 +131,7 @@ void __declspec(dllexport) __cdecl DesktopShellRun(HWND hwndParent,
   UNUSED(hwndParent);
   UNUSED(string_size);
   HRESULT hr;
-  wchar_t *wbuf = NULL,
-          *params = NULL;
+  wchar_t *wbuf = NULL;
   IShellWindows *shellWindows = NULL;
   IShellBrowser *shellBrowser = NULL;
   IShellView *shellView = NULL;
@@ -248,19 +247,12 @@ void __declspec(dllexport) __cdecl DesktopShellRun(HWND hwndParent,
       goto done;
     }
 
-  if ((*stacktop)->next && (*stacktop)->next->text)
-    {
-      params = acp_to_wchar((*stacktop)->next->text, strlen((*stacktop)->next->text));
-    }
-
-  if (!shellexecute(shellDispatch, wbuf, params))
+  if (!shellexecute(shellDispatch, wbuf, NULL))
     {
       ERRORPRINTF ("Failed to execute.");
     }
   if (wbuf)
     free(wbuf);
-  if (params)
-    free (params);
 done:
   if (folderView)
     {

-----------------------------------------------------------------------

Summary of changes:
 src/desktopshellrun.cpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org



More information about the Gpg4win-commits mailing list