actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Decouple <cstddef>

Browse Source
This commit is contained in:
Martin Natano
2023-04-20 11:21:29 +02:00
parent 093675cdc3
commit 78fb2e9fc3
171 changed files with 2012 additions and 1786 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/archutils/Win32/Crash.cpp
+3 -2
View File
@@ -3,6 +3,7 @@
// DO NOT USE stdio.h! printf() calls malloc()!
//#include <stdio.h>
#include <cstddef>
#include <windows.h>
#include "global.h"
@@ -80,7 +81,7 @@ void CrashHandler::SetForegroundWindow( HWND hWnd )
g_hForegroundWnd = hWnd;
}
void WriteToChild( HANDLE hPipe, const void *pData, size_t iSize )
void WriteToChild( HANDLE hPipe, const void *pData, std::size_t iSize )
{
while( iSize )
{
@@ -467,7 +468,7 @@ static bool PointsToValidCall( ULONG_PTR ptr )
return IsValidCall(buf+7, len);
}
void CrashHandler::do_backtrace( const void **buf, size_t size,
void CrashHandler::do_backtrace( const void **buf, std::size_t size,
HANDLE hProcess, HANDLE hThread, const CONTEXT *pContext )
{
const void **pLast = buf + size - 1;
src/archutils/Win32/Crash.h
+6 -3
View File
@@ -1,12 +1,15 @@
#ifndef CRASH_H
#define CRASH_H
#include <cstddef>
#include <windows.h>
/** @brief Win32 crash handling. */
namespace CrashHandler
{
extern long __stdcall ExceptionHandler(struct _EXCEPTION_POINTERS *ExceptionInfo);
void do_backtrace( const void **buf, size_t size, HANDLE hProcess, HANDLE hThread, const CONTEXT *pContext );
void do_backtrace( const void **buf, std::size_t size, HANDLE hProcess, HANDLE hThread, const CONTEXT *pContext );
void SymLookup( const void *ptr, char *buf );
void ForceCrash( const char *reason );
void ForceDeadlock( RString reason, uint64_t iID );
@@ -24,7 +27,7 @@ namespace CrashHandler
* (c) 1998-2001 Avery Lee
* (c) 2003-2004 Glenn Maynard
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -34,7 +37,7 @@ namespace CrashHandler
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
src/archutils/Win32/CrashHandlerChild.cpp
+16 -15
View File
@@ -3,6 +3,7 @@
#include "Crash.h"
#include <errno.h>
#include <cstddef>
#include <windows.h>
#include <commctrl.h>
#include "archutils/Win32/ddk/dbghelp.h"
@@ -103,10 +104,10 @@ namespace VDDebugInfo
src += 64;
const int* pVer = reinterpret_cast<const int*>(src);
const size_t* pRVASize = reinterpret_cast<const size_t*>(src + sizeof(int));
const size_t* pFNamSize = reinterpret_cast<const size_t*>(src + sizeof(int) + sizeof(size_t));
const int* pSegCnt = reinterpret_cast<const int*>(src + sizeof(int) + 2 * sizeof(size_t));
src += 2 * (sizeof(int) + sizeof(size_t));
const std::size_t* pRVASize = reinterpret_cast<const std::size_t*>(src + sizeof(int));
const std::size_t* pFNamSize = reinterpret_cast<const std::size_t*>(src + sizeof(int) + sizeof(std::size_t));
const int* pSegCnt = reinterpret_cast<const int*>(src + sizeof(int) + 2 * sizeof(std::size_t));
src += 2 * (sizeof(int) + sizeof(std::size_t));
pctx->nBuildNumber = *pVer;
pctx->pRVAHeap = reinterpret_cast<const unsigned char*>(src + sizeof(uintptr_t));
@@ -146,7 +147,7 @@ namespace VDDebugInfo
if( dwFileSize == INVALID_FILE_SIZE )
break;
char *buffer = new char[static_cast<size_t>(dwFileSize) + 1];
char *buffer = new char[static_cast<std::size_t>(dwFileSize) + 1];
std::fill(buffer, buffer + dwFileSize + 1, '\0' );
DWORD dwActual;
@@ -177,7 +178,7 @@ namespace VDDebugInfo
return false;
}
static const char *GetNameFromHeap(const char *heap, size_t idx)
static const char *GetNameFromHeap(const char *heap, std::size_t idx)
{
while(idx--)
while(*heap++);
@@ -192,7 +193,7 @@ namespace VDDebugInfo
const unsigned char *pr = pctx->pRVAHeap;
const unsigned char *pr_limit = (const unsigned char *)pctx->pFuncNameHeap;
size_t idx = 0;
std::size_t idx = 0;
// Linearly unpack RVA deltas and find lower_bound
rva -= pctx->nFirstRVA;
@@ -313,7 +314,7 @@ namespace SymbolLookup
| UNDNAME_NO_CV_THISTYPE
| UNDNAME_NO_ALLOCATION_MODEL
| UNDNAME_NO_ACCESS_SPECIFIERS // no public:
| UNDNAME_NO_MS_KEYWORDS // no __cdecl
| UNDNAME_NO_MS_KEYWORDS // no __cdecl
| UNDNAME_NO_MEMBER_TYPE // no virtual, static
) )
{
@@ -340,7 +341,7 @@ namespace SymbolLookup
return "???";
}
RString sName;
char *buffer = new char[static_cast<size_t>(iSize) + 1];
char *buffer = new char[static_cast<std::size_t>(iSize) + 1];
std::fill(buffer, buffer + iSize + 1, '\0');
if (!ReadFromParent(iFD, buffer, iSize))
{
@@ -392,7 +393,7 @@ namespace SymbolLookup
}
wsprintf( buf, "%" ADDRESS_ZEROS "Ix: %s!%" ADDRESS_ZEROS "Ix",
reinterpret_cast<uintptr_t>(ptr), sName.c_str(),
reinterpret_cast<uintptr_t>(ptr), sName.c_str(),
reinterpret_cast<uintptr_t>(meminfo.AllocationBase) );
}
}
@@ -487,7 +488,7 @@ static void MakeCrashReport( const CompleteCrashData &Data, RString &sOut )
sOut += ssprintf( "\n" );
sOut += ssprintf( "Partial log:\n" );
for( size_t i = 0; i < Data.m_asRecent.size(); ++i )
for( std::size_t i = 0; i < Data.m_asRecent.size(); ++i )
sOut += ssprintf( "%s\n", Data.m_asRecent[i].c_str() );
sOut += ssprintf( "\n" );
@@ -527,7 +528,7 @@ bool ReadCrashDataFromParent( int iFD, CompleteCrashData &Data )
if( !ReadFromParent(iFD, &iSize, sizeof(iSize)) )
return false;
char *buffer = new char[static_cast<size_t>(iSize) + 1];
char *buffer = new char[static_cast<std::size_t>(iSize) + 1];
std::fill(buffer, buffer + iSize + 1, '\0');
bool wasReadSuccessful = ReadFromParent(iFD, buffer, iSize);
RString tmp = buffer;
@@ -708,7 +709,7 @@ INT_PTR CrashDialog::HandleMessage( UINT msg, WPARAM wParam, LPARAM lParam )
{
case IDC_STATIC_HEADER_TEXT:
case IDC_STATIC_ICON:
hbr = (HBRUSH)::GetStockObject(WHITE_BRUSH);
hbr = (HBRUSH)::GetStockObject(WHITE_BRUSH);
SetBkMode( hdc, OPAQUE );
SetBkColor( hdc, RGB(255,255,255) );
break;
@@ -907,7 +908,7 @@ void CrashHandler::CrashHandlerHandleArgs( int argc, char* argv[] )
/*
* (c) 2003-2006 Glenn Maynard
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -917,7 +918,7 @@ void CrashHandler::CrashHandlerHandleArgs( int argc, char* argv[] )
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
src/archutils/Win32/CrashHandlerNetworking.cpp
+10 -9
View File
@@ -6,6 +6,7 @@
#include "RageTimer.h"
#include "RageUtil.h"
#include <cstddef>
#if defined(WINDOWS)
#include <windows.h>
@@ -71,14 +72,14 @@ public:
/* Read data. Block until any data is received, then return all data
* available. Return the number of bytes read. The return value will always
* be >= 0, unless an error or cancellation occured. */
virtual int Read( void *pBuffer, size_t iSize ) = 0;
virtual int Read( void *pBuffer, std::size_t iSize ) = 0;
/* Write data to the socket. (Design note: we always write all of the data
* unless an error or cancellation occurs, and those states are checked
* with GetState(). If that happens, the number of bytes written is
* meaningless, since it may have simply been buffered and never sent.
* So, this function returns no value.) */
virtual void Write( const void *pBuffer, size_t iSize ) = 0;
virtual void Write( const void *pBuffer, std::size_t iSize ) = 0;
/* Cancel the connection. This operation can clear an error state, aborts
* any blocking calls, never fails, and will always result in the socket
@@ -126,8 +127,8 @@ public:
void Open( const RString &sHost, int iPort, ConnectionType ct = CONN_TCP );
void Shutdown();
void Close();
int Read( void *pBuffer, size_t iSize );
void Write( const void *pBuffer, size_t iSize );
int Read( void *pBuffer, std::size_t iSize );
void Write( const void *pBuffer, std::size_t iSize );
void Cancel();
@@ -439,7 +440,7 @@ void NetworkStream_Win32::Close()
{
if( m_State == STATE_IDLE )
return;
/* If we have an active, stable connection, make sure we flush any data
* completely before closing. If you don't want to do this, call Cancel()
* first. */
@@ -490,7 +491,7 @@ void NetworkStream_Win32::Cancel()
m_Mutex.Unlock();
}
int NetworkStream_Win32::Read( void *pBuffer, size_t iSize )
int NetworkStream_Win32::Read( void *pBuffer, std::size_t iSize )
{
if( m_State != STATE_CONNECTED )
return 0;
@@ -539,7 +540,7 @@ int NetworkStream_Win32::Read( void *pBuffer, size_t iSize )
return iRead;
}
void NetworkStream_Win32::Write( const void *pBuffer, size_t iSize )
void NetworkStream_Win32::Write( const void *pBuffer, std::size_t iSize )
{
if( m_State != STATE_CONNECTED )
return;
@@ -747,7 +748,7 @@ void NetworkPostData::SetData( const RString &sKey, const RString &sData )
/*
* (c) 2006 Glenn Maynard
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -757,7 +758,7 @@ void NetworkPostData::SetData( const RString &sKey, const RString &sData )
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
src/archutils/Win32/RegistryAccess.cpp
+17 -16
View File
@@ -4,13 +4,14 @@
#include "RageUtil.h"
#include "archutils/Win32/ErrorStrings.h"
#include <cstddef>
#include <windows.h>
/* Given "HKEY_LOCAL_MACHINE\hardware\foo", return "hardware\foo", and place
* the HKEY_LOCAL_MACHINE constant in key. */
static bool GetRegKeyType( const RString &sIn, RString &sOut, HKEY &key )
{
size_t iBackslash = sIn.find( '\\' );
std::size_t iBackslash = sIn.find( '\\' );
if( iBackslash == sIn.npos )
{
LOG->Warn( "Invalid registry key: \"%s\" ", sIn.c_str() );
@@ -94,9 +95,9 @@ bool RegistryAccess::GetRegValue( const RString &sKey, const RString &sName, int
DWORD iType;
LONG iRet = RegQueryValueEx( hKey, sName, nullptr, &iType, (LPBYTE) &iValue, &iSize );
RegCloseKey( hKey );
if( iRet != ERROR_SUCCESS )
if( iRet != ERROR_SUCCESS )
return false;
if( iType != REG_DWORD )
return false; /* type mismatch */
@@ -160,14 +161,14 @@ bool RegistryAccess::SetRegValue( const RString &sKey, const RString &sName, con
bool bSuccess = true;
TCHAR sz[255];
if( sVal.size() > 254 )
return false;
strcpy( sz, sVal.c_str() );
LONG lResult = ::RegSetValueEx(hKey, LPCTSTR(sName), 0, REG_SZ, (LPBYTE)sz, strlen(sz) + 1);
if( lResult != ERROR_SUCCESS )
if( lResult != ERROR_SUCCESS )
bSuccess = false;
::RegCloseKey(hKey);
@@ -181,10 +182,10 @@ bool RegistryAccess::SetRegValue( const RString &sKey, const RString &sName, boo
return false;
bool bSuccess = true;
if (::RegSetValueEx(hKey, LPCTSTR(sName), 0,
REG_BINARY, (LPBYTE)&bVal, sizeof(bVal))
!= ERROR_SUCCESS)
!= ERROR_SUCCESS)
bSuccess = false;
::RegCloseKey(hKey);
@@ -201,13 +202,13 @@ bool RegistryAccess::CreateKey( const RString &sKey )
HKEY hKey;
DWORD dwDisposition = 0;
if( ::RegCreateKeyEx(
hType,
sSubkey,
0,
hType,
sSubkey,
0,
nullptr,
REG_OPTION_NON_VOLATILE,
KEY_ALL_ACCESS,
nullptr,
REG_OPTION_NON_VOLATILE,
KEY_ALL_ACCESS,
nullptr,
&hKey,
&dwDisposition ) != ERROR_SUCCESS )
{
@@ -220,7 +221,7 @@ bool RegistryAccess::CreateKey( const RString &sKey )
/*
* (c) 2004 Glenn Maynard
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -230,7 +231,7 @@ bool RegistryAccess::CreateKey( const RString &sKey )
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
src/archutils/Win32/mapconv.cpp
+16 -15
View File
@@ -3,11 +3,12 @@
#include <vector>
#include <algorithm>
#include <inttypes.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <cstddef>
#include <cinttypes>
#include <cstdint>
#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <ctype.h>
#define MAX_FNAMBUF (0x0FFFFFFF)
@@ -95,7 +96,7 @@ void RemoveAnonymousNamespaces( char *p )
void parsename(uintptr_t rva, char *func_name) {
RemoveAnonymousNamespaces( func_name );
fnamptr = strtack(fnamptr, func_name, fnambuf+MAX_FNAMBUF);
if(!fnamptr)
throw "Too many func names; increase MAX_FNAMBUF.";
@@ -223,7 +224,7 @@ int main(int argc, char **argv) {
// printf("Processing RVA entries...\n");
for (size_t i = 0; i < rvabuf.size(); ++i) {
for (std::size_t i = 0; i < rvabuf.size(); ++i) {
uint16_t grp;
uint32_t start;
uintptr_t rva;
@@ -236,17 +237,17 @@ int main(int argc, char **argv) {
parsename(rva, symname);
}
// printf("Processing segment entries...\n");
for (size_t i = 0; i < segcnt; i++) {
for (std::size_t i = 0; i < segcnt; i++) {
segbuf[i][0] += grpstart[seggrp[i]];
// printf("\t#%-2zu %p-%p\n", i + 1, reinterpret_cast<void*>(segbuf[i][0]), reinterpret_cast<void*>(segbuf[i][0] + segbuf[i][1] - 1));
}
/*
printf("Raw statistics:\n");
printf("\tRVA bytes: %zu\n", rvabuf.size() * 4);
printf("\tFunc name bytes: %" PRIdPTR "\n", static_cast<ptrdiff_t>(fnamptr - fnambuf));
printf("\tFunc name bytes: %" PRIdPTR "\n", static_cast<std::ptrdiff_t>(fnamptr - fnambuf));
printf("\nPacking RVA data..."); fflush(stdout);
*/
@@ -256,7 +257,7 @@ int main(int argc, char **argv) {
uintptr_t lastrva = firstrva;
for(; itRVA != itRVAEnd; ++itRVA) {
ptrdiff_t rvadiff = (*itRVA).rva - lastrva;
std::ptrdiff_t rvadiff = (*itRVA).rva - lastrva;
lastrva += rvadiff;
@@ -287,7 +288,7 @@ int main(int argc, char **argv) {
fwrite(header, 64, 1, fo);
size_t t;
std::size_t t;
fwrite(&ver, sizeof ver, 1, fo);
@@ -308,7 +309,7 @@ int main(int argc, char **argv) {
if (fclose(fo))
throw "output file close failed";
} catch (const char *s) {
fprintf(stderr, "%s: %s\n", argv[1], s);
}
@@ -321,7 +322,7 @@ int main(int argc, char **argv) {
/*
* (c) 2002 Avery Lee
* All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -331,7 +332,7 @@ int main(int argc, char **argv) {
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF