commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r644156 - in /commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr: prunmgr.c prunmgr.h prunmgr.manifest prunmgr.rc
Date Thu, 03 Apr 2008 04:28:49 GMT
Author: mturk
Date: Wed Apr  2 21:28:47 2008
New Revision: 644156

URL: http://svn.apache.org/viewvc?rev=644156&view=rev
Log:
Fix Vista runs by prefixing the global object with Global, and 64 builds by using the same
registry key, so 32-bit manager can manage 64-bit services

Modified:
    commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.c
    commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.h
    commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.manifest
    commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.rc

Modified: commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.c
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.c?rev=644156&r1=644155&r2=644156&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.c (original)
+++ commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.c Wed Apr  2 21:28:47
2008
@@ -56,6 +56,12 @@
 #define START_SYSTEM         L"SystemInit"
 #define EMPTY_PASSWORD       L"               "
 
+#ifdef WIN64
+#define KREG_WOW6432  KEY_WOW64_32KEY
+#else
+#define KREG_WOW6432  0
+#endif
+
 /* Main application pool */
 APXHANDLE hPool     = NULL;
 APXHANDLE hService  = NULL;
@@ -1442,9 +1448,11 @@
     HANDLE event;
     WCHAR en[SIZ_DESLEN];
     int i;
-    lstrcpyW(en, szServiceName);
+
+    lstrcpyW(en, L"Global\\");
+    lstrcatW(en, szServiceName);
     lstrcatW(en, L"SIGNAL");
-    for (i = 0; i < lstrlenW(en); i++) {
+    for (i = 7; i < lstrlenW(en); i++) {
         if (en[i] >= L'a' && en[i] <= L'z')
             en[i] = en[i] - 32;
     }
@@ -1682,7 +1690,8 @@
                                   apxLoadResource(IDS_APPLICATION, 0),
                                   APXREG_USER);
     loadConfiguration();
-    hRegserv = apxCreateRegistryW(hPool, KEY_READ | KEY_WRITE, PRG_REGROOT,
+    hRegserv = apxCreateRegistryW(hPool, KEY_READ | KEY_WRITE | KREG_WOW6432,
+                                  PRG_REGROOT,
                                   lpCmdline->szApplication,
                                   APXREG_SOFTWARE | APXREG_SERVICE);
 

Modified: commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.h
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.h?rev=644156&r1=644155&r2=644156&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.h (original)
+++ commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.h Wed Apr  2 21:28:47
2008
@@ -15,7 +15,6 @@
  */
  
 /* ====================================================================
- * jar2exe -- convert .jar file to WIN32 executable.
  * Contributed by Mladen Turk <mturk@apache.org>
  * 05 Aug 2003
  * ==================================================================== 
@@ -25,7 +24,7 @@
 #define _PRUNMGR_H
 
 #undef  PRG_VERSION
-#define PRG_VERSION    "2.0.3.0" 
+#define PRG_VERSION    "2.0.4.0" 
 #define PRG_REGROOT   L"Apache Software Foundation\\Procrun 2.0"
 
 #define IDM_TM_EXIT                     2000

Modified: commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.manifest
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.manifest?rev=644156&r1=644155&r2=644156&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.manifest (original)
+++ commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.manifest Wed Apr
 2 21:28:47 2008
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?> 
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 
-<assemblyIdentity version="2.0.1.0" processorArchitecture="X86" name="Apache.Procrun.Prunmgr"
type="win32" /> 
-<description>Procrun Service Manager</description> 
+<assemblyIdentity version="3.1.0.0" processorArchitecture="*" name="Apache.Procrun.Prunmgr"
type="win32" /> 
+<description>Apache Procrun Service Manager</description> 
 <dependency> 
 <dependentAssembly> 
-<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0"
processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*" /> 
+<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0"
processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*" /> 
 </dependentAssembly> 
 </dependency> 
 </assembly> 

Modified: commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.rc
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.rc?rev=644156&r1=644155&r2=644156&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.rc (original)
+++ commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.rc Wed Apr  2 21:28:47
2008
@@ -30,9 +30,7 @@
 BMP_APMNUHDR         BITMAP                 "../../resources/apmnuhdr.bmp"
 #endif
 
-#ifdef USE_MAINFEST
 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "prunmgr.manifest"
-#endif
 
 IDD_ABOUTBOX DIALOGEX 0, 0, 337, 187
 STYLE DS_SETFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
@@ -227,7 +225,7 @@
 STRINGTABLE 
 BEGIN
     IDS_APPLICATION     RSTR_PSM
-    IDS_APPVERSION      "Version 2.0.2"
+    IDS_APPVERSION      "Version 2.0.4"
     IDS_APPFULLNAME     RSTR_PSM " Version " PRG_VERSION
     IDS_APPCOPYRIGHT    "Copyright © 2000-2007 The Apache Software Foundation"
     IDS_APPDESCRIPTION  "Apache Procrun Service Management Tool"
@@ -258,8 +256,8 @@
 END
 
 1 VERSIONINFO
- FILEVERSION 2,0,3,0
- PRODUCTVERSION 2,0,3,0
+ FILEVERSION 2,0,4,0
+ PRODUCTVERSION 2,0,4,0
  FILEFLAGSMASK 0x3fL
 #if defined(_DEBUG)
  FILEFLAGS 0x03L



Mime
View raw message