wrongly replaced 'and' reverted

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

1 files changed, 3 insertions, 3 deletions

diff --git a/plugins/ShellExt/src/shlipc.cpp b/plugins/ShellExt/src/shlipc.cpp
index 6cba631398..f21c599d20 100644
--- a/plugins/ShellExt/src/shlipc.cpp
+++ b/plugins/ShellExt/src/shlipc.cpp
@@ -60,7 +60,7 @@ void ipcPrepareRequests(int ipcPacketSize, THeaderIPC *pipch, DWORD fRequests)
 	pipch->DataSize = ipcPacketSize - pipch->cbSize;

 	// the server side will adjust these pointers as soon as it opens

 	// the mapped file to it's base address, these are set 'ere because ipcAlloc()

-	// maybe used on the client side && are translated by the server side.

+	// maybe used on the client side and are translated by the server side.

 	// ipcAlloc() is used on the client side when transferring filenames

 	// to the ST thread.

 	pipch->DataPtr = (TSlotIPC*)(LPSTR(pipch) + sizeof(THeaderIPC));

@@ -74,7 +74,7 @@ DWORD ipcSendRequest(HANDLE hSignal, HANDLE hWaitFor, THeaderIPC *pipch, DWORD d
 {

 	// signal ST to work

 	SetEvent(hSignal);

-	// wait for reply, it should open a h&&le to hWaitFor... 

+	// wait for reply, it should open a handle to hWaitFor... 

 	while (true) {

 		switch ( WaitForSingleObjectEx(hWaitFor, dwTimeoutMsecs, true)) {

 		case WAIT_OBJECT_0:

@@ -137,7 +137,7 @@ void ipcFixupAddresses(BOOL FromServer, THeaderIPC *pipch)
 	TSlotIPC *pct = pipch->DataPtr;

 	while (pct != NULL) {

 		// the first pointer is already fixed up, have to get a pointer

-		// to the next pointer && modify where it jumps to

+		// to the next pointer and modify where it jumps to

 		TSlotIPC **q = &pct->Next;

 		if (*q != NULL)

 			*q = (TSlotIPC*)(UINT_PTR(*q) + diff);