windows-misc-20050112

New AFS Logo Icon

Fix the assignment of the dataVersion for the freelance scache entries

Fix the calling convention of the AFSD Service Main function to be
WINAPI.

diff --git a/src/WINNT/afsd/afsd.ico b/src/WINNT/afsd/afsd.ico
index 10cc59c76cdf2992346b07c42241e73abcb9ac1f..40810ae0909e5d634fa69f2a35591de48072f65f 100644 (file)
Binary files a/src/WINNT/afsd/afsd.ico and b/src/WINNT/afsd/afsd.ico differ

diff --git a/src/WINNT/afsd/afsd_service.c b/src/WINNT/afsd/afsd_service.c
index 31e488c15dfdb3e9132dce6c6c211938016c79d5..3df179134f8feec79c5a5826339a7f63f2af4fdd 100644 (file)
--- a/src/WINNT/afsd/afsd_service.c
+++ b/src/WINNT/afsd/afsd_service.c
@@ -972,7 +972,7 @@ typedef SERVICE_STATUS_HANDLE ( * RegisterServiceCtrlHandlerFunc   )(  LPCTSTR ,
 RegisterServiceCtrlHandlerExFunc pRegisterServiceCtrlHandlerEx = NULL;
 RegisterServiceCtrlHandlerFunc   pRegisterServiceCtrlHandler   = NULL; 
 
-void afsd_Main(DWORD argc, LPTSTR *argv)
+VOID WINAPI afsd_Main(DWORD argc, LPTSTR *argv)
 {
     long code;
     char *reason;

diff --git a/src/WINNT/afsd/afsd_service.rc b/src/WINNT/afsd/afsd_service.rc
index 189c56cd6ee6335f74bdb0287818007ee4fd9702..4cf9a0e074863327bec265b8217c83aeec519c13 100644 (file)
--- a/src/WINNT/afsd/afsd_service.rc
+++ b/src/WINNT/afsd/afsd_service.rc
@@ -13,5 +13,8 @@
 #define AFS_VERINFO_NAME "afsd_service"
 #define AFS_VERINFO_FILENAME "afsd_service.exe"
 
+1      ICON    afsd.ico
+
 #include "AFS_component_version_number.h"
 #include "..\..\config\NTVersioninfo.rc"
+

diff --git a/src/WINNT/afsd/cm_dcache.c b/src/WINNT/afsd/cm_dcache.c
index 274c61ea0a63e07c6367a37e5d46ce06ce1936a2..279f0f6b2a24a5d78153857cea4c8b6c8069ab6f 100644 (file)
--- a/src/WINNT/afsd/cm_dcache.c
+++ b/src/WINNT/afsd/cm_dcache.c
@@ -1182,7 +1182,7 @@ long cm_GetBuffer(cm_scache_t *scp, cm_buf_t *bufp, int *cpffp, cm_user_t *up,
         afsStatus.FileType = 0x2;
         afsStatus.LinkCount = scp->linkCount;
         afsStatus.Length = cm_fakeDirSize;
-        afsStatus.DataVersion = scp->dataVersion;
+        afsStatus.DataVersion = cm_fakeDirVersion;
         afsStatus.Author = 0x1;
         afsStatus.Owner = 0x0;
         afsStatus.CallerAccess = 0x9;
@@ -1191,8 +1191,8 @@ long cm_GetBuffer(cm_scache_t *scp, cm_buf_t *bufp, int *cpffp, cm_user_t *up,
         afsStatus.ParentVnode = 0x1;
         afsStatus.ParentUnique = 0x1;
         afsStatus.ResidencyMask = 0;
-        afsStatus.ClientModTime = FakeFreelanceModTime;
-        afsStatus.ServerModTime = FakeFreelanceModTime;
+        afsStatus.ClientModTime = (afs_uint32)FakeFreelanceModTime;
+        afsStatus.ServerModTime = (afs_uint32)FakeFreelanceModTime;
         afsStatus.Group = 0;
         afsStatus.SyncCounter = 0;
         afsStatus.dataVersionHigh = 0;

diff --git a/src/WINNT/afsd/cm_scache.c b/src/WINNT/afsd/cm_scache.c
index 74cc3cb5491cecafa80483028989141d447784d1..0442af527252c3971634824603a5b6ba15683a50 100644 (file)
--- a/src/WINNT/afsd/cm_scache.c
+++ b/src/WINNT/afsd/cm_scache.c
@@ -344,7 +344,7 @@ long cm_GetSCache(cm_fid_t *fidp, cm_scache_t **outScpp, cm_user_t *userp,
         scp->parentUnique = 0x1;
         scp->parentVnode=0x1;
         scp->group=0;
-        scp->dataVersion=0x8;
+        scp->dataVersion=cm_fakeDirVersion;
         *outScpp = scp;
         lock_ReleaseWrite(&cm_scacheLock);
         /*afsi_log("   getscache done");*/
@@ -844,7 +844,7 @@ void cm_MergeStatus(cm_scache_t *scp, AFSFetchStatus *statusp, AFSVolSync *volp,
         statusp->FileType = CM_SCACHETYPE_DIRECTORY;
         statusp->LinkCount = scp->linkCount;
         statusp->Length = cm_fakeDirSize;
-        statusp->DataVersion = scp->dataVersion;
+        statusp->DataVersion = cm_fakeDirVersion;
         statusp->Author = 0x1;
         statusp->Owner = 0x0;
         statusp->CallerAccess = 0x9;
@@ -853,8 +853,8 @@ void cm_MergeStatus(cm_scache_t *scp, AFSFetchStatus *statusp, AFSVolSync *volp,
         statusp->ParentVnode = 0x1;
         statusp->ParentUnique = 0x1;
         statusp->ResidencyMask = 0;
-        statusp->ClientModTime = FakeFreelanceModTime;
-        statusp->ServerModTime = FakeFreelanceModTime;
+        statusp->ClientModTime = (afs_uint32)FakeFreelanceModTime;
+        statusp->ServerModTime = (afs_uint32)FakeFreelanceModTime;
         statusp->Group = 0;
         statusp->SyncCounter = 0;
         statusp->dataVersionHigh = 0;