diff --git a/xbmc/win32/WIN32Util.cpp b/xbmc/win32/WIN32Util.cpp index 7d5ea8863e47e..e3630e3647057 100644 --- a/xbmc/win32/WIN32Util.cpp +++ b/xbmc/win32/WIN32Util.cpp @@ -772,8 +772,8 @@ bool CWIN32Util::EjectDrive(const char cDriveLetter) char VetoName[MAX_PATH]; bool bSuccess = false; - res = CM_Get_Parent(&DevInst, DevInst, 0); // disk's parent, e.g. the USB bridge, the SATA controller.... - res = CM_Get_DevNode_Status(&Status, &ProblemNumber, DevInst, 0); + CM_Get_Parent(&DevInst, DevInst, 0); // disk's parent, e.g. the USB bridge, the SATA controller.... + CM_Get_DevNode_Status(&Status, &ProblemNumber, DevInst, 0); for(int i=0;i<3;i++) { @@ -1387,8 +1387,14 @@ LONG CWIN32Util::UtilRegGetValue( const HKEY hKey, const char *const pcKey, DWOR { if (ppcBuffer) { - char *pcValue=*ppcBuffer; - if (!pcValue || !pdwSizeBuff || dwSize +dwSizeAdd > *pdwSizeBuff) pcValue= (char*)realloc(pcValue, dwSize +dwSizeAdd); + char *pcValue=*ppcBuffer, *pcValueTmp; + if (!pcValue || !pdwSizeBuff || dwSize +dwSizeAdd > *pdwSizeBuff) { + pcValueTmp = (char*)realloc(pcValue, dwSize +dwSizeAdd); + if(pcValueTmp != NULL) + { + pcValue = pcValueTmp; + } + } lRet= RegQueryValueEx(hKey,pcKey,NULL,NULL,(LPBYTE)pcValue,&dwSize); if ( lRet == ERROR_SUCCESS || *ppcBuffer ) *ppcBuffer= pcValue; diff --git a/xbmc/win32/XBMC_PC.cpp b/xbmc/win32/XBMC_PC.cpp index 41b1cca5b2aaf..9593bdbc06b8d 100644 --- a/xbmc/win32/XBMC_PC.cpp +++ b/xbmc/win32/XBMC_PC.cpp @@ -227,10 +227,9 @@ INT WINAPI WinMain( HINSTANCE hInst, HINSTANCE, LPSTR commandLine, INT ) } #endif - HRESULT hr = E_FAIL; IMMDeviceEnumerator *pEnumerator = NULL; CMMNotificationClient cMMNC; - hr = CoCreateInstance(CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL, IID_IMMDeviceEnumerator, (void**)&pEnumerator); + HRESULT hr = CoCreateInstance(CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL, IID_IMMDeviceEnumerator, (void**)&pEnumerator); if(SUCCEEDED(hr)) { pEnumerator->RegisterEndpointNotificationCallback(&cMMNC);