aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWiSo <wiso@xbmc.org>2012-06-16 22:24:22 +0200
committerWiSo <wiso@xbmc.org>2012-06-16 22:24:22 +0200
commitd1c462f8eaf1817f821748c7d779d41d6d9d5bf6 (patch)
treeba607e8b1443cd7908377d690251b9e21264543b
parent5834a30425ab3677a064b72a3b14faa824ec21e2 (diff)
[WIN32] cosmetics: remove whitespaces
-rw-r--r--xbmc/win32/WIN32Util.cpp104
-rw-r--r--xbmc/win32/WMIInterface.cpp38
-rw-r--r--xbmc/win32/WMIInterface.h4
-rw-r--r--xbmc/win32/WindowHelper.cpp2
-rw-r--r--xbmc/win32/XBMC_PC.cpp40
-rw-r--r--xbmc/win32/inttypes.h18
-rw-r--r--xbmc/win32/my_ntddscsi.h2
-rw-r--r--xbmc/win32/resource.h2
8 files changed, 105 insertions, 105 deletions
diff --git a/xbmc/win32/WIN32Util.cpp b/xbmc/win32/WIN32Util.cpp
index a7bf0646c3..a32393833d 100644
--- a/xbmc/win32/WIN32Util.cpp
+++ b/xbmc/win32/WIN32Util.cpp
@@ -144,7 +144,7 @@ int CWIN32Util::GetDriveStatus(const CStdString &strPath)
return 2;
hDevice = CreateFile( strPath.c_str(),
- GENERIC_READ | GENERIC_WRITE,
+ GENERIC_READ | GENERIC_WRITE,
FILE_SHARE_READ | FILE_SHARE_WRITE,
NULL,
OPEN_EXISTING,
@@ -157,7 +157,7 @@ int CWIN32Util::GetDriveStatus(const CStdString &strPath)
}
sptd_sb.sptd.Length=sizeof(SCSI_PASS_THROUGH_DIRECT);
- sptd_sb.sptd.PathId=0;
+ sptd_sb.sptd.PathId=0;
sptd_sb.sptd.TargetId=0;
sptd_sb.sptd.Lun=0;
sptd_sb.sptd.CdbLength=10;
@@ -242,7 +242,7 @@ bool CWIN32Util::PowerManagement(PowerState State)
}
// Get the LUID for the shutdown privilege.
LookupPrivilegeValue(NULL, SE_SHUTDOWN_NAME, &tkp.Privileges[0].Luid);
- tkp.PrivilegeCount = 1; // one privilege to set
+ tkp.PrivilegeCount = 1; // one privilege to set
tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
// Get the shutdown privilege for this process.
AdjustTokenPrivileges(hToken, FALSE, &tkp, 0, (PTOKEN_PRIVILEGES)NULL, 0);
@@ -318,12 +318,12 @@ bool CWIN32Util::XBMCShellExecute(const CStdString &strPath, bool bWaitForScript
strExe.Replace("\"","");
- strWorkingDir = strExe;
- iIndex = strWorkingDir.ReverseFind('\\');
- if(iIndex != -1)
- {
- strWorkingDir[iIndex+1] = '\0';
- }
+ strWorkingDir = strExe;
+ iIndex = strWorkingDir.ReverseFind('\\');
+ if(iIndex != -1)
+ {
+ strWorkingDir[iIndex+1] = '\0';
+ }
CStdStringW WstrExe, WstrParams, WstrWorkingDir;
g_charsetConverter.utf8ToW(strExe, WstrExe);
@@ -375,12 +375,12 @@ std::vector<CStdString> CWIN32Util::GetDiskUsage()
if( dwStrLength != 0 )
{
CStdString strRet;
-
+
dwStrLength+= 1;
pcBuffer= new char [dwStrLength];
GetLogicalDriveStrings( dwStrLength, pcBuffer );
int iPos= 0;
- do
+ do
{
CStdString strDrive = pcBuffer + iPos;
if( DRIVE_FIXED == GetDriveType( strDrive.c_str() ) &&
@@ -425,7 +425,7 @@ CStdString CWIN32Util::GetSpecialFolder(int csidl)
{
g_charsetConverter.wToUTF8(szPath, strProfilePath);
strProfilePath = UncToSmb(strProfilePath);
- }
+ }
else
strProfilePath = "";
@@ -443,12 +443,12 @@ CStdString CWIN32Util::GetProfilePath()
CStdString strHomePath;
CUtil::GetHomePath(strHomePath);
-
+
if(g_application.PlatformDirectoriesEnabled())
strProfilePath = URIUtils::AddFileToFolder(GetSpecialFolder(CSIDL_APPDATA|CSIDL_FLAG_CREATE), "XBMC");
else
strProfilePath = URIUtils::AddFileToFolder(strHomePath , "portable_data");
-
+
if (strProfilePath.length() == 0)
strProfilePath = strHomePath;
@@ -502,14 +502,14 @@ HRESULT CWIN32Util::ToggleTray(const char cDriveLetter)
return S_FALSE;
cDL = dvdDevice[0];
}
-
- CStdString strVolFormat;
+
+ CStdString strVolFormat;
strVolFormat.Format( _T("\\\\.\\%c:" ), cDL);
- HANDLE hDrive= CreateFile( strVolFormat.c_str(), GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE,
+ HANDLE hDrive= CreateFile( strVolFormat.c_str(), GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE,
NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
- CStdString strRootFormat;
+ CStdString strRootFormat;
strRootFormat.Format( _T("%c:\\"), cDL);
- if( ( hDrive != INVALID_HANDLE_VALUE || GetLastError() == NO_ERROR) &&
+ if( ( hDrive != INVALID_HANDLE_VALUE || GetLastError() == NO_ERROR) &&
( GetDriveType( strRootFormat ) == DRIVE_CDROM ) )
{
DWORD dwDummy;
@@ -540,13 +540,13 @@ HRESULT CWIN32Util::EjectTray(const char cDriveLetter)
return S_FALSE;
cDL = dvdDevice[0];
}
-
- CStdString strVolFormat;
+
+ CStdString strVolFormat;
strVolFormat.Format( _T("\\\\.\\%c:" ), cDL);
if(GetDriveStatus(strVolFormat) != 1)
return ToggleTray(cDL);
- else
+ else
return S_OK;
}
@@ -560,22 +560,22 @@ HRESULT CWIN32Util::CloseTray(const char cDriveLetter)
return S_FALSE;
cDL = dvdDevice[0];
}
-
- CStdString strVolFormat;
+
+ CStdString strVolFormat;
strVolFormat.Format( _T("\\\\.\\%c:" ), cDL);
if(GetDriveStatus(strVolFormat) == 1)
return ToggleTray(cDL);
- else
+ else
return S_OK;
}
-// safe removal of USB drives:
+// safe removal of USB drives:
// http://www.codeproject.com/KB/system/RemoveDriveByLetter.aspx
// http://www.techtalkz.com/microsoft-device-drivers/250734-remove-usb-device-c-3.html
#if _MSC_VER > 1400
-DEVINST CWIN32Util::GetDrivesDevInstByDiskNumber(long DiskNumber)
+DEVINST CWIN32Util::GetDrivesDevInstByDiskNumber(long DiskNumber)
{
GUID* guid = (GUID*)(void*)&GUID_DEVINTERFACE_DISK;
@@ -600,7 +600,7 @@ DEVINST CWIN32Util::GetDrivesDevInstByDiskNumber(long DiskNumber)
spdid.cbSize = sizeof(spdid);
- while ( true )
+ while ( true )
{
bRet = SetupDiEnumDeviceInterfaces(hDevInfo, NULL, guid, dwIndex, &devInterfaceData);
if (!bRet)
@@ -611,7 +611,7 @@ DEVINST CWIN32Util::GetDrivesDevInstByDiskNumber(long DiskNumber)
dwSize = 0;
SetupDiGetDeviceInterfaceDetail(hDevInfo, &spdid, NULL, 0, &dwSize, NULL);
- if ( dwSize )
+ if ( dwSize )
{
pspdidd = (PSP_DEVICE_INTERFACE_DETAIL_DATA)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwSize);
if ( pspdidd == NULL )
@@ -623,17 +623,17 @@ DEVINST CWIN32Util::GetDrivesDevInstByDiskNumber(long DiskNumber)
long res = SetupDiGetDeviceInterfaceDetail(hDevInfo, &spdid,
pspdidd, dwSize, &dwSize, &spdd);
- if ( res )
+ if ( res )
{
HANDLE hDrive = CreateFile(pspdidd->DevicePath, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, NULL, NULL);
- if ( hDrive != INVALID_HANDLE_VALUE )
+ if ( hDrive != INVALID_HANDLE_VALUE )
{
STORAGE_DEVICE_NUMBER sdn;
DWORD dwBytesReturned = 0;
res = DeviceIoControl(hDrive, IOCTL_STORAGE_GET_DEVICE_NUMBER, NULL, 0, &sdn, sizeof(sdn), &dwBytesReturned, NULL);
- if ( res )
+ if ( res )
{
- if ( DiskNumber == (long)sdn.DeviceNumber )
+ if ( DiskNumber == (long)sdn.DeviceNumber )
{
CloseHandle(hDrive);
SetupDiDestroyDeviceInfoList(hDevInfo);
@@ -658,7 +658,7 @@ bool CWIN32Util::EjectDrive(const char cDriveLetter)
if( !cDriveLetter )
return false;
- CStdString strVolFormat;
+ CStdString strVolFormat;
strVolFormat.Format( _T("\\\\.\\%c:" ), cDriveLetter);
long DiskNumber = -1;
@@ -751,21 +751,21 @@ BOOL CWIN32Util::IsCurrentUserLocalAdministrator()
{
BOOL b;
SID_IDENTIFIER_AUTHORITY NtAuthority = SECURITY_NT_AUTHORITY;
- PSID AdministratorsGroup;
+ PSID AdministratorsGroup;
b = AllocateAndInitializeSid(
&NtAuthority,
2,
SECURITY_BUILTIN_DOMAIN_RID,
DOMAIN_ALIAS_RID_ADMINS,
0, 0, 0, 0, 0, 0,
- &AdministratorsGroup);
+ &AdministratorsGroup);
if(b)
{
- if (!CheckTokenMembership( NULL, AdministratorsGroup, &b))
+ if (!CheckTokenMembership( NULL, AdministratorsGroup, &b))
{
b = FALSE;
- }
- FreeSid(AdministratorsGroup);
+ }
+ FreeSid(AdministratorsGroup);
}
return(b);
@@ -778,7 +778,7 @@ void CWIN32Util::GetDrivesByType(VECSOURCES &localDrives, Drive_Types eDriveType
if( dwStrLength != 0 )
{
CMediaSource share;
-
+
dwStrLength+= 1;
pcBuffer= new WCHAR [dwStrLength];
GetLogicalDriveStringsW( dwStrLength, pcBuffer );
@@ -790,7 +790,7 @@ void CWIN32Util::GetDrivesByType(VECSOURCES &localDrives, Drive_Types eDriveType
cVolumeName[0]= L'\0';
CStdStringW strWdrive = pcBuffer + iPos;
-
+
UINT uDriveType= GetDriveTypeW( strWdrive.c_str() );
// don't use GetVolumeInformation on fdd's as the floppy controller may be enabled in Bios but
// no floppy HW is attached which causes huge delays.
@@ -813,7 +813,7 @@ void CWIN32Util::GetDrivesByType(VECSOURCES &localDrives, Drive_Types eDriveType
share.strPath= share.strName= "";
bool bUseDCD= false;
- if( uDriveType > DRIVE_UNKNOWN &&
+ if( uDriveType > DRIVE_UNKNOWN &&
(( eDriveType == ALL_DRIVES && (uDriveType == DRIVE_FIXED || uDriveType == DRIVE_REMOTE || uDriveType == DRIVE_CDROM || uDriveType == DRIVE_REMOVABLE )) ||
( eDriveType == LOCAL_DRIVES && (uDriveType == DRIVE_FIXED || uDriveType == DRIVE_REMOTE)) ||
( eDriveType == REMOVABLE_DRIVES && ( uDriveType == DRIVE_REMOVABLE )) ||
@@ -1430,7 +1430,7 @@ bool CWIN32Util::GetFocussedProcess(CStdString &strProcessFile)
HINSTANCE hpsapi = LoadLibrary("psapi.dll");
if (hpsapi)
{
- DWORD (WINAPI *pGetModuleFileNameExA)(HANDLE,HMODULE,LPTSTR,DWORD);
+ DWORD (WINAPI *pGetModuleFileNameExA)(HANDLE,HMODULE,LPTSTR,DWORD);
pGetModuleFileNameExA = (DWORD (WINAPI*)(HANDLE,HMODULE,LPTSTR,DWORD)) GetProcAddress(hpsapi, "GetModuleFileNameExA");
if (pGetModuleFileNameExA)
if (pGetModuleFileNameExA(hproc, NULL, procfile, MAX_PATH))
@@ -1496,7 +1496,7 @@ extern "C"
{
/* case-independent string matching, similar to strstr but
* matching */
- char * strcasestr(const char* haystack, const char* needle)
+ char * strcasestr(const char* haystack, const char* needle)
{
int i;
int nlength = (int) strlen (needle);
@@ -1506,9 +1506,9 @@ extern "C"
if (hlength <= 0) return NULL;
if (nlength <= 0) return (char *)haystack;
/* hlength and nlength > 0, nlength <= hlength */
- for (i = 0; i <= (hlength - nlength); i++)
+ for (i = 0; i <= (hlength - nlength); i++)
{
- if (strncasecmp (haystack + i, needle, nlength) == 0)
+ if (strncasecmp (haystack + i, needle, nlength) == 0)
{
return (char *)haystack + i;
}
@@ -1525,7 +1525,7 @@ bool CWIN32Util::IsUsbDevice(const CStdStringW &strWdrive)
{
CStdStringW strWDevicePath;
strWDevicePath.Format(L"\\\\.\\%s",strWdrive.Left(2));
-
+
HANDLE deviceHandle = CreateFileW(
strWDevicePath.c_str(),
0, // no access to the drive
@@ -1538,18 +1538,18 @@ bool CWIN32Util::IsUsbDevice(const CStdStringW &strWdrive)
if(deviceHandle == INVALID_HANDLE_VALUE)
return false;
-
+
// setup query
STORAGE_PROPERTY_QUERY query;
memset(&query, 0, sizeof(query));
query.PropertyId = StorageDeviceProperty;
query.QueryType = PropertyStandardQuery;
-
+
// issue query
DWORD bytes;
STORAGE_DEVICE_DESCRIPTOR devd;
STORAGE_BUS_TYPE busType = BusTypeUnknown;
-
+
if (DeviceIoControl(deviceHandle,
IOCTL_STORAGE_QUERY_PROPERTY,
&query, sizeof(query),
@@ -1558,8 +1558,8 @@ bool CWIN32Util::IsUsbDevice(const CStdStringW &strWdrive)
{
busType = devd.BusType;
}
-
+
CloseHandle(deviceHandle);
-
+
return BusTypeUsb == busType;
} \ No newline at end of file
diff --git a/xbmc/win32/WMIInterface.cpp b/xbmc/win32/WMIInterface.cpp
index 5f9e991e12..ce385f8de3 100644
--- a/xbmc/win32/WMIInterface.cpp
+++ b/xbmc/win32/WMIInterface.cpp
@@ -47,7 +47,7 @@ bool CWIN32Wmi::Connect()
if (FAILED(hres))
{
return false; // Program has failed.
- }
+ }
hres = CoInitializeSecurity(
NULL,
@@ -55,21 +55,21 @@ bool CWIN32Wmi::Connect()
NULL, // Authentication services
NULL, // Reserved
RPC_C_AUTHN_LEVEL_DEFAULT, // Default authentication
- RPC_C_IMP_LEVEL_IMPERSONATE, // Default Impersonation
+ RPC_C_IMP_LEVEL_IMPERSONATE, // Default Impersonation
NULL, // Authentication info
EOAC_NONE, // Additional capabilities
NULL // Reserved
- );
+ );
if (FAILED(hres))
{
return false; // Program has failed.
- }
+ }
pLoc = NULL;
hres = CoCreateInstance(
- CLSID_WbemLocator,
+ CLSID_WbemLocator,
0,
CLSCTX_INPROC_SERVER,
IID_IWbemLocator, (LPVOID *) &pLoc);
@@ -80,7 +80,7 @@ bool CWIN32Wmi::Connect()
}
pSvc = NULL;
-
+
// Connect to the root\cimv2 namespace with
// the current user and obtain pointer pSvc
// to make IWbemServices calls.
@@ -94,13 +94,13 @@ bool CWIN32Wmi::Connect()
0, // Context object
&pSvc // pointer to IWbemServices proxy
);
-
+
if (FAILED(hres))
{
- pLoc->Release();
+ pLoc->Release();
CoUninitialize();
return false; // Program has failed.
- }
+ }
hres = CoSetProxyBlanket(
pSvc, // Indicates the proxy to set
@@ -116,10 +116,10 @@ bool CWIN32Wmi::Connect()
if (FAILED(hres))
{
pSvc->Release();
- pLoc->Release();
+ pLoc->Release();
CoUninitialize();
return false; // Program has failed.
- }
+ }
pEnumerator = NULL;
@@ -138,7 +138,7 @@ void CWIN32Wmi::Release()
if(pclsObj != NULL)
pclsObj->Release();
- CoUninitialize();
+ CoUninitialize();
bconnected = false;
pSvc = NULL;
@@ -157,11 +157,11 @@ void CWIN32Wmi::testquery()
WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY,
NULL,
&pEnumerator);
-
+
if (FAILED(hres))
{
return; // Program has failed.
- }
+ }
ULONG uReturn = 0;
while (pEnumerator)
@@ -175,7 +175,7 @@ void CWIN32Wmi::testquery()
}
VARIANT vtProp;
- VariantInit(&vtProp);
+ VariantInit(&vtProp);
// Get the value of the Name property
//hr = pclsObj->Get(L"Description", 0, &vtProp, 0, 0);
@@ -185,7 +185,7 @@ void CWIN32Wmi::testquery()
VariantClear(&vtProp);
//iCpu++;
}
- pclsObj->Release();
+ pclsObj->Release();
pclsObj = NULL;
}
@@ -204,11 +204,11 @@ std::vector<CStdString> CWIN32Wmi::GetWMIStrVector(CStdString& strQuery, CStdStr
WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY,
NULL,
&pEnumerator);
-
+
if (FAILED(hres))
{
return strResult; // Program has failed.
- }
+ }
ULONG uReturn = 0;
while (pEnumerator)
@@ -232,7 +232,7 @@ std::vector<CStdString> CWIN32Wmi::GetWMIStrVector(CStdString& strQuery, CStdStr
pEnumerator->Release();
pEnumerator = NULL;
if(pclsObj != NULL)
- pclsObj->Release();
+ pclsObj->Release();
pclsObj = NULL;
return strResult;
}
diff --git a/xbmc/win32/WMIInterface.h b/xbmc/win32/WMIInterface.h
index 83c2fb140e..3e4bb1d9f0 100644
--- a/xbmc/win32/WMIInterface.h
+++ b/xbmc/win32/WMIInterface.h
@@ -22,8 +22,8 @@
*/
-#include <Wbemidl.h>
-#pragma comment(lib, "wbemuuid.lib")
+#include <Wbemidl.h>
+#pragma comment(lib, "wbemuuid.lib")
#pragma comment(lib, "comsuppw.lib")
diff --git a/xbmc/win32/WindowHelper.cpp b/xbmc/win32/WindowHelper.cpp
index 8aa7da9874..702a38a66a 100644
--- a/xbmc/win32/WindowHelper.cpp
+++ b/xbmc/win32/WindowHelper.cpp
@@ -77,7 +77,7 @@ void CWHelper::Process()
{
while (( !m_bStop ))
{
- if(WaitForSingleObject(m_hProcess,500) != WAIT_TIMEOUT)
+ if(WaitForSingleObject(m_hProcess,500) != WAIT_TIMEOUT)
break;
/*if((m_hwnd != NULL) && (IsIconic(m_hwnd) == TRUE))
break;*/
diff --git a/xbmc/win32/XBMC_PC.cpp b/xbmc/win32/XBMC_PC.cpp
index 3ebf3f906a..8841f11f92 100644
--- a/xbmc/win32/XBMC_PC.cpp
+++ b/xbmc/win32/XBMC_PC.cpp
@@ -37,48 +37,48 @@ typedef BOOL (WINAPI *MINIDUMPWRITEDUMP)(HANDLE hProcess, DWORD dwPid, HANDLE hF
CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam);
-// Minidump creation function
-LONG WINAPI CreateMiniDump( EXCEPTION_POINTERS* pEp )
+// Minidump creation function
+LONG WINAPI CreateMiniDump( EXCEPTION_POINTERS* pEp )
{
// Create the dump file where the xbmc.exe resides
CStdString errorMsg;
CStdString dumpFile;
CDateTime now(CDateTime::GetCurrentDateTime());
dumpFile.Format("%s\\xbmc_crashlog-%04i%02i%02i-%02i%02i%02i.dmp", CWIN32Util::GetProfilePath().c_str(), now.GetYear(), now.GetMonth(), now.GetDay(), now.GetHour(), now.GetMinute(), now.GetSecond());
- HANDLE hFile = CreateFile(dumpFile.c_str(), GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL );
+ HANDLE hFile = CreateFile(dumpFile.c_str(), GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL );
// Call MiniDumpWriteDump api with the dump file
- if ( hFile && ( hFile != INVALID_HANDLE_VALUE ) )
+ if ( hFile && ( hFile != INVALID_HANDLE_VALUE ) )
{
// Load the DBGHELP DLL
- HMODULE hDbgHelpDll = ::LoadLibrary("DBGHELP.DLL");
+ HMODULE hDbgHelpDll = ::LoadLibrary("DBGHELP.DLL");
if (hDbgHelpDll)
{
MINIDUMPWRITEDUMP pDump = (MINIDUMPWRITEDUMP)::GetProcAddress(hDbgHelpDll, "MiniDumpWriteDump");
if (pDump)
{
// Initialize minidump structure
- MINIDUMP_EXCEPTION_INFORMATION mdei;
+ MINIDUMP_EXCEPTION_INFORMATION mdei;
mdei.ThreadId = CThread::GetCurrentThreadId();
- mdei.ExceptionPointers = pEp;
- mdei.ClientPointers = FALSE;
+ mdei.ExceptionPointers = pEp;
+ mdei.ClientPointers = FALSE;
// Call the minidump api with normal dumping
// We can get more detail information by using other minidump types but the dump file will be
// extermely large.
- BOOL rv = pDump(GetCurrentProcess(), GetCurrentProcessId(), hFile, MiniDumpNormal, &mdei, 0, NULL);
- if( !rv )
+ BOOL rv = pDump(GetCurrentProcess(), GetCurrentProcessId(), hFile, MiniDumpNormal, &mdei, 0, NULL);
+ if( !rv )
{
errorMsg.Format("MiniDumpWriteDump failed with error id %d", GetLastError());
- MessageBox(NULL, errorMsg.c_str(), "XBMC: Error", MB_OK|MB_ICONERROR);
- }
+ MessageBox(NULL, errorMsg.c_str(), "XBMC: Error", MB_OK|MB_ICONERROR);
+ }
}
else
{
errorMsg.Format("MiniDumpWriteDump failed to load with error id %d", GetLastError());
MessageBox(NULL, errorMsg.c_str(), "XBMC: Error", MB_OK|MB_ICONERROR);
}
-
+
// Close the DLL
FreeLibrary(hDbgHelpDll);
}
@@ -88,13 +88,13 @@ LONG WINAPI CreateMiniDump( EXCEPTION_POINTERS* pEp )
MessageBox(NULL, errorMsg.c_str(), "XBMC: Error", MB_OK|MB_ICONERROR);
}
- // Close the file
- CloseHandle( hFile );
+ // Close the file
+ CloseHandle( hFile );
}
- else
+ else
{
errorMsg.Format("CreateFile '%s' failed with error id %d", dumpFile.c_str(), GetLastError());
- MessageBox(NULL, errorMsg.c_str(), "XBMC: Error", MB_OK|MB_ICONERROR);
+ MessageBox(NULL, errorMsg.c_str(), "XBMC: Error", MB_OK|MB_ICONERROR);
}
return pEp->ExceptionRecord->ExceptionCode;;
@@ -152,9 +152,9 @@ INT WINAPI WinMain( HINSTANCE hInst, HINSTANCE, LPSTR commandLine, INT )
// Handle numeric values using the default/POSIX standard
setlocale(LC_NUMERIC, "C");
- // If the command line passed to WinMain, commandLine, is not "" we need
+ // If the command line passed to WinMain, commandLine, is not "" we need
// to process the command line arguments.
- // Note that commandLine does not include the program name and can be
+ // Note that commandLine does not include the program name and can be
// equal to "" if no arguments were supplied. By contrast GetCommandLineW()
// does include the program name and is never equal to "".
g_advancedSettings.Initialize();
@@ -216,7 +216,7 @@ INT WINAPI WinMain( HINSTANCE hInst, HINSTANCE, LPSTR commandLine, INT )
}
g_application.Run(true);
-
+
// the end
WSACleanup();
CoUninitialize();
diff --git a/xbmc/win32/inttypes.h b/xbmc/win32/inttypes.h
index 8cb23a49e4..73b7543ca8 100644
--- a/xbmc/win32/inttypes.h
+++ b/xbmc/win32/inttypes.h
@@ -1,32 +1,32 @@
// ISO C9x compliant inttypes.h for Microsoft Visual Studio
-// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124
-//
+// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124
+//
// Copyright (c) 2006 Alexander Chemeris
-//
+//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
-//
+//
// 1. Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
-//
+//
// 2. Redistributions in binary form must reproduce the above copyright
// notice, this list of conditions and the following disclaimer in the
// documentation and/or other materials provided with the distribution.
-//
+//
// 3. The name of the author may be used to endorse or promote products
// derived from this software without specific prior written permission.
-//
+//
// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
+//
///////////////////////////////////////////////////////////////////////////////
#ifndef _MSC_VER // [
diff --git a/xbmc/win32/my_ntddscsi.h b/xbmc/win32/my_ntddscsi.h
index cd53c894b4..07132c07d5 100644
--- a/xbmc/win32/my_ntddscsi.h
+++ b/xbmc/win32/my_ntddscsi.h
@@ -60,7 +60,7 @@ typedef struct _SCSI_PASS_THROUGH_DIRECT {
ULONG TimeOutValue;
PVOID DataBuffer;
ULONG SenseInfoOffset;
- UCHAR Cdb[16];
+ UCHAR Cdb[16];
}SCSI_PASS_THROUGH_DIRECT, *PSCSI_PASS_THROUGH_DIRECT;
//** End of defines taken from ntddscsi.h from MS Windows DDK CD
diff --git a/xbmc/win32/resource.h b/xbmc/win32/resource.h
index f1198cdd10..048dc0e411 100644
--- a/xbmc/win32/resource.h
+++ b/xbmc/win32/resource.h
@@ -22,7 +22,7 @@
#define IDI_MAIN_ICON 100
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NO_MFC 1