Skip to content
This repository
Browse code

Merge pull request #1186 from jabbera/GeneralCleanup

A few more issues found from Code Analysis in VS
  • Loading branch information...
commit 97010221a903e963a2c6e4bae4606fec8b9c1bc9 2 parents fbb95f4 + 2b69b92
jmarshallnz authored July 18, 2012
2  xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp
@@ -130,7 +130,7 @@ bool CAESinkDirectSound::Initialize(AEAudioFormat &format, std::string &device)
130 130
 
131 131
   LPGUID deviceGUID = NULL;
132 132
   RPC_CSTR wszUuid  = NULL;
133  
-  HRESULT hr;
  133
+  HRESULT hr = E_FAIL;
134 134
   std::list<DSDevice> DSDeviceList;
135 135
   std::string deviceFriendlyName;
136 136
   DirectSoundEnumerate(DSEnumCallback, &DSDeviceList);
2  xbmc/network/websocket/WebSocketV8.cpp
@@ -185,7 +185,7 @@ const CWebSocketFrame* CWebSocketV8::close(WebSocketCloseReason reason /* = WebS
185 185
     m_state = WebSocketStateClosed;
186 186
 
187 187
   CWebSocketFrame* frame = new CWebSocketFrame(WebSocketConnectionClose, data, length);
188  
-  delete data;
  188
+  delete[] data;
189 189
 
190 190
   return frame;
191 191
 }
2  xbmc/rendering/dx/RenderSystemDX.cpp
@@ -620,7 +620,7 @@ bool CRenderSystemDX::BeginRender()
620 620
   if (!m_bRenderCreated)
621 621
     return false;
622 622
 
623  
-  DWORD oldStatus = m_nDeviceStatus;
  623
+  HRESULT oldStatus = m_nDeviceStatus;
624 624
   if (m_useD3D9Ex)
625 625
   {
626 626
     m_nDeviceStatus = ((IDirect3DDevice9Ex*)m_pD3DDevice)->CheckDeviceState(m_hDeviceWnd);

0 notes on commit 9701022

Please sign in to comment.
Something went wrong with that request. Please try again.