[commons-daemon] branch master updated: Correct regression in DAEMON-401

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git


The following commit(s) were added to refs/heads/master by this push:
     new 4228b53  Correct regression in DAEMON-401
4228b53 is described below

commit 4228b53ec99ae4e7f1d96242fbc8d4a27316fd57
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Sep 3 22:30:37 2019 +0100

    Correct regression in DAEMON-401
    
    An incorrect calling convention (__stdcall rather than __cdecl) caused
    memory corruption when running as a 32-bit process.
---
 src/changes/changes.xml             | 4 ++++
 src/native/windows/include/apxwin.h | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 17e040e..6ce7717 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -42,6 +42,10 @@
       <action issue="DAEMON-403" type="fix" dev="markt" due-to="Charles">
         jsvc. Correct debug log message that reports change in umask.
       </action>
+      <action issue="DAEMON-401" type="fix" dev="markt" due-to="Norimasa 
Yamamoto">
+        Procrun. Correct a regression in the previous fix for this issue that
+        caused 32-bit services to crash on start-up.
+      </action> 
     </release>
     <release version="1.2.0" date="2019-06-28" description="Feature and bug 
fix release">
       <action type="fix" dev="markt" due-to="mturk" >
diff --git a/src/native/windows/include/apxwin.h 
b/src/native/windows/include/apxwin.h
index cbd4ac9..1d70063 100644
--- a/src/native/windows/include/apxwin.h
+++ b/src/native/windows/include/apxwin.h
@@ -118,7 +118,7 @@ LPSTR       MzWideToAscii(LPCWSTR ws, LPSTR s);
 LPSTR       WideToANSI(LPCWSTR ws);
 LPSTR       MzWideToANSI(LPCWSTR ws);
 
-typedef int (__stdcall *WPUTENV) (const wchar_t *env);
+typedef int (*WPUTENV) (const wchar_t *env);
 
 typedef struct APXMULTISZ APXMULTISZ;
 typedef APXMULTISZ*       LPAPXMULTISZ;