Author: mladen.turk(a)jboss.com Date: 2008-03-14 12:01:08 -0400 (Fri, 14 Mar 2008) New Revision: 1437 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/prunmgr/prunmgr.manifest trunk/utils/windows/native/service/procrun/apps/prunmgr/prunmgr.rc 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/apps/prunsrv/prunsrv.rc Log: Vista requires the Global prefix for named resources. This is backward compatible, although W2K requires Terminal services installed Modified: trunk/utils/windows/native/service/procrun/apps/prunmgr/prunmgr.c =================================================================== --- trunk/utils/windows/native/service/procrun/apps/prunmgr/prunmgr.c 2008-03-13 13:38:07 UTC (rev 1436) +++ trunk/utils/windows/native/service/procrun/apps/prunmgr/prunmgr.c 2008-03-14 16:01:08 UTC (rev 1437) @@ -1442,9 +1442,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; } Modified: trunk/utils/windows/native/service/procrun/apps/prunmgr/prunmgr.h =================================================================== --- trunk/utils/windows/native/service/procrun/apps/prunmgr/prunmgr.h 2008-03-13 13:38:07 UTC (rev 1436) +++ trunk/utils/windows/native/service/procrun/apps/prunmgr/prunmgr.h 2008-03-14 16:01:08 UTC (rev 1437) @@ -25,7 +25,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"JBoss\\JBoss Web 2" #define IDM_TM_EXIT 2000 Modified: trunk/utils/windows/native/service/procrun/apps/prunmgr/prunmgr.manifest =================================================================== --- trunk/utils/windows/native/service/procrun/apps/prunmgr/prunmgr.manifest 2008-03-13 13:38:07 UTC (rev 1436) +++ trunk/utils/windows/native/service/procrun/apps/prunmgr/prunmgr.manifest 2008-03-14 16:01:08 UTC (rev 1437) @@ -1,6 +1,6 @@ <?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="JBoss.Web.Service" type="win32" /> +<assemblyIdentity version="2.0.4.0" processorArchitecture="X86" name="JBoss.Web.Service" type="win32" /> <description>JBoss Web Service Manager</description> <dependency> <dependentAssembly> Modified: trunk/utils/windows/native/service/procrun/apps/prunmgr/prunmgr.rc =================================================================== --- trunk/utils/windows/native/service/procrun/apps/prunmgr/prunmgr.rc 2008-03-13 13:38:07 UTC (rev 1436) +++ trunk/utils/windows/native/service/procrun/apps/prunmgr/prunmgr.rc 2008-03-14 16:01:08 UTC (rev 1437) @@ -263,8 +263,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 Modified: trunk/utils/windows/native/service/procrun/apps/prunsrv/prunsrv.c =================================================================== --- trunk/utils/windows/native/service/procrun/apps/prunsrv/prunsrv.c 2008-03-13 13:38:07 UTC (rev 1436) +++ trunk/utils/windows/native/service/procrun/apps/prunsrv/prunsrv.c 2008-03-14 16:01:08 UTC (rev 1437) @@ -1161,9 +1161,10 @@ WCHAR en[SIZ_DESLEN]; int i; PSECURITY_ATTRIBUTES sa = GetNullACL(); - lstrcpyW(en, _service_name); + lstrcpyW(en, L"Global\\"); + lstrcatW(en, _service_name); lstrcatW(en, PRSRV_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; } Modified: trunk/utils/windows/native/service/procrun/apps/prunsrv/prunsrv.h =================================================================== --- trunk/utils/windows/native/service/procrun/apps/prunsrv/prunsrv.h 2008-03-13 13:38:07 UTC (rev 1436) +++ trunk/utils/windows/native/service/procrun/apps/prunsrv/prunsrv.h 2008-03-14 16:01:08 UTC (rev 1437) @@ -25,7 +25,7 @@ #define _PRUNSRV_H #undef PRG_VERSION -#define PRG_VERSION "2.0.3.0" +#define PRG_VERSION "2.0.4.0" #define PRG_REGROOT L"JBoss\\JBoss Web 2" #endif /* _PRUNSRV_H */ Modified: trunk/utils/windows/native/service/procrun/apps/prunsrv/prunsrv.rc =================================================================== --- trunk/utils/windows/native/service/procrun/apps/prunsrv/prunsrv.rc 2008-03-13 13:38:07 UTC (rev 1436) +++ trunk/utils/windows/native/service/procrun/apps/prunsrv/prunsrv.rc 2008-03-14 16:01:08 UTC (rev 1437) @@ -30,8 +30,8 @@ IDI_MAINICON ICON "../../resources/jboss.ico" 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