From 5a19f89d6c8eb148e6bb7b450f702b666f685ed1 Mon Sep 17 00:00:00 2001
From: Rozhuk Ivan <rozhuk.im@gmail.com>
Date: Sat, 13 Dec 2014 10:52:12 +0000
Subject: MoveMemory -> memmove

git-svn-id: http://svn.miranda-ng.org/main/trunk@11365 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/core/miranda.cpp             | 4 ++--
 src/core/stdaway/sendmsg.cpp     | 2 +-
 src/core/stdfile/fileopts.cpp    | 4 ++--
 src/core/stdfile/filexferdlg.cpp | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/core')

diff --git a/src/core/miranda.cpp b/src/core/miranda.cpp
index d115105c35..8647b142ea 100644
--- a/src/core/miranda.cpp
+++ b/src/core/miranda.cpp
@@ -389,8 +389,8 @@ static INT_PTR RemoveWait(WPARAM wParam, LPARAM)
 		return 1;
 
 	waitObjectCount--;
-	MoveMemory(&hWaitObjects[i], &hWaitObjects[i + 1], sizeof(HANDLE)*(waitObjectCount - i));
-	MoveMemory(&pszWaitServices[i], &pszWaitServices[i + 1], sizeof(char*)*(waitObjectCount - i));
+	memmove(&hWaitObjects[i], &hWaitObjects[i + 1], sizeof(HANDLE)*(waitObjectCount - i));
+	memmove(&pszWaitServices[i], &pszWaitServices[i + 1], sizeof(char*)*(waitObjectCount - i));
 	return 0;
 }
 
diff --git a/src/core/stdaway/sendmsg.cpp b/src/core/stdaway/sendmsg.cpp
index e9da826892..6ba1ea1ed8 100644
--- a/src/core/stdaway/sendmsg.cpp
+++ b/src/core/stdaway/sendmsg.cpp
@@ -133,7 +133,7 @@ static TCHAR* GetAwayMessage(int statusMode, char *szProto)
 
 			if (mir_tstrlen(substituteStr) > 6)
 				dbv.ptszVal = (TCHAR*)mir_realloc(dbv.ptszVal, (mir_tstrlen(dbv.ptszVal) + 1 + mir_tstrlen(substituteStr) - 6) * sizeof(TCHAR));
-			MoveMemory(dbv.ptszVal + i + mir_tstrlen(substituteStr), dbv.ptszVal + i + 6, (mir_tstrlen(dbv.ptszVal) - i - 5) * sizeof(TCHAR));
+			memmove(dbv.ptszVal + i + mir_tstrlen(substituteStr), dbv.ptszVal + i + 6, (mir_tstrlen(dbv.ptszVal) - i - 5) * sizeof(TCHAR));
 			memcpy(dbv.ptszVal+i, substituteStr, mir_tstrlen(substituteStr) * sizeof(TCHAR));
 		}
 	}
diff --git a/src/core/stdfile/fileopts.cpp b/src/core/stdfile/fileopts.cpp
index a7c361de7e..b19f424274 100644
--- a/src/core/stdfile/fileopts.cpp
+++ b/src/core/stdfile/fileopts.cpp
@@ -187,7 +187,7 @@ static INT_PTR CALLBACK DlgProcFileOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			if (str[0] == '"') {
 				TCHAR *pszQuote = _tcschr(str + 1, '"');
 				if (pszQuote) *pszQuote = 0;
-				MoveMemory(str, str + 1, (_tcslen(str) * sizeof(TCHAR)));
+				memmove(str, str + 1, (_tcslen(str) * sizeof(TCHAR)));
 			}
 			else {
 				TCHAR *pszSpace = _tcschr(str, ' ');
@@ -196,7 +196,7 @@ static INT_PTR CALLBACK DlgProcFileOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			ofn.nMaxFileTitle = MAX_PATH;
 			if (!GetOpenFileName(&ofn)) break;
 			if (_tcschr(str, ' ') != NULL) {
-				MoveMemory(str + 1, str, ((SIZEOF(str) - 2) * sizeof(TCHAR)));
+				memmove(str + 1, str, ((SIZEOF(str) - 2) * sizeof(TCHAR)));
 				str[0] = '"';
 				_tcscat(str, _T("\""));
 			}
diff --git a/src/core/stdfile/filexferdlg.cpp b/src/core/stdfile/filexferdlg.cpp
index 3bf08dc08d..b9d5980746 100644
--- a/src/core/stdfile/filexferdlg.cpp
+++ b/src/core/stdfile/filexferdlg.cpp
@@ -297,7 +297,7 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 		return TRUE;
 
 	case WM_TIMER:
-		MoveMemory(dat->bytesRecvedHistory + 1, dat->bytesRecvedHistory, sizeof(dat->bytesRecvedHistory) - sizeof(dat->bytesRecvedHistory[0]));
+		memmove(dat->bytesRecvedHistory + 1, dat->bytesRecvedHistory, sizeof(dat->bytesRecvedHistory) - sizeof(dat->bytesRecvedHistory[0]));
 		dat->bytesRecvedHistory[0] = dat->transferStatus.totalProgress;
 		if (dat->bytesRecvedHistorySize < SIZEOF(dat->bytesRecvedHistory))
 			dat->bytesRecvedHistorySize++;
-- 
cgit v1.2.3