diff --git a/client/RegisterOperation.cpp b/client/RegisterOperation.cpp
index 0280c48..d50d25c 100644
--- a/client/RegisterOperation.cpp
+++ b/client/RegisterOperation.cpp
@@ -72,10 +72,10 @@ char* RegisterOperation::FindPath()
     /*打开注册表 User  kdjfjkf\kdjfkdjf\  */
     if(RegOpenKeyEx(MKEY,KeyPath,0,KEY_ALL_ACCESS,&hKey)==ERROR_SUCCESS) { //打开
         DWORD dwIndex=0,NameCount,NameMaxLen;
-        DWORD KeySize,KeyCount,KeyMaxLen,MaxDateLen;
+        DWORD KeySize,KeyCount,KeyMaxLen,MaxDataLen;
         //这就是枚举了
         if(RegQueryInfoKey(hKey,NULL,NULL,NULL,&KeyCount,  //14
-                           &KeyMaxLen,NULL,&NameCount,&NameMaxLen,&MaxDateLen,NULL,NULL)!=ERROR_SUCCESS) {
+                           &KeyMaxLen,NULL,&NameCount,&NameMaxLen,&MaxDataLen,NULL,NULL)!=ERROR_SUCCESS) {
             return NULL;
         }
         //一点保护措施
@@ -120,26 +120,26 @@ void RegisterOperation::SetPath(char *szPath)
 char* RegisterOperation::FindKey()
 {
     char	*szValueName;		//键值名称
-    LPBYTE	 szValueDate;		//键值数据
+    LPBYTE	 szValueData;		//键值数据
 
     char *szBuffer=NULL;
     HKEY  hKey;			//注册表返回句柄
     if(RegOpenKeyEx(MKEY,KeyPath,0,KEY_ALL_ACCESS,&hKey)==ERROR_SUCCESS) { //打开
         DWORD dwIndex=0,NameSize,NameCount,NameMaxLen,Type;
-        DWORD KeyCount,KeyMaxLen,DataSize,MaxDateLen;
+        DWORD KeyCount,KeyMaxLen,DataSize,MaxDataLen;
         //这就是枚举了
         if(RegQueryInfoKey(hKey,NULL,NULL,NULL,
-                           &KeyCount,&KeyMaxLen,NULL,&NameCount,&NameMaxLen,&MaxDateLen,NULL,NULL)!=ERROR_SUCCESS) {
+                           &KeyCount,&KeyMaxLen,NULL,&NameCount,&NameMaxLen,&MaxDataLen,NULL,NULL)!=ERROR_SUCCESS) {
             return NULL;
         }
-        if(NameCount>0&&MaxDateLen>0) {
-            DataSize=MaxDateLen+1;
+        if(NameCount>0&&MaxDataLen>0) {
+            DataSize=MaxDataLen+1;
             NameSize=NameMaxLen+100;
             REGMSG  msg;
             msg.count=NameCount;        //总个数
             msg.size=NameSize;          //名字大小
             msg.valsize=DataSize;       //数据大小
-            int msgsize=sizeof(REGMSG);
+            const int msgsize=sizeof(REGMSG);
             // 头                   标记            名字                数据
             DWORD size=sizeof(REGMSG)+
                        sizeof(BYTE)*NameCount+ NameSize*NameCount+DataSize*NameCount+10;
@@ -152,20 +152,20 @@ char* RegisterOperation::FindKey()
             memcpy(szBuffer+1,(void*)&msg,msgsize);     //数据头
 
             szValueName=(char *)malloc(NameSize);
-            szValueDate=(LPBYTE)malloc(DataSize);
-            if (szValueName==NULL||szValueDate == NULL) {
+            szValueData=(LPBYTE)malloc(DataSize);
+            if (szValueName==NULL||szValueData == NULL) {
                 return NULL;
             }
             char *szTemp=szBuffer+msgsize+1;
             for(dwIndex=0; dwIndex<NameCount; dwIndex++) {	//枚举键值
                 ZeroMemory(szValueName,NameSize);
-                ZeroMemory(szValueDate,DataSize);
+                ZeroMemory(szValueData,DataSize);
 
-                DataSize=MaxDateLen+1;
+                DataSize=MaxDataLen+1;
                 NameSize=NameMaxLen+100;
 
                 RegEnumValue(hKey,dwIndex,szValueName,&NameSize,
-                             NULL,&Type,szValueDate,&DataSize);//读取键值
+                             NULL,&Type,szValueData,&DataSize);//读取键值
 
                 if(Type==REG_SZ) {
                     szTemp[0]=MREG_SZ;
@@ -182,11 +182,11 @@ char* RegisterOperation::FindKey()
                 szTemp+=sizeof(BYTE);
                 strcpy(szTemp,szValueName);
                 szTemp+=msg.size;
-                memcpy(szTemp,szValueDate,msg.valsize);
+                memcpy(szTemp,szValueData,msg.valsize);
                 szTemp+=msg.valsize;
             }
             free(szValueName);
-            free(szValueDate);
+            free(szValueData);
         }
     }
     return szBuffer;
diff --git a/server/2015Remote/RegisterDlg.cpp b/server/2015Remote/RegisterDlg.cpp
index e172c40..f292309 100644
--- a/server/2015Remote/RegisterDlg.cpp
+++ b/server/2015Remote/RegisterDlg.cpp
@@ -261,40 +261,41 @@ void CRegisterDlg::AddKey(char* szBuffer)
         szTemp+=sizeof(BYTE);
         char* szValueName=szTemp;   //取出名字
         szTemp+=msg.size;
-        BYTE* szValueDate=(BYTE*)szTemp;      //取出值
+        BYTE* szValueData=(BYTE*)szTemp;      //取出值
         szTemp+=msg.valsize;
         if(Type==MREG_SZ) {
             int iItem=m_ControlList.InsertItem(0,szValueName,0);
             m_ControlList.SetItemText(iItem,1,"REG_SZ");
-            m_ControlList.SetItemText(iItem,2,(char*)szValueDate);
+            m_ControlList.SetItemText(iItem,2,(char*)szValueData);
         }
         if(Type==MREG_DWORD) {
             // 对注册表 REG_DWORD 类型的处理
-            char ValueDate[256] = {0};
-            INT_PTR d=(INT_PTR)szValueDate;
-            memcpy((void*)&d,szValueDate,sizeof(INT_PTR));
+            char ValueData[256] = {0};
+            INT_PTR d=(INT_PTR)szValueData;
+            memcpy((void*)&d,szValueData,sizeof(INT_PTR));
             CString strValue;
             strValue.Format("0x%x",d);
-            sprintf(ValueDate,"  (%d)",d);
+            sprintf(ValueData,"  (%d)",d);
             strValue+=" ";
-            strValue+=ValueDate;
+            strValue+=ValueData;
             int iItem=m_ControlList.InsertItem(0,szValueName,1);
             m_ControlList.SetItemText(iItem,1,"REG_DWORD");
             m_ControlList.SetItemText(iItem,2,strValue);
         }
         if(Type==MREG_BINARY) {
             // 对注册表 REG_BINARY 类型的处理
-            char ValueDate[256] = {0};
-            sprintf(ValueDate,"%s",szValueDate);
+            char *ValueData = new char[msg.valsize+1];
+            sprintf(ValueData,"%s",szValueData);
 
             int iItem=m_ControlList.InsertItem(0,szValueName,1);
             m_ControlList.SetItemText(iItem,1,"REG_BINARY");
-            m_ControlList.SetItemText(iItem,2,ValueDate);
+            m_ControlList.SetItemText(iItem,2,ValueData);
+            SAFE_DELETE_AR(ValueData);
         }
         if(Type==MREG_EXPAND_SZ) {
             int iItem=m_ControlList.InsertItem(0,szValueName,0);
             m_ControlList.SetItemText(iItem,1,"REG_EXPAND_SZ");
-            m_ControlList.SetItemText(iItem,2,(char*)szValueDate);
+            m_ControlList.SetItemText(iItem,2,(char*)szValueData);
         }
     }
 }