MoveMemory -> memmove

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

7 files changed, 9 insertions, 9 deletions

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++;
diff --git a/src/modules/database/dbini.cpp b/src/modules/database/dbini.cpp
index 1bf4eac286..4016258914 100644
--- a/src/modules/database/dbini.cpp
+++ b/src/modules/database/dbini.cpp
@@ -347,7 +347,7 @@ LBL_NewLine:
 					case 'r': *pstr = '\r'; break;

 					default:  *pstr = pstr[1]; break;

 					}

-					MoveMemory(pstr + 1, pstr + 2, mir_strlen(pstr + 2) + 1);

+					memmove(pstr + 1, pstr + 2, mir_strlen(pstr + 2) + 1);

 				}

 			}

 		case 'u':

diff --git a/src/modules/netlib/netliblog.cpp b/src/modules/netlib/netliblog.cpp
index 5f18385f14..43f14d4ac9 100644
--- a/src/modules/netlib/netliblog.cpp
+++ b/src/modules/netlib/netliblog.cpp
@@ -187,7 +187,7 @@ static INT_PTR CALLBACK LogOptionsDlgProc(HWND hwndDlg, UINT message, WPARAM wPa
 					return 1;

 

 				if (LOWORD(wParam) == IDC_RUNATSTARTBROWSE && _tcschr(str, ' ') != NULL) {

-					MoveMemory(str + 1, str, ((SIZEOF(str) - 2) * sizeof(TCHAR)));

+					memmove(str + 1, str, ((SIZEOF(str) - 2) * sizeof(TCHAR)));

 					str[0] = '"';

 					mir_tstrcat(str, _T("\""));

 				}

diff --git a/src/modules/netlib/netlibpktrecver.cpp b/src/modules/netlib/netlibpktrecver.cpp
index b8abc81144..a74d45771b 100644
--- a/src/modules/netlib/netlibpktrecver.cpp
+++ b/src/modules/netlib/netlibpktrecver.cpp
@@ -70,7 +70,7 @@ INT_PTR NetlibPacketRecverGetMore(WPARAM wParam, LPARAM lParam)
 		}

 	}

 	else {

-		MoveMemory(nlpr->packetRecver.buffer, nlpr->packetRecver.buffer + nlprParam->bytesUsed, nlpr->packetRecver.bytesAvailable - nlprParam->bytesUsed);

+		memmove(nlpr->packetRecver.buffer, nlpr->packetRecver.buffer + nlprParam->bytesUsed, nlpr->packetRecver.bytesAvailable - nlprParam->bytesUsed);

 		nlpr->packetRecver.bytesAvailable -= nlprParam->bytesUsed;

 	}