commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r441137 - in /jakarta/commons/proper/daemon/trunk/src/native/nt/procrun: ./ apps/apsvcmgr/ apps/prunmgr/ apps/prunsrv/ include/ src/
Date Thu, 07 Sep 2006 16:52:28 GMT
Author: mturk
Date: Thu Sep  7 09:52:27 2006
New Revision: 441137

URL: http://svn.apache.org/viewvc?view=rev&rev=441137
Log:
Upgrade build files to VS2005.

Modified:
    jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.c
    jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.h
    jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.manifest
    jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.rc
    jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.vcproj
    jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.c
    jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.h
    jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.manifest
    jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.rc
    jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.vcproj
    jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.h
    jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.rc
    jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.vcproj
    jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/include/apxwin.h
    jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/libprocrun.vcproj
    jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/procrun.sln
    jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/src/gui.c
    jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/src/mclib.c

Modified: jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.c
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.c?view=diff&rev=441137&r1=441136&r2=441137
==============================================================================
--- jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.c (original)
+++ jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.c Thu
Sep  7 09:52:27 2006
@@ -610,10 +610,10 @@
 #endif 
     hWndListHdr = ListView_GetHeader(hWndList);
     /* Sub-class */
-    ListViewWinMain = (WNDPROC)((SIZE_T)SetWindowLong(hWndList, GWL_WNDPROC, 
+    ListViewWinMain = (WNDPROC)((SIZE_T)SetWindowLong(hWndList, GWLP_WNDPROC, 
                                                       (LONG)((SIZE_T)ListViewMainSubclass)));

 
-    ListViewWinHead = (WNDPROC)((SIZE_T)SetWindowLong(hWndListHdr, GWL_WNDPROC, 
+    ListViewWinHead = (WNDPROC)((SIZE_T)SetWindowLong(hWndListHdr, GWLP_WNDPROC, 
                                                       (LONG)((SIZE_T)ListViewHeadSubclass)));

 
 
@@ -869,7 +869,7 @@
                     }
                     else {
                         SET_BIT_FLAG(_propertyChanged, 1);
-                        SetWindowLong(hDlg, DWL_MSGRESULT,
+                        SetWindowLong(hDlg, DWLP_MSGRESULT,
                                       PSNRET_INVALID_NOCHANGEPAGE);
                         return TRUE;                        
                     }
@@ -1019,7 +1019,7 @@
                         PropSheet_UnChanged(GetParent(hDlg), hDlg); 
                     else {
                         SET_BIT_FLAG(_propertyChanged, 2);
-                        SetWindowLong(hDlg, DWL_MSGRESULT,
+                        SetWindowLong(hDlg, DWLP_MSGRESULT,
                                       PSNRET_INVALID_NOCHANGEPAGE);
                         return TRUE;                        
                     }

Modified: jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.h
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.h?view=diff&rev=441137&r1=441136&r2=441137
==============================================================================
--- jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.h (original)
+++ jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.h Thu
Sep  7 09:52:27 2006
@@ -14,7 +14,7 @@
  */
  
 #undef  PRG_VERSION
-#define PRG_VERSION    "1.0.0.0" 
+#define PRG_VERSION    "2.0.1.0" 
 
 #define NUMTOOLBUTTONS                  17
 #define IDC_TOOLBAR                     2000

Modified: jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.manifest
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.manifest?view=diff&rev=441137&r1=441136&r2=441137
==============================================================================
--- jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.manifest
(original)
+++ jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.manifest
Thu Sep  7 09:52:27 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?> 
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 
-<assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="Apache.Procrun.Apsvcmgr"
type="win32" /> 
-<description>Your application description here.</description> 
+<assemblyIdentity version="2.0.1.0" processorArchitecture="X86" name="Apache.Procrun.Apsvcmgr"
type="win32" /> 
+<description>Service Manager.</description> 
 <dependency> 
 <dependentAssembly> 
 <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0"
processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*" /> 

Modified: jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.rc
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.rc?view=diff&rev=441137&r1=441136&r2=441137
==============================================================================
--- jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.rc (original)
+++ jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.rc Thu
Sep  7 09:52:27 2006
@@ -25,8 +25,10 @@
 IDB_SUSERS           BITMAP  DISCARDABLE    "../../resources/susers.bmp"
 IDR_LICENSE          RTF                    "../../resources/license.rtf"
 BMP_JAKARTA          BITMAP                 "../../resources/jakarta.bmp"
- 
+
+#ifdef USE_MAINFEST
 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "apsvcmgr.manifest"
+#endif
 
 IDC_APPLICATION MENU 
 BEGIN
@@ -276,8 +278,8 @@
  
 
 1 VERSIONINFO
- FILEVERSION 1,0,0,0
- PRODUCTVERSION 1,0,0,0
+ FILEVERSION 2,0,1,0
+ PRODUCTVERSION 2,0,1,0
  FILEFLAGSMASK 0x3fL
 #if defined(_DEBUG)
  FILEFLAGS 0x03L
@@ -297,7 +299,7 @@
       VALUE "FileDescription", RSTR_ASM "\0"
       VALUE "FileVersion", PRG_VERSION
       VALUE "InternalName", RSTR_ASM "\0"
-      VALUE "LegalCopyright", "Copyright © 2000-2003 The Apache Software Foundation.\0"
+      VALUE "LegalCopyright", "Copyright © 2000-2006 The Apache Software Foundation.\0"
       VALUE "OriginalFilename", "apsvcmgr.exe\0"
       VALUE "ProductName", RSTR_ASM "\0"
       VALUE "ProductVersion", PRG_VERSION

Modified: jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.vcproj
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/apsvcmgr/apsvcmgr.vcproj?view=diff&rev=441137&r1=441136&r2=441137
==============================================================================
Binary files - no diff available.

Modified: jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.c
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.c?view=diff&rev=441137&r1=441136&r2=441137
==============================================================================
--- jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.c (original)
+++ jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.c Thu Sep
 7 09:52:27 2006
@@ -647,7 +647,7 @@
                     }
                     else {
                         SET_BIT_FLAG(_propertyChanged, 1);
-                        SetWindowLong(hDlg, DWL_MSGRESULT,
+                        SetWindowLong(hDlg, DWLP_MSGRESULT,
                                       PSNRET_INVALID_NOCHANGEPAGE);
                         return TRUE;                        
                     }
@@ -802,7 +802,7 @@
                         PropSheet_UnChanged(GetParent(hDlg), hDlg); 
                     else {
                         SET_BIT_FLAG(_propertyChanged, 2);
-                        SetWindowLong(hDlg, DWL_MSGRESULT,
+                        SetWindowLong(hDlg, DWLP_MSGRESULT,
                                       PSNRET_INVALID_NOCHANGEPAGE);
                         return TRUE;                        
                     }
@@ -942,7 +942,7 @@
                         PropSheet_UnChanged(GetParent(hDlg), hDlg); 
                     else {
                         SET_BIT_FLAG(_propertyChanged, 3);
-                        SetWindowLong(hDlg, DWL_MSGRESULT,
+                        SetWindowLong(hDlg, DWLP_MSGRESULT,
                                       PSNRET_INVALID_NOCHANGEPAGE);
                         return TRUE;                        
                     }
@@ -1075,7 +1075,7 @@
                         PropSheet_UnChanged(GetParent(hDlg), hDlg); 
                     else {
                         SET_BIT_FLAG(_propertyChanged, 4);
-                        SetWindowLong(hDlg, DWL_MSGRESULT,
+                        SetWindowLong(hDlg, DWLP_MSGRESULT,
                                       PSNRET_INVALID_NOCHANGEPAGE);
                         return TRUE;                        
                     }
@@ -1213,7 +1213,7 @@
                         PropSheet_UnChanged(GetParent(hDlg), hDlg); 
                     else {
                         SET_BIT_FLAG(_propertyChanged, 5);
-                        SetWindowLong(hDlg, DWL_MSGRESULT,
+                        SetWindowLong(hDlg, DWLP_MSGRESULT,
                                       PSNRET_INVALID_NOCHANGEPAGE);
                         return TRUE;                        
                     }
@@ -1360,7 +1360,7 @@
                         PropSheet_UnChanged(GetParent(hDlg), hDlg); 
                     else {
                         SET_BIT_FLAG(_propertyChanged, 6);
-                        SetWindowLong(hDlg, DWL_MSGRESULT,
+                        SetWindowLong(hDlg, DWLP_MSGRESULT,
                                       PSNRET_INVALID_NOCHANGEPAGE);
                         return TRUE;                        
                     }

Modified: jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.h
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.h?view=diff&rev=441137&r1=441136&r2=441137
==============================================================================
--- jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.h (original)
+++ jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.h Thu Sep
 7 09:52:27 2006
@@ -24,7 +24,7 @@
 #define _PRUNMGR_H
 
 #undef  PRG_VERSION
-#define PRG_VERSION    "1.0.0.0" 
+#define PRG_VERSION    "2.0.1.0" 
 #define PRG_REGROOT   L"Apache Software Foundation\\Procrun 2.0"
 
 #define IDM_TM_EXIT                     2000

Modified: jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.manifest
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.manifest?view=diff&rev=441137&r1=441136&r2=441137
==============================================================================
--- jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.manifest
(original)
+++ jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.manifest
Thu Sep  7 09:52:27 2006
@@ -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="1.0.0.0" processorArchitecture="X86" name="Apache.Procrun.Prunmgr"
type="win32" /> 
+<assemblyIdentity version="2.0.1.0" processorArchitecture="X86" name="Apache.Procrun.Prunmgr"
type="win32" /> 
 <description>Procrun Service Manager</description> 
 <dependency> 
 <dependentAssembly> 

Modified: jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.rc
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.rc?view=diff&rev=441137&r1=441136&r2=441137
==============================================================================
--- jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.rc (original)
+++ jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.rc Thu
Sep  7 09:52:27 2006
@@ -28,7 +28,10 @@
 #if 0 
 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
@@ -254,8 +257,8 @@
 END
 
 1 VERSIONINFO
- FILEVERSION 1,0,0,0
- PRODUCTVERSION 1,0,0,0
+ FILEVERSION 2,0,1,0
+ PRODUCTVERSION 2,0,1,0
  FILEFLAGSMASK 0x3fL
 #if defined(_DEBUG)
  FILEFLAGS 0x03L
@@ -275,7 +278,7 @@
       VALUE "FileDescription", RSTR_PSM "\0"
       VALUE "FileVersion", PRG_VERSION
       VALUE "InternalName", RSTR_PSM "\0"
-      VALUE "LegalCopyright", "Copyright © 2000-2004 The Apache Software Foundation.\0"
+      VALUE "LegalCopyright", "Copyright © 2000-2006 The Apache Software Foundation.\0"
       VALUE "OriginalFilename", "prunmgr.exe\0"
       VALUE "ProductName", RSTR_PSM "\0"
       VALUE "ProductVersion", PRG_VERSION

Modified: jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.vcproj
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.vcproj?view=diff&rev=441137&r1=441136&r2=441137
==============================================================================
Binary files - no diff available.

Modified: jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.h
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.h?view=diff&rev=441137&r1=441136&r2=441137
==============================================================================
--- jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.h (original)
+++ jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.h Thu Sep
 7 09:52:27 2006
@@ -24,7 +24,7 @@
 #define _PRUNSRV_H
 
 #undef  PRG_VERSION
-#define PRG_VERSION    "1.0.0.0" 
+#define PRG_VERSION    "2.0.1.0" 
 #define PRG_REGROOT   L"Apache Software Foundation\\Procrun 2.0"
 
 #endif /* _PRUNSRV_H */

Modified: jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.rc
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.rc?view=diff&rev=441137&r1=441136&r2=441137
==============================================================================
--- jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.rc (original)
+++ jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.rc Thu
Sep  7 09:52:27 2006
@@ -21,8 +21,8 @@
 IDI_MAINICON         ICON                   "../../resources/procrunw.ico" 
 
 1 VERSIONINFO
- FILEVERSION 2,0,0,0
- PRODUCTVERSION 2,0,0,0
+ FILEVERSION 2,0,1,0
+ PRODUCTVERSION 2,0,1,0
  FILEFLAGSMASK 0x3fL
 #if defined(_DEBUG)
  FILEFLAGS 0x03L
@@ -42,7 +42,7 @@
       VALUE "FileDescription", RSTR_PRUNSRV "\0"
       VALUE "FileVersion", PRG_VERSION
       VALUE "InternalName", RSTR_PRUNSRV "\0"
-      VALUE "LegalCopyright", "Copyright © 2000-2003 The Apache Software Foundation.\0"
+      VALUE "LegalCopyright", "Copyright © 2000-2006 The Apache Software Foundation.\0"
       VALUE "OriginalFilename", "prunsrv.exe\0"
       VALUE "ProductName", RSTR_PRUNSRV "\0"
       VALUE "ProductVersion", PRG_VERSION

Modified: jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.vcproj
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.vcproj?view=diff&rev=441137&r1=441136&r2=441137
==============================================================================
Binary files - no diff available.

Modified: jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/include/apxwin.h
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/include/apxwin.h?view=diff&rev=441137&r1=441136&r2=441137
==============================================================================
--- jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/include/apxwin.h (original)
+++ jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/include/apxwin.h Thu Sep  7
09:52:27 2006
@@ -37,6 +37,14 @@
 
 #include <lm.h>
 
+#ifndef _INTPTR_T_DEFINED
+#ifdef  _WIN64
+typedef __int64             intptr_t;
+#else
+typedef _W64 int            intptr_t;
+#endif
+#define _INTPTR_T_DEFINED
+#endif
 
 #define APXMACRO_BEGIN                  do {
 #define APXMACRO_END                    } while(0)

Modified: jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/libprocrun.vcproj
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/libprocrun.vcproj?view=diff&rev=441137&r1=441136&r2=441137
==============================================================================
Binary files - no diff available.

Modified: jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/procrun.sln
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/procrun.sln?view=diff&rev=441137&r1=441136&r2=441137
==============================================================================
Binary files - no diff available.

Modified: jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/src/gui.c
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/src/gui.c?view=diff&rev=441137&r1=441136&r2=441137
==============================================================================
--- jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/src/gui.c (original)
+++ jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/src/gui.c Thu Sep  7 09:52:27
2006
@@ -530,7 +530,7 @@
 LPSTR apxBrowseForFolderA(HWND hWnd, LPCSTR szTitle, LPCSTR szName)
 {
     BROWSEINFOA  bi;
-    ITEMIDLIST   *il, *ir;
+    LPITEMIDLIST il, ir;
     LPMALLOC     pMalloc;
     CHAR         szPath[MAX_PATH+1];
     LPSTR        rv = NULL;
@@ -561,7 +561,7 @@
 LPWSTR apxBrowseForFolderW(HWND hWnd, LPCWSTR szTitle, LPCWSTR szName)
 {
     BROWSEINFOW  bi;
-    ITEMIDLIST   *il, *ir;
+    LPITEMIDLIST il, ir;
     LPMALLOC     pMalloc;
     WCHAR        szPath[MAX_PATH+1];
     LPWSTR       rv = NULL;
@@ -786,7 +786,7 @@
     DeleteObject(hBmp);
 
     ListView_SetImageList(hList, _st_sel_users_il, LVSIL_SMALL);
-    _st_sel_users_lvm = (WNDPROC)((SIZE_T)SetWindowLong(hList, GWL_WNDPROC, 
+    _st_sel_users_lvm = (WNDPROC)((SIZE_T)SetWindowLong(hList, GWLP_WNDPROC, 
                                                         (LONG)((SIZE_T)__apxSelectUserCreateLvSubclass)));

 
 }
@@ -894,7 +894,7 @@
     switch (uMsg) {
         case WM_INITDIALOG:
             /* Set the application icon */
-            SetClassLong(hDlg, GCL_HICON,
+            SetClassLong(hDlg, GCLP_HICON,
                          (LONG)(SIZE_T)LoadIcon(_st_sys_gui.hInstance,
                                         MAKEINTRESOURCE(IDI_MAINICON))); 
             apxCenterWindow(hDlg, _st_sys_gui.hMainWnd);

Modified: jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/src/mclib.c
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/src/mclib.c?view=diff&rev=441137&r1=441136&r2=441137
==============================================================================
--- jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/src/mclib.c (original)
+++ jakarta/commons/proper/daemon/trunk/src/native/nt/procrun/src/mclib.c Thu Sep  7 09:52:27
2006
@@ -56,7 +56,11 @@
 { 
 
     SIZE_T t;
+#ifdef WIN64
+    UINT64 c;
+#else
     UINT   c;
+#endif
     LPBYTE dst;
 
     dst = Destination;
@@ -100,7 +104,11 @@
     /* Fill words.  Length was >= 2*words so we know t >= 1 here. */
     t = Length / wsize;
     do {
-        *(UINT *)dst = c;
+#ifdef WIN64
+        *(UINT64 *)dst = c;
+#else
+        *(UINT   *)dst = c;
+#endif
         dst += wsize;
     } while (--t != 0);
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message