Permalink
Browse files

Merge pull request #1186 from jabbera/GeneralCleanup

A few more issues found from Code Analysis in VS
  • Loading branch information...
jmarshallnz committed Jul 19, 2012
2 parents fbb95f4 + 2b69b92 commit 97010221a903e963a2c6e4bae4606fec8b9c1bc9
@@ -130,7 +130,7 @@ bool CAESinkDirectSound::Initialize(AEAudioFormat &format, std::string &device)
LPGUID deviceGUID = NULL;
RPC_CSTR wszUuid = NULL;
- HRESULT hr;
+ HRESULT hr = E_FAIL;
std::list<DSDevice> DSDeviceList;
std::string deviceFriendlyName;
DirectSoundEnumerate(DSEnumCallback, &DSDeviceList);
@@ -185,7 +185,7 @@ const CWebSocketFrame* CWebSocketV8::close(WebSocketCloseReason reason /* = WebS
m_state = WebSocketStateClosed;
CWebSocketFrame* frame = new CWebSocketFrame(WebSocketConnectionClose, data, length);
- delete data;
+ delete[] data;
return frame;
}
@@ -620,7 +620,7 @@ bool CRenderSystemDX::BeginRender()
if (!m_bRenderCreated)
return false;
- DWORD oldStatus = m_nDeviceStatus;
+ HRESULT oldStatus = m_nDeviceStatus;
if (m_useD3D9Ex)
{
m_nDeviceStatus = ((IDirect3DDevice9Ex*)m_pD3DDevice)->CheckDeviceState(m_hDeviceWnd);

0 comments on commit 9701022

Please sign in to comment.