CopyMemory -> memcpy

git-svn-id: http://svn.miranda-ng.org/main/trunk@11363 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 8 insertions, 8 deletions

diff --git a/plugins/Variables/src/parse_logic.cpp b/plugins/Variables/src/parse_logic.cpp
index ea14e89660..42f0ced5c3 100644
--- a/plugins/Variables/src/parse_logic.cpp
+++ b/plugins/Variables/src/parse_logic.cpp
@@ -170,7 +170,7 @@ static TCHAR *parseFor(ARGUMENTSINFO *ai)
 	TCHAR *res = mir_tstrdup(_T(""));

 

 	FORMATINFO fi;

-	CopyMemory(&fi, ai->fi, sizeof(fi));

+	memcpy(&fi, ai->fi, sizeof(fi));

 	fi.eCount = fi.pCount = 0;

 	fi.tszFormat = ai->targv[1];

 	mir_free(formatString(&fi));

diff --git a/plugins/Variables/src/parse_str.cpp b/plugins/Variables/src/parse_str.cpp
index 1d993f8b4c..36e2fab4f6 100644
--- a/plugins/Variables/src/parse_str.cpp
+++ b/plugins/Variables/src/parse_str.cpp
@@ -87,7 +87,7 @@ static TCHAR *parseEolToCrlf(ARGUMENTSINFO *ai)
 		res = (TCHAR*)mir_realloc(res, (_tcslen(res) + 2)*sizeof(TCHAR));

 		cur = res + loc;

 		MoveMemory(cur + 2, cur + 1, (_tcslen(cur + 1) + 1)*sizeof(TCHAR));

-		CopyMemory(cur, _T("\r\n"), 2 * sizeof(TCHAR));

+		memcpy(cur, _T("\r\n"), 2 * sizeof(TCHAR));

 		cur += 2;

 	}

 	while (cur != NULL);

@@ -148,7 +148,7 @@ static TCHAR *parseFixeol2(ARGUMENTSINFO *ai)
 				cur = res + pos;

 			}

 			MoveMemory(cur + _tcslen(szReplacement), cur + _tcslen(szEol), (_tcslen(cur + _tcslen(szEol)) + 1)*sizeof(TCHAR));

-			CopyMemory(cur, szReplacement, _tcslen(szReplacement)*sizeof(TCHAR));

+			memcpy(cur, szReplacement, _tcslen(szReplacement)*sizeof(TCHAR));

 			pos += _tcslen(szReplacement) - 1;

 		}

 	}

@@ -409,7 +409,7 @@ static TCHAR *parseReplace(ARGUMENTSINFO *ai)
 					cur = res + pos;

 				}

 				MoveMemory(cur + _tcslen(ai->targv[i + 1]), cur + _tcslen(ai->targv[i]), (_tcslen(cur + _tcslen(ai->targv[i])) + 1)*sizeof(TCHAR));

-				CopyMemory(cur, ai->targv[i + 1], _tcslen(ai->targv[i + 1])*sizeof(TCHAR));

+				memcpy(cur, ai->targv[i + 1], _tcslen(ai->targv[i + 1])*sizeof(TCHAR));

 				pos += _tcslen(ai->targv[i + 1]) - 1;

 			}

 		}

diff --git a/plugins/Variables/src/variables.cpp b/plugins/Variables/src/variables.cpp
index cc1818eca9..a378a87904 100644
--- a/plugins/Variables/src/variables.cpp
+++ b/plugins/Variables/src/variables.cpp
@@ -332,7 +332,7 @@ static TCHAR* replaceDynVars(TCHAR* szTemplate, FORMATINFO* fi)
 					fi->err = EMEM;
 					return NULL;
 				}
-				CopyMemory(tcur+1, tcur, strlen(tcur)+1);
+				memcpy(tcur+1, tcur, strlen(tcur)+1);
 				tcur++;
 			}
 		}*/
@@ -353,7 +353,7 @@ static TCHAR* replaceDynVars(TCHAR* szTemplate, FORMATINFO* fi)
 		scur = string+scurPos;
 		cur = string+curPos;
 		MoveMemory(scur + parsedTokenLen, cur, (_tcslen(cur)+1)*sizeof(TCHAR));
-		CopyMemory(scur, parsedToken, parsedTokenLen*sizeof(TCHAR));
+		memcpy(scur, parsedToken, parsedTokenLen*sizeof(TCHAR));
 		{
 			size_t len = _tcslen(string);
 			string = (TCHAR*)mir_realloc(string, (len+1)*sizeof(TCHAR));
@@ -390,12 +390,12 @@ static INT_PTR formatStringService(WPARAM wParam, LPARAM lParam)
 
  	if (((FORMATINFO *)wParam)->cbSize >= sizeof(FORMATINFO)) {
 		memset(&tempFi, 0, sizeof(FORMATINFO));
-		CopyMemory(&tempFi, (FORMATINFO *)wParam, sizeof(FORMATINFO));
+		memcpy(&tempFi, (FORMATINFO *)wParam, sizeof(FORMATINFO));
 		fi = &tempFi;
 	}
  	else if (((FORMATINFO *)wParam)->cbSize == FORMATINFOV2_SIZE) {
  		memset(&tempFi, 0, sizeof(FORMATINFO));
- 		CopyMemory(&tempFi, (FORMATINFO *)wParam, FORMATINFOV2_SIZE);
+ 		memcpy(&tempFi, (FORMATINFO *)wParam, FORMATINFOV2_SIZE);
  		fi = &tempFi;
  	}
 	else {