Author: mladen.turk(a)jboss.com Date: 2008-03-26 07:36:55 -0400 (Wed, 26 Mar 2008) New Revision: 1460 Modified: trunk/utils/windows/native/service/procrun/apps/prunmgr/prunmgr.c trunk/utils/windows/native/service/procrun/apps/prunmgr/prunmgr.h trunk/utils/windows/native/service/procrun/apps/prunsrv/prunsrv.c trunk/utils/windows/native/service/procrun/apps/prunsrv/prunsrv.h trunk/utils/windows/native/service/procrun/src/cmdline.c Log: Always use 32-bit registry settings because installer is 32-bit Modified: trunk/utils/windows/native/service/procrun/apps/prunmgr/prunmgr.c =================================================================== --- trunk/utils/windows/native/service/procrun/apps/prunmgr/prunmgr.c 2008-03-26 11:07:00 UTC (rev 1459) +++ trunk/utils/windows/native/service/procrun/apps/prunmgr/prunmgr.c 2008-03-26 11:36:55 UTC (rev 1460) @@ -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; @@ -1684,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: trunk/utils/windows/native/service/procrun/apps/prunmgr/prunmgr.h =================================================================== --- trunk/utils/windows/native/service/procrun/apps/prunmgr/prunmgr.h 2008-03-26 11:07:00 UTC (rev 1459) +++ trunk/utils/windows/native/service/procrun/apps/prunmgr/prunmgr.h 2008-03-26 11:36:55 UTC (rev 1460) @@ -26,7 +26,7 @@ #undef PRG_VERSION #define PRG_VERSION "2.0.4.0" -#define PRG_REGROOT L"JBoss\\JBoss Web Service Wrapper" +#define PRG_REGROOT L"JBoss\\JBoss Web 2" #define IDM_TM_EXIT 2000 #define IDM_TM_START 2001 Modified: trunk/utils/windows/native/service/procrun/apps/prunsrv/prunsrv.c =================================================================== --- trunk/utils/windows/native/service/procrun/apps/prunsrv/prunsrv.c 2008-03-26 11:07:00 UTC (rev 1459) +++ trunk/utils/windows/native/service/procrun/apps/prunsrv/prunsrv.c 2008-03-26 11:36:55 UTC (rev 1460) @@ -40,6 +40,12 @@ #define STDOUT_FILENO 1 #define STDERR_FILENO 2 +#ifdef WIN64 +#define KREG_WOW6432 KEY_WOW64_32KEY +#else +#define KREG_WOW6432 0 +#endif + typedef struct APX_STDWRAP { LPCWSTR szLogPath; LPCWSTR szStdOutFilename; @@ -413,7 +419,8 @@ int i = 0; SetLastError(ERROR_SUCCESS); - hRegistry = apxCreateRegistryW(gPool, KEY_READ, PRG_REGROOT, + hRegistry = apxCreateRegistryW(gPool, KEY_READ | KREG_WOW6432, + PRG_REGROOT, lpCmdline->szApplication, APXREG_SOFTWARE | APXREG_SERVICE); if (IS_INVALID_HANDLE(hRegistry)) { @@ -485,7 +492,8 @@ { APXHANDLE hRegistry; int i = 0; - hRegistry = apxCreateRegistryW(gPool, KEY_WRITE, PRG_REGROOT, + hRegistry = apxCreateRegistryW(gPool, KEY_WRITE | KREG_WOW6432, + PRG_REGROOT, lpCmdline->szApplication, APXREG_SOFTWARE | APXREG_SERVICE); if (IS_INVALID_HANDLE(hRegistry)) Modified: trunk/utils/windows/native/service/procrun/apps/prunsrv/prunsrv.h =================================================================== --- trunk/utils/windows/native/service/procrun/apps/prunsrv/prunsrv.h 2008-03-26 11:07:00 UTC (rev 1459) +++ trunk/utils/windows/native/service/procrun/apps/prunsrv/prunsrv.h 2008-03-26 11:36:55 UTC (rev 1460) @@ -26,7 +26,7 @@ #undef PRG_VERSION #define PRG_VERSION "2.0.4.0" -#define PRG_REGROOT L"JBoss\\JBoss Web Service Wrapper" +#define PRG_REGROOT L"JBoss\\JBoss Web 2" #endif /* _PRUNSRV_H */ Modified: trunk/utils/windows/native/service/procrun/src/cmdline.c =================================================================== --- trunk/utils/windows/native/service/procrun/src/cmdline.c 2008-03-26 11:07:00 UTC (rev 1459) +++ trunk/utils/windows/native/service/procrun/src/cmdline.c 2008-03-26 11:36:55 UTC (rev 1460) @@ -22,7 +22,7 @@ #define X86_SUFFIX L".X86" #define X64_SUFFIX L".X64" -#define A64_SUFFIX L".A64" +#define A64_SUFFIX L".I64" /* Those two are declared in handles.c */ extern LPWSTR *_st_sys_argvw;