dolphin-emu/dolphin

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Merge pull request #142 from Tilka/clang-modernize

Run clang-modernize and manually fix the result

master

commit 633dc75e857d649ffab7c4398e92536bccc9e1de 2 parents f401263 + d802d39

Parlane authored March 10, 2014

Showing 355 changed files with 2,264 additions and 2,218 deletions. Show Diff Stats Hide Diff Stats

4  Source/Core/AudioCommon/AOSoundStream.cpp
8  Source/Core/AudioCommon/AOSoundStream.h
6  Source/Core/AudioCommon/AlsaSoundStream.cpp
8  Source/Core/AudioCommon/AlsaSoundStream.h
4  Source/Core/AudioCommon/CoreAudioSoundStream.cpp
6  Source/Core/AudioCommon/DPL2Decoder.cpp
8  Source/Core/AudioCommon/DSoundStream.cpp
12  Source/Core/AudioCommon/NullSoundStream.h
11  Source/Core/AudioCommon/OpenALStream.cpp
14  Source/Core/AudioCommon/OpenALStream.h
32  Source/Core/AudioCommon/OpenSLESStream.cpp
4  Source/Core/AudioCommon/OpenSLESStream.h
14  Source/Core/AudioCommon/PulseAudioStream.cpp
8  Source/Core/AudioCommon/PulseAudioStream.h
2  Source/Core/AudioCommon/WaveFile.cpp
2  Source/Core/AudioCommon/XAudio2Stream.cpp
2  Source/Core/AudioCommon/XAudio2_7Stream.cpp
20  Source/Core/AudioCommon/aldlist.cpp
10  Source/Core/Common/ArmCPUDetect.cpp
4  Source/Core/Common/ArmEmitter.h
4  Source/Core/Common/BreakPoints.cpp
12  Source/Core/Common/CDUtils.cpp
10  Source/Core/Common/ChunkFile.h
2  Source/Core/Common/CommonFuncs.h
14  Source/Core/Common/ConsoleListener.cpp
2  Source/Core/Common/ConsoleListener.h
2  Source/Core/Common/Crypto/ec.cpp
24  Source/Core/Common/ExtendedTrace.cpp
8  Source/Core/Common/FifoQueue.h
38  Source/Core/Common/FileUtil.cpp
6  Source/Core/Common/FileUtil.h
6  Source/Core/Common/IniFile.cpp
2  Source/Core/Common/LinearDiskCache.h
4  Source/Core/Common/LogManager.cpp
4  Source/Core/Common/LogManager.h
12  Source/Core/Common/MemArena.cpp
16  Source/Core/Common/MemoryUtil.cpp
4  Source/Core/Common/Misc.cpp
4  Source/Core/Common/StdConditionVariable.h
10  Source/Core/Common/StdMutex.h
6  Source/Core/Common/StdThread.h
8  Source/Core/Common/StringUtil.cpp
12  Source/Core/Common/SymbolDB.cpp
6  Source/Core/Common/SymbolDB.h
6  Source/Core/Common/Timer.cpp
6  Source/Core/Common/x64Emitter.h
2  Source/Core/Core/ActionReplay.cpp
2  Source/Core/Core/ArmMemTools.cpp
4  Source/Core/Core/Boot/Boot.cpp
6  Source/Core/Core/Boot/Boot.h
8  Source/Core/Core/Boot/Boot_DOL.cpp
4  Source/Core/Core/Boot/Boot_WiiWAD.cpp
6  Source/Core/Core/Boot/ElfReader.cpp
4  Source/Core/Core/Boot/ElfReader.h
2  Source/Core/Core/ConfigManager.cpp
2  Source/Core/Core/Core.cpp
8  Source/Core/Core/CoreParameter.cpp
6  Source/Core/Core/CoreTiming.cpp
50  Source/Core/Core/DSP/DSPAssembler.cpp
6  Source/Core/Core/DSP/DSPAssembler.h
4  Source/Core/Core/DSP/DSPCodeUtil.cpp
8  Source/Core/Core/DSP/DSPCore.cpp
6  Source/Core/Core/DSP/DSPDisassembler.cpp
10  Source/Core/Core/DSP/DSPEmitter.cpp
140  Source/Core/Core/DSP/DSPTables.cpp
2  Source/Core/Core/DSP/Jit/DSPJitBranch.cpp
16  Source/Core/Core/DSP/Jit/DSPJitRegCache.cpp
4  Source/Core/Core/DSP/Jit/DSPJitUtil.cpp
6  Source/Core/Core/Debugger/Dump.cpp
48  Source/Core/Core/Debugger/PPCDebugInterface.h
18  Source/Core/Core/FifoPlayer/FifoDataFile.cpp
12  Source/Core/Core/FifoPlayer/FifoPlayer.cpp
2  Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp
8  Source/Core/Core/FifoPlayer/FifoRecorder.cpp
6  Source/Core/Core/HLE/HLE.cpp
2  Source/Core/Core/HW/BBA-TAP/TAP_Unix.cpp
16  Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp
8  Source/Core/Core/HW/CPU.cpp
2  Source/Core/Core/HW/CPU.h
6  Source/Core/Core/HW/DSP.cpp
20  Source/Core/Core/HW/DSPHLE/DSPHLE.cpp
4  Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX.cpp
10  Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.cpp
2  Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp
42  Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h
4  Source/Core/Core/HW/DSPLLE/DSPLLE.cpp
36  Source/Core/Core/HW/DSPLLE/DSPLLE.h
2  Source/Core/Core/HW/DSPLLE/DSPSymbols.cpp
4  Source/Core/Core/HW/EXI.cpp
8  Source/Core/Core/HW/EXI_Channel.cpp
4  Source/Core/Core/HW/EXI_Device.cpp
2  Source/Core/Core/HW/EXI_Device.h
2  Source/Core/Core/HW/EXI_DeviceIPL.cpp
8  Source/Core/Core/HW/EXI_DeviceIPL.h
8  Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp
8  Source/Core/Core/HW/EXI_DeviceMic.h
6  Source/Core/Core/HW/GCMemcard.cpp
20  Source/Core/Core/HW/Memmap.cpp
2  Source/Core/Core/HW/SI.cpp
10  Source/Core/Core/HW/SI_DeviceGCController.h
8  Source/Core/Core/HW/SI_DeviceGCSteeringWheel.h
26  Source/Core/Core/HW/VideoInterface.cpp
8  Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp
2  Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
6  Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h
2  Source/Core/Core/HW/WiimoteReal/IODummy.cpp
8  Source/Core/Core/HW/WiimoteReal/IONix.cpp
74  Source/Core/Core/HW/WiimoteReal/IOWin.cpp
18  Source/Core/Core/HW/WiimoteReal/IOdarwin.mm
14  Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
2  Source/Core/Core/IPC_HLE/ICMPWin.cpp
56  Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp
8  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h
16  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp
10  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h
14  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h
10  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp
8  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h
2  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
12  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h
28  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp
10  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h
38  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp
34  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h
139  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp
8  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h
2  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp
10  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h
12  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h
34  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
12  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.h
8  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp
10  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h
4  Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
12  Source/Core/Core/IPC_HLE/WII_Socket.cpp
2  Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp
12  Source/Core/Core/IPC_HLE/fakepoll.h
28  Source/Core/Core/Movie.cpp
30  Source/Core/Core/NetPlayClient.cpp
64  Source/Core/Core/NetPlayServer.cpp
24  Source/Core/Core/PowerPC/GDBStub.cpp
2  Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp
10  Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp
2  Source/Core/Core/PowerPC/Jit64/JitRegCache.cpp
26  Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp
4  Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp
2  Source/Core/Core/PowerPC/Jit64IL/JitIL.h
2  Source/Core/Core/PowerPC/JitArmIL/JitIL.h
8  Source/Core/Core/PowerPC/JitCommon/JitBackpatch.cpp
22  Source/Core/Core/PowerPC/JitCommon/JitCache.cpp
4  Source/Core/Core/PowerPC/JitCommon/JitCache.h
32  Source/Core/Core/PowerPC/JitILCommon/IR.cpp
20  Source/Core/Core/PowerPC/JitILCommon/IR.h
2  Source/Core/Core/PowerPC/JitILCommon/JitILBase_Branch.cpp
2  Source/Core/Core/PowerPC/JitILCommon/JitILBase_Integer.cpp
2  Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStore.cpp
8  Source/Core/Core/PowerPC/JitInterface.cpp
12  Source/Core/Core/PowerPC/PPCSymbolDB.cpp
12  Source/Core/Core/PowerPC/PPCTables.cpp
2  Source/Core/Core/PowerPC/PowerPC.cpp
8  Source/Core/Core/State.cpp
18  Source/Core/Core/VolumeHandler.cpp
12  Source/Core/Core/ec_wii.cpp
6  Source/Core/Core/x64MemTools.cpp
2  Source/Core/DiscIO/BannerLoader.cpp
4  Source/Core/DiscIO/BannerLoaderGC.cpp
10  Source/Core/DiscIO/BannerLoaderGC.h
6  Source/Core/DiscIO/BannerLoaderWii.cpp
10  Source/Core/DiscIO/BannerLoaderWii.h
8  Source/Core/DiscIO/Blob.cpp
6  Source/Core/DiscIO/Blob.h
2  Source/Core/DiscIO/CISOBlob.cpp
6  Source/Core/DiscIO/CISOBlob.h
2  Source/Core/DiscIO/CompressedBlob.cpp
6  Source/Core/DiscIO/CompressedBlob.h
8  Source/Core/DiscIO/DiscScrubber.cpp
18  Source/Core/DiscIO/DriveBlob.cpp
10  Source/Core/DiscIO/DriveBlob.h
2  Source/Core/DiscIO/FileBlob.cpp
6  Source/Core/DiscIO/FileBlob.h
24  Source/Core/DiscIO/FileHandlerARC.cpp
22  Source/Core/DiscIO/FileMonitor.cpp
14  Source/Core/DiscIO/FileSystemGCWii.cpp
20  Source/Core/DiscIO/FileSystemGCWii.h
4  Source/Core/DiscIO/Filesystem.cpp
18  Source/Core/DiscIO/NANDContentLoader.cpp
22  Source/Core/DiscIO/VolumeCreator.cpp
18  Source/Core/DiscIO/VolumeDirectory.cpp
20  Source/Core/DiscIO/VolumeDirectory.h
14  Source/Core/DiscIO/VolumeGC.cpp
26  Source/Core/DiscIO/VolumeGC.h
2  Source/Core/DiscIO/VolumeWad.cpp
22  Source/Core/DiscIO/VolumeWad.h
20  Source/Core/DiscIO/VolumeWiiCrypted.cpp
30  Source/Core/DiscIO/VolumeWiiCrypted.h
4  Source/Core/DiscIO/WbfsBlob.cpp
6  Source/Core/DiscIO/WbfsBlob.h
8  Source/Core/DiscIO/WiiWad.cpp
4  Source/Core/DolphinWX/ARCodeAddEdit.cpp
49  Source/Core/DolphinWX/CheatsWindow.cpp
2  Source/Core/DolphinWX/ConfigMain.cpp
2  Source/Core/DolphinWX/Debugger/BreakpointView.h
4  Source/Core/DolphinWX/Debugger/CodeView.cpp
20  Source/Core/DolphinWX/Debugger/CodeWindow.cpp
2  Source/Core/DolphinWX/Debugger/CodeWindow.h
20  Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp
10  Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp
2  Source/Core/DolphinWX/Debugger/DSPDebugWindow.h
14  Source/Core/DolphinWX/Debugger/DSPRegisterView.h
6  Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp
4  Source/Core/DolphinWX/Debugger/DebuggerPanel.h
4  Source/Core/DolphinWX/Debugger/JitWindow.h
4  Source/Core/DolphinWX/Debugger/MemoryView.cpp
10  Source/Core/DolphinWX/Debugger/MemoryWindow.cpp
2  Source/Core/DolphinWX/Debugger/MemoryWindow.h
14  Source/Core/DolphinWX/Debugger/RegisterView.h
4  Source/Core/DolphinWX/Debugger/RegisterWindow.cpp
8  Source/Core/DolphinWX/FifoPlayerDlg.cpp
26  Source/Core/DolphinWX/Frame.cpp
4  Source/Core/DolphinWX/Frame.h
8  Source/Core/DolphinWX/FrameAui.cpp
16  Source/Core/DolphinWX/FrameTools.cpp
8  Source/Core/DolphinWX/GLInterface/EGL.cpp
18  Source/Core/DolphinWX/GLInterface/GLX.cpp
16  Source/Core/DolphinWX/GLInterface/GLX.h
2  Source/Core/DolphinWX/GLInterface/InterfaceBase.h
4  Source/Core/DolphinWX/GLInterface/Platform.cpp
22  Source/Core/DolphinWX/GLInterface/WGL.cpp
32  Source/Core/DolphinWX/GLInterface/Wayland_Util.cpp
8  Source/Core/DolphinWX/GLInterface/X11_Util.cpp
22  Source/Core/DolphinWX/GameListCtrl.cpp
2  Source/Core/DolphinWX/GameListCtrl.h
2  Source/Core/DolphinWX/Globals.h
6  Source/Core/DolphinWX/HotkeyDlg.cpp
10  Source/Core/DolphinWX/ISOFile.cpp
24  Source/Core/DolphinWX/ISOProperties.cpp
10  Source/Core/DolphinWX/InputConfigDiag.cpp
18  Source/Core/DolphinWX/InputConfigDiag.h
133  Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp
2  Source/Core/DolphinWX/LogConfigWindow.cpp
2  Source/Core/DolphinWX/LogWindow.cpp
2  Source/Core/DolphinWX/LogWindow.h
16  Source/Core/DolphinWX/Main.cpp
8  Source/Core/DolphinWX/Main.h
36  Source/Core/DolphinWX/MainAndroid.cpp
14  Source/Core/DolphinWX/MainNoGUI.cpp
14  Source/Core/DolphinWX/MemcardManager.cpp
18  Source/Core/DolphinWX/NetWindow.cpp
16  Source/Core/DolphinWX/NetWindow.h
2  Source/Core/DolphinWX/TASInputDlg.cpp
4  Source/Core/DolphinWX/VideoConfigDiag.cpp
4  Source/Core/DolphinWX/VideoConfigDiag.h
12  Source/Core/DolphinWX/X11Utils.cpp
10  Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
12  Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
2  Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp
46  Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
12  Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
8  Source/Core/InputCommon/ControllerInterface/Device.cpp
12  Source/Core/InputCommon/ControllerInterface/Device.h
6  Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp
2  Source/Core/InputCommon/ControllerInterface/ExpressionParser.h
4  Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp
2  Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h
4  Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h
12  Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm
4  Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm
6  Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm
16  Source/Core/InputCommon/ControllerInterface/SDL/SDL.h
6  Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
30  Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
4  Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp
24  Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h
8  Source/Core/InputCommon/UDPWiimote.cpp
6  Source/Core/InputCommon/UDPWrapper.cpp
4  Source/Core/InputCommon/UDPWrapper.h
74  Source/Core/VideoBackends/D3D/D3DBase.cpp
6  Source/Core/VideoBackends/D3D/D3DBase.h
2  Source/Core/VideoBackends/D3D/D3DBlob.cpp
2  Source/Core/VideoBackends/D3D/D3DBlob.h
48  Source/Core/VideoBackends/D3D/D3DShader.cpp
8  Source/Core/VideoBackends/D3D/D3DShader.h
8  Source/Core/VideoBackends/D3D/D3DTexture.cpp
64  Source/Core/VideoBackends/D3D/D3DUtil.cpp
28  Source/Core/VideoBackends/D3D/FramebufferManager.cpp
6  Source/Core/VideoBackends/D3D/GfxState.cpp
10  Source/Core/VideoBackends/D3D/LineGeometryShader.cpp
2  Source/Core/VideoBackends/D3D/NativeVertexFormat.cpp
80  Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp
42  Source/Core/VideoBackends/D3D/PixelShaderCache.cpp
2  Source/Core/VideoBackends/D3D/PixelShaderCache.h
10  Source/Core/VideoBackends/D3D/PointGeometryShader.cpp
36  Source/Core/VideoBackends/D3D/Render.cpp
4  Source/Core/VideoBackends/D3D/Television.cpp
14  Source/Core/VideoBackends/D3D/TextureCache.cpp
12  Source/Core/VideoBackends/D3D/VertexManager.cpp
30  Source/Core/VideoBackends/D3D/VertexShaderCache.cpp
2  Source/Core/VideoBackends/D3D/VertexShaderCache.h
34  Source/Core/VideoBackends/D3D/XFBEncoder.cpp
6  Source/Core/VideoBackends/D3D/main.cpp
12  Source/Core/VideoBackends/OGL/FramebufferManager.cpp
14  Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp
4  Source/Core/VideoBackends/OGL/GLUtil.cpp
4  Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp
2  Source/Core/VideoBackends/OGL/PerfQuery.h
4  Source/Core/VideoBackends/OGL/PostProcessing.cpp
34  Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
4  Source/Core/VideoBackends/OGL/RasterFont.cpp
20  Source/Core/VideoBackends/OGL/Render.cpp
2  Source/Core/VideoBackends/OGL/Render.h
36  Source/Core/VideoBackends/OGL/StreamBuffer.cpp
2  Source/Core/VideoBackends/OGL/TextureCache.cpp
2  Source/Core/VideoBackends/OGL/TextureCache.h
6  Source/Core/VideoBackends/OGL/TextureConverter.cpp
6  Source/Core/VideoBackends/OGL/VertexManager.cpp
2  Source/Core/VideoBackends/OGL/VertexManager.h
10  Source/Core/VideoBackends/OGL/main.cpp
2  Source/Core/VideoBackends/Software/BPMemLoader.cpp
2  Source/Core/VideoBackends/Software/DebugUtil.cpp
2  Source/Core/VideoBackends/Software/OpcodeDecoder.cpp
12  Source/Core/VideoBackends/Software/Rasterizer.cpp
2  Source/Core/VideoBackends/Software/SWCommandProcessor.cpp
4  Source/Core/VideoBackends/Software/SWRenderer.cpp
10  Source/Core/VideoBackends/Software/SWVertexLoader.cpp
2  Source/Core/VideoBackends/Software/SWmain.cpp
24  Source/Core/VideoBackends/Software/Tev.cpp
2  Source/Core/VideoBackends/Software/TextureSampler.cpp
46  Source/Core/VideoCommon/AVIDump.cpp
2  Source/Core/VideoCommon/BPStructs.cpp
12  Source/Core/VideoCommon/Debugger.cpp
18  Source/Core/VideoCommon/EmuWindow.cpp
2  Source/Core/VideoCommon/Fifo.cpp
18  Source/Core/VideoCommon/FramebufferManagerBase.cpp
2  Source/Core/VideoCommon/FramebufferManagerBase.h
4  Source/Core/VideoCommon/HiresTextures.cpp
16  Source/Core/VideoCommon/ImageWrite.cpp
2  Source/Core/VideoCommon/IndexGenerator.cpp
4  Source/Core/VideoCommon/OpcodeDecoding.cpp
2  Source/Core/VideoCommon/PerfQueryBase.cpp
8  Source/Core/VideoCommon/PixelShaderGen.cpp
2  Source/Core/VideoCommon/RenderBase.cpp
8  Source/Core/VideoCommon/ShaderGenCommon.h
30  Source/Core/VideoCommon/TextureCacheBase.cpp
2  Source/Core/VideoCommon/TextureConversionShader.cpp
8  Source/Core/VideoCommon/VertexLoader.cpp
2  Source/Core/VideoCommon/VertexLoaderManager.cpp
10  Source/Core/VideoCommon/VertexLoader_Position.cpp
10  Source/Core/VideoCommon/VertexLoader_TextCoord.cpp
6  Source/Core/VideoCommon/VertexShaderGen.cpp
8  Source/Core/VideoCommon/VideoBackendBase.cpp
40  Source/Core/VideoCommon/VideoBackendBase.h
4  Source/DSPSpy/main_spy.cpp
2  Source/DSPSpy/real_dsp.cpp
4  Source/UnitTests/Core/MMIOTest.cpp
2  docs/DSP/DSP_InterC/DSP_InterC/DSP_InterC.cpp

4  Source/Core/AudioCommon/AOSoundStream.cpp

show inline notes

View

              
    @@ -22,7 +22,7 @@ void AOSound::SoundLoop()
  
         	format.rate = m_mixer->GetSampleRate();
      
         	format.byte_format = AO_FMT_LITTLE;
      
        -	device = ao_open_live(default_driver, &format, NULL /* no options */);
      
        +	device = ao_open_live(default_driver, &format, nullptr /* no options */);
      
         	if (!device)
      
         	{
      
         		PanicAlertT("AudioCommon: Error opening AO device.\n");
      
    @@ -73,7 +73,7 @@ void AOSound::Stop()
  
         	ao_shutdown();
      
        -	device = NULL;
      
        +	device = nullptr;
      
         	}
      
         }

8  Source/Core/AudioCommon/AOSoundStream.h

show inline notes

View

              
    @@ -31,11 +31,11 @@ class AOSound : public SoundStream
  
         	virtual ~AOSound();
      
        -	virtual bool Start();
      
        +	virtual bool Start() override;
      
        -	virtual void SoundLoop();
      
        +	virtual void SoundLoop() override;
      
        -	virtual void Stop();
      
        +	virtual void Stop() override;
      
         	static bool isValid() {
      
         		return true;
      
    @@ -45,7 +45,7 @@ class AOSound : public SoundStream
  
         		return true;
      
         	}
      
        -	virtual void Update();
      
        +	virtual void Update() override;
      
         #else
      
         public:

6  Source/Core/AudioCommon/AlsaSoundStream.cpp

show inline notes

View

              
    @@ -12,7 +12,7 @@
  
         #define BUFFER_SIZE_MAX 8192
      
         #define BUFFER_SIZE_BYTES (BUFFER_SIZE_MAX*2*2)
      
        -AlsaSound::AlsaSound(CMixer *mixer) : SoundStream(mixer), thread_data(0), handle(NULL), frames_to_deliver(FRAME_COUNT_MIN)
      
        +AlsaSound::AlsaSound(CMixer *mixer) : SoundStream(mixer), thread_data(0), handle(nullptr), frames_to_deliver(FRAME_COUNT_MIN)
      
         {
      
         	mix_buffer = new u8[BUFFER_SIZE_BYTES];
      
         }
      
    @@ -204,11 +204,11 @@ bool AlsaSound::AlsaInit()
  
         void AlsaSound::AlsaShutdown()
      
         {
      
        -	if (handle != NULL)
      
        +	if (handle != nullptr)
      
         	{
      
         		snd_pcm_drop(handle);
      
         		snd_pcm_close(handle);
      
        -		handle = NULL;
      
        +		handle = nullptr;
      
         	}
      
         }

8  Source/Core/AudioCommon/AlsaSoundStream.h

show inline notes

View

              
    @@ -19,9 +19,9 @@ class AlsaSound : public SoundStream
  
         	AlsaSound(CMixer *mixer);
      
         	virtual ~AlsaSound();
      
        -	virtual bool Start();
      
        -	virtual void SoundLoop();
      
        -	virtual void Stop();
      
        +	virtual bool Start() override;
      
        +	virtual void SoundLoop() override;
      
        +	virtual void Stop() override;
      
         	static bool isValid() {
      
         		return true;
      
    @@ -30,7 +30,7 @@ class AlsaSound : public SoundStream
  
         		return true;
      
         	}
      
        -	virtual void Update();
      
        +	virtual void Update() override;
      
         private:
      
         	bool AlsaInit();

4  Source/Core/AudioCommon/CoreAudioSoundStream.cpp

show inline notes

View

              
    @@ -40,8 +40,8 @@ bool CoreAudioSound::Start()
  
         	desc.componentFlags = 0;
      
         	desc.componentFlagsMask = 0;
      
         	desc.componentManufacturer = kAudioUnitManufacturer_Apple;
      
        -	component = FindNextComponent(NULL, &desc);
      
        -	if (component == NULL) {
      
        +	component = FindNextComponent(nullptr, &desc);
      
        +	if (component == nullptr) {
      
         		ERROR_LOG(AUDIO, "error finding audio component");
      
         		return false;
      
         	}

6  Source/Core/AudioCommon/DPL2Decoder.cpp

show inline notes

View

              
    @@ -123,7 +123,7 @@ float* design_fir(unsigned int *n, float* fc, float opt)
  
         	float fc1;                               // Cutoff frequencies
      
         	// Sanity check
      
        -	if(*n==0) return NULL;
      
        +	if(*n==0) return nullptr;
      
         	MathUtil::Clamp(&fc[0],float(0.001),float(1));
      
         	float *w=(float*)calloc(sizeof(float),*n);
      
    @@ -188,7 +188,7 @@ void done(void)
  
         	{
      
         		free(filter_coefs_lfe);
      
         	}
      
        -	filter_coefs_lfe = NULL;
      
        +	filter_coefs_lfe = nullptr;
      
         }
      
         float* calc_coefficients_125Hz_lowpass(int rate)
      
    @@ -378,5 +378,5 @@ void dpl2reset()
  
         {
      
         	olddelay = -1;
      
         	oldfreq = 0;
      
        -	filter_coefs_lfe = NULL;
      
        +	filter_coefs_lfe = nullptr;
      
         }

8  Source/Core/AudioCommon/DSoundStream.cpp

show inline notes

View

              
    @@ -32,7 +32,7 @@ bool DSound::CreateBuffer()
  
         	dsbdesc.lpwfxFormat = (WAVEFORMATEX *)&pcmwf;
      
         	dsbdesc.guid3DAlgorithm = DS3DALG_DEFAULT;
      
        -	HRESULT res = ds->CreateSoundBuffer(&dsbdesc, &dsBuffer, NULL);
      
        +	HRESULT res = ds->CreateSoundBuffer(&dsbdesc, &dsBuffer, nullptr);
      
         	if (SUCCEEDED(res))
      
         	{
      
         		dsBuffer->SetCurrentPosition(0);
      
    @@ -43,7 +43,7 @@ bool DSound::CreateBuffer()
  
         	{
      
         		// Failed.
      
         		PanicAlertT("Sound buffer creation failed: %08x", res);
      
        -		dsBuffer = NULL;
      
        +		dsBuffer = nullptr;
      
         		return false;
      
         	}
      
         }
      
    @@ -130,7 +130,7 @@ void DSound::SetVolume(int volume)
  
         	// This is in "dBA attenuation" from 0 to -10000, logarithmic
      
         	m_volume = (int)floor(log10((float)volume) * 5000.0f) - 10000;
      
        -	if (dsBuffer != NULL)
      
        +	if (dsBuffer != nullptr)
      
         		dsBuffer->SetVolume(m_volume);
      
         }
      
    @@ -143,7 +143,7 @@ void DSound::Clear(bool mute)
  
         {
      
         	m_muted = mute;
      
        -	if (dsBuffer != NULL)
      
        +	if (dsBuffer != nullptr)
      
         	{
      
         		if (m_muted)
      
         		{

12  Source/Core/AudioCommon/NullSoundStream.h

show inline notes

View

              
    @@ -21,12 +21,12 @@ class NullSound : public SoundStream
  
         	virtual ~NullSound() {}
      
        -	virtual bool Start();
      
        -	virtual void SoundLoop();
      
        -	virtual void SetVolume(int volume);
      
        -	virtual void Stop();
      
        -	virtual void Clear(bool mute);
      
        +	virtual bool Start() override;
      
        +	virtual void SoundLoop() override;
      
        +	virtual void SetVolume(int volume) override;
      
        +	virtual void Stop() override;
      
        +	virtual void Clear(bool mute) override;
      
         	static bool isValid() { return true; }
      
         	virtual bool usesMixer() const { return true; }
      
        -	virtual void Update();
      
        +	virtual void Update() override;
      
         };

11  Source/Core/AudioCommon/OpenALStream.cpp

show inline notes

View

              
    @@ -17,17 +17,17 @@ bool OpenALStream::Start()
  
         {
      
         	bool bReturn = false;
      
        -	ALDeviceList *pDeviceList = new ALDeviceList();
      
        -	if ((pDeviceList) && (pDeviceList->GetNumDevices()))
      
        +	ALDeviceList pDeviceList;
      
        +	if (pDeviceList.GetNumDevices())
      
         	{
      
        -		char *defDevName = pDeviceList->GetDeviceName(pDeviceList->GetDefaultDevice());
      
        +		char *defDevName = pDeviceList.GetDeviceName(pDeviceList.GetDefaultDevice());
      
         		WARN_LOG(AUDIO, "Found OpenAL device %s", defDevName);
      
         		ALCdevice *pDevice = alcOpenDevice(defDevName);
      
         		if (pDevice)
      
         		{
      
        -			ALCcontext *pContext = alcCreateContext(pDevice, NULL);
      
        +			ALCcontext *pContext = alcCreateContext(pDevice, nullptr);
      
         			if (pContext)
      
         			{
      
         				// Used to determine an appropriate period size (2x period = total buffer size)
      
    @@ -49,7 +49,6 @@ bool OpenALStream::Start()
  
         		{
      
         			PanicAlertT("OpenAL: can't open device %s", defDevName);
      
         		}
      
        -		delete pDeviceList;
      
         	}
      
         	else
      
         	{
      
    @@ -84,7 +83,7 @@ void OpenALStream::Stop()
  
         	ALCcontext *pContext = alcGetCurrentContext();
      
         	ALCdevice *pDevice = alcGetContextsDevice(pContext);
      
        -	alcMakeContextCurrent(NULL);
      
        +	alcMakeContextCurrent(nullptr);
      
         	alcDestroyContext(pContext);
      
         	alcCloseDevice(pDevice);
      
         }

14  Source/Core/AudioCommon/OpenALStream.h

show inline notes

View

              
    @@ -44,21 +44,21 @@ class OpenALStream: public SoundStream
  
         {
      
         #if defined HAVE_OPENAL && HAVE_OPENAL
      
         public:
      
        -	OpenALStream(CMixer *mixer, void *hWnd = NULL)
      
        +	OpenALStream(CMixer *mixer, void *hWnd = nullptr)
      
         		: SoundStream(mixer)
      
         		, uiSource(0)
      
         	{}
      
         	virtual ~OpenALStream() {}
      
        -	virtual bool Start();
      
        -	virtual void SoundLoop();
      
        -	virtual void SetVolume(int volume);
      
        -	virtual void Stop();
      
        -	virtual void Clear(bool mute);
      
        +	virtual bool Start() override;
      
        +	virtual void SoundLoop() override;
      
        +	virtual void SetVolume(int volume) override;
      
        +	virtual void Stop() override;
      
        +	virtual void Clear(bool mute) override;
      
         	static bool isValid() { return true; }
      
         	virtual bool usesMixer() const { return true; }
      
        -	virtual void Update();
      
        +	virtual void Update() override;
      
         private:
      
         	std::thread thread;

32  Source/Core/AudioCommon/OpenSLESStream.cpp

show inline notes

View

              
    @@ -17,7 +17,7 @@
  
         static SLObjectItf outputMixObject;
      
         // buffer queue player interfaces
      
        -static SLObjectItf bqPlayerObject = NULL;
      
        +static SLObjectItf bqPlayerObject = nullptr;
      
         static SLPlayItf bqPlayerPlay;
      
         static SLAndroidSimpleBufferQueueItf bqPlayerBufferQueue;
      
         static SLMuteSoloItf bqPlayerMuteSolo;
      
    @@ -32,7 +32,7 @@
  
         static void bqPlayerCallback(SLAndroidSimpleBufferQueueItf bq, void *context) {
      
         	assert(bq == bqPlayerBufferQueue);
      
        -	assert(NULL == context);
      
        +	assert(nullptr == context);
      
         	short *nextBuffer = buffer[curBuffer];
      
         	int nextSize = sizeof(buffer[0]);
      
    @@ -53,7 +53,7 @@ bool OpenSLESStream::Start()
  
         {
      
         	SLresult result;
      
         	// create engine
      
        -	result = slCreateEngine(&engineObject, 0, NULL, 0, NULL, NULL);
      
        +	result = slCreateEngine(&engineObject, 0, nullptr, 0, nullptr, nullptr);
      
         	assert(SL_RESULT_SUCCESS == result);
      
         	result = (*engineObject)->Realize(engineObject, SL_BOOLEAN_FALSE);
      
         	assert(SL_RESULT_SUCCESS == result);
      
    @@ -79,7 +79,7 @@ bool OpenSLESStream::Start()
  
         	// configure audio sink
      
         	SLDataLocator_OutputMix loc_outmix = {SL_DATALOCATOR_OUTPUTMIX, outputMixObject};
      
        -	SLDataSink audioSnk = {&loc_outmix, NULL};
      
        +	SLDataSink audioSnk = {&loc_outmix, nullptr};
      
         	// create audio player
      
         	const SLInterfaceID ids[2] = {SL_IID_BUFFERQUEUE, SL_IID_VOLUME};
      
    @@ -94,7 +94,7 @@ bool OpenSLESStream::Start()
  
         	result = (*bqPlayerObject)->GetInterface(bqPlayerObject, SL_IID_BUFFERQUEUE,
      
         		&bqPlayerBufferQueue);
      
         	assert(SL_RESULT_SUCCESS == result);
      
        -	result = (*bqPlayerBufferQueue)->RegisterCallback(bqPlayerBufferQueue, bqPlayerCallback, NULL);
      
        +	result = (*bqPlayerBufferQueue)->RegisterCallback(bqPlayerBufferQueue, bqPlayerCallback, nullptr);
      
         	assert(SL_RESULT_SUCCESS == result);
      
         	result = (*bqPlayerPlay)->SetPlayState(bqPlayerPlay, SL_PLAYSTATE_PLAYING);
      
         	assert(SL_RESULT_SUCCESS == result);
      
    @@ -113,22 +113,22 @@ bool OpenSLESStream::Start()
  
         void OpenSLESStream::Stop()
      
         {
      
        -	if (bqPlayerObject != NULL) {
      
        +	if (bqPlayerObject != nullptr) {
      
         		(*bqPlayerObject)->Destroy(bqPlayerObject);
      
        -		bqPlayerObject = NULL;
      
        -		bqPlayerPlay = NULL;
      
        -		bqPlayerBufferQueue = NULL;
      
        -		bqPlayerMuteSolo = NULL;
      
        -		bqPlayerVolume = NULL;
      
        +		bqPlayerObject = nullptr;
      
        +		bqPlayerPlay = nullptr;
      
        +		bqPlayerBufferQueue = nullptr;
      
        +		bqPlayerMuteSolo = nullptr;
      
        +		bqPlayerVolume = nullptr;
      
         	}
      
        -	if (outputMixObject != NULL) {
      
        +	if (outputMixObject != nullptr) {
      
         		(*outputMixObject)->Destroy(outputMixObject);
      
        -		outputMixObject = NULL;
      
        +		outputMixObject = nullptr;
      
         	}
      
        -	if (engineObject != NULL) {
      
        +	if (engineObject != nullptr) {
      
         		(*engineObject)->Destroy(engineObject);
      
        -		engineObject = NULL;
      
        -		engineEngine = NULL;
      
        +		engineObject = nullptr;
      
        +		engineEngine = nullptr;
      
         	}
      
         }
      
         #endif

4  Source/Core/AudioCommon/OpenSLESStream.h

show inline notes

View

              
    @@ -11,7 +11,7 @@ class OpenSLESStream : public SoundStream
  
         {
      
         #ifdef ANDROID
      
         public:
      
        -	OpenSLESStream(CMixer *mixer, void *hWnd = NULL)
      
        +	OpenSLESStream(CMixer *mixer, void *hWnd = nullptr)
      
         		: SoundStream(mixer)
      
         	{};
      
    @@ -27,6 +27,6 @@ class OpenSLESStream : public SoundStream
  
         	Common::Event soundSyncEvent;
      
         #else
      
         public:
      
        -	OpenSLESStream(CMixer *mixer, void *hWnd = NULL): SoundStream(mixer) {}
      
        +	OpenSLESStream(CMixer *mixer, void *hWnd = nullptr): SoundStream(mixer) {}
      
         #endif // HAVE_OPENSL
      
         };

14  Source/Core/AudioCommon/PulseAudioStream.cpp

show inline notes

View

              
    @@ -47,7 +47,7 @@ void PulseAudio::SoundLoop()
  
         	if (PulseInit())
      
         	{
      
         		while (m_run_thread.load() && m_pa_connected == 1 && m_pa_error >= 0)
      
        -			m_pa_error = pa_mainloop_iterate(m_pa_ml, 1, NULL);
      
        +			m_pa_error = pa_mainloop_iterate(m_pa_ml, 1, nullptr);
      
         		if(m_pa_error < 0)
      
         			ERROR_LOG(AUDIO, "PulseAudio error: %s", pa_strerror(m_pa_error));
      
    @@ -66,12 +66,12 @@ bool PulseAudio::PulseInit()
  
         	m_pa_ml = pa_mainloop_new();
      
         	m_pa_mlapi = pa_mainloop_get_api(m_pa_ml);
      
         	m_pa_ctx = pa_context_new(m_pa_mlapi, "dolphin-emu");
      
        -	m_pa_error = pa_context_connect(m_pa_ctx, NULL, PA_CONTEXT_NOFLAGS, NULL);
      
        +	m_pa_error = pa_context_connect(m_pa_ctx, nullptr, PA_CONTEXT_NOFLAGS, nullptr);
      
         	pa_context_set_state_callback(m_pa_ctx, StateCallback, this);
      
         	// wait until we're connected to the pulseaudio server
      
         	while (m_pa_connected == 0 && m_pa_error >= 0)
      
        -		m_pa_error = pa_mainloop_iterate(m_pa_ml, 1, NULL);
      
        +		m_pa_error = pa_mainloop_iterate(m_pa_ml, 1, nullptr);
      
         	if (m_pa_connected == 2 || m_pa_error < 0)
      
         	{
      
    @@ -85,7 +85,7 @@ bool PulseAudio::PulseInit()
  
         	ss.format = PA_SAMPLE_S16LE;
      
         	ss.channels = 2;
      
         	ss.rate = m_mixer->GetSampleRate();
      
        -	m_pa_s = pa_stream_new(m_pa_ctx, "Playback", &ss, NULL);
      
        +	m_pa_s = pa_stream_new(m_pa_ctx, "Playback", &ss, nullptr);
      
         	pa_stream_set_write_callback(m_pa_s, WriteCallback, this);
      
         	pa_stream_set_underflow_callback(m_pa_s, UnderflowCallback, this);
      
    @@ -97,7 +97,7 @@ bool PulseAudio::PulseInit()
  
         	m_pa_ba.prebuf = -1;             // start as early as possible
      
         	m_pa_ba.tlength = BUFFER_SIZE;   // designed latency, only change this flag for low latency output
      
         	pa_stream_flags flags = pa_stream_flags(PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_ADJUST_LATENCY | PA_STREAM_AUTO_TIMING_UPDATE);
      
        -	m_pa_error = pa_stream_connect_playback(m_pa_s, NULL, &m_pa_ba, flags, NULL, NULL);
      
        +	m_pa_error = pa_stream_connect_playback(m_pa_s, nullptr, &m_pa_ba, flags, nullptr, nullptr);
      
         	if (m_pa_error < 0)
      
         	{
      
         		ERROR_LOG(AUDIO, "PulseAudio failed to initialize: %s", pa_strerror(m_pa_error));
      
    @@ -135,7 +135,7 @@ void PulseAudio::StateCallback(pa_context* c)
  
         void PulseAudio::UnderflowCallback(pa_stream* s)
      
         {
      
         	m_pa_ba.tlength += BUFFER_SIZE;
      
        -	pa_stream_set_buffer_attr(s, &m_pa_ba, NULL, NULL);
      
        +	pa_stream_set_buffer_attr(s, &m_pa_ba, nullptr, nullptr);
      
         	WARN_LOG(AUDIO, "pulseaudio underflow, new latency: %d bytes", m_pa_ba.tlength);
      
         }
      
    @@ -150,7 +150,7 @@ void PulseAudio::WriteCallback(pa_stream* s, size_t length)
  
         		return; // error will be printed from main loop
      
         	m_mixer->Mix((s16*) buffer, length / sizeof(s16) / CHANNEL_COUNT);
      
        -	m_pa_error = pa_stream_write(s, buffer, length, NULL, 0, PA_SEEK_RELATIVE);
      
        +	m_pa_error = pa_stream_write(s, buffer, length, nullptr, 0, PA_SEEK_RELATIVE);
      
         }
      
         // Callbacks that forward to internal methods (required because PulseAudio is a C API).

8  Source/Core/AudioCommon/PulseAudioStream.h

show inline notes

View

              
    @@ -20,21 +20,21 @@ class PulseAudio : public SoundStream
  
         public:
      
         	PulseAudio(CMixer *mixer);
      
        -	virtual bool Start();
      
        -	virtual void Stop();
      
        +	virtual bool Start() override;
      
        +	virtual void Stop() override;
      
         	static bool isValid() {return true;}
      
         	virtual bool usesMixer() const {return true;}
      
        -	virtual void Update();
      
        +	virtual void Update() override;
      
         	void StateCallback(pa_context *c);
      
         	void WriteCallback(pa_stream *s, size_t length);
      
         	void UnderflowCallback(pa_stream *s);
      
         private:
      
        -	virtual void SoundLoop();
      
        +	virtual void SoundLoop() override;
      
         	bool PulseInit();
      
         	void PulseShutdown();

2  Source/Core/AudioCommon/WaveFile.cpp

show inline notes

View

              
    @@ -11,7 +11,7 @@
  
         WaveFileWriter::WaveFileWriter():
      
         	skip_silence(false),
      
         	audio_size(0),
      
        -	conv_buffer(NULL)
      
        +	conv_buffer(nullptr)
      
         {
      
         }

2  Source/Core/AudioCommon/XAudio2Stream.cpp

show inline notes

View

              
    @@ -158,7 +158,7 @@ bool XAudio2::InitLibrary()
  
         	: SoundStream(mixer)
      
         	, m_mastering_voice(nullptr)
      
         	, m_volume(1.0f)
      
        -	, m_cleanup_com(SUCCEEDED(CoInitializeEx(NULL, COINIT_MULTITHREADED)))
      
        +	, m_cleanup_com(SUCCEEDED(CoInitializeEx(nullptr, COINIT_MULTITHREADED)))
      
         {
      
         }

2  Source/Core/AudioCommon/XAudio2_7Stream.cpp

show inline notes

View

              
    @@ -159,7 +159,7 @@ bool XAudio2_7::InitLibrary()
  
         	: SoundStream(mixer)
      
         	, m_mastering_voice(nullptr)
      
         	, m_volume(1.0f)
      
        -	, m_cleanup_com(SUCCEEDED(CoInitializeEx(NULL, COINIT_MULTITHREADED)))
      
        +	, m_cleanup_com(SUCCEEDED(CoInitializeEx(nullptr, COINIT_MULTITHREADED)))
      
         {
      
         }

20  Source/Core/AudioCommon/aldlist.cpp

show inline notes

View

              
    @@ -50,13 +50,13 @@
  
         	defaultDeviceIndex = 0;
      
         	// grab function pointers for 1.0-API functions, and if successful proceed to enumerate all devices
      
        -	//if (LoadOAL10Library(NULL, &ALFunction) == TRUE) {
      
        -		if (alcIsExtensionPresent(NULL, "ALC_ENUMERATION_EXT"))
      
        +	//if (LoadOAL10Library(nullptr, &ALFunction) == TRUE) {
      
        +		if (alcIsExtensionPresent(nullptr, "ALC_ENUMERATION_EXT"))
      
         		{
      
        -			const char *devices = alcGetString(NULL, ALC_DEVICE_SPECIFIER);
      
        -			const char *defaultDeviceName = alcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER);
      
        -			// go through device list (each device terminated with a single NULL, list terminated with double NULL)
      
        -			for (s32 index = 0; devices != NULL && strlen(devices) > 0; index++, devices += strlen(devices) + 1)
      
        +			const char *devices = alcGetString(nullptr, ALC_DEVICE_SPECIFIER);
      
        +			const char *defaultDeviceName = alcGetString(nullptr, ALC_DEFAULT_DEVICE_SPECIFIER);
      
        +			// go through device list (each device terminated with a single nullptr, list terminated with double nullptr)
      
        +			for (s32 index = 0; devices != nullptr && strlen(devices) > 0; index++, devices += strlen(devices) + 1)
      
         			{
      
         				if (strcmp(defaultDeviceName, devices) == 0)
      
         				{
      
    @@ -65,7 +65,7 @@
  
         				ALCdevice *device = alcOpenDevice(devices);
      
         				if (device)
      
         				{
      
        -					ALCcontext *context = alcCreateContext(device, NULL);
      
        +					ALCcontext *context = alcCreateContext(device, nullptr);
      
         					if (context)
      
         					{
      
         						alcMakeContextCurrent(context);
      
    @@ -79,7 +79,7 @@
  
         								bNewName = false;
      
         							}
      
         						}
      
        -						if ((bNewName) && (actualDeviceName != NULL) && (strlen(actualDeviceName) > 0))
      
        +						if ((bNewName) && (actualDeviceName != nullptr) && (strlen(actualDeviceName) > 0))
      
         						{
      
         							ALDeviceInfo.bSelected = true;
      
         							ALDeviceInfo.strDeviceName = actualDeviceName;
      
    @@ -120,7 +120,7 @@
  
         							vDeviceInfo.push_back(ALDeviceInfo);
      
         						}
      
        -						alcMakeContextCurrent(NULL);
      
        +						alcMakeContextCurrent(nullptr);
      
         						alcDestroyContext(context);
      
         					}
      
         					alcCloseDevice(device);
      
    @@ -163,7 +163,7 @@ char * ALDeviceList::GetDeviceName(s32 index)
  
         	if (index < GetNumDevices())
      
         		return (char *)vDeviceInfo[index].strDeviceName.c_str();
      
         	else
      
        -		return NULL;
      
        +		return nullptr;
      
         }
      
         /*

10  Source/Core/Common/ArmCPUDetect.cpp

show inline notes

View

              
    @@ -14,7 +14,7 @@
  
         char *GetCPUString()
      
         {
      
         	const char marker[] = "Hardware\t: ";
      
        -	char *cpu_string = 0;
      
        +	char *cpu_string = nullptr;
      
         	// Count the number of processor lines in /proc/cpuinfo
      
         	char buf[1024];
      
    @@ -38,7 +38,7 @@ char *GetCPUString()
  
         unsigned char GetCPUImplementer()
      
         {
      
         	const char marker[] = "CPU implementer\t: ";
      
        -	char *implementer_string = 0;
      
        +	char *implementer_string = nullptr;
      
         	unsigned char implementer = 0;
      
         	char buf[1024];
      
    @@ -65,7 +65,7 @@ unsigned char GetCPUImplementer()
  
         unsigned short GetCPUPart()
      
         {
      
         	const char marker[] = "CPU part\t: ";
      
        -	char *part_string = 0;
      
        +	char *part_string = nullptr;
      
         	unsigned short part = 0;
      
         	char buf[1024];
      
    @@ -105,11 +105,11 @@ bool CheckCPUFeature(const char *feature)
  
         			continue;
      
         		char *featurestring = buf + sizeof(marker) - 1;
      
         		char *token = strtok(featurestring, " ");
      
        -		while (token != NULL)
      
        +		while (token != nullptr)
      
         		{
      
         			if (strstr(token, feature))
      
         				return true;
      
        -			token = strtok(NULL, " ");
      
        +			token = strtok(nullptr, " ");
      
         		}
      
         	}

4  Source/Core/Common/ArmEmitter.h

show inline notes

View

              
    @@ -710,7 +710,7 @@ class ARMXCodeBlock : public ARMXEmitter
  
         	size_t region_size;
      
         public:
      
        -	ARMXCodeBlock() : region(NULL), region_size(0) {}
      
        +	ARMXCodeBlock() : region(nullptr), region_size(0) {}
      
         	virtual ~ARMXCodeBlock() { if (region) FreeCodeSpace(); }
      
         	// Call this before you generate any code.
      
    @@ -735,7 +735,7 @@ class ARMXCodeBlock : public ARMXEmitter
  
         	{
      
         #ifndef __SYMBIAN32__
      
         		FreeMemoryPages(region, region_size);
      
        -		region = NULL;
      
        +		region = nullptr;
      
         #endif
      
         		region_size = 0;
      
         	}

4  Source/Core/Common/BreakPoints.cpp

show inline notes

View

              
    @@ -152,7 +152,7 @@ void MemChecks::AddFromStrings(const TMemChecksStr& mcstrs)
  
         void MemChecks::Add(const TMemCheck& _rMemoryCheck)
      
         {
      
        -	if (GetMemCheck(_rMemoryCheck.StartAddress) == 0)
      
        +	if (GetMemCheck(_rMemoryCheck.StartAddress) == nullptr)
      
         		m_MemChecks.push_back(_rMemoryCheck);
      
         }
      
    @@ -184,7 +184,7 @@ TMemCheck *MemChecks::GetMemCheck(u32 address)
  
         	}
      
         	// none found
      
        -	return 0;
      
        +	return nullptr;
      
         }
      
         void TMemCheck::Action(DebugInterface *debug_interface, u32 iValue, u32 addr, bool write, int size, u32 pc)

12  Source/Core/Common/CDUtils.cpp

show inline notes

View

              
    @@ -41,7 +41,7 @@ bool is_cdrom(const TCHAR* drive)
  
         {
      
         	std::vector<std::string> drives;
      
        -	const DWORD buffsize = GetLogicalDriveStrings(0, NULL);
      
        +	const DWORD buffsize = GetLogicalDriveStrings(0, nullptr);
      
         	std::vector<TCHAR> buff(buffsize);
      
         	if (GetLogicalDriveStrings(buffsize, buff.data()) == buffsize - 1)
      
         	{
      
    @@ -77,7 +77,7 @@ bool is_cdrom(const TCHAR* drive)
  
         		return( drives );
      
         	classes_to_match = IOServiceMatching( kIOCDMediaClass );
      
        -	if( classes_to_match == NULL )
      
        +	if( classes_to_match == nullptr )
      
         		return( drives );
      
         	CFDictionarySetValue( classes_to_match,
      
    @@ -101,7 +101,7 @@ bool is_cdrom(const TCHAR* drive)
  
         				IORegistryEntryCreateCFProperty( next_media,
      
         					CFSTR( kIOBSDNameKey ), kCFAllocatorDefault,
      
         					0 );
      
        -			if( str_bsd_path == NULL )
      
        +			if( str_bsd_path == nullptr )
      
         			{
      
         				IOObjectRelease( next_media );
      
         				continue;
      
    @@ -118,7 +118,7 @@ bool is_cdrom(const TCHAR* drive)
  
         				sizeof(psz_buf) - dev_path_length,
      
         				kCFStringEncodingASCII))
      
         			{
      
        -				if(psz_buf != NULL)
      
        +				if(psz_buf != nullptr)
      
         				{
      
         					std::string str = psz_buf;
      
         					drives.push_back(str);
      
    @@ -151,7 +151,7 @@ bool is_cdrom(const TCHAR* drive)
  
         		{ "/dev/acd%d", 0, 27 },
      
         		{ "/dev/cd%d", 0, 27 },
      
         #endif
      
        -		{ NULL, 0, 0 }
      
        +		{ nullptr, 0, 0 }
      
         	};
      
         // Returns true if a device is a block or char device and not a symbolic link
      
    @@ -196,7 +196,7 @@ static bool is_cdrom(const std::string& drive, char *mnttype)
  
         		for (unsigned int j = checklist[i].num_min; j <= checklist[i].num_max; ++j)
      
         		{
      
         			std::string drive = StringFromFormat(checklist[i].format, j);
      
        -			if (is_cdrom(drive, NULL))
      
        +			if (is_cdrom(drive, nullptr))
      
         			{
      
         				drives.push_back(std::move(drive));
      
         			}

10  Source/Core/Common/ChunkFile.h

show inline notes

View

              
    @@ -206,7 +206,7 @@ class PointerWrap
  
         	void DoLinkedList(LinkedListItem<T>*& list_start, LinkedListItem<T>** list_end=0)
      
         	{
      
         		LinkedListItem<T>* list_cur = list_start;
      
        -		LinkedListItem<T>* prev = 0;
      
        +		LinkedListItem<T>* prev = nullptr;
      
         		while (true)
      
         		{
      
    @@ -220,7 +220,7 @@ class PointerWrap
  
         				{
      
         					if (mode == MODE_READ)
      
         					{
      
        -						cur->next = 0;
      
        +						cur->next = nullptr;
      
         						list_cur = cur;
      
         						if (prev)
      
         							prev->next = cur;
      
    @@ -239,13 +239,13 @@ class PointerWrap
  
         				if (mode == MODE_READ)
      
         				{
      
         					if (prev)
      
        -						prev->next = 0;
      
        +						prev->next = nullptr;
      
         					if (list_end)
      
         						*list_end = prev;
      
         					if (list_cur)
      
         					{
      
         						if (list_start == list_cur)
      
        -							list_start = 0;
      
        +							list_start = nullptr;
      
         						do
      
         						{
      
         							LinkedListItem<T>* next = list_cur->next;
      
    @@ -393,7 +393,7 @@ class CChunkFileReader
  
         		}
      
         		// Get data
      
        -		u8 *ptr = 0;
      
        +		u8 *ptr = nullptr;
      
         		PointerWrap p(&ptr, PointerWrap::MODE_MEASURE);
      
         		_class.DoState(p);
      
         		size_t const sz = (size_t)ptr;

2  Source/Core/Common/CommonFuncs.h

show inline notes

View

              
    @@ -127,7 +127,7 @@ inline u64 _rotr64(u64 x, unsigned int shift){
  
         			// Restore the global locale
      
         			_configthreadlocale(_DISABLE_PER_THREAD_LOCALE);
      
         		}
      
        -		else if(new_locale != NULL)
      
        +		else if(new_locale != nullptr)
      
         		{
      
         			// Configure the thread to set the locale only for this thread
      
         			_configthreadlocale(_ENABLE_PER_THREAD_LOCALE);

14  Source/Core/Common/ConsoleListener.cpp

show inline notes

View

              
    @@ -18,7 +18,7 @@
  
         ConsoleListener::ConsoleListener()
      
         {
      
         #ifdef _WIN32
      
        -	hConsole = NULL;
      
        +	hConsole = nullptr;
      
         	bUseColor = true;
      
         #else
      
         	bUseColor = isatty(fileno(stdout));
      
    @@ -68,19 +68,19 @@ void ConsoleListener::UpdateHandle()
  
         void ConsoleListener::Close()
      
         {
      
         #ifdef _WIN32
      
        -	if (hConsole == NULL)
      
        +	if (hConsole == nullptr)
      
         		return;
      
         	FreeConsole();
      
        -	hConsole = NULL;
      
        +	hConsole = nullptr;
      
         #else
      
        -	fflush(NULL);
      
        +	fflush(nullptr);
      
         #endif
      
         }
      
         bool ConsoleListener::IsOpen()
      
         {
      
         #ifdef _WIN32
      
        -	return (hConsole != NULL);
      
        +	return (hConsole != nullptr);
      
         #else
      
         	return true;
      
         #endif
      
    @@ -280,11 +280,11 @@ void ConsoleListener::Log(LogTypes::LOG_LEVELS Level, const char *Text)
  
         	{
      
         		// First 10 chars white
      
         		SetConsoleTextAttribute(hConsole, FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY);
      
        -		WriteConsole(hConsole, Text, 10, &cCharsWritten, NULL);
      
        +		WriteConsole(hConsole, Text, 10, &cCharsWritten, nullptr);
      
         		Text += 10;
      
         	}
      
         	SetConsoleTextAttribute(hConsole, Color);
      
        -	WriteConsole(hConsole, Text, (DWORD)strlen(Text), &cCharsWritten, NULL);
      
        +	WriteConsole(hConsole, Text, (DWORD)strlen(Text), &cCharsWritten, nullptr);
      
         #else
      
         	char ColorAttr[16] = "";
      
         	char ResetAttr[16] = "";

2  Source/Core/Common/ConsoleListener.h

show inline notes

View

              
    @@ -26,7 +26,7 @@ class ConsoleListener : public LogListener
  
         #ifdef _WIN32
      
         	COORD GetCoordinates(int BytesRead, int BufferWidth);
      
         #endif
      
        -	void Log(LogTypes::LOG_LEVELS, const char *Text);
      
        +	void Log(LogTypes::LOG_LEVELS, const char *Text) override;
      
         	void ClearScreen(bool Cursor = true);
      
         private:

2  Source/Core/Common/Crypto/ec.cpp

show inline notes

View

              
    @@ -316,7 +316,7 @@ void point_mul(u8 *d, const u8 *a, const u8 *b) // a is bignum
  
         static void silly_random(u8 * rndArea, u8 count)
      
         {
      
         	u16 i;
      
        -	srand((unsigned) (time(NULL)));
      
        +	srand((unsigned) (time(nullptr)));
      
         	for(i=0;i<count;i++)
      
         	{

24  Source/Core/Common/ExtendedTrace.cpp

show inline notes

View

              
    @@ -84,7 +84,7 @@ static void InitSymbolPath( PSTR lpszSymbolPath, PCSTR lpszIniPath )
  
         	}
      
         	// Add user defined path
      
        -	if ( lpszIniPath != NULL )
      
        +	if ( lpszIniPath != nullptr )
      
         		if ( lpszIniPath[0] != '\0' )
      
         		{
      
         			strcat( lpszSymbolPath, ";" );
      
    @@ -140,7 +140,7 @@ static BOOL GetFunctionInfoFromAddresses( ULONG fnAddress, ULONG stackAddress, L
  
         	DWORD             dwSymSize = 10000;
      
         	TCHAR             lpszUnDSymbol[BUFFERSIZE]=_T("?");
      
         	CHAR              lpszNonUnicodeUnDSymbol[BUFFERSIZE]="?";
      
        -	LPTSTR            lpszParamSep = NULL;
      
        +	LPTSTR            lpszParamSep = nullptr;
      
         	LPTSTR            lpszParsed = lpszUnDSymbol;
      
         	PIMAGEHLP_SYMBOL  pSym = (PIMAGEHLP_SYMBOL)GlobalAlloc( GMEM_FIXED, dwSymSize );
      
    @@ -193,13 +193,13 @@ static BOOL GetFunctionInfoFromAddresses( ULONG fnAddress, ULONG stackAddress, L
  
         		// Let's go through the stack, and modify the function prototype, and insert the actual
      
         		// parameter values from the stack
      
        -		if ( _tcsstr( lpszUnDSymbol, _T("(void)") ) == NULL && _tcsstr( lpszUnDSymbol, _T("()") ) == NULL)
      
        +		if ( _tcsstr( lpszUnDSymbol, _T("(void)") ) == nullptr && _tcsstr( lpszUnDSymbol, _T("()") ) == nullptr)
      
         		{
      
         			ULONG index = 0;
      
         			for( ; ; index++ )
      
         			{
      
         				lpszParamSep = _tcschr( lpszParsed, _T(',') );
      
        -				if ( lpszParamSep == NULL )
      
        +				if ( lpszParamSep == nullptr )
      
         					break;
      
         				*lpszParamSep = _T('\0');
      
    @@ -211,7 +211,7 @@ static BOOL GetFunctionInfoFromAddresses( ULONG fnAddress, ULONG stackAddress, L
  
         			}
      
         			lpszParamSep = _tcschr( lpszParsed, _T(')') );
      
        -			if ( lpszParamSep != NULL )
      
        +			if ( lpszParamSep != nullptr )
      
         			{
      
         				*lpszParamSep = _T('\0');
      
    @@ -254,7 +254,7 @@ static BOOL GetSourceInfoFromAddress( UINT address, LPTSTR lpszSourceInfo )
  
         		PCSTR2LPTSTR( lineInfo.FileName, lpszFileName );
      
         		TCHAR fname[_MAX_FNAME];
      
         		TCHAR ext[_MAX_EXT];
      
        -		_tsplitpath(lpszFileName, NULL, NULL, fname, ext);
      
        +		_tsplitpath(lpszFileName, nullptr, nullptr, fname, ext);
      
         		_stprintf( lpszSourceInfo, _T("%s%s(%d)"), fname, ext, lineInfo.LineNumber );
      
         		ret = TRUE;
      
         	}
      
    @@ -338,11 +338,11 @@ void StackTrace( HANDLE hThread, const char* lpszMessage, FILE *file )
  
         				hProcess,
      
         				hThread,
      
         				&callStack,
      
        -				NULL,
      
        -				NULL,
      
        +				nullptr,
      
        +				nullptr,
      
         				SymFunctionTableAccess,
      
         				SymGetModuleBase,
      
        -				NULL);
      
        +				nullptr);
      
         			if ( index == 0 )
      
         				continue;
      
    @@ -393,11 +393,11 @@ void StackTrace(HANDLE hThread, const char* lpszMessage, FILE *file, DWORD eip,
  
         				hProcess,
      
         				hThread,
      
         				&callStack,
      
        -				NULL,
      
        -				NULL,
      
        +				nullptr,
      
        +				nullptr,
      
         				SymFunctionTableAccess,
      
         				SymGetModuleBase,
      
        -				NULL);
      
        +				nullptr);
      
         			if ( index == 0 )
      
         				continue;

8  Source/Core/Common/FifoQueue.h

show inline notes

View

              
    @@ -65,8 +65,8 @@ class FifoQueue
  
         		ElementPtr *tmpptr = m_read_ptr;
      
         		// advance the read pointer
      
         		m_read_ptr = AtomicLoad(tmpptr->next);
      
        -		// set the next element to NULL to stop the recursive deletion
      
        -		tmpptr->next = NULL;
      
        +		// set the next element to nullptr to stop the recursive deletion
      
        +		tmpptr->next = nullptr;
      
         		delete tmpptr; // this also deletes the element
      
         	}
      
    @@ -81,7 +81,7 @@ class FifoQueue
  
         		ElementPtr *tmpptr = m_read_ptr;
      
         		m_read_ptr = AtomicLoadAcquire(tmpptr->next);
      
         		t = std::move(tmpptr->current);
      
        -		tmpptr->next = NULL;
      
        +		tmpptr->next = nullptr;
      
         		delete tmpptr;
      
         		return true;
      
         	}
      
    @@ -100,7 +100,7 @@ class FifoQueue
  
         	class ElementPtr
      
         	{
      
         	public:
      
        -		ElementPtr() : next(NULL) {}
      
        +		ElementPtr() : next(nullptr) {}
      
         		~ElementPtr()
      
         		{

38  Source/Core/Common/FileUtil.cpp

show inline notes

View

              
    @@ -150,7 +150,7 @@ bool CreateDir(const std::string &path)
  
         {
      
         	INFO_LOG(COMMON, "CreateDir: directory %s", path.c_str());
      
         #ifdef _WIN32
      
        -	if (::CreateDirectory(UTF8ToTStr(path).c_str(), NULL))
      
        +	if (::CreateDirectory(UTF8ToTStr(path).c_str(), nullptr))
      
         		return true;
      
         	DWORD error = GetLastError();
      
         	if (error == ERROR_ALREADY_EXISTS)
      
    @@ -250,7 +250,7 @@ bool Rename(const std::string &srcFilename, const std::string &destFilename)
  
         	auto df = UTF8ToTStr(destFilename);
      
         	// The Internet seems torn about whether ReplaceFile is atomic or not.
      
         	// Hopefully it's atomic enough...
      
        -	if (ReplaceFile(df.c_str(), sf.c_str(), NULL, REPLACEFILE_IGNORE_MERGE_ERRORS, NULL, NULL))
      
        +	if (ReplaceFile(df.c_str(), sf.c_str(), nullptr, REPLACEFILE_IGNORE_MERGE_ERRORS, nullptr, nullptr))
      
         		return true;
      
         	// Might have failed because the destination doesn't exist.
      
         	if (GetLastError() == ERROR_FILE_NOT_FOUND)
      
    @@ -481,7 +481,7 @@ u32 ScanDirectoryTree(const std::string &directory, FSTEntry& parentEntry)
  
         		FSTEntry entry;
      
         		const std::string virtualName(TStrToUTF8(ffd.cFileName));
      
         #else
      
        -	struct dirent dirent, *result = NULL;
      
        +	struct dirent dirent, *result = nullptr;
      
         	DIR *dirp = opendir(directory.c_str());
      
         	if (!dirp)
      
    @@ -549,7 +549,7 @@ bool DeleteDirRecursively(const std::string &directory)
  
         	{
      
         		const std::string virtualName(TStrToUTF8(ffd.cFileName));
      
         #else
      
        -	struct dirent dirent, *result = NULL;
      
        +	struct dirent dirent, *result = nullptr;
      
         	DIR *dirp = opendir(directory.c_str());
      
         	if (!dirp)
      
         		return false;
      
    @@ -623,7 +623,7 @@ void CopyDir(const std::string &source_path, const std::string &dest_path)
  
         	{
      
         		const std::string virtualName(TStrToUTF8(ffd.cFileName));
      
         #else
      
        -	struct dirent dirent, *result = NULL;
      
        +	struct dirent dirent, *result = nullptr;
      
         	DIR *dirp = opendir(source_path.c_str());
      
         	if (!dirp) return;
      
    @@ -660,11 +660,11 @@ void CopyDir(const std::string &source_path, const std::string &dest_path)
  
         {
      
         	char *dir;
      
         	// Get the current working directory (getcwd uses malloc)
      
        -	if (!(dir = __getcwd(NULL, 0))) {
      
        +	if (!(dir = __getcwd(nullptr, 0))) {
      
         		ERROR_LOG(COMMON, "GetCurrentDirectory failed: %s",
      
         				GetLastErrorMsg());
      
        -		return NULL;
      
        +		return nullptr;
      
         	}
      
         	std::string strDir = dir;
      
         	free(dir);
      
    @@ -682,11 +682,11 @@ bool SetCurrentDir(const std::string &directory)
  
         	std::string abs = path;
      
         #ifdef _WIN32
      
         	TCHAR absbuf[MAX_PATH];
      
        -	if (_tfullpath(absbuf, UTF8ToTStr(path).c_str(), MAX_PATH) != NULL)
      
        +	if (_tfullpath(absbuf, UTF8ToTStr(path).c_str(), MAX_PATH) != nullptr)
      
         		abs = TStrToUTF8(absbuf);
      
         #else
      
         	char absbuf[PATH_MAX];
      
        -	if (realpath(path.c_str(), absbuf) != NULL)
      
        +	if (realpath(path.c_str(), absbuf) != nullptr)
      
         		abs = absbuf;
      
         #endif
      
         	return abs + ".xxx";
      
    @@ -715,7 +715,7 @@ bool SetCurrentDir(const std::string &directory)
  
         	if (DolphinPath.empty())
      
         	{
      
         		TCHAR Dolphin_exe_Path[2048];
      
        -		GetModuleFileName(NULL, Dolphin_exe_Path, 2048);
      
        +		GetModuleFileName(nullptr, Dolphin_exe_Path, 2048);
      
         		DolphinPath = TStrToUTF8(Dolphin_exe_Path);
      
         		DolphinPath = DolphinPath.substr(0, DolphinPath.find_last_of('\\'));
      
         	}
      
    @@ -767,14 +767,14 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new
  
         		HKEY hkey;
      
         		DWORD local = 0;
      
         		TCHAR configPath[MAX_PATH] = {0};
      
        -		if (RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Software\\Dolphin Emulator"), NULL, KEY_QUERY_VALUE, &hkey) == ERROR_SUCCESS)
      
        +		if (RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Software\\Dolphin Emulator"), 0, KEY_QUERY_VALUE, &hkey) == ERROR_SUCCESS)
      
         		{
      
         			DWORD size = 4;
      
        -			if (RegQueryValueEx(hkey, TEXT("LocalUserConfig"), NULL, NULL, reinterpret_cast<LPBYTE>(&local), &size) != ERROR_SUCCESS)
      
        +			if (RegQueryValueEx(hkey, TEXT("LocalUserConfig"), nullptr, nullptr, reinterpret_cast<LPBYTE>(&local), &size) != ERROR_SUCCESS)
      
         				local = 0;
      
         			size = MAX_PATH;
      
        -			if (RegQueryValueEx(hkey, TEXT("UserConfigPath"), NULL, NULL, (LPBYTE)configPath, &size) != ERROR_SUCCESS)
      
        +			if (RegQueryValueEx(hkey, TEXT("UserConfigPath"), nullptr, nullptr, (LPBYTE)configPath, &size) != ERROR_SUCCESS)
      
         				configPath[0] = 0;
      
         			RegCloseKey(hkey);
      
         		}
      
    @@ -783,7 +783,7 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new
  
         		// Get Program Files path in case we need it.
      
         		TCHAR my_documents[MAX_PATH];
      
        -		bool my_documents_found = SUCCEEDED(SHGetFolderPath(NULL, CSIDL_MYDOCUMENTS, NULL, SHGFP_TYPE_CURRENT, my_documents));
      
        +		bool my_documents_found = SUCCEEDED(SHGetFolderPath(nullptr, CSIDL_MYDOCUMENTS, nullptr, SHGFP_TYPE_CURRENT, my_documents));
      
         		if (local) // Case 1-2
      
         			paths[D_USER_IDX] = GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP;
      
    @@ -960,7 +960,7 @@ bool ReadFileToString(const char *filename, std::string &str)
  
         }
      
         IOFile::IOFile()
      
        -	: m_file(NULL), m_good(true)
      
        +	: m_file(nullptr), m_good(true)
      
         {}
      
         IOFile::IOFile(std::FILE* file)
      
    @@ -968,7 +968,7 @@ bool ReadFileToString(const char *filename, std::string &str)
  
         {}
      
         IOFile::IOFile(const std::string& filename, const char openmode[])
      
        -	: m_file(NULL), m_good(true)
      
        +	: m_file(nullptr), m_good(true)
      
         {
      
         	Open(filename, openmode);
      
         }
      
    @@ -979,7 +979,7 @@ bool ReadFileToString(const char *filename, std::string &str)
  
         }
      
         IOFile::IOFile(IOFile&& other)
      
        -	: m_file(NULL), m_good(true)
      
        +	: m_file(nullptr), m_good(true)
      
         {
      
         	Swap(other);
      
         }
      
    @@ -1014,14 +1014,14 @@ bool IOFile::Close()
  
         	if (!IsOpen() || 0 != std::fclose(m_file))
      
         		m_good = false;
      
        -	m_file = NULL;
      
        +	m_file = nullptr;
      
         	return m_good;
      
         }
      
         std::FILE* IOFile::ReleaseHandle()
      
         {
      
         	std::FILE* const ret = m_file;
      
        -	m_file = NULL;
      
        +	m_file = nullptr;
      
         	return ret;
      
         }

6  Source/Core/Common/FileUtil.h

show inline notes

View

              
    @@ -167,7 +167,7 @@ class IOFile : public NonCopyable
  
         	bool Close();
      
         	template <typename T>
      
        -	bool ReadArray(T* data, size_t length, size_t* pReadBytes = NULL)
      
        +	bool ReadArray(T* data, size_t length, size_t* pReadBytes = nullptr)
      
         	{
      
         		size_t read_bytes = 0;
      
         		if (!IsOpen() || length != (read_bytes = std::fread(data, sizeof(T), length, m_file)))
      
    @@ -198,11 +198,11 @@ class IOFile : public NonCopyable
  
         		return WriteArray(reinterpret_cast<const char*>(data), length);
      
         	}
      
        -	bool IsOpen() { return NULL != m_file; }
      
        +	bool IsOpen() { return nullptr != m_file; }
      
         	// m_good is set to false when a read, write or other function fails
      
         	bool IsGood() { return m_good; }
      
        -	operator void*() { return m_good ? m_file : NULL; }
      
        +	operator void*() { return m_good ? m_file : nullptr; }
      
         	std::FILE* ReleaseHandle();

6  Source/Core/Common/IniFile.cpp

show inline notes

View

              
    @@ -212,7 +212,7 @@ const IniFile::Section* IniFile::GetSection(const std::string& sectionName) cons
  
         	for (const Section& sect : sections)
      
         		if (!strcasecmp(sect.name.c_str(), sectionName.c_str()))
      
         			return (&(sect));
      
        -	return 0;
      
        +	return nullptr;
      
         }
      
         IniFile::Section* IniFile::GetSection(const std::string& sectionName)
      
    @@ -220,7 +220,7 @@ const IniFile::Section* IniFile::GetSection(const std::string& sectionName) cons
  
         	for (Section& sect : sections)
      
         		if (!strcasecmp(sect.name.c_str(), sectionName.c_str()))
      
         			return (&(sect));
      
        -	return 0;
      
        +	return nullptr;
      
         }
      
         IniFile::Section* IniFile::GetOrCreateSection(const std::string& sectionName)
      
    @@ -335,7 +335,7 @@ bool IniFile::Load(const std::string& filename, bool keep_current_data)
  
         	if (in.fail()) return false;
      
        -	Section* current_section = NULL;
      
        +	Section* current_section = nullptr;
      
         	while (!in.eof())
      
         	{
      
         		char templine[MAX_BYTES];

2  Source/Core/Common/LinearDiskCache.h

show inline notes

View

              
    @@ -70,7 +70,7 @@ class LinearDiskCache
  
         			// good header, read some key/value pairs
      
         			K key;
      
        -			V *value = NULL;
      
        +			V *value = nullptr;
      
         			u32 value_size;
      
         			u32 entry_number;

4  Source/Core/Common/LogManager.cpp

show inline notes

View

              
    @@ -30,7 +30,7 @@ void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type,
  
         	va_end(args);
      
         }
      
        -LogManager *LogManager::m_logManager = NULL;
      
        +LogManager *LogManager::m_logManager = nullptr;
      
         LogManager::LogManager()
      
         {
      
    @@ -145,7 +145,7 @@ void LogManager::Init()
  
         void LogManager::Shutdown()
      
         {
      
         	delete m_logManager;
      
        -	m_logManager = NULL;
      
        +	m_logManager = nullptr;
      
         }
      
         LogContainer::LogContainer(const char* shortName, const char* fullName, bool enable)

4  Source/Core/Common/LogManager.h

show inline notes

View

              
    @@ -29,7 +29,7 @@ class FileLogListener : public LogListener
  
         public:
      
         	FileLogListener(const char *filename);
      
        -	void Log(LogTypes::LOG_LEVELS, const char *msg);
      
        +	void Log(LogTypes::LOG_LEVELS, const char *msg) override;
      
         	bool IsValid() { return !m_logfile.fail(); }
      
         	bool IsEnabled() const { return m_enable; }
      
    @@ -46,7 +46,7 @@ class FileLogListener : public LogListener
  
         class DebuggerLogListener : public LogListener
      
         {
      
         public:
      
        -	void Log(LogTypes::LOG_LEVELS, const char *msg);
      
        +	void Log(LogTypes::LOG_LEVELS, const char *msg) override;
      
         };
      
         class LogContainer

12  Source/Core/Common/MemArena.cpp

show inline notes

View

              
    @@ -52,7 +52,7 @@ int AshmemCreateFileMapping(const char *name, size_t size)
  
         void MemArena::GrabLowMemSpace(size_t size)
      
         {
      
         #ifdef _WIN32
      
        -	hMemoryMapping = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, (DWORD)(size), NULL);
      
        +	hMemoryMapping = CreateFileMapping(INVALID_HANDLE_VALUE, nullptr, PAGE_READWRITE, 0, (DWORD)(size), nullptr);
      
         #elif defined(ANDROID)
      
         	fd = AshmemCreateFileMapping("Dolphin-emu", size);
      
         	if (fd < 0)
      
    @@ -190,9 +190,9 @@ static bool Memory_TryBase(u8 *base, const MemoryView *views, int num_views, u32
  
         	for (int i = 0; i < num_views; i++)
      
         	{
      
         		if (views[i].out_ptr_low)
      
        -			*views[i].out_ptr_low = 0;
      
        +			*views[i].out_ptr_low = nullptr;
      
         		if (views[i].out_ptr)
      
        -			*views[i].out_ptr = 0;
      
        +			*views[i].out_ptr = nullptr;
      
         	}
      
         	int i;
      
    @@ -255,13 +255,13 @@ u8 *MemoryMap_Setup(const MemoryView *views, int num_views, u32 flags, MemArena
  
         	{
      
         		PanicAlert("MemoryMap_Setup: Failed finding a memory base.");
      
         		exit(0);
      
        -		return 0;
      
        +		return nullptr;
      
         	}
      
         #else
      
         #ifdef _WIN32
      
         	// Try a whole range of possible bases. Return once we got a valid one.
      
         	u32 max_base_addr = 0x7FFF0000 - 0x31000000;
      
        -	u8 *base = NULL;
      
        +	u8 *base = nullptr;
      
         	for (u32 base_addr = 0x40000; base_addr < max_base_addr; base_addr += 0x40000)
      
         	{
      
    @@ -304,7 +304,7 @@ void MemoryMap_Shutdown(const MemoryView *views, int num_views, u32 flags, MemAr
  
         			{
      
         				arena->ReleaseView(*outptr, view->size);
      
         				freeset.insert(*outptr);
      
        -				*outptr = NULL;
      
        +				*outptr = nullptr;
      
         			}
      
         		}
      
         	}

16  Source/Core/Common/MemoryUtil.cpp

show inline notes

View

              
    @@ -31,7 +31,7 @@ void* AllocateExecutableMemory(size_t size, bool low)
  
         #if defined(_WIN32)
      
         	void* ptr = VirtualAlloc(0, size, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
      
         #else
      
        -	static char *map_hint = 0;
      
        +	static char *map_hint = nullptr;
      
         #if defined(__x86_64__) && !defined(MAP_32BIT)
      
         	// This OS has no flag to enforce allocation below the 4 GB boundary,
      
         	// but if we hint that we want a low address it is very likely we will
      
    @@ -56,9 +56,9 @@ void* AllocateExecutableMemory(size_t size, bool low)
  
         #if defined(__FreeBSD__)
      
         	if (ptr == MAP_FAILED)
      
         	{
      
        -		ptr = NULL;
      
        +		ptr = nullptr;
      
         #else
      
        -	if (ptr == NULL)
      
        +	if (ptr == nullptr)
      
         	{
      
         #endif
      
         		PanicAlert("Failed to allocate executable memory");
      
    @@ -88,14 +88,14 @@ void* AllocateMemoryPages(size_t size)
  
         #ifdef _WIN32
      
         	void* ptr = VirtualAlloc(0, size, MEM_COMMIT, PAGE_READWRITE);
      
         #else
      
        -	void* ptr = mmap(0, size, PROT_READ | PROT_WRITE,
      
        +	void* ptr = mmap(nullptr, size, PROT_READ | PROT_WRITE,
      
         			MAP_ANON | MAP_PRIVATE, -1, 0);
      
         #endif
      
         	// printf("Mapped memory at %p (size %ld)\n", ptr,
      
         	//	(unsigned long)size);
      
        -	if (ptr == NULL)
      
        +	if (ptr == nullptr)
      
         		PanicAlert("Failed to allocate raw memory");
      
         	return ptr;
      
    @@ -106,7 +106,7 @@ void* AllocateAlignedMemory(size_t size,size_t alignment)
  
         #ifdef _WIN32
      
         	void* ptr =  _aligned_malloc(size,alignment);
      
         #else
      
        -	void* ptr = NULL;
      
        +	void* ptr = nullptr;
      
         #ifdef ANDROID
      
         	ptr = memalign(alignment, size);
      
         #else
      
    @@ -118,7 +118,7 @@ void* AllocateAlignedMemory(size_t size,size_t alignment)
  
         	// printf("Mapped memory at %p (size %ld)\n", ptr,
      
         	//	(unsigned long)size);
      
        -	if (ptr == NULL)
      
        +	if (ptr == nullptr)
      
         		PanicAlert("Failed to allocate aligned memory");
      
         	return ptr;
      
    @@ -185,7 +185,7 @@ void UnWriteProtectMemory(void* ptr, size_t size, bool allowExecute)
  
         	// Print information about the memory usage of the process.
      
         	hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, processID);
      
        -	if (NULL == hProcess) return "MemUsage Error";
      
        +	if (nullptr == hProcess) return "MemUsage Error";
      
         	if (GetProcessMemoryInfo(hProcess, &pmc, sizeof(pmc)))
      
         		Ret = StringFromFormat("%s K", ThousandSeparate(pmc.WorkingSetSize / 1024, 7).c_str());

4  Source/Core/Common/Misc.cpp

show inline notes

View

              
    @@ -21,9 +21,9 @@ const char* GetLastErrorMsg()
  
         #ifdef _WIN32
      
         	static __declspec(thread) char err_str[buff_size] = {};
      
        -	FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(),
      
        +	FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, nullptr, GetLastError(),
      
         		MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
      
        -		err_str, buff_size, NULL);
      
        +		err_str, buff_size, nullptr);
      
         #else
      
         	static __thread char err_str[buff_size] = {};

4  Source/Core/Common/StdConditionVariable.h

show inline notes

View

              
    @@ -72,9 +72,9 @@ class condition_variable
  
         #if defined(_WIN32) && defined(USE_CONDITION_VARIABLES)
      
         		InitializeConditionVariable(&m_handle);
      
         #elif defined(_WIN32)
      
        -		m_handle = CreateEvent(NULL, false, false, NULL);
      
        +		m_handle = CreateEvent(nullptr, false, false, nullptr);
      
         #else
      
        -		pthread_cond_init(&m_handle, NULL);
      
        +		pthread_cond_init(&m_handle, nullptr);
      
         #endif
      
         	}

10  Source/Core/Common/StdMutex.h

show inline notes

View

              
    @@ -143,7 +143,7 @@ class mutex
  
         #ifdef _WIN32
      
         		InitializeSRWLock(&m_handle);
      
         #else
      
        -		pthread_mutex_init(&m_handle, NULL);
      
        +		pthread_mutex_init(&m_handle, nullptr);
      
         #endif
      
         	}
      
    @@ -238,7 +238,7 @@ class unique_lock
  
         	typedef Mutex mutex_type;
      
         	unique_lock()
      
        -		: pm(NULL), owns(false)
      
        +		: pm(nullptr), owns(false)
      
         	{}
      
         	/*explicit*/ unique_lock(mutex_type& m)
      
    @@ -290,11 +290,11 @@ class unique_lock
  
         	unique_lock(const unique_lock&) /*= delete*/;
      
         	unique_lock(unique_lock&& other)
      
        -		: pm(NULL), owns(false)
      
        +		: pm(nullptr), owns(false)
      
         	{
      
         #else
      
         	unique_lock(const unique_lock& u)
      
        -		: pm(NULL), owns(false)
      
        +		: pm(nullptr), owns(false)
      
         	{
      
         		// ugly const_cast to get around lack of rvalue references
      
         		unique_lock& other = const_cast<unique_lock&>(u);
      
    @@ -335,7 +335,7 @@ class unique_lock
  
         	{
      
         		auto const ret = mutex();
      
        -		pm = NULL;
      
        +		pm = nullptr;
      
         		owns = false;
      
         		return ret;

6  Source/Core/Common/StdThread.h

show inline notes

View

              
    @@ -193,7 +193,7 @@ class thread
  
         		WaitForSingleObject(m_handle, INFINITE);
      
         		detach();
      
         #else
      
        -		pthread_join(m_id.m_thread, NULL);
      
        +		pthread_join(m_id.m_thread, nullptr);
      
         		m_id = id();
      
         #endif
      
         	}
      
    @@ -238,9 +238,9 @@ class thread
  
         	void StartThread(F* param)
      
         	{
      
         #ifdef USE_BEGINTHREADEX
      
        -		m_handle = (HANDLE)_beginthreadex(NULL, 0, &RunAndDelete<F>, param, 0, &m_id.m_thread);
      
        +		m_handle = (HANDLE)_beginthreadex(nullptr, 0, &RunAndDelete<F>, param, 0, &m_id.m_thread);
      
         #elif defined(_WIN32)
      
        -		m_handle = CreateThread(NULL, 0, &RunAndDelete<F>, param, 0, &m_id.m_thread);
      
        +		m_handle = CreateThread(nullptr, 0, &RunAndDelete<F>, param, 0, &m_id.m_thread);
      
         #else
      
         		pthread_attr_t attr;
      
         		pthread_attr_init(&attr);

8  Source/Core/Common/StringUtil.cpp

show inline notes

View

              
    @@ -28,7 +28,7 @@
  
         // faster than sscanf
      
         bool AsciiToHex(const char* _szValue, u32& result)
      
         {
      
        -	char *endptr = NULL;
      
        +	char *endptr = nullptr;
      
         	const u32 value = strtoul(_szValue, &endptr, 16);
      
         	if (!endptr || *endptr)
      
    @@ -66,7 +66,7 @@ bool CharArrayFromFormatV(char* out, int outsize, const char* format, va_list ar
  
         	// will be present in the middle of a multibyte sequence.
      
         	//
      
         	// This is why we lookup an ANSI (cp1252) locale here and use _vsnprintf_l.
      
        -	static locale_t c_locale = NULL;
      
        +	static locale_t c_locale = nullptr;
      
         	if (!c_locale)
      
         		c_locale = _create_locale(LC_ALL, ".1252");
      
         	writtenCount = _vsnprintf_l(out, outsize, format, c_locale, args);
      
    @@ -89,7 +89,7 @@ bool CharArrayFromFormatV(char* out, int outsize, const char* format, va_list ar
  
         std::string StringFromFormat(const char* format, ...)
      
         {
      
         	va_list args;
      
        -	char *buf = NULL;
      
        +	char *buf = nullptr;
      
         #ifdef _WIN32
      
         	int required = 0;
      
    @@ -159,7 +159,7 @@ bool CharArrayFromFormatV(char* out, int outsize, const char* format, va_list ar
  
         bool TryParse(const std::string &str, u32 *const output)
      
         {
      
        -	char *endptr = NULL;
      
        +	char *endptr = nullptr;
      
         	// Reset errno to a value other than ERANGE
      
         	errno = 0;

12  Source/Core/Common/SymbolDB.cpp

show inline notes

View

              
    @@ -12,15 +12,15 @@
  
         void SymbolDB::List()
      
         {
      
        -	for (XFuncMap::iterator iter = functions.begin(); iter != functions.end(); ++iter)
      
        +	for (const auto& func : functions)
      
         	{
      
         		DEBUG_LOG(OSHLE, "%s @ %08x: %i bytes (hash %08x) : %i calls",
      
        -			iter->second.name.c_str(), iter->second.address,
      
        -			iter->second.size, iter->second.hash,
      
        -			iter->second.numCalls);
      
        +		          func.second.name.c_str(), func.second.address,
      
        +		          func.second.size, func.second.hash,
      
        +		          func.second.numCalls);
      
         	}
      
         	INFO_LOG(OSHLE, "%lu functions known in this program above.",
      
        -		(unsigned long)functions.size());
      
        +	         (unsigned long)functions.size());
      
         }
      
         void SymbolDB::Clear(const char *prefix)
      
    @@ -46,7 +46,7 @@ Symbol *SymbolDB::GetSymbolFromName(const char *name)
  
         		if (!strcmp(func.second.name.c_str(), name))
      
         			return &func.second;
      
         	}
      
        -	return 0;
      
        +	return nullptr;
      
         }
      
         void SymbolDB::AddCompleteSymbol(const Symbol &symbol)

6  Source/Core/Common/SymbolDB.h

show inline notes

View

              
    @@ -79,8 +79,8 @@ class SymbolDB
  
         public:
      
         	SymbolDB() {}
      
         	virtual ~SymbolDB() {}
      
        -	virtual Symbol *GetSymbolFromAddr(u32 addr) { return 0; }
      
        -	virtual Symbol *AddFunction(u32 startAddr) { return 0;}
      
        +	virtual Symbol *GetSymbolFromAddr(u32 addr) { return nullptr; }
      
        +	virtual Symbol *AddFunction(u32 startAddr) { return nullptr;}
      
         	void AddCompleteSymbol(const Symbol &symbol);
      
    @@ -90,7 +90,7 @@ class SymbolDB
  
         		if (iter != checksumToFunction.end())
      
         			return iter->second;
      
         		else
      
        -			return 0;
      
        +			return nullptr;
      
         	}
      
         	const XFuncMap &Symbols() const {return functions;}

6  Source/Core/Common/Timer.cpp

show inline notes

View

              
    @@ -27,7 +27,7 @@ u32 Timer::GetTimeMs()
  
         	return timeGetTime();
      
         #else
      
         	struct timeval t;
      
        -	(void)gettimeofday(&t, NULL);
      
        +	(void)gettimeofday(&t, nullptr);
      
         	return ((u32)(t.tv_sec * 1000 + t.tv_usec / 1000));
      
         #endif
      
         }
      
    @@ -184,7 +184,7 @@ u64 Timer::GetLocalTimeSinceJan1970()
  
         	return StringFromFormat("%s:%03i", tmp, tp.millitm);
      
         #else
      
         	struct timeval t;
      
        -	(void)gettimeofday(&t, NULL);
      
        +	(void)gettimeofday(&t, nullptr);
      
         	return StringFromFormat("%s:%03d", tmp, (int)(t.tv_usec / 1000));
      
         #endif
      
         }
      
    @@ -198,7 +198,7 @@ double Timer::GetDoubleTime()
  
         	(void)::ftime(&tp);
      
         #else
      
         	struct timeval t;
      
        -	(void)gettimeofday(&t, NULL);
      
        +	(void)gettimeofday(&t, nullptr);
      
         #endif
      
         	// Get continuous timestamp
      
         	u64 TmpSeconds = Common::Timer::GetTimeSinceJan1970();

6  Source/Core/Common/x64Emitter.h

show inline notes

View

              
    @@ -265,7 +265,7 @@ class XEmitter
  
         	inline void Write64(u64 value) {*(u64*)code = (value); code += 8;}
      
         public:
      
        -	XEmitter() { code = NULL; }
      
        +	XEmitter() { code = nullptr; }
      
         	XEmitter(u8 *code_ptr) { code = code_ptr; }
      
         	virtual ~XEmitter() {}
      
    @@ -773,7 +773,7 @@ class XCodeBlock : public XEmitter
  
         	size_t region_size;
      
         public:
      
        -	XCodeBlock() : region(NULL), region_size(0) {}
      
        +	XCodeBlock() : region(nullptr), region_size(0) {}
      
         	virtual ~XCodeBlock() { if (region) FreeCodeSpace(); }
      
         	// Call this before you generate any code.
      
    @@ -797,7 +797,7 @@ class XCodeBlock : public XEmitter
  
         	void FreeCodeSpace()
      
         	{
      
         		FreeMemoryPages(region, region_size);
      
        -		region = NULL;
      
        +		region = nullptr;
      
         		region_size = 0;
      
         	}

2  Source/Core/Core/ActionReplay.cpp

show inline notes

View

              
    @@ -72,7 +72,7 @@ enum
  
         };
      
         // pointer to the code currently being run, (used by log messages that include the code name)
      
        -static ARCode const* current_code = NULL;
      
        +static ARCode const* current_code = nullptr;
      
         static bool b_RanOnce = false;
      
         static std::vector<ARCode> arCodes;

2  Source/Core/Core/ArmMemTools.cpp

show inline notes

View

              
    @@ -81,6 +81,6 @@ void InstallExceptionHandler()
  
         	sa.sa_sigaction = &sigsegv_handler;
      
         	sa.sa_flags = SA_SIGINFO;
      
         	sigemptyset(&sa.sa_mask);
      
        -	sigaction(SIGSEGV, &sa, NULL);
      
        +	sigaction(SIGSEGV, &sa, nullptr);
      
         }
      
         }  // namespace

4  Source/Core/Core/Boot/Boot.cpp

show inline notes

View

              
    @@ -125,7 +125,7 @@ bool CBoot::FindMapFile(std::string* existing_map_file,
  
         bool CBoot::LoadMapFromFilename()
      
         {
      
         	std::string strMapFilename;
      
        -	bool found = FindMapFile(&strMapFilename, NULL);
      
        +	bool found = FindMapFile(&strMapFilename, nullptr);
      
         	if (found && g_symbolDB.LoadMap(strMapFilename.c_str()))
      
         	{
      
         		UpdateDebugger_MapLoaded();
      
    @@ -201,7 +201,7 @@ bool CBoot::BootUp()
  
         	case SCoreStartupParameter::BOOT_ISO:
      
         	{
      
         		DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(_StartupPara.m_strFilename);
      
        -		if (pVolume == NULL)
      
        +		if (pVolume == nullptr)
      
         			break;
      
         		bool isoWii = DiscIO::IsVolumeWiiDisc(pVolume);

6  Source/Core/Core/Boot/Boot.h

show inline notes

View

              
    @@ -30,10 +30,10 @@ class CBoot
  
         	// Tries to find a map file for the current game by looking first in the
      
         	// local user directory, then in the shared user directory.
      
         	//
      
        -	// If existing_map_file is not NULL and a map file exists, it is set to the
      
        +	// If existing_map_file is not nullptr and a map file exists, it is set to the
      
         	// path to the existing map file.
      
         	//
      
        -	// If writable_map_file is not NULL, it is set to the path to where a map
      
        +	// If writable_map_file is not nullptr, it is set to the path to where a map
      
         	// file should be saved.
      
         	//
      
         	// Returns true if a map file exists, false if none could be found.
      
    @@ -43,7 +43,7 @@ class CBoot
  
         private:
      
         	static void RunFunction(u32 _iAddr);
      
        -	static void UpdateDebugger_MapLoaded(const char* _gameID = NULL);
      
        +	static void UpdateDebugger_MapLoaded(const char* _gameID = nullptr);
      
         	static bool LoadMapFromFilename();
      
         	static bool Boot_ELF(const char *filename);

8  Source/Core/Core/Boot/Boot_DOL.cpp

show inline notes

View

              
    @@ -34,13 +34,13 @@
  
         	for (auto& sect : text_section)
      
         	{
      
         		delete [] sect;
      
        -		sect = NULL;
      
        +		sect = nullptr;
      
         	}
      
         	for (auto& sect : data_section)
      
         	{
      
         		delete [] sect;
      
        -		sect = NULL;
      
        +		sect = nullptr;
      
         	}
      
         }
      
    @@ -54,9 +54,9 @@ void CDolLoader::Initialize(u8* _pBuffer, u32 _Size)
  
         		p[i] = Common::swap32(p[i]);
      
         	for (auto& sect : text_section)
      
        -		sect = NULL;
      
        +		sect = nullptr;
      
         	for (auto& sect : data_section)
      
        -		sect = NULL;
      
        +		sect = nullptr;
      
         	u32 HID4_pattern = 0x7c13fba6;
      
         	u32 HID4_mask = 0xfc1fffff;

4  Source/Core/Core/Boot/Boot_WiiWAD.cpp

show inline notes

View

              
    @@ -90,7 +90,7 @@ bool CBoot::Boot_WiiWAD(const char* _pFilename)
  
         	// DOL
      
         	const DiscIO::SNANDContent* pContent = ContentLoader.GetContentByIndex(ContentLoader.GetBootIndex());
      
        -	if (pContent == NULL)
      
        +	if (pContent == nullptr)
      
         		return false;
      
         	WII_IPC_HLE_Interface::SetDefaultContentFile(_pFilename);
      
    @@ -119,7 +119,7 @@ bool CBoot::Boot_WiiWAD(const char* _pFilename)
  
         	// Load patches and run startup patches
      
         	const DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(_pFilename);
      
        -	if (pVolume != NULL)
      
        +	if (pVolume != nullptr)
      
         		PatchEngine::LoadPatches();
      
         	return true;

6  Source/Core/Core/Boot/ElfReader.cpp

show inline notes

View

              
    @@ -82,7 +82,7 @@ static void byteswapSection(Elf32_Shdr &sec)
  
         const char *ElfReader::GetSectionName(int section) const
      
         {
      
         	if (sections[section].sh_type == SHT_NULL)
      
        -		return NULL;
      
        +		return nullptr;
      
         	int nameOffset = sections[section].sh_name;
      
         	char *ptr = (char*)GetSectionDataPtr(header->e_shstrndx);
      
    @@ -90,7 +90,7 @@ const char *ElfReader::GetSectionName(int section) const
  
         	if (ptr)
      
         		return ptr + nameOffset;
      
         	else
      
        -		return NULL;
      
        +		return nullptr;
      
         }
      
         bool ElfReader::LoadInto(u32 vaddr)
      
    @@ -181,7 +181,7 @@ SectionID ElfReader::GetSectionByName(const char *name, int firstSection) const
  
         	{
      
         		const char *secname = GetSectionName(i);
      
        -		if (secname != NULL && strcmp(name, secname) == 0)
      
        +		if (secname != nullptr && strcmp(name, secname) == 0)
      
         			return i;
      
         	}
      
         	return -1;

4  Source/Core/Core/Boot/ElfReader.h

show inline notes

View

              
    @@ -51,11 +51,11 @@ class ElfReader
  
         	const u8 *GetSectionDataPtr(int section) const
      
         	{
      
         		if (section < 0 || section >= header->e_shnum)
      
        -			return 0;
      
        +			return nullptr;
      
         		if (sections[section].sh_type != SHT_NOBITS)
      
         			return GetPtr(sections[section].sh_offset);
      
         		else
      
        -			return 0;
      
        +			return nullptr;
      
         	}
      
         	bool IsCodeSection(int section) const
      
         	{

2  Source/Core/Core/ConfigManager.cpp

show inline notes

View

              
    @@ -125,7 +125,7 @@ void SConfig::Init()
  
         void SConfig::Shutdown()
      
         {
      
         	delete m_Instance;
      
        -	m_Instance = NULL;
      
        +	m_Instance = nullptr;
      
         }
      
         SConfig::~SConfig()

2  Source/Core/Core/Core.cpp

show inline notes

View

              
    @@ -79,7 +79,7 @@
  
         bool g_bStopping = false;
      
         bool g_bHwInit = false;
      
         bool g_bStarted = false;
      
        -void *g_pWindowHandle = NULL;
      
        +void *g_pWindowHandle = nullptr;
      
         std::string g_stateFileName;
      
         std::thread g_EmuThread;

8  Source/Core/Core/CoreParameter.cpp

show inline notes

View

              
    @@ -21,7 +21,7 @@
  
         #include "DiscIO/VolumeCreator.h"
      
         SCoreStartupParameter::SCoreStartupParameter()
      
        -: hInstance(0),
      
        +: hInstance(nullptr),
      
           bEnableDebugging(false), bAutomaticStart(false), bBootToPause(false),
      
           bJITNoBlockCache(false), bJITBlockLinking(true),
      
           bJITOff(false),
      
    @@ -125,7 +125,7 @@ bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2)
  
         			}
      
         			std::string Extension;
      
        -			SplitPath(m_strFilename, NULL, NULL, &Extension);
      
        +			SplitPath(m_strFilename, nullptr, nullptr, &Extension);
      
         			if (!strcasecmp(Extension.c_str(), ".gcm") ||
      
         				!strcasecmp(Extension.c_str(), ".iso") ||
      
         				!strcasecmp(Extension.c_str(), ".wbfs") ||
      
    @@ -135,7 +135,7 @@ bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2)
  
         			{
      
         				m_BootType = BOOT_ISO;
      
         				DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(m_strFilename);
      
        -				if (pVolume == NULL)
      
        +				if (pVolume == nullptr)
      
         				{
      
         					if (bootDrive)
      
         						PanicAlertT("Could not read \"%s\".  "
      
    @@ -223,7 +223,7 @@ bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2)
  
         				const DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(m_strFilename);
      
         				const DiscIO::INANDContentLoader& ContentLoader = DiscIO::CNANDContentManager::Access().GetNANDLoader(m_strFilename);
      
        -				if (ContentLoader.GetContentByIndex(ContentLoader.GetBootIndex()) == NULL)
      
        +				if (ContentLoader.GetContentByIndex(ContentLoader.GetBootIndex()) == nullptr)
      
         				{
      
         					//WAD is valid yet cannot be booted. Install instead.
      
         					u64 installed = DiscIO::CNANDContentManager::Access().Install_WiiWAD(m_strFilename);

6  Source/Core/Core/CoreTiming.cpp

show inline notes

View

              
    @@ -43,7 +43,7 @@ struct BaseEvent
  
         Common::FifoQueue<BaseEvent, false> tsQueue;
      
         // event pools
      
        -Event *eventPool = 0;
      
        +Event *eventPool = nullptr;
      
         int downcount, slicelength;
      
         int maxSliceLength = MAX_SLICE_LENGTH;
      
    @@ -59,7 +59,7 @@ struct BaseEvent
  
         int ev_lost;
      
        -void (*advanceCallback)(int cyclesExecuted) = NULL;
      
        +void (*advanceCallback)(int cyclesExecuted) = nullptr;
      
         Event* GetNewEvent()
      
         {
      
    @@ -236,7 +236,7 @@ void ClearPendingEvents()
  
         void AddEventToQueue(Event* ne)
      
         {
      
        -	Event* prev = NULL;
      
        +	Event* prev = nullptr;
      
         	Event** pNext = &first;
      
         	for(;;)
      
         	{

50  Source/Core/Core/DSP/DSPAssembler.cpp

show inline notes

View

              
    @@ -79,7 +79,7 @@
  
         };
      
         DSPAssembler::DSPAssembler(const AssemblerSettings &settings) :
      
        -	gdg_buffer(NULL),
      
        +	gdg_buffer(nullptr),
      
         	m_cur_addr(0),
      
         	m_cur_pass(0),
      
         	m_current_param(0),
      
    @@ -127,7 +127,7 @@ bool DSPAssembler::Assemble(const char *text, std::vector<u16> &code, std::vecto
  
         	if(gdg_buffer) {
      
         		free(gdg_buffer);
      
        -		gdg_buffer = NULL;
      
        +		gdg_buffer = nullptr;
      
         	}
      
         	last_error_str = "(no errors)";
      
    @@ -310,7 +310,7 @@ char *DSPAssembler::FindBrackets(char *src, char *dst)
  
         	}
      
         	if (count)
      
         		ShowError(ERR_NO_MATCHING_BRACKETS);
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
         // Bizarre in-place expression evaluator.
      
    @@ -323,7 +323,7 @@ u32 DSPAssembler::ParseExpression(const char *ptr)
  
         	char *s_buffer = (char *)malloc(1024);
      
         	strcpy(s_buffer, ptr);
      
        -	while ((pbuf = FindBrackets(s_buffer, d_buffer)) != NULL)
      
        +	while ((pbuf = FindBrackets(s_buffer, d_buffer)) != nullptr)
      
         	{
      
         		val = ParseExpression(d_buffer);
      
         		sprintf(d_buffer, "%s%d%s", s_buffer, val, pbuf);
      
    @@ -359,14 +359,14 @@ u32 DSPAssembler::ParseExpression(const char *ptr)
  
         		d_buffer[i] = c;
      
         	}
      
        -	while ((pbuf = strstr(d_buffer, "+")) != NULL)
      
        +	while ((pbuf = strstr(d_buffer, "+")) != nullptr)
      
         	{
      
         		*pbuf = 0x0;
      
         		val = ParseExpression(d_buffer) + ParseExpression(pbuf+1);
      
         		sprintf(d_buffer, "%d", val);
      
         	}
      
        -	while ((pbuf = strstr(d_buffer, "-")) != NULL)
      
        +	while ((pbuf = strstr(d_buffer, "-")) != nullptr)
      
         	{
      
         		*pbuf = 0x0;
      
         		val = ParseExpression(d_buffer) - ParseExpression(pbuf+1);
      
    @@ -378,28 +378,28 @@ u32 DSPAssembler::ParseExpression(const char *ptr)
  
         		sprintf(d_buffer, "%d", val);
      
         	}
      
        -	while ((pbuf = strstr(d_buffer, "*")) != NULL)
      
        +	while ((pbuf = strstr(d_buffer, "*")) != nullptr)
      
         	{
      
         		*pbuf = 0x0;
      
         		val = ParseExpression(d_buffer) * ParseExpression(pbuf+1);
      
         		sprintf(d_buffer, "%d", val);
      
         	}
      
        -	while ((pbuf = strstr(d_buffer, "/")) != NULL)
      
        +	while ((pbuf = strstr(d_buffer, "/")) != nullptr)
      
         	{
      
         		*pbuf = 0x0;
      
         		val = ParseExpression(d_buffer) / ParseExpression(pbuf+1);
      
         		sprintf(d_buffer, "%d", val);
      
         	}
      
        -	while ((pbuf = strstr(d_buffer, "|")) != NULL)
      
        +	while ((pbuf = strstr(d_buffer, "|")) != nullptr)
      
         	{
      
         		*pbuf = 0x0;
      
         		val = ParseExpression(d_buffer) | ParseExpression(pbuf+1);
      
         		sprintf(d_buffer, "%d", val);
      
         	}
      
        -	while ((pbuf = strstr(d_buffer, "&")) != NULL)
      
        +	while ((pbuf = strstr(d_buffer, "&")) != nullptr)
      
         	{
      
         		*pbuf = 0x0;
      
         		val = ParseExpression(d_buffer) & ParseExpression(pbuf+1);
      
    @@ -420,7 +420,7 @@ u32 DSPAssembler::GetParams(char *parstr, param_t *par)
  
         	tmpstr = strtok(tmpstr, ",\x00");
      
         	for (int i = 0; i < 10; i++)
      
         	{
      
        -		if (tmpstr == NULL)
      
        +		if (tmpstr == nullptr)
      
         			break;
      
         		tmpstr = skip_spaces(tmpstr);
      
         		if (strlen(tmpstr) == 0)
      
    @@ -463,7 +463,7 @@ u32 DSPAssembler::GetParams(char *parstr, param_t *par)
  
         			par[i].type = P_VAL;
      
         			break;
      
         		}
      
        -		tmpstr = strtok(NULL, ",\x00");
      
        +		tmpstr = strtok(nullptr, ",\x00");
      
         	}
      
         	return count;
      
         }
      
    @@ -493,7 +493,7 @@ const opc_t *DSPAssembler::FindOpcode(const char *opcode, u32 par_count, const o
  
         		}
      
         	}
      
         	ShowError(ERR_UNKNOWN_OPCODE);
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
         // weird...
      
    @@ -780,8 +780,8 @@ bool DSPAssembler::AssembleFile(const char *fname, int pass)
  
         		//printf("A: %s\n", line);
      
         		code_line++;
      
        -		param_t params[10] = {{0, P_NONE, NULL}};
      
        -		param_t params_ext[10] = {{0, P_NONE, NULL}};
      
        +		param_t params[10] = {{0, P_NONE, nullptr}};
      
        +		param_t params_ext[10] = {{0, P_NONE, nullptr}};
      
         		bool upper = true;
      
         		for (int i = 0; i < LINEBUF_SIZE; i++)
      
    @@ -851,33 +851,33 @@ bool DSPAssembler::AssembleFile(const char *fname, int pass)
  
         			}
      
         		}
      
        -		char *opcode = NULL;
      
        +		char *opcode = nullptr;
      
         		opcode = strtok(ptr, " ");
      
        -		char *opcode_ext = NULL;
      
        +		char *opcode_ext = nullptr;
      
         		u32 params_count = 0;
      
         		u32 params_count_ext = 0;
      
         		if (opcode)
      
         		{
      
        -			if ((opcode_ext = strstr(opcode, "'")) != NULL)
      
        +			if ((opcode_ext = strstr(opcode, "'")) != nullptr)
      
         			{
      
         				opcode_ext[0] = '\0';
      
         				opcode_ext++;
      
         				if (strlen(opcode_ext) == 0)
      
        -					opcode_ext = NULL;
      
        +					opcode_ext = nullptr;
      
         			}
      
         			// now we have opcode and label
      
         			params_count = 0;
      
         			params_count_ext = 0;
      
        -			char *paramstr = strtok(NULL, "\0");
      
        -			char *paramstr_ext = 0;
      
        +			char *paramstr = strtok(nullptr, "\0");
      
        +			char *paramstr_ext = nullptr;
      
         			// there is valid opcode so probably we have parameters
      
         			if (paramstr)
      
         			{
      
        -				if ((paramstr_ext = strstr(paramstr, ":")) != NULL)
      
        +				if ((paramstr_ext = strstr(paramstr, ":")) != nullptr)
      
         				{
      
         					paramstr_ext[0] = '\0';
      
         					paramstr_ext++;
      
    @@ -899,14 +899,14 @@ bool DSPAssembler::AssembleFile(const char *fname, int pass)
  
         				if (strcmp(opcode, "EQU") == 0)
      
         				{
      
         					lval = params[0].val;
      
        -					opcode = NULL;
      
        +					opcode = nullptr;
      
         				}
      
         			}
      
         			if (pass == 1)
      
         				labels.RegisterLabel(label, lval);
      
         		}
      
        -		if (opcode == NULL)
      
        +		if (opcode == nullptr)
      
         			continue;
      
         		// check if opcode is reserved compiler word
      
    @@ -981,7 +981,7 @@ bool DSPAssembler::AssembleFile(const char *fname, int pass)
  
         		VerifyParams(opc, params, params_count);
      
        -		const opc_t *opc_ext = NULL;
      
        +		const opc_t *opc_ext = nullptr;
      
         		// Check for opcode extensions.
      
         		if (opc->extended)
      
         		{

6  Source/Core/Core/DSP/DSPAssembler.h

show inline notes

View

              
    @@ -73,7 +73,7 @@ class DSPAssembler
  
         	// one for each word of code, indicating the source assembler code line number it came from.
      
         	// If returns false, call GetErrorString to get some text to present to the user.
      
        -	bool Assemble(const char *text, std::vector<u16> &code, std::vector<int> *line_numbers = NULL);
      
        +	bool Assemble(const char *text, std::vector<u16> &code, std::vector<int> *line_numbers = nullptr);
      
         	std::string GetErrorString() const { return last_error_str; }
      
         	err_t GetError() const { return last_error; }
      
    @@ -103,8 +103,8 @@ class DSPAssembler
  
         	void InitPass(int pass);
      
         	bool AssembleFile(const char *fname, int pass);
      
        -	void ShowError(err_t err_code, const char *extra_info = NULL);
      
        -	// void ShowWarning(err_t err_code, const char *extra_info = NULL);
      
        +	void ShowError(err_t err_code, const char *extra_info = nullptr);
      
        +	// void ShowWarning(err_t err_code, const char *extra_info = nullptr);
      
         	char *FindBrackets(char *src, char *dst);
      
         	const opc_t *FindOpcode(const char *opcode, u32 par_count, const opc_t * const opcod, int opcod_size);

4  Source/Core/Core/DSP/DSPCodeUtil.cpp

show inline notes

View

              
    @@ -114,7 +114,7 @@ void CodeToHeader(const std::vector<u16> &code, std::string _filename,
  
         	header.reserve(code_padded.size() * 4);
      
         	header.append("#define NUM_UCODES 1\n\n");
      
         	std::string filename;
      
        -	SplitPath(_filename, NULL, &filename, NULL);
      
        +	SplitPath(_filename, nullptr, &filename, nullptr);
      
         	header.append(StringFromFormat("const char* UCODE_NAMES[NUM_UCODES] = {\"%s\"};\n\n", filename.c_str()));
      
         	header.append("const unsigned short dsp_code[NUM_UCODES][0x1000] = {\n");
      
    @@ -151,7 +151,7 @@ void CodesToHeader(const std::vector<u16> *codes, const std::vector<std::string>
  
         	for (u32 i = 0; i < numCodes; i++)
      
         	{
      
         		std::string filename;
      
        -		if (! SplitPath(filenames->at(i), NULL, &filename, NULL))
      
        +		if (! SplitPath(filenames->at(i), nullptr, &filename, nullptr))
      
         			filename = filenames->at(i);
      
         		header.append(StringFromFormat("\t\"%s\",\n", filename.c_str()));
      
         	}

8  Source/Core/Core/DSP/DSPCore.cpp

show inline notes

View

              
    @@ -41,7 +41,7 @@
  
         DSPCoreState core_state = DSPCORE_STOP;
      
         u16 cyclesLeft = 0;
      
         bool init_hax = false;
      
        -DSPEmitter *dspjit = NULL;
      
        +DSPEmitter *dspjit = nullptr;
      
         Common::Event step_event;
      
         static bool LoadRom(const char *fname, int size_in_words, u16 *rom)
      
    @@ -133,7 +133,7 @@ static void DSPCore_FreeMemoryPages()
  
         	FreeMemoryPages(g_dsp.iram, DSP_IRAM_BYTE_SIZE);
      
         	FreeMemoryPages(g_dsp.dram, DSP_DRAM_BYTE_SIZE);
      
         	FreeMemoryPages(g_dsp.coef, DSP_COEF_BYTE_SIZE);
      
        -	g_dsp.irom = g_dsp.iram = g_dsp.dram = g_dsp.coef = NULL;
      
        +	g_dsp.irom = g_dsp.iram = g_dsp.dram = g_dsp.coef = nullptr;
      
         }
      
         bool DSPCore_Init(const char *irom_filename, const char *coef_filename,
      
    @@ -142,7 +142,7 @@ bool DSPCore_Init(const char *irom_filename, const char *coef_filename,
  
         	g_dsp.step_counter = 0;
      
         	cyclesLeft = 0;
      
         	init_hax = false;
      
        -	dspjit = NULL;
      
        +	dspjit = nullptr;
      
         	g_dsp.irom = (u16*)AllocateMemoryPages(DSP_IROM_BYTE_SIZE);
      
         	g_dsp.iram = (u16*)AllocateMemoryPages(DSP_IRAM_BYTE_SIZE);
      
    @@ -218,7 +218,7 @@ void DSPCore_Shutdown()
  
         	if(dspjit) {
      
         		delete dspjit;
      
        -		dspjit = NULL;
      
        +		dspjit = nullptr;
      
         	}
      
         	DSPCore_FreeMemoryPages();
      
         }

6  Source/Core/Core/DSP/DSPDisassembler.cpp

show inline notes

View

              
    @@ -208,8 +208,8 @@ bool DSPDisassembler::DisOpcode(const u16 *binbuf, int base_addr, int pass, u16
  
         	const u32 op1 = binbuf[*pc & 0x0fff];
      
        -	const DSPOPCTemplate *opc = NULL;
      
        -	const DSPOPCTemplate *opc_ext = NULL;
      
        +	const DSPOPCTemplate *opc = nullptr;
      
        +	const DSPOPCTemplate *opc_ext = nullptr;
      
         	// find opcode
      
         	for (int j = 0; j < opcodes_size; j++)
      
    @@ -222,7 +222,7 @@ bool DSPDisassembler::DisOpcode(const u16 *binbuf, int base_addr, int pass, u16
  
         			break;
      
         		}
      
         	}
      
        -	const DSPOPCTemplate fake_op = {"CW", 0x0000, 0x0000, nop, NULL, 1, 1, {{P_VAL, 2, 0, 0, 0xffff}}, false, false, false, false, false};
      
        +	const DSPOPCTemplate fake_op = {"CW", 0x0000, 0x0000, nop, nullptr, 1, 1, {{P_VAL, 2, 0, 0, 0xffff}}, false, false, false, false, false};
      
         	if (!opc)
      
         		opc = &fake_op;

10  Source/Core/Core/DSP/DSPEmitter.cpp

show inline notes

View

              
    @@ -18,7 +18,7 @@
  
         DSPEmitter::DSPEmitter() : gpr(*this), storeIndex(-1), storeIndex2(-1)
      
         {
      
        -	m_compiledCode = NULL;
      
        +	m_compiledCode = nullptr;
      
         	AllocCodeSpace(COMPILED_CODE_SIZE);
      
    @@ -37,7 +37,7 @@
  
         	for(int i = 0x0000; i < MAX_BLOCKS; i++)
      
         	{
      
         		blocks[i] = (DSPCompiledCode)stubEntryPoint;
      
        -		blockLinks[i] = 0;
      
        +		blockLinks[i] = nullptr;
      
         		blockSize[i] = 0;
      
         	}
      
         }
      
    @@ -55,7 +55,7 @@ void DSPEmitter::ClearIRAM()
  
         	for(int i = 0x0000; i < 0x1000; i++)
      
         	{
      
         		blocks[i] = (DSPCompiledCode)stubEntryPoint;
      
        -		blockLinks[i] = 0;
      
        +		blockLinks[i] = nullptr;
      
         		blockSize[i] = 0;
      
         		unresolvedJumps[i].clear();
      
         	}
      
    @@ -71,7 +71,7 @@ void DSPEmitter::ClearIRAMandDSPJITCodespaceReset()
  
         	for(int i = 0x0000; i < 0x10000; i++)
      
         	{
      
         		blocks[i] = (DSPCompiledCode)stubEntryPoint;
      
        -		blockLinks[i] = 0;
      
        +		blockLinks[i] = nullptr;
      
         		blockSize[i] = 0;
      
         		unresolvedJumps[i].clear();
      
         	}
      
    @@ -345,7 +345,7 @@ void DSPEmitter::Compile(u16 start_addr)
  
         				{
      
         					// Mark the block to be recompiled again
      
         					blocks[i] = (DSPCompiledCode)stubEntryPoint;
      
        -					blockLinks[i] = 0;
      
        +					blockLinks[i] = nullptr;
      
         					blockSize[i] = 0;
      
         				}
      
         			}

140  Source/Core/Core/DSP/DSPTables.cpp

show inline notes

View

              
    @@ -292,7 +292,7 @@ void nop(const UDSPInstruction opc)
  
         };
      
         const DSPOPCTemplate cw =
      
        -	{"CW",     0x0000, 0x0000, nop, NULL, 1, 1, {{P_VAL, 2, 0, 0, 0xffff}}, false, false, false, false, false};
      
        +	{"CW",     0x0000, 0x0000, nop, nullptr, 1, 1, {{P_VAL, 2, 0, 0, 0xffff}}, false, false, false, false, false};
      
         // extended opcodes
      
    @@ -353,43 +353,43 @@ void nop(const UDSPInstruction opc)
  
         	{0xffae, "COEF_A1_7", "COEF_A1_7",},
      
         	{0xffaf, "COEF_A2_7", "COEF_A2_7",},
      
        -	{0xffb0, "0xffb0", 0,},
      
        -	{0xffb1, "0xffb1", 0,},
      
        -	{0xffb2, "0xffb2", 0,},
      
        -	{0xffb3, "0xffb3", 0,},
      
        -	{0xffb4, "0xffb4", 0,},
      
        -	{0xffb5, "0xffb5", 0,},
      
        -	{0xffb6, "0xffb6", 0,},
      
        -	{0xffb7, "0xffb7", 0,},
      
        -	{0xffb8, "0xffb8", 0,},
      
        -	{0xffb9, "0xffb9", 0,},
      
        -	{0xffba, "0xffba", 0,},
      
        -	{0xffbb, "0xffbb", 0,},
      
        -	{0xffbc, "0xffbc", 0,},
      
        -	{0xffbd, "0xffbd", 0,},
      
        -	{0xffbe, "0xffbe", 0,},
      
        -	{0xffbf, "0xffbf", 0,},
      
        -
      
        -	{0xffc0, "0xffc0", 0,},
      
        -	{0xffc1, "0xffc1", 0,},
      
        -	{0xffc2, "0xffc2", 0,},
      
        -	{0xffc3, "0xffc3", 0,},
      
        -	{0xffc4, "0xffc4", 0,},
      
        -	{0xffc5, "0xffc5", 0,},
      
        -	{0xffc6, "0xffc6", 0,},
      
        -	{0xffc7, "0xffc7", 0,},
      
        -	{0xffc8, "0xffc8", 0,},
      
        +	{0xffb0, "0xffb0", nullptr,},
      
        +	{0xffb1, "0xffb1", nullptr,},
      
        +	{0xffb2, "0xffb2", nullptr,},
      
        +	{0xffb3, "0xffb3", nullptr,},
      
        +	{0xffb4, "0xffb4", nullptr,},
      
        +	{0xffb5, "0xffb5", nullptr,},
      
        +	{0xffb6, "0xffb6", nullptr,},
      
        +	{0xffb7, "0xffb7", nullptr,},
      
        +	{0xffb8, "0xffb8", nullptr,},
      
        +	{0xffb9, "0xffb9", nullptr,},
      
        +	{0xffba, "0xffba", nullptr,},
      
        +	{0xffbb, "0xffbb", nullptr,},
      
        +	{0xffbc, "0xffbc", nullptr,},
      
        +	{0xffbd, "0xffbd", nullptr,},
      
        +	{0xffbe, "0xffbe", nullptr,},
      
        +	{0xffbf, "0xffbf", nullptr,},
      
        +
      
        +	{0xffc0, "0xffc0", nullptr,},
      
        +	{0xffc1, "0xffc1", nullptr,},
      
        +	{0xffc2, "0xffc2", nullptr,},
      
        +	{0xffc3, "0xffc3", nullptr,},
      
        +	{0xffc4, "0xffc4", nullptr,},
      
        +	{0xffc5, "0xffc5", nullptr,},
      
        +	{0xffc6, "0xffc6", nullptr,},
      
        +	{0xffc7, "0xffc7", nullptr,},
      
        +	{0xffc8, "0xffc8", nullptr,},
      
         	{0xffc9, "DSCR", "DSP DMA Control Reg",},
      
        -	{0xffca, "0xffca", 0,},
      
        +	{0xffca, "0xffca", nullptr,},
      
         	{0xffcb, "DSBL", "DSP DMA Block Length",},
      
        -	{0xffcc, "0xffcc", 0,},
      
        +	{0xffcc, "0xffcc", nullptr,},
      
         	{0xffcd, "DSPA", "DSP DMA DMEM Address",},
      
         	{0xffce, "DSMAH", "DSP DMA Mem Address H",},
      
         	{0xffcf, "DSMAL", "DSP DMA Mem Address L",},
      
        -	{0xffd0, "0xffd0",0,},
      
        +	{0xffd0, "0xffd0",nullptr,},
      
         	{0xffd1, "SampleFormat", "SampleFormat",},
      
        -	{0xffd2, "0xffd2",0,},
      
        +	{0xffd2, "0xffd2",nullptr,},
      
         	{0xffd3, "UnkZelda", "Unk Zelda reads/writes from/to it",},
      
         	{0xffd4, "ACSAH", "Accelerator start address H",},
      
         	{0xffd5, "ACSAL", "Accelerator start address L",},
      
    @@ -402,36 +402,36 @@ void nop(const UDSPInstruction opc)
  
         	{0xffdc, "yn2", "yn2",},
      
         	{0xffdd, "ARAM", "Direct Read from ARAM (uses ADPCM)",},
      
         	{0xffde, "GAIN", "Gain",},
      
        -	{0xffdf, "0xffdf", 0,},
      
        -
      
        -	{0xffe0, "0xffe0",0,},
      
        -	{0xffe1, "0xffe1",0,},
      
        -	{0xffe2, "0xffe2",0,},
      
        -	{0xffe3, "0xffe3",0,},
      
        -	{0xffe4, "0xffe4",0,},
      
        -	{0xffe5, "0xffe5",0,},
      
        -	{0xffe6, "0xffe6",0,},
      
        -	{0xffe7, "0xffe7",0,},
      
        -	{0xffe8, "0xffe8",0,},
      
        -	{0xffe9, "0xffe9",0,},
      
        -	{0xffea, "0xffea",0,},
      
        -	{0xffeb, "0xffeb",0,},
      
        -	{0xffec, "0xffec",0,},
      
        -	{0xffed, "0xffed",0,},
      
        -	{0xffee, "0xffee",0,},
      
        +	{0xffdf, "0xffdf", nullptr,},
      
        +
      
        +	{0xffe0, "0xffe0",nullptr,},
      
        +	{0xffe1, "0xffe1",nullptr,},
      
        +	{0xffe2, "0xffe2",nullptr,},
      
        +	{0xffe3, "0xffe3",nullptr,},
      
        +	{0xffe4, "0xffe4",nullptr,},
      
        +	{0xffe5, "0xffe5",nullptr,},
      
        +	{0xffe6, "0xffe6",nullptr,},
      
        +	{0xffe7, "0xffe7",nullptr,},
      
        +	{0xffe8, "0xffe8",nullptr,},
      
        +	{0xffe9, "0xffe9",nullptr,},
      
        +	{0xffea, "0xffea",nullptr,},
      
        +	{0xffeb, "0xffeb",nullptr,},
      
        +	{0xffec, "0xffec",nullptr,},
      
        +	{0xffed, "0xffed",nullptr,},
      
        +	{0xffee, "0xffee",nullptr,},
      
         	{0xffef, "AMDM", "ARAM DMA Request Mask",},
      
        -	{0xfff0, "0xfff0",0,},
      
        -	{0xfff1, "0xfff1",0,},
      
        -	{0xfff2, "0xfff2",0,},
      
        -	{0xfff3, "0xfff3",0,},
      
        -	{0xfff4, "0xfff4",0,},
      
        -	{0xfff5, "0xfff5",0,},
      
        -	{0xfff6, "0xfff6",0,},
      
        -	{0xfff7, "0xfff7",0,},
      
        -	{0xfff8, "0xfff8",0,},
      
        -	{0xfff9, "0xfff9",0,},
      
        -	{0xfffa, "0xfffa",0,},
      
        +	{0xfff0, "0xfff0",nullptr,},
      
        +	{0xfff1, "0xfff1",nullptr,},
      
        +	{0xfff2, "0xfff2",nullptr,},
      
        +	{0xfff3, "0xfff3",nullptr,},
      
        +	{0xfff4, "0xfff4",nullptr,},
      
        +	{0xfff5, "0xfff5",nullptr,},
      
        +	{0xfff6, "0xfff6",nullptr,},
      
        +	{0xfff7, "0xfff7",nullptr,},
      
        +	{0xfff8, "0xfff8",nullptr,},
      
        +	{0xfff9, "0xfff9",nullptr,},
      
        +	{0xfffa, "0xfffa",nullptr,},
      
         	{0xfffb, "DIRQ", "DSP IRQ Request",},
      
         	{0xfffc, "DMBH", "DSP Mailbox H",},
      
         	{0xfffd, "DMBL", "DSP Mailbox L",},
      
    @@ -492,7 +492,7 @@ const char* pdname(u16 val)
  
         {
      
         	static char tmpstr[12]; // nasty
      
        -	for (auto& pdlabel : pdlabels)
      
        +	for (const pdlabel_t& pdlabel : pdlabels)
      
         	{
      
         		if (pdlabel.addr == val)
      
         			return pdlabel.name;
      
    @@ -527,31 +527,37 @@ void InitInstructionTable()
  
         	{
      
         		extOpTable[i] = &cw;
      
        -		for (auto& ext : opcodes_ext)
      
        +		for (const DSPOPCTemplate& ext : opcodes_ext)
      
         		{
      
         			u16 mask = ext.opcode_mask;
      
         			if ((mask & i) == ext.opcode)
      
         			{
      
         				if (extOpTable[i] == &cw)
      
        +				{
      
         					extOpTable[i] = &ext;
      
        +				}
      
         				else
      
         				{
      
         					//if the entry already in the table
      
         					//is a strict subset, allow it
      
         					if ((extOpTable[i]->opcode_mask | ext.opcode_mask) != extOpTable[i]->opcode_mask)
      
        +					{
      
         						ERROR_LOG(DSPLLE, "opcode ext table place %d already in use by %s when inserting %s", i, extOpTable[i]->name, ext.name);
      
        +					}
      
         				}
      
         			}
      
         		}
      
         	}
      
         	// op table
      
        -	for (int i = 0; i < OPTABLE_SIZE; i++)
      
        -		opTable[i] = &cw;
      
        +	for (const DSPOPCTemplate*& opcode : opTable)
      
        +	{
      
        +		opcode = &cw;
      
        +	}
      
         	for (int i = 0; i < OPTABLE_SIZE; i++)
      
         	{
      
        -		for (auto& opcode : opcodes)
      
        +		for (const DSPOPCTemplate& opcode : opcodes)
      
         		{
      
         			u16 mask = opcode.opcode_mask;
      
         			if ((mask & i) == opcode.opcode)
      
    @@ -564,6 +570,8 @@ void InitInstructionTable()
  
         		}
      
         	}
      
        -	for (int i=0; i < WRITEBACKLOGSIZE; i++)
      
        -		writeBackLogIdx[i] = -1;
      
        +	for (int& elem : writeBackLogIdx)
      
        +	{
      
        +		elem = -1;
      
        +	}
      
         }

2  Source/Core/Core/DSP/Jit/DSPJitBranch.cpp

show inline notes

View

              
    @@ -95,7 +95,7 @@ static void WriteBlockLink(DSPEmitter& emitter, u16 dest)
  
         	// Jump directly to the called block if it has already been compiled.
      
         	if (!(dest >= emitter.startAddr && dest <= emitter.compilePC))
      
         	{
      
        -		if (emitter.blockLinks[dest] != 0 )
      
        +		if (emitter.blockLinks[dest] != nullptr )
      
         		{
      
         			emitter.gpr.flushRegs();
      
         			// Check if we have enough cycles to execute the next block

16  Source/Core/Core/DSP/Jit/DSPJitRegCache.cpp

show inline notes

View

              
    @@ -71,7 +71,7 @@ static void *reg_ptr(int reg)
  
         #endif
      
         	default:
      
         		_assert_msg_(DSPLLE, 0, "cannot happen");
      
        -		return NULL;
      
        +		return nullptr;
      
         	}
      
         }
      
    @@ -81,7 +81,7 @@ static void *reg_ptr(int reg)
  
         DSPJitRegCache::DSPJitRegCache(DSPEmitter &_emitter)
      
         	: emitter(_emitter), temporary(false), merged(false)
      
         {
      
        -	for(auto& xreg : xregs)
      
        +	for (X64CachedReg& xreg : xregs)
      
         	{
      
         		xreg.guest_reg = DSP_REG_STATIC;
      
         		xreg.pushed = false;
      
    @@ -475,7 +475,7 @@ void DSPJitRegCache::pushRegs()
  
         	}
      
         	int push_count = 0;
      
        -	for(auto& xreg : xregs)
      
        +	for (X64CachedReg& xreg : xregs)
      
         	{
      
         		if (xreg.guest_reg == DSP_REG_USED)
      
         			push_count++;
      
    @@ -533,7 +533,7 @@ void DSPJitRegCache::popRegs() {
  
         	emitter.MOV(32, M(&ebp_store), R(EBP));
      
         #endif
      
         	int push_count = 0;
      
        -	for(auto& xreg : xregs)
      
        +	for (X64CachedReg& xreg : xregs)
      
         	{
      
         		if (xreg.pushed)
      
         		{
      
    @@ -1062,9 +1062,8 @@ X64Reg DSPJitRegCache::spillXReg()
  
         {
      
         	int max_use_ctr_diff = 0;
      
         	X64Reg least_recent_use_reg = INVALID_REG;
      
        -	for(size_t i = 0; i < sizeof(alloc_order)/sizeof(alloc_order[0]); i++)
      
        +	for (X64Reg reg : alloc_order)
      
         	{
      
        -		X64Reg reg = alloc_order[i];
      
         		if (xregs[reg].guest_reg <= DSP_REG_MAX_MEM_BACKED &&
      
         		    !regs[xregs[reg].guest_reg].used)
      
         		{
      
    @@ -1084,9 +1083,8 @@ X64Reg DSPJitRegCache::spillXReg()
  
         	}
      
         	//just choose one.
      
        -	for(size_t i = 0; i < sizeof(alloc_order)/sizeof(alloc_order[0]); i++)
      
        +	for (X64Reg reg : alloc_order)
      
         	{
      
        -		X64Reg reg = alloc_order[i];
      
         		if (xregs[reg].guest_reg <= DSP_REG_MAX_MEM_BACKED &&
      
         		    !regs[xregs[reg].guest_reg].used)
      
         		{
      
    @@ -1118,7 +1116,7 @@ void DSPJitRegCache::spillXReg(X64Reg reg)
  
         X64Reg DSPJitRegCache::findFreeXReg()
      
         {
      
        -	for(auto& x : alloc_order)
      
        +	for (X64Reg x : alloc_order)
      
         	{
      
         		if (xregs[x].guest_reg == DSP_REG_NONE)
      
         		{

4  Source/Core/Core/DSP/Jit/DSPJitUtil.cpp

show inline notes

View

              
    @@ -31,7 +31,7 @@ void DSPEmitter::dsp_reg_stack_push(int stack_reg)
  
         	MOVZX(32, 8, EAX, R(AL));
      
         #endif
      
         	MOV(16, MComplex(EAX, EAX, 1,
      
        -			 PtrOffset(&g_dsp.reg_stack[stack_reg][0],0)), R(tmp1));
      
        +			 PtrOffset(&g_dsp.reg_stack[stack_reg][0],nullptr)), R(tmp1));
      
         	gpr.putXReg(tmp1);
      
         }
      
    @@ -50,7 +50,7 @@ void DSPEmitter::dsp_reg_stack_pop(int stack_reg)
  
         	MOVZX(32, 8, EAX, R(AL));
      
         #endif
      
         	MOV(16, R(tmp1), MComplex(EAX, EAX, 1,
      
        -				  PtrOffset(&g_dsp.reg_stack[stack_reg][0],0)));
      
        +				  PtrOffset(&g_dsp.reg_stack[stack_reg][0],nullptr)));
      
         	MOV(16, M(&g_dsp.r.st[stack_reg]), R(tmp1));
      
         	gpr.putXReg(tmp1);

6  Source/Core/Core/Debugger/Dump.cpp

show inline notes

View

              
    @@ -10,7 +10,7 @@
  
         #include "Core/Debugger/Dump.h"
      
         CDump::CDump(const char* _szFilename) :
      
        -	m_pData(NULL)
      
        +	m_pData(nullptr)
      
         {
      
         	File::IOFile pStream(_szFilename, "rb");
      
         	if (pStream)
      
    @@ -25,10 +25,10 @@
  
         CDump::~CDump(void)
      
         {
      
        -	if (m_pData != NULL)
      
        +	if (m_pData != nullptr)
      
         	{
      
         		delete[] m_pData;
      
        -		m_pData = NULL;
      
        +		m_pData = nullptr;
      
         	}
      
         }

48  Source/Core/Core/Debugger/PPCDebugInterface.h

show inline notes

View

              
    @@ -14,32 +14,32 @@ class PPCDebugInterface : public DebugInterface
  
         {
      
         public:
      
         	PPCDebugInterface(){}
      
        -	virtual void Disassemble(unsigned int address, char *dest, int max_size) final;
      
        -	virtual void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size) final;
      
        -	virtual int GetInstructionSize(int /*instruction*/) final {return 4;}
      
        -	virtual bool IsAlive() final;
      
        -	virtual bool IsBreakpoint(unsigned int address) final;
      
        -	virtual void SetBreakpoint(unsigned int address) final;
      
        -	virtual void ClearBreakpoint(unsigned int address) final;
      
        -	virtual void ClearAllBreakpoints() final;
      
        -	virtual void ToggleBreakpoint(unsigned int address) final;
      
        -	virtual void ClearAllMemChecks() final;
      
        -	virtual bool IsMemCheck(unsigned int address) final;
      
        -	virtual void ToggleMemCheck(unsigned int address) final;
      
        -	virtual unsigned int ReadMemory(unsigned int address) final;
      
        +	virtual void Disassemble(unsigned int address, char *dest, int max_size) final override;
      
        +	virtual void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size) final override;
      
        +	virtual int GetInstructionSize(int /*instruction*/) final override {return 4;}
      
        +	virtual bool IsAlive() final override;
      
        +	virtual bool IsBreakpoint(unsigned int address) final override;
      
        +	virtual void SetBreakpoint(unsigned int address) final override;
      
        +	virtual void ClearBreakpoint(unsigned int address) final override;
      
        +	virtual void ClearAllBreakpoints() final override;
      
        +	virtual void ToggleBreakpoint(unsigned int address) final override;
      
        +	virtual void ClearAllMemChecks() final override;
      
        +	virtual bool IsMemCheck(unsigned int address) final override;
      
        +	virtual void ToggleMemCheck(unsigned int address) final override;
      
        +	virtual unsigned int ReadMemory(unsigned int address) final override;
      
         	enum {
      
         		EXTRAMEM_ARAM = 1,
      
         	};
      
        -	virtual unsigned int ReadExtraMemory(int memory, unsigned int address) final;
      
        -	virtual unsigned int ReadInstruction(unsigned int address) final;
      
        -	virtual unsigned int GetPC() final;
      
        -	virtual void SetPC(unsigned int address) final;
      
        -	virtual void Step() final {}
      
        -	virtual void BreakNow() final;
      
        -	virtual void RunToBreakpoint() final;
      
        -	virtual void InsertBLR(unsigned int address, unsigned int value) final;
      
        -	virtual int GetColor(unsigned int address) final;
      
        -	virtual std::string GetDescription(unsigned int address) final;
      
        -	virtual void ShowJitResults(u32 address) final;
      
        +	virtual unsigned int ReadExtraMemory(int memory, unsigned int address) final override;
      
        +	virtual unsigned int ReadInstruction(unsigned int address) final override;
      
        +	virtual unsigned int GetPC() final override;
      
        +	virtual void SetPC(unsigned int address) final override;
      
        +	virtual void Step() final override {}
      
        +	virtual void BreakNow() final override;
      
        +	virtual void RunToBreakpoint() final override;
      
        +	virtual void InsertBLR(unsigned int address, unsigned int value) final override;
      
        +	virtual int GetColor(unsigned int address) final override;
      
        +	virtual std::string GetDescription(unsigned int address) final override;
      
        +	virtual void ShowJitResults(u32 address) final override;
      
         };

18  Source/Core/Core/FifoPlayer/FifoDataFile.cpp

show inline notes

View

              
    @@ -52,8 +52,7 @@ bool FifoDataFile::Save(const char *filename)
  
         	// Add space for frame list
      
         	u64 frameListOffset = file.Tell();
      
        -	for (size_t i = 0; i < m_Frames.size(); i++)
      
        -		PadFile(sizeof(FileFrameInfo), file);
      
        +	PadFile(m_Frames.size() * sizeof(FileFrameInfo), file);
      
         	u64 bpMemOffset = file.Tell();
      
         	file.WriteArray(m_BPMem, BP_MEM_SIZE);
      
    @@ -130,7 +129,7 @@ FifoDataFile *FifoDataFile::Load(const std::string &filename, bool flagsOnly)
  
         	File::IOFile file;
      
         	file.Open(filename, "rb");
      
         	if (!file)
      
        -		return NULL;
      
        +		return nullptr;
      
         	FileHeader header;
      
         	file.ReadBytes(&header, sizeof(header));
      
    @@ -138,7 +137,7 @@ FifoDataFile *FifoDataFile::Load(const std::string &filename, bool flagsOnly)
  
         	if (header.fileId != FILE_ID || header.min_loader_version > VERSION_NUMBER)
      
         	{
      
         		file.Close();
      
        -		return NULL;
      
        +		return nullptr;
      
         	}
      
         	FifoDataFile* dataFile = new FifoDataFile;
      
    @@ -194,12 +193,10 @@ FifoDataFile *FifoDataFile::Load(const std::string &filename, bool flagsOnly)
  
         	return dataFile;
      
         }
      
        -void FifoDataFile::PadFile(u32 numBytes, File::IOFile &file)
      
        +void FifoDataFile::PadFile(u32 numBytes, File::IOFile& file)
      
         {
      
        -	FILE *handle = file.GetHandle();
      
        -
      
        -	for (u32 i = 0; i < numBytes; ++i)
      
        -		fputc(0, handle);
      
        +	const u8 zero = 0;
      
        +	fwrite(&zero, sizeof(zero), numBytes, file.GetHandle());
      
         }
      
         void FifoDataFile::SetFlag(u32 flag, bool set)
      
    @@ -219,8 +216,7 @@ u64 FifoDataFile::WriteMemoryUpdates(const std::vector<MemoryUpdate> &memUpdates
  
         {
      
         	// Add space for memory update list
      
         	u64 updateListOffset = file.Tell();
      
        -	for (size_t i = 0; i < memUpdates.size(); i++)
      
        -		PadFile(sizeof(FileMemoryUpdate), file);
      
        +	PadFile(memUpdates.size() * sizeof(FileMemoryUpdate), file);
      
         	for (unsigned int i = 0; i < memUpdates.size(); ++i)
      
         	{

12  Source/Core/Core/FifoPlayer/FifoPlayer.cpp

show inline notes

View

              
    @@ -39,13 +39,13 @@ bool FifoPlayer::Open(const std::string& filename)
  
         	if (m_FileLoadedCb)
      
         		m_FileLoadedCb();
      
        -	return (m_File != NULL);
      
        +	return (m_File != nullptr);
      
         }
      
         void FifoPlayer::Close()
      
         {
      
         	delete m_File;
      
        -	m_File = NULL;
      
        +	m_File = nullptr;
      
         	m_FrameRangeStart = 0;
      
         	m_FrameRangeEnd = 0;
      
    @@ -158,9 +158,9 @@ void FifoPlayer::SetFrameRangeEnd(u32 end)
  
         	m_ObjectRangeStart(0),
      
         	m_ObjectRangeEnd(10000),
      
         	m_EarlyMemoryUpdates(false),
      
        -	m_FileLoadedCb(NULL),
      
        -	m_FrameWrittenCb(NULL),
      
        -	m_File(NULL)
      
        +	m_FileLoadedCb(nullptr),
      
        +	m_FrameWrittenCb(nullptr),
      
        +	m_File(nullptr)
      
         {
      
         	m_Loop = SConfig::GetInstance().m_LocalCoreStartupParameter.bLoopFifoReplay;
      
         }
      
    @@ -271,7 +271,7 @@ void FifoPlayer::WriteAllMemoryUpdates()
  
         void FifoPlayer::WriteMemory(const MemoryUpdate& memUpdate)
      
         {
      
        -	u8 *mem = NULL;
      
        +	u8 *mem = nullptr;
      
         	if (memUpdate.address & 0x10000000)
      
         		mem = &Memory::m_pEXRAM[memUpdate.address & Memory::EXRAM_MASK];

2  Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp

show inline notes

View

              
    @@ -16,7 +16,7 @@
  
         FifoRecordAnalyzer::FifoRecordAnalyzer() :
      
         	m_DrawingObject(false),
      
        -	m_BpMem(NULL)
      
        +	m_BpMem(nullptr)
      
         {
      
         }

8  Source/Core/Core/FifoPlayer/FifoRecorder.cpp

show inline notes

View

              
    @@ -19,13 +19,13 @@
  
         	m_WasRecording(false),
      
         	m_RequestedRecordingEnd(false),
      
         	m_RecordFramesRemaining(0),
      
        -	m_FinishedCb(NULL),
      
        -	m_File(NULL),
      
        +	m_FinishedCb(nullptr),
      
        +	m_File(nullptr),
      
         	m_SkipNextData(true),
      
         	m_SkipFutureData(true),
      
         	m_FrameEnded(false),
      
        -	m_Ram(NULL),
      
        -	m_ExRam(NULL)
      
        +	m_Ram(nullptr),
      
        +	m_ExRam(nullptr)
      
         {
      
         }

6  Source/Core/Core/HLE/HLE.cpp

show inline notes

View

              
    @@ -88,7 +88,7 @@ void PatchFunctions()
  
         	for (u32 i = 0; i < sizeof(OSPatches) / sizeof(SPatch); i++)
      
         	{
      
         		Symbol *symbol = g_symbolDB.GetSymbolFromName(OSPatches[i].m_szPatchName);
      
        -		if (symbol > 0)
      
        +		if (symbol)
      
         		{
      
         			for (u32 addr = symbol->address; addr < symbol->address + symbol->size; addr += 4)
      
         			{
      
    @@ -103,7 +103,7 @@ void PatchFunctions()
  
         		for (size_t i = 1; i < sizeof(OSBreakPoints) / sizeof(SPatch); i++)
      
         		{
      
         			Symbol *symbol = g_symbolDB.GetSymbolFromName(OSPatches[i].m_szPatchName);
      
        -			if (symbol > 0)
      
        +			if (symbol)
      
         			{
      
         				PowerPC::breakpoints.Add(symbol->address, false);
      
         				INFO_LOG(OSHLE, "Adding BP to %s %08x", OSBreakPoints[i].m_szPatchName, symbol->address);
      
    @@ -159,7 +159,7 @@ bool IsEnabled(int flags)
  
         u32 UnPatch(std::string patchName)
      
         {
      
         	Symbol *symbol = g_symbolDB.GetSymbolFromName(patchName.c_str());
      
        -	if (symbol > 0)
      
        +	if (symbol)
      
         	{
      
         		for (u32 addr = symbol->address; addr < symbol->address + symbol->size; addr += 4)
      
         		{

2  Source/Core/Core/HW/BBA-TAP/TAP_Unix.cpp

show inline notes

View

              
    @@ -120,7 +120,7 @@ void ReadThreadHandler(CEXIETHERNET* self)
  
         		struct timeval timeout;
      
         		timeout.tv_sec = 0;
      
         		timeout.tv_usec = 50000;
      
        -		if (select(self->fd + 1, &rfds, NULL, NULL, &timeout) <= 0)
      
        +		if (select(self->fd + 1, &rfds, nullptr, nullptr, &timeout) <= 0)
      
         			continue;
      
         		int readBytes = read(self->fd, self->mRecvBuffer, BBA_RECV_SIZE);

16  Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp

show inline notes

View

              
    @@ -35,7 +35,7 @@ bool IsTAPDevice(const TCHAR *guid)
  
         		DWORD data_type;
      
         		len = sizeof(enum_name);
      
        -		status = RegEnumKeyEx(netcard_key, i, enum_name, &len, NULL, NULL, NULL, NULL);
      
        +		status = RegEnumKeyEx(netcard_key, i, enum_name, &len, nullptr, nullptr, nullptr, nullptr);
      
         		if (status == ERROR_NO_MORE_ITEMS)
      
         			break;
      
    @@ -53,13 +53,13 @@ bool IsTAPDevice(const TCHAR *guid)
  
         		else
      
         		{
      
         			len = sizeof(component_id);
      
        -			status = RegQueryValueEx(unit_key, component_id_string, NULL,
      
        +			status = RegQueryValueEx(unit_key, component_id_string, nullptr,
      
         				&data_type, (LPBYTE)component_id, &len);
      
         			if (!(status != ERROR_SUCCESS || data_type != REG_SZ))
      
         			{
      
         				len = sizeof(net_cfg_instance_id);
      
        -				status = RegQueryValueEx(unit_key, net_cfg_instance_id_string, NULL,
      
        +				status = RegQueryValueEx(unit_key, net_cfg_instance_id_string, nullptr,
      
         					&data_type, (LPBYTE)net_cfg_instance_id, &len);
      
         				if (status == ERROR_SUCCESS && data_type == REG_SZ)
      
    @@ -106,7 +106,7 @@ bool GetGUIDs(std::vector<std::basic_string<TCHAR>>& guids)
  
         		len = sizeof(enum_name);
      
         		status = RegEnumKeyEx(control_net_key, i, enum_name,
      
        -			&len, NULL, NULL, NULL, NULL);
      
        +			&len, nullptr, nullptr, nullptr, nullptr);
      
         		if (status == ERROR_NO_MORE_ITEMS)
      
         			break;
      
    @@ -122,7 +122,7 @@ bool GetGUIDs(std::vector<std::basic_string<TCHAR>>& guids)
  
         		if (status == ERROR_SUCCESS)
      
         		{
      
         			len = sizeof(name_data);
      
        -			status = RegQueryValueEx(connection_key, name_string, NULL,
      
        +			status = RegQueryValueEx(connection_key, name_string, nullptr,
      
         				&name_type, (LPBYTE)name_data, &len);
      
         			if (status != ERROR_SUCCESS || name_type != REG_SZ)
      
    @@ -199,7 +199,7 @@ bool CEXIETHERNET::Activate()
  
         	/* get driver version info */
      
         	ULONG info[3];
      
         	if (DeviceIoControl(mHAdapter, TAP_IOCTL_GET_VERSION,
      
        -		&info, sizeof(info), &info, sizeof(info), &len, NULL))
      
        +		&info, sizeof(info), &info, sizeof(info), &len, nullptr))
      
         	{
      
         		INFO_LOG(SP1, "TAP-Win32 Driver Version %d.%d %s",
      
         			info[0], info[1], info[2] ? "(DEBUG)" : "");
      
    @@ -217,7 +217,7 @@ bool CEXIETHERNET::Activate()
  
         	/* set driver media status to 'connected' */
      
         	ULONG status = TRUE;
      
         	if (!DeviceIoControl(mHAdapter, TAP_IOCTL_SET_MEDIA_STATUS,
      
        -		&status, sizeof(status), &status, sizeof(status), &len, NULL))
      
        +		&status, sizeof(status), &status, sizeof(status), &len, nullptr))
      
         	{
      
         		ERROR_LOG(SP1, "WARNING: The TAP-Win32 driver rejected a"
      
         			"TAP_IOCTL_SET_MEDIA_STATUS DeviceIoControl call.");
      
    @@ -283,7 +283,7 @@ bool CEXIETHERNET::RecvInit()
  
         {
      
         	// Set up recv event
      
        -	if ((mHRecvEvent = CreateEvent(NULL, false, false, NULL)) == NULL)
      
        +	if ((mHRecvEvent = CreateEvent(nullptr, false, false, nullptr)) == nullptr)
      
         	{
      
         		ERROR_LOG(SP1, "Failed to create recv event:%x", GetLastError());
      
         		return false;

8  Source/Core/Core/HW/CPU.cpp

show inline notes

View

              
    @@ -18,20 +18,20 @@
  
         namespace
      
         {
      
         	static Common::Event m_StepEvent;
      
        -	static Common::Event *m_SyncEvent = NULL;
      
        +	static Common::Event *m_SyncEvent = nullptr;
      
         	static std::mutex m_csCpuOccupied;
      
         }
      
         void CCPU::Init(int cpu_core)
      
         {
      
         	PowerPC::Init(cpu_core);
      
        -	m_SyncEvent = NULL;
      
        +	m_SyncEvent = nullptr;
      
         }
      
         void CCPU::Shutdown()
      
         {
      
         	PowerPC::Shutdown();
      
        -	m_SyncEvent = NULL;
      
        +	m_SyncEvent = nullptr;
      
         }
      
         void CCPU::Run()
      
    @@ -68,7 +68,7 @@ void CCPU::Run()
  
         			if (m_SyncEvent)
      
         			{
      
         				m_SyncEvent->Set();
      
        -				m_SyncEvent = NULL;
      
        +				m_SyncEvent = nullptr;
      
         			}
      
         			Host_UpdateDisasmDialog();
      
         			break;

2  Source/Core/Core/HW/CPU.h

show inline notes

View

              
    @@ -28,7 +28,7 @@ class CCPU
  
         	static void Reset();
      
         	// StepOpcode (Steps one Opcode)
      
        -	static void StepOpcode(Common::Event *event = 0);
      
        +	static void StepOpcode(Common::Event *event = nullptr);
      
         	// one step only
      
         	static void SingleStep();

6  Source/Core/Core/HW/DSP.cpp

show inline notes

View

              
    @@ -174,7 +174,7 @@ struct ARAMInfo
  
         		wii_mode = false;
      
         		size = ARAM_SIZE;
      
         		mask = ARAM_MASK;
      
        -		ptr = NULL;
      
        +		ptr = nullptr;
      
         	}
      
         };
      
    @@ -282,12 +282,12 @@ void Shutdown()
  
         	if (!g_ARAM.wii_mode)
      
         	{
      
         		FreeMemoryPages(g_ARAM.ptr, g_ARAM.size);
      
        -		g_ARAM.ptr = NULL;
      
        +		g_ARAM.ptr = nullptr;
      
         	}
      
         	dsp_emulator->Shutdown();
      
         	delete dsp_emulator;
      
        -	dsp_emulator = NULL;
      
        +	dsp_emulator = nullptr;
      
         }
      
         void RegisterMMIO(MMIO::Mapping* mmio, u32 base)

20  Source/Core/Core/HW/DSPHLE/DSPHLE.cpp

show inline notes

View

              
    @@ -21,7 +21,7 @@
  
         DSPHLE::DSPHLE()
      
         {
      
         	m_InitMixer = false;
      
        -	soundStream = NULL;
      
        +	soundStream = nullptr;
      
         }
      
         // Mailbox utility
      
    @@ -46,8 +46,8 @@ bool DSPHLE::Initialize(void *hWnd, bool bWii, bool bDSPThread)
  
         {
      
         	m_hWnd = hWnd;
      
         	m_bWii = bWii;
      
        -	m_pUCode = NULL;
      
        -	m_lastUCode = NULL;
      
        +	m_pUCode = nullptr;
      
        +	m_lastUCode = nullptr;
      
         	m_bHalt = false;
      
         	m_bAssertInt = false;
      
    @@ -74,7 +74,7 @@ void DSPHLE::DSP_Update(int cycles)
  
         {
      
         	// This is called OFTEN - better not do anything expensive!
      
         	// ~1/6th as many cycles as the period PPC-side.
      
        -	if (m_pUCode != NULL)
      
        +	if (m_pUCode != nullptr)
      
         		m_pUCode->Update(cycles / 6);
      
         }
      
    @@ -82,7 +82,7 @@ u32 DSPHLE::DSP_UpdateRate()
  
         {
      
         	// AX HLE uses 3ms (Wii) or 5ms (GC) timing period
      
         	int fields = VideoInterface::GetNumFields();
      
        -	if (m_pUCode != NULL)
      
        +	if (m_pUCode != nullptr)
      
         		return (SystemTimers::GetTicksPerSecond() / 1000) * m_pUCode->GetUpdateMs() / fields;
      
         	else
      
         		return SystemTimers::GetTicksPerSecond() / 1000;
      
    @@ -90,7 +90,7 @@ u32 DSPHLE::DSP_UpdateRate()
  
         void DSPHLE::SendMailToDSP(u32 _uMail)
      
         {
      
        -	if (m_pUCode != NULL) {
      
        +	if (m_pUCode != nullptr) {
      
         		DEBUG_LOG(DSP_MAIL, "CPU writes 0x%08x", _uMail);
      
         		m_pUCode->HandleMail(_uMail);
      
         	}
      
    @@ -105,7 +105,7 @@ void DSPHLE::SetUCode(u32 _crc)
  
         {
      
         	delete m_pUCode;
      
        -	m_pUCode = NULL;
      
        +	m_pUCode = nullptr;
      
         	m_MailHandler.Clear();
      
         	m_pUCode = UCodeFactory(_crc, this, m_bWii);
      
         }
      
    @@ -117,7 +117,7 @@ void DSPHLE::SwapUCode(u32 _crc)
  
         {
      
         	m_MailHandler.Clear();
      
        -	if (m_lastUCode == NULL)
      
        +	if (m_lastUCode == nullptr)
      
         	{
      
         		m_lastUCode = m_pUCode;
      
         		m_pUCode = UCodeFactory(_crc, this, m_bWii);
      
    @@ -126,7 +126,7 @@ void DSPHLE::SwapUCode(u32 _crc)
  
         	{
      
         		delete m_pUCode;
      
         		m_pUCode = m_lastUCode;
      
        -		m_lastUCode = NULL;
      
        +		m_lastUCode = nullptr;
      
         	}
      
         }
      
    @@ -154,7 +154,7 @@ void DSPHLE::DoState(PointerWrap &p)
  
         			AudioCommon::PauseAndLock(false);
      
         			soundStream->Stop();
      
         			delete soundStream;
      
        -			soundStream = NULL;
      
        +			soundStream = nullptr;
      
         		}
      
         	}

4  Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX.cpp

show inline notes

View

              
    @@ -468,7 +468,7 @@ void CUCode_AX::ProcessPBList(u32 pb_addr)
  
         			ApplyUpdatesForMs(curr_ms, (u16*)&pb, pb.updates.num_updates, updates);
      
         			ProcessVoice(pb, buffers, spms, ConvertMixerControl(pb.mixer_control),
      
        -			             m_coeffs_available ? m_coeffs : NULL);
      
        +			             m_coeffs_available ? m_coeffs : nullptr);
      
         			// Forward the buffers
      
         			for (u32 i = 0; i < sizeof (buffers.ptrs) / sizeof (buffers.ptrs[0]); ++i)
      
    @@ -482,7 +482,7 @@ void CUCode_AX::ProcessPBList(u32 pb_addr)
  
         void CUCode_AX::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr)
      
         {
      
        -	int* buffers[3] = { 0 };
      
        +	int* buffers[3] = { nullptr };
      
         	switch (aux_id)
      
         	{

10  Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.cpp

show inline notes

View

              
    @@ -20,8 +20,8 @@
  
         	: CUCode_AX(dsp_hle, l_CRC),
      
         	  m_last_main_volume(0x8000)
      
         {
      
        -	for (int i = 0; i < 3; ++i)
      
        -		m_last_aux_volumes[i] = 0x8000;
      
        +	for (u16& volume : m_last_aux_volumes)
      
        +		volume = 0x8000;
      
         	WARN_LOG(DSPHLE, "Instantiating CUCode_AXWii");
      
    @@ -467,7 +467,7 @@ void CUCode_AXWii::ProcessPBList(u32 pb_addr)
  
         				ApplyUpdatesForMs(curr_ms, (u16*)&pb, num_updates, updates);
      
         				ProcessVoice(pb, buffers, 32,
      
         				             ConvertMixerControl(HILO_TO_32(pb.mixer_control)),
      
        -				             m_coeffs_available ? m_coeffs : NULL);
      
        +				             m_coeffs_available ? m_coeffs : nullptr);
      
         				// Forward the buffers
      
         				for (u32 i = 0; i < sizeof (buffers.ptrs) / sizeof (buffers.ptrs[0]); ++i)
      
    @@ -479,7 +479,7 @@ void CUCode_AXWii::ProcessPBList(u32 pb_addr)
  
         		{
      
         			ProcessVoice(pb, buffers, 96,
      
         			             ConvertMixerControl(HILO_TO_32(pb.mixer_control)),
      
        -			             m_coeffs_available ? m_coeffs : NULL);
      
        +			             m_coeffs_available ? m_coeffs : nullptr);
      
         		}
      
         		WritePB(pb_addr, pb);
      
    @@ -493,7 +493,7 @@ void CUCode_AXWii::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr, u16
  
         	GenerateVolumeRamp(volume_ramp, m_last_aux_volumes[aux_id], volume, 96);
      
         	m_last_aux_volumes[aux_id] = volume;
      
        -	int* buffers[3] = { 0 };
      
        +	int* buffers[3] = { nullptr };
      
         	int* main_buffers[3] = {
      
         		m_samples_left,
      
         		m_samples_right,

2  Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp

show inline notes

View

              
    @@ -99,7 +99,7 @@ IUCode* UCodeFactory(u32 _CRC, DSPHLE *dsp_hle, bool bWii)
  
         		break;
      
         	}
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
         bool IUCode::NeedsResumeMail()

42  Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h

show inline notes

View

              
    @@ -14,25 +14,25 @@ class DSPDebugInterface : public DebugInterface
  
         {
      
         public:
      
         	DSPDebugInterface(){}
      
        -	virtual void Disassemble(unsigned int address, char *dest, int max_size) final;
      
        -	virtual void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size) final;
      
        -	virtual int GetInstructionSize(int instruction) final {return 1;}
      
        -	virtual bool IsAlive() final;
      
        -	virtual bool IsBreakpoint(unsigned int address) final;
      
        -	virtual void SetBreakpoint(unsigned int address) final;
      
        -	virtual void ClearBreakpoint(unsigned int address) final;
      
        -	virtual void ClearAllBreakpoints() final;
      
        -	virtual void ToggleBreakpoint(unsigned int address) final;
      
        -	virtual void ClearAllMemChecks() final;
      
        -	virtual bool IsMemCheck(unsigned int address) final;
      
        -	virtual void ToggleMemCheck(unsigned int address) final;
      
        -	virtual unsigned int ReadMemory(unsigned int address) final;
      
        -	virtual unsigned int ReadInstruction(unsigned int address) final;
      
        -	virtual unsigned int GetPC() final;
      
        -	virtual void SetPC(unsigned int address) final;
      
        -	virtual void Step() final {}
      
        -	virtual void RunToBreakpoint() final;
      
        -	virtual void InsertBLR(unsigned int address, unsigned int value) final;
      
        -	virtual int GetColor(unsigned int address) final;
      
        -	virtual std::string GetDescription(unsigned int address) final;
      
        +	virtual void Disassemble(unsigned int address, char *dest, int max_size) final override;
      
        +	virtual void GetRawMemoryString(int memory, unsigned int address, char *dest, int max_size) final override;
      
        +	virtual int GetInstructionSize(int instruction) final override {return 1;}
      
        +	virtual bool IsAlive() final override;
      
        +	virtual bool IsBreakpoint(unsigned int address) final override;
      
        +	virtual void SetBreakpoint(unsigned int address) final override;
      
        +	virtual void ClearBreakpoint(unsigned int address) final override;
      
        +	virtual void ClearAllBreakpoints() final override;
      
        +	virtual void ToggleBreakpoint(unsigned int address) final override;
      
        +	virtual void ClearAllMemChecks() final override;
      
        +	virtual bool IsMemCheck(unsigned int address) final override;
      
        +	virtual void ToggleMemCheck(unsigned int address) final override;
      
        +	virtual unsigned int ReadMemory(unsigned int address) final override;
      
        +	virtual unsigned int ReadInstruction(unsigned int address) final override;
      
        +	virtual unsigned int GetPC() final override;
      
        +	virtual void SetPC(unsigned int address) final override;
      
        +	virtual void Step() final override {}
      
        +	virtual void RunToBreakpoint() final override;
      
        +	virtual void InsertBLR(unsigned int address, unsigned int value) final override;
      
        +	virtual int GetColor(unsigned int address) final override;
      
        +	virtual std::string GetDescription(unsigned int address) final override;
      
         };

4  Source/Core/Core/HW/DSPLLE/DSPLLE.cpp

show inline notes

View

              
    @@ -33,7 +33,7 @@
  
         DSPLLE::DSPLLE()
      
         {
      
        -	soundStream = NULL;
      
        +	soundStream = nullptr;
      
         	m_InitMixer = false;
      
         	m_bIsRunning = false;
      
         	m_cycle_count = 0;
      
    @@ -95,7 +95,7 @@ void DSPLLE::DoState(PointerWrap &p)
  
         			AudioCommon::PauseAndLock(false);
      
         			soundStream->Stop();
      
         			delete soundStream;
      
        -			soundStream = NULL;
      
        +			soundStream = nullptr;
      
         		}
      
         	}
      
         }

36  Source/Core/Core/HW/DSPLLE/DSPLLE.h

show inline notes

View

              
    @@ -15,24 +15,24 @@ class DSPLLE : public DSPEmulator
  
         public:
      
         	DSPLLE();
      
        -	virtual bool Initialize(void *hWnd, bool bWii, bool bDSPThread);
      
        -	virtual void Shutdown();
      
        -	virtual bool IsLLE() { return true; }
      
        -
      
        -	virtual void DoState(PointerWrap &p);
      
        -	virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true);
      
        -
      
        -	virtual void DSP_WriteMailBoxHigh(bool _CPUMailbox, unsigned short);
      
        -	virtual void DSP_WriteMailBoxLow(bool _CPUMailbox, unsigned short);
      
        -	virtual unsigned short DSP_ReadMailBoxHigh(bool _CPUMailbox);
      
        -	virtual unsigned short DSP_ReadMailBoxLow(bool _CPUMailbox);
      
        -	virtual unsigned short DSP_ReadControlRegister();
      
        -	virtual unsigned short DSP_WriteControlRegister(unsigned short);
      
        -	virtual void DSP_SendAIBuffer(unsigned int address, unsigned int num_samples);
      
        -	virtual void DSP_Update(int cycles);
      
        -	virtual void DSP_StopSoundStream();
      
        -	virtual void DSP_ClearAudioBuffer(bool mute);
      
        -	virtual u32 DSP_UpdateRate();
      
        +	virtual bool Initialize(void *hWnd, bool bWii, bool bDSPThread) override;
      
        +	virtual void Shutdown() override;
      
        +	virtual bool IsLLE() override { return true; }
      
        +
      
        +	virtual void DoState(PointerWrap &p) override;
      
        +	virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) override;
      
        +
      
        +	virtual void DSP_WriteMailBoxHigh(bool _CPUMailbox, unsigned short) override;
      
        +	virtual void DSP_WriteMailBoxLow(bool _CPUMailbox, unsigned short) override;
      
        +	virtual unsigned short DSP_ReadMailBoxHigh(bool _CPUMailbox) override;
      
        +	virtual unsigned short DSP_ReadMailBoxLow(bool _CPUMailbox) override;
      
        +	virtual unsigned short DSP_ReadControlRegister() override;
      
        +	virtual unsigned short DSP_WriteControlRegister(unsigned short) override;
      
        +	virtual void DSP_SendAIBuffer(unsigned int address, unsigned int num_samples) override;
      
        +	virtual void DSP_Update(int cycles) override;
      
        +	virtual void DSP_StopSoundStream() override;
      
        +	virtual void DSP_ClearAudioBuffer(bool mute) override;
      
        +	virtual u32 DSP_UpdateRate() override;
      
         private:
      
         	static void dsp_thread(DSPLLE* lpParameter);

2  Source/Core/Core/HW/DSPLLE/DSPSymbols.cpp

show inline notes

View

              
    @@ -70,7 +70,7 @@ Symbol *DSPSymbolDB::GetSymbolFromAddr(u32 addr)
  
         				return &func.second;
      
         		}
      
         	}
      
        -	return 0;
      
        +	return nullptr;
      
         }
      
         // lower case only

4  Source/Core/Core/HW/EXI.cpp

show inline notes

View

              
    @@ -47,7 +47,7 @@ void Shutdown()
  
         	for (auto& channel : g_Channels)
      
         	{
      
         		delete channel;
      
        -		channel = NULL;
      
        +		channel = nullptr;
      
         	}
      
         }
      
    @@ -102,7 +102,7 @@ IEXIDevice* FindDevice(TEXIDevices device_type, int customIndex)
  
         		if (device)
      
         			return device;
      
         	}
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
         // Unused (?!)

8  Source/Core/Core/HW/EXI_Channel.cpp

show inline notes

View

              
    @@ -87,7 +87,7 @@ void CEXIChannel::RegisterMMIO(MMIO::Mapping* mmio, u32 base)
  
         			IEXIDevice* pDevice = GetDevice(m_Status.CHIP_SELECT ^ newStatus.CHIP_SELECT);
      
         			m_Status.CHIP_SELECT = newStatus.CHIP_SELECT;
      
        -			if (pDevice != NULL)
      
        +			if (pDevice != nullptr)
      
         				pDevice->SetCS(m_Status.CHIP_SELECT);
      
         			CoreTiming::ScheduleEvent_Threadsafe_Immediate(updateInterrupts, 0);
      
    @@ -110,7 +110,7 @@ void CEXIChannel::RegisterMMIO(MMIO::Mapping* mmio, u32 base)
  
         			if (m_Control.TSTART)
      
         			{
      
         				IEXIDevice* pDevice = GetDevice(m_Status.CHIP_SELECT);
      
        -				if (pDevice == NULL)
      
        +				if (pDevice == nullptr)
      
         					return;
      
         				if (m_Control.DMA == 0)
      
    @@ -216,7 +216,7 @@ IEXIDevice* CEXIChannel::GetDevice(const u8 chip_select)
  
         	case 2: return m_pDevices[1].get();
      
         	case 4: return m_pDevices[2].get();
      
         	}
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
         void CEXIChannel::Update()
      
    @@ -273,5 +273,5 @@ IEXIDevice* CEXIChannel::FindDevice(TEXIDevices device_type, int customIndex)
  
         		if (device)
      
         			return device;
      
         	}
      
        -	return NULL;
      
        +	return nullptr;
      
         }

4  Source/Core/Core/HW/EXI_Device.cpp

show inline notes

View

              
    @@ -90,7 +90,7 @@ class CEXIDummy : public IEXIDevice
  
         // F A C T O R Y
      
         IEXIDevice* EXIDevice_Create(TEXIDevices device_type, const int channel_num)
      
         {
      
        -	IEXIDevice* result = NULL;
      
        +	IEXIDevice* result = nullptr;
      
         	switch (device_type)
      
         	{
      
    @@ -132,7 +132,7 @@ IEXIDevice* EXIDevice_Create(TEXIDevices device_type, const int channel_num)
  
         		break;
      
         	}
      
        -	if (result != NULL)
      
        +	if (result != nullptr)
      
         		result->m_deviceType = device_type;
      
         	return result;

2  Source/Core/Core/HW/EXI_Device.h

show inline notes

View

              
    @@ -40,7 +40,7 @@ class IEXIDevice
  
         	virtual void SetCS(int) {}
      
         	virtual void DoState(PointerWrap&) {}
      
         	virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) {}
      
        -	virtual IEXIDevice* FindDevice(TEXIDevices device_type, int customIndex=-1) { return (device_type == m_deviceType) ? this : NULL; }
      
        +	virtual IEXIDevice* FindDevice(TEXIDevices device_type, int customIndex=-1) { return (device_type == m_deviceType) ? this : nullptr; }
      
         	// Update
      
         	virtual void Update() {}

2  Source/Core/Core/HW/EXI_DeviceIPL.cpp

show inline notes

View

              
    @@ -130,7 +130,7 @@ void CEXIIPL::Descrambler(u8* data, u32 size)
  
         	}
      
         	FreeMemoryPages(m_pIPL, ROM_SIZE);
      
        -	m_pIPL = NULL;
      
        +	m_pIPL = nullptr;
      
         	// SRAM
      
         	File::IOFile file(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strSRAM, "wb");

8  Source/Core/Core/HW/EXI_DeviceIPL.h

show inline notes

View

              
    @@ -13,9 +13,9 @@ class CEXIIPL : public IEXIDevice
  
         	CEXIIPL();
      
         	virtual ~CEXIIPL();
      
        -	virtual void SetCS(int _iCS);
      
        -	bool IsPresent();
      
        -	void DoState(PointerWrap &p);
      
        +	virtual void SetCS(int _iCS) override;
      
        +	bool IsPresent() override;
      
        +	void DoState(PointerWrap &p) override;
      
         	static u32 GetGCTime();
      
         	static u32 NetPlay_GetGCTime();
      
    @@ -62,7 +62,7 @@ class CEXIIPL : public IEXIDevice
  
         	int m_count;
      
         	bool m_FontsLoaded;
      
        -	virtual void TransferByte(u8 &_uByte);
      
        +	virtual void TransferByte(u8 &_uByte) override;
      
         	bool IsWriteCommand() const { return !!(m_uAddress & (1 << 31)); }
      
         	u32 CommandRegion() const { return (m_uAddress & ~(1 << 31)) >> 8; }

8  Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp

show inline notes

View

              
    @@ -108,7 +108,7 @@ void innerFlush(FlushData* data)
  
         	if (!pFile)
      
         	{
      
         		std::string dir;
      
        -		SplitPath(data->filename, &dir, 0, 0);
      
        +		SplitPath(data->filename, &dir, nullptr, nullptr);
      
         		if (!File::IsDirectory(dir))
      
         			File::CreateFullPath(dir);
      
         		pFile.Open(data->filename, "wb");
      
    @@ -166,7 +166,7 @@ void CEXIMemoryCard::Flush(bool exiting)
  
         	CoreTiming::RemoveEvent(et_this_card);
      
         	Flush(true);
      
         	delete[] memory_card_content;
      
        -	memory_card_content = NULL;
      
        +	memory_card_content = nullptr;
      
         	if (flushThread.joinable())
      
         	{
      
    @@ -482,8 +482,8 @@ void CEXIMemoryCard::DoState(PointerWrap &p)
  
         IEXIDevice* CEXIMemoryCard::FindDevice(TEXIDevices device_type, int customIndex)
      
         {
      
         	if (device_type != m_deviceType)
      
        -		return NULL;
      
        +		return nullptr;
      
         	if (customIndex != card_index)
      
        -		return NULL;
      
        +		return nullptr;
      
         	return this;
      
         }

8  Source/Core/Core/HW/EXI_DeviceMic.h

show inline notes

View

              
    @@ -13,9 +13,9 @@ class CEXIMic : public IEXIDevice
  
         public:
      
         	CEXIMic(const int index);
      
         	virtual ~CEXIMic();
      
        -	void SetCS(int cs);
      
        -	bool IsInterruptSet();
      
        -	bool IsPresent();
      
        +	void SetCS(int cs) override;
      
        +	bool IsInterruptSet() override;
      
        +	bool IsPresent() override;
      
         private:
      
         	static u8 const exi_id[];
      
    @@ -93,7 +93,7 @@ class CEXIMic : public IEXIDevice
  
         	int samples_avail;
      
         protected:
      
        -	virtual void TransferByte(u8 &byte);
      
        +	virtual void TransferByte(u8 &byte) override;
      
         };
      
         #else // HAVE_PORTAUDIO

6  Source/Core/Core/HW/GCMemcard.cpp

show inline notes

View

              
    @@ -34,7 +34,7 @@ static void ByteSwap(u8 *valueA, u8 *valueB)
  
         	{
      
         		//This function can be removed once more about hdr is known and we can check for a valid header
      
         		std::string fileType;
      
        -		SplitPath(filename, NULL, NULL, &fileType);
      
        +		SplitPath(filename, nullptr, nullptr, &fileType);
      
         		if (strcasecmp(fileType.c_str(), ".raw") && strcasecmp(fileType.c_str(), ".gcp"))
      
         		{
      
         			PanicAlertT("File has the extension \"%s\"\nvalid extensions are (.raw/.gcp)", fileType.c_str());
      
    @@ -814,7 +814,7 @@ u32 GCMemcard::ImportGciInternal(FILE* gcih, const char *inputFile, const std::s
  
         	File::IOFile gci(gcih);
      
         	unsigned int offset;
      
         	std::string fileType;
      
        -	SplitPath(inputFile, NULL, NULL, &fileType);
      
        +	SplitPath(inputFile, nullptr, nullptr, &fileType);
      
         	if (!strcasecmp(fileType.c_str(), ".gci"))
      
         		offset = GCI;
      
    @@ -913,7 +913,7 @@ u32 GCMemcard::ExportGci(u8 index, const char *fileName, const std::string &dire
  
         		gci.Open(fileName, "wb");
      
         		std::string fileType;
      
        -		SplitPath(fileName, NULL, NULL, &fileType);
      
        +		SplitPath(fileName, nullptr, nullptr, &fileType);
      
         		if (!strcasecmp(fileType.c_str(), ".gcs"))
      
         		{
      
         			offset = GCS;

20  Source/Core/Core/HW/Memmap.cpp

show inline notes

View

              
    @@ -53,7 +53,7 @@
  
         // Init() declarations
      
         // ----------------
      
         // Store the MemArena here
      
        -u8* base = NULL;
      
        +u8* base = nullptr;
      
         // The MemArena class
      
         MemArena g_arena;
      
    @@ -121,8 +121,8 @@ bool IsInitialized()
  
         static const MemoryView views[] =
      
         {
      
         	{&m_pRAM,      &m_pPhysicalRAM,          0x00000000, RAM_SIZE, 0},
      
        -	{NULL,         &m_pVirtualCachedRAM,     0x80000000, RAM_SIZE, MV_MIRROR_PREVIOUS},
      
        -	{NULL,         &m_pVirtualUncachedRAM,   0xC0000000, RAM_SIZE, MV_MIRROR_PREVIOUS},
      
        +	{nullptr,         &m_pVirtualCachedRAM,     0x80000000, RAM_SIZE, MV_MIRROR_PREVIOUS},
      
        +	{nullptr,         &m_pVirtualUncachedRAM,   0xC0000000, RAM_SIZE, MV_MIRROR_PREVIOUS},
      
         //  Don't map any memory for the EFB. We want all access to this area to go
      
         //  through the hardware access handlers.
      
    @@ -134,8 +134,8 @@ bool IsInitialized()
  
         	{&m_pFakeVMEM, &m_pVirtualFakeVMEM,      0x7E000000, FAKEVMEM_SIZE, MV_FAKE_VMEM},
      
         	{&m_pEXRAM,    &m_pPhysicalEXRAM,        0x10000000, EXRAM_SIZE, MV_WII_ONLY},
      
        -	{NULL,         &m_pVirtualCachedEXRAM,   0x90000000, EXRAM_SIZE, MV_WII_ONLY | MV_MIRROR_PREVIOUS},
      
        -	{NULL,         &m_pVirtualUncachedEXRAM, 0xD0000000, EXRAM_SIZE, MV_WII_ONLY | MV_MIRROR_PREVIOUS},
      
        +	{nullptr,         &m_pVirtualCachedEXRAM,   0x90000000, EXRAM_SIZE, MV_WII_ONLY | MV_MIRROR_PREVIOUS},
      
        +	{nullptr,         &m_pVirtualUncachedEXRAM, 0xD0000000, EXRAM_SIZE, MV_WII_ONLY | MV_MIRROR_PREVIOUS},
      
         };
      
         static const int num_views = sizeof(views) / sizeof(MemoryView);
      
    @@ -185,7 +185,7 @@ void Shutdown()
  
         	if (bFakeVMEM) flags |= MV_FAKE_VMEM;
      
         	MemoryMap_Shutdown(views, num_views, flags, &g_arena);
      
         	g_arena.ReleaseSpace();
      
        -	base = NULL;
      
        +	base = nullptr;
      
         	delete mmio_mapping;
      
         	INFO_LOG(MEMMAP, "Memory system shut down.");
      
         }
      
    @@ -223,7 +223,7 @@ void WriteBigEData(const u8 *_pData, const u32 _Address, const size_t _iSize)
  
         void Memset(const u32 _Address, const u8 _iValue, const u32 _iLength)
      
         {
      
         	u8 *ptr = GetPointer(_Address);
      
        -	if (ptr != NULL)
      
        +	if (ptr != nullptr)
      
         	{
      
         		memset(ptr,_iValue,_iLength);
      
         	}
      
    @@ -239,7 +239,7 @@ void DMA_LCToMemory(const u32 _MemAddr, const u32 _CacheAddr, const u32 _iNumBlo
  
         	const u8 *src = GetCachePtr() + (_CacheAddr & 0x3FFFF);
      
         	u8 *dst = GetPointer(_MemAddr);
      
        -	if ((dst != NULL) && (src != NULL) && (_MemAddr & 3) == 0 && (_CacheAddr & 3) == 0)
      
        +	if ((dst != nullptr) && (src != nullptr) && (_MemAddr & 3) == 0 && (_CacheAddr & 3) == 0)
      
         	{
      
         		memcpy(dst, src, 32 * _iNumBlocks);
      
         	}
      
    @@ -258,7 +258,7 @@ void DMA_MemoryToLC(const u32 _CacheAddr, const u32 _MemAddr, const u32 _iNumBlo
  
         	const u8 *src = GetPointer(_MemAddr);
      
         	u8 *dst = GetCachePtr() + (_CacheAddr & 0x3FFFF);
      
        -	if ((dst != NULL) && (src != NULL) && (_MemAddr & 3) == 0 && (_CacheAddr & 3) == 0)
      
        +	if ((dst != nullptr) && (src != nullptr) && (_MemAddr & 3) == 0 && (_CacheAddr & 3) == 0)
      
         	{
      
         		memcpy(dst, src, 32 * _iNumBlocks);
      
         	}
      
    @@ -343,7 +343,7 @@ u8 *GetPointer(const u32 _Address)
  
         	ERROR_LOG(MEMMAP, "Unknown Pointer %#8x PC %#8x LR %#8x", _Address, PC, LR);
      
        -	return NULL;
      
        +	return nullptr;
      
         }

2  Source/Core/Core/HW/SI.cpp

show inline notes

View

              
    @@ -434,7 +434,7 @@ void GenerateSIInterrupt(SIInterruptType _SIInterrupt)
  
         void RemoveDevice(int _iDeviceNumber)
      
         {
      
         	delete g_Channel[_iDeviceNumber].m_pDevice;
      
        -	g_Channel[_iDeviceNumber].m_pDevice = NULL;
      
        +	g_Channel[_iDeviceNumber].m_pDevice = nullptr;
      
         }
      
         void AddDevice(ISIDevice* pDevice)

10  Source/Core/Core/HW/SI_DeviceGCController.h

show inline notes

View

              
    @@ -85,20 +85,20 @@ class CSIDevice_GCController : public ISIDevice
  
         	CSIDevice_GCController(SIDevices device, int _iDeviceNumber);
      
         	// Run the SI Buffer
      
        -	virtual int RunBuffer(u8* _pBuffer, int _iLength);
      
        +	virtual int RunBuffer(u8* _pBuffer, int _iLength) override;
      
         	// Send and Receive pad input from network
      
         	static bool NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus);
      
         	static u8 NetPlay_InGamePadToLocalPad(u8 numPAD);
      
         	// Return true on new data
      
        -	virtual bool GetData(u32& _Hi, u32& _Low);
      
        +	virtual bool GetData(u32& _Hi, u32& _Low) override;
      
         	// Send a command directly
      
        -	virtual void SendCommand(u32 _Cmd, u8 _Poll);
      
        +	virtual void SendCommand(u32 _Cmd, u8 _Poll) override;
      
         	// Savestate support
      
        -	virtual void DoState(PointerWrap& p);
      
        +	virtual void DoState(PointerWrap& p) override;
      
         };
      
    @@ -108,7 +108,7 @@ class CSIDevice_TaruKonga : public CSIDevice_GCController
  
         public:
      
         	CSIDevice_TaruKonga(SIDevices device, int _iDeviceNumber) : CSIDevice_GCController(device, _iDeviceNumber) { }
      
        -	virtual bool GetData(u32& _Hi, u32& _Low)
      
        +	virtual bool GetData(u32& _Hi, u32& _Low) override
      
         	{
      
         		CSIDevice_GCController::GetData(_Hi, _Low);
      
         		_Hi &= ~PAD_USE_ORIGIN << 16;

8  Source/Core/Core/HW/SI_DeviceGCSteeringWheel.h

show inline notes

View

              
    @@ -85,18 +85,18 @@ class CSIDevice_GCSteeringWheel : public ISIDevice
  
         	CSIDevice_GCSteeringWheel(SIDevices device, int _iDeviceNumber);
      
         	// Run the SI Buffer
      
        -	virtual int RunBuffer(u8* _pBuffer, int _iLength);
      
        +	virtual int RunBuffer(u8* _pBuffer, int _iLength) override;
      
         	// Send and Receive pad input from network
      
         	static bool NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus);
      
         	static u8 NetPlay_InGamePadToLocalPad(u8 numPAD);
      
         	// Return true on new data
      
        -	virtual bool GetData(u32& _Hi, u32& _Low);
      
        +	virtual bool GetData(u32& _Hi, u32& _Low) override;
      
         	// Send a command directly
      
        -	virtual void SendCommand(u32 _Cmd, u8 _Poll);
      
        +	virtual void SendCommand(u32 _Cmd, u8 _Poll) override;
      
         	// Savestate support
      
        -	virtual void DoState(PointerWrap& p);
      
        +	virtual void DoState(PointerWrap& p) override;
      
         };

26  Source/Core/Core/HW/VideoInterface.cpp

show inline notes

View

              
    @@ -173,11 +173,15 @@ void Init()
  
         	m_DTVStatus.ntsc_j = Core::g_CoreStartupParameter.bForceNTSCJ;
      
        -	for (int i = 0; i < 4; i++)
      
        -		m_InterruptRegister[i].Hex = 0;
      
        +	for (UVIInterruptRegister& reg : m_InterruptRegister)
      
        +	{
      
        +		reg.Hex = 0;
      
        +	}
      
        -	for (int i = 0; i < 2; i++)
      
        -		m_LatchRegister[i].Hex = 0;
      
        +	for (UVILatchRegister& reg : m_LatchRegister)
      
        +	{
      
        +		reg.Hex = 0;
      
        +	}
      
         	m_DisplayControlRegister.Hex = 0;
      
         	UpdateParameters();
      
    @@ -359,8 +363,10 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base)
  
         			{
      
         				// shuffle2 clear all data, reset to default vals, and enter idle mode
      
         				m_DisplayControlRegister.RST = 0;
      
        -				for (int i = 0; i < 4; i++)
      
        -					m_InterruptRegister[i].Hex = 0;
      
        +				for (UVIInterruptRegister& reg : m_InterruptRegister)
      
        +				{
      
        +					reg.Hex = 0;
      
        +				}
      
         				UpdateInterrupts();
      
         			}
      
    @@ -576,10 +582,12 @@ void Update()
  
         	if (++m_VBeamPos > s_lineCount * fields)
      
         		m_VBeamPos = 1;
      
        -	for (int i = 0; i < 4; i++)
      
        +	for (UVIInterruptRegister& reg : m_InterruptRegister)
      
         	{
      
        -		if (m_VBeamPos == m_InterruptRegister[i].VCT)
      
        -			m_InterruptRegister[i].IR_INT = 1;
      
        +		if (m_VBeamPos == reg.VCT)
      
        +		{
      
        +			reg.IR_INT = 1;
      
        +		}
      
         	}
      
         	UpdateInterrupts();
      
         }

8  Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp

show inline notes

View

              
    @@ -117,7 +117,7 @@ void Spy(Wiimote* wm_, const void* data_, size_t size_)
  
         		case WM_SPACE_REGS2: {
      
         			const u8 region_offset = (u8)address;
      
        -			void *region_ptr = NULL;
      
        +			void *region_ptr = nullptr;
      
         			int region_size = 0;
      
         			switch(data[3])
      
    @@ -200,7 +200,7 @@ void Spy(Wiimote* wm_, const void* data_, size_t size_)
  
         		address &= 0xFEFFFF;
      
         		u16 size = Common::swap16(rd->size);
      
         		u8 *const block = new u8[size];
      
        -		void *region_ptr = NULL;
      
        +		void *region_ptr = nullptr;
      
         		dataRep.push(((data[2]>>1)<<16) + ((data[3])<<8) + addressLO);
      
    @@ -948,7 +948,7 @@ void Wiimote::WriteData(const wm_write_data* const wd)
  
         				address &= 0xFF00FF;
      
         			const u8 region_offset = (u8)address;
      
        -			void *region_ptr = NULL;
      
        +			void *region_ptr = nullptr;
      
         			int region_size = 0;
      
         			switch (address >> 16)
      
    @@ -1093,7 +1093,7 @@ void Wiimote::ReadData(const wm_read_data* const rd)
  
         				address &= 0xFF00FF;
      
         			const u8 region_offset = (u8)address;
      
        -			void *region_ptr = NULL;
      
        +			void *region_ptr = nullptr;
      
         			int region_size = 0;
      
         			switch (address >> 16)

2  Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp

show inline notes

View

              
    @@ -257,7 +257,7 @@ void Wiimote::Reset()
  
         	: m_index(index)
      
         	, ir_sin(0)
      
         	, ir_cos(1)
      
        -// , m_sound_stream( NULL )
      
        +// , m_sound_stream( nullptr )
      
         {
      
         	// ---- set up all the controls ----

6  Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h

show inline notes

View

              
    @@ -116,7 +116,7 @@ class Wiimote : public ControllerEmu
  
         	};
      
         	Wiimote(const unsigned int index);
      
        -	std::string GetName() const;
      
        +	std::string GetName() const override;
      
         	void Update();
      
         	void InterruptChannel(const u16 _channelID, const void* _pData, u32 _Size);
      
    @@ -125,7 +125,7 @@ class Wiimote : public ControllerEmu
  
         	void DoState(PointerWrap& p);
      
         	void RealState();
      
        -	void LoadDefaults(const ControllerInterface& ciface);
      
        +	void LoadDefaults(const ControllerInterface& ciface) override;
      
         protected:
      
         	bool Step();
      
    @@ -153,7 +153,7 @@ class Wiimote : public ControllerEmu
  
         	void ReportMode(const wm_report_mode* const dr);
      
         	void SendAck(const u8 _reportID);
      
        -	void RequestStatus(const wm_request_status* const rs = NULL);
      
        +	void RequestStatus(const wm_request_status* const rs = nullptr);
      
         	void ReadData(const wm_read_data* const rd);
      
         	void WriteData(const wm_write_data* const wd);
      
         	void SendReadDataReply(ReadRequest& _request);

2  Source/Core/Core/HW/WiimoteReal/IODummy.cpp

show inline notes

View

              
    @@ -22,7 +22,7 @@ void WiimoteScanner::Update()
  
         void WiimoteScanner::FindWiimotes(std::vector<Wiimote*> & found_wiimotes, Wiimote* & found_board)
      
         {
      
         	found_wiimotes.clear();
      
        -	found_board = NULL;
      
        +	found_board = nullptr;
      
         }
      
         bool WiimoteScanner::IsReady() const

8  Source/Core/Core/HW/WiimoteReal/IONix.cpp

show inline notes

View

              
    @@ -19,7 +19,7 @@
  
         	, device_sock(-1)
      
         {
      
         	// Get the id of the first bluetooth device.
      
        -	device_id = hci_get_route(NULL);
      
        +	device_id = hci_get_route(nullptr);
      
         	if (device_id < 0)
      
         	{
      
         		NOTICE_LOG(WIIMOTE, "Bluetooth not found.");
      
    @@ -57,10 +57,10 @@ void WiimoteScanner::FindWiimotes(std::vector<Wiimote*> & found_wiimotes, Wiimot
  
         	int const max_infos = 255;
      
         	inquiry_info scan_infos[max_infos] = {};
      
         	auto* scan_infos_ptr = scan_infos;
      
        -	found_board = NULL;
      
        +	found_board = nullptr;
      
         	// Scan for bluetooth devices
      
        -	int const found_devices = hci_inquiry(device_id, wait_len, max_infos, NULL, &scan_infos_ptr, IREQ_CACHE_FLUSH);
      
        +	int const found_devices = hci_inquiry(device_id, wait_len, max_infos, nullptr, &scan_infos_ptr, IREQ_CACHE_FLUSH);
      
         	if (found_devices < 0)
      
         	{
      
         		ERROR_LOG(WIIMOTE, "Error searching for bluetooth devices.");
      
    @@ -211,7 +211,7 @@ int Wiimote::IORead(u8* buf)
  
         	FD_SET(int_sock, &fds);
      
         	FD_SET(wakeup_pipe_r, &fds);
      
        -	if (select(int_sock + 1, &fds, NULL, NULL, NULL) == -1)
      
        +	if (select(int_sock + 1, &fds, nullptr, nullptr, nullptr) == -1)
      
         	{
      
         		ERROR_LOG(WIIMOTE, "Unable to select wiimote %i input socket.", index + 1);
      
         		return -1;

74  Source/Core/Core/HW/WiimoteReal/IOWin.cpp

show inline notes

View

              
    @@ -51,25 +51,25 @@
  
         typedef DWORD (__stdcall *PBth_BluetoothAuthenticateDevice)(HWND, HANDLE, BLUETOOTH_DEVICE_INFO*, PWCHAR, ULONG);
      
         typedef DWORD (__stdcall *PBth_BluetoothEnumerateInstalledServices)(HANDLE, BLUETOOTH_DEVICE_INFO*, DWORD*, GUID*);
      
        -PHidD_GetHidGuid HidD_GetHidGuid = NULL;
      
        -PHidD_GetAttributes HidD_GetAttributes = NULL;
      
        -PHidD_SetOutputReport HidD_SetOutputReport = NULL;
      
        -PHidD_GetProductString HidD_GetProductString = NULL;
      
        -
      
        -PBth_BluetoothFindDeviceClose Bth_BluetoothFindDeviceClose = NULL;
      
        -PBth_BluetoothFindFirstDevice Bth_BluetoothFindFirstDevice = NULL;
      
        -PBth_BluetoothFindFirstRadio Bth_BluetoothFindFirstRadio = NULL;
      
        -PBth_BluetoothFindNextDevice Bth_BluetoothFindNextDevice = NULL;
      
        -PBth_BluetoothFindNextRadio Bth_BluetoothFindNextRadio = NULL;
      
        -PBth_BluetoothFindRadioClose Bth_BluetoothFindRadioClose = NULL;
      
        -PBth_BluetoothGetRadioInfo Bth_BluetoothGetRadioInfo = NULL;
      
        -PBth_BluetoothRemoveDevice Bth_BluetoothRemoveDevice = NULL;
      
        -PBth_BluetoothSetServiceState Bth_BluetoothSetServiceState = NULL;
      
        -PBth_BluetoothAuthenticateDevice Bth_BluetoothAuthenticateDevice = NULL;
      
        -PBth_BluetoothEnumerateInstalledServices Bth_BluetoothEnumerateInstalledServices = NULL;
      
        -
      
        -HINSTANCE hid_lib = NULL;
      
        -HINSTANCE bthprops_lib = NULL;
      
        +PHidD_GetHidGuid HidD_GetHidGuid = nullptr;
      
        +PHidD_GetAttributes HidD_GetAttributes = nullptr;
      
        +PHidD_SetOutputReport HidD_SetOutputReport = nullptr;
      
        +PHidD_GetProductString HidD_GetProductString = nullptr;
      
        +
      
        +PBth_BluetoothFindDeviceClose Bth_BluetoothFindDeviceClose = nullptr;
      
        +PBth_BluetoothFindFirstDevice Bth_BluetoothFindFirstDevice = nullptr;
      
        +PBth_BluetoothFindFirstRadio Bth_BluetoothFindFirstRadio = nullptr;
      
        +PBth_BluetoothFindNextDevice Bth_BluetoothFindNextDevice = nullptr;
      
        +PBth_BluetoothFindNextRadio Bth_BluetoothFindNextRadio = nullptr;
      
        +PBth_BluetoothFindRadioClose Bth_BluetoothFindRadioClose = nullptr;
      
        +PBth_BluetoothGetRadioInfo Bth_BluetoothGetRadioInfo = nullptr;
      
        +PBth_BluetoothRemoveDevice Bth_BluetoothRemoveDevice = nullptr;
      
        +PBth_BluetoothSetServiceState Bth_BluetoothSetServiceState = nullptr;
      
        +PBth_BluetoothAuthenticateDevice Bth_BluetoothAuthenticateDevice = nullptr;
      
        +PBth_BluetoothEnumerateInstalledServices Bth_BluetoothEnumerateInstalledServices = nullptr;
      
        +
      
        +HINSTANCE hid_lib = nullptr;
      
        +HINSTANCE bthprops_lib = nullptr;
      
         static int initialized = 0;
      
    @@ -201,22 +201,22 @@ void WiimoteScanner::FindWiimotes(std::vector<Wiimote*> & found_wiimotes, Wiimot
  
         	HidD_GetHidGuid(&device_id);
      
         	// Get all hid devices connected
      
        -	HDEVINFO const device_info = SetupDiGetClassDevs(&device_id, NULL, NULL, (DIGCF_DEVICEINTERFACE | DIGCF_PRESENT));
      
        +	HDEVINFO const device_info = SetupDiGetClassDevs(&device_id, nullptr, nullptr, (DIGCF_DEVICEINTERFACE | DIGCF_PRESENT));
      
         	SP_DEVICE_INTERFACE_DATA device_data;
      
         	device_data.cbSize = sizeof(device_data);
      
        -	PSP_DEVICE_INTERFACE_DETAIL_DATA detail_data = NULL;
      
        +	PSP_DEVICE_INTERFACE_DETAIL_DATA detail_data = nullptr;
      
        -	for (int index = 0; SetupDiEnumDeviceInterfaces(device_info, NULL, &device_id, index, &device_data); ++index)
      
        +	for (int index = 0; SetupDiEnumDeviceInterfaces(device_info, nullptr, &device_id, index, &device_data); ++index)
      
         	{
      
         		// Get the size of the data block required
      
         		DWORD len;
      
        -		SetupDiGetDeviceInterfaceDetail(device_info, &device_data, NULL, 0, &len, NULL);
      
        +		SetupDiGetDeviceInterfaceDetail(device_info, &device_data, nullptr, 0, &len, nullptr);
      
         		detail_data = (PSP_DEVICE_INTERFACE_DETAIL_DATA)malloc(len);
      
         		detail_data->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA);
      
         		// Query the data for this device
      
        -		if (SetupDiGetDeviceInterfaceDetail(device_info, &device_data, detail_data, len, NULL, NULL))
      
        +		if (SetupDiGetDeviceInterfaceDetail(device_info, &device_data, detail_data, len, nullptr, nullptr))
      
         		{
      
         			auto const wm = new Wiimote;
      
         			wm->devicepath = detail_data->DevicePath;
      
    @@ -250,7 +250,7 @@ void WiimoteScanner::FindWiimotes(std::vector<Wiimote*> & found_wiimotes, Wiimot
  
         int CheckDeviceType_Write(HANDLE &dev_handle, const u8* buf, size_t size, int attempts)
      
         {
      
         	OVERLAPPED hid_overlap_write = OVERLAPPED();
      
        -	hid_overlap_write.hEvent = CreateEvent(NULL, true, false, NULL);
      
        +	hid_overlap_write.hEvent = CreateEvent(nullptr, true, false, nullptr);
      
         	enum win_bt_stack_t stack = MSBT_STACK_UNKNOWN;
      
         	DWORD written = 0;
      
    @@ -287,7 +287,7 @@ int CheckDeviceType_Write(HANDLE &dev_handle, const u8* buf, size_t size, int at
  
         int CheckDeviceType_Read(HANDLE &dev_handle, u8* buf, int attempts)
      
         {
      
         	OVERLAPPED hid_overlap_read = OVERLAPPED();
      
        -	hid_overlap_read.hEvent = CreateEvent(NULL, true, false, NULL);
      
        +	hid_overlap_read.hEvent = CreateEvent(nullptr, true, false, nullptr);
      
         	int read = 0;
      
         	for (; attempts>0; --attempts)
      
         	{
      
    @@ -318,8 +318,8 @@ void WiimoteScanner::CheckDeviceType(std::basic_string<TCHAR> &devicepath, bool
  
         	HANDLE dev_handle = CreateFile(devicepath.c_str(),
      
         	                               GENERIC_READ | GENERIC_WRITE,
      
         	                               FILE_SHARE_READ | FILE_SHARE_WRITE,
      
        -	                               NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED,
      
        -	                               NULL);
      
        +	                               nullptr, OPEN_EXISTING, FILE_FLAG_OVERLAPPED,
      
        +	                               nullptr);
      
         	if (dev_handle == INVALID_HANDLE_VALUE)
      
         		return;
      
         	// enable to only check for official nintendo wiimotes/bb's
      
    @@ -447,7 +447,7 @@ bool WiimoteScanner::IsReady() const
  
         	HANDLE hRadio;
      
         	HBLUETOOTH_RADIO_FIND hFindRadio = Bth_BluetoothFindFirstRadio(&radioParam, &hRadio);
      
        -	if (NULL != hFindRadio)
      
        +	if (nullptr != hFindRadio)
      
         	{
      
         		Bth_BluetoothFindRadioClose(hFindRadio);
      
         		return true;
      
    @@ -480,7 +480,7 @@ bool Wiimote::ConnectInternal()
  
         	dev_handle = CreateFile(devicepath.c_str(),
      
         		GENERIC_READ | GENERIC_WRITE, open_flags,
      
        -		NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL);
      
        +		nullptr, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, nullptr);
      
         	if (dev_handle == INVALID_HANDLE_VALUE)
      
         	{
      
    @@ -549,10 +549,10 @@ void Wiimote::InitInternal()
  
         	stack = MSBT_STACK_UNKNOWN;
      
         	hid_overlap_read = OVERLAPPED();
      
        -	hid_overlap_read.hEvent = CreateEvent(NULL, true, false, NULL);
      
        +	hid_overlap_read.hEvent = CreateEvent(nullptr, true, false, nullptr);
      
         	hid_overlap_write = OVERLAPPED();
      
        -	hid_overlap_write.hEvent = CreateEvent(NULL, true, false, NULL);
      
        +	hid_overlap_write.hEvent = CreateEvent(nullptr, true, false, nullptr);
      
         }
      
         void Wiimote::TeardownInternal()
      
    @@ -620,7 +620,7 @@ int _IORead(HANDLE &dev_handle, OVERLAPPED &hid_overlap_read, u8* buf, int index
  
         		}
      
         	}
      
        -	WiimoteEmu::Spy(NULL, buf, bytes + 1);
      
        +	WiimoteEmu::Spy(nullptr, buf, bytes + 1);
      
         	return bytes + 1;
      
         }
      
    @@ -642,7 +642,7 @@ int Wiimote::IORead(u8* buf)
  
         int _IOWrite(HANDLE &dev_handle, OVERLAPPED &hid_overlap_write, enum win_bt_stack_t &stack, const u8* buf, size_t len)
      
         {
      
        -	WiimoteEmu::Spy(NULL, buf, len);
      
        +	WiimoteEmu::Spy(nullptr, buf, len);
      
         	switch (stack)
      
         	{
      
    @@ -772,7 +772,7 @@ void ProcessWiimotes(bool new_scan, T& callback)
  
         				if (false == Bth_BluetoothFindNextDevice(hFindDevice, &btdi))
      
         				{
      
         					Bth_BluetoothFindDeviceClose(hFindDevice);
      
        -					hFindDevice = NULL;
      
        +					hFindDevice = nullptr;
      
         				}
      
         			}
      
         		}
      
    @@ -780,7 +780,7 @@ void ProcessWiimotes(bool new_scan, T& callback)
  
         		if (false == Bth_BluetoothFindNextRadio(hFindRadio, &hRadio))
      
         		{
      
         			Bth_BluetoothFindRadioClose(hFindRadio);
      
        -			hFindRadio = NULL;
      
        +			hFindRadio = nullptr;
      
         		}
      
         	}
      
         }
      
    @@ -810,7 +810,7 @@ bool AttachWiimote(HANDLE hRadio, const BLUETOOTH_RADIO_INFO& radio_info, BLUETO
  
         #if defined(AUTHENTICATE_WIIMOTES)
      
         		// Authenticate
      
         		auto const& radio_addr = radio_info.address.rgBytes;
      
        -		const DWORD auth_result = Bth_BluetoothAuthenticateDevice(NULL, hRadio, &btdi,
      
        +		const DWORD auth_result = Bth_BluetoothAuthenticateDevice(nullptr, hRadio, &btdi,
      
         		                                                          std::vector<WCHAR>(radio_addr, radio_addr + 6).data(), 6);
      
         		if (ERROR_SUCCESS != auth_result)

18  Source/Core/Core/HW/WiimoteReal/IOdarwin.mm

show inline notes

View

              
    @@ -40,19 +40,19 @@ - (void) l2capChannelData: (IOBluetoothL2CAPChannel *) l2capChannel
  
         	length: (NSUInteger) length
      
         {
      
         	IOBluetoothDevice *device = [l2capChannel device];
      
        -	WiimoteReal::Wiimote *wm = NULL;
      
        +	WiimoteReal::Wiimote *wm = nullptr;
      
         	std::lock_guard<std::recursive_mutex> lk(WiimoteReal::g_refresh_lock);
      
         	for (int i = 0; i < MAX_WIIMOTES; i++)
      
         	{
      
        -		if (WiimoteReal::g_wiimotes[i] == NULL)
      
        +		if (WiimoteReal::g_wiimotes[i] == nullptr)
      
         			continue;
      
         		if ([device isEqual: WiimoteReal::g_wiimotes[i]->btd] == TRUE)
      
         			wm = WiimoteReal::g_wiimotes[i];
      
         	}
      
        -	if (wm == NULL) {
      
        +	if (wm == nullptr) {
      
         		ERROR_LOG(WIIMOTE, "Received packet for unknown wiimote");
      
         		return;
      
         	}
      
    @@ -79,19 +79,19 @@ - (void) l2capChannelData: (IOBluetoothL2CAPChannel *) l2capChannel
  
         - (void) l2capChannelClosed: (IOBluetoothL2CAPChannel *) l2capChannel
      
         {
      
         	IOBluetoothDevice *device = [l2capChannel device];
      
        -	WiimoteReal::Wiimote *wm = NULL;
      
        +	WiimoteReal::Wiimote *wm = nullptr;
      
         	std::lock_guard<std::recursive_mutex> lk(WiimoteReal::g_refresh_lock);
      
         	for (int i = 0; i < MAX_WIIMOTES; i++)
      
         	{
      
        -		if (WiimoteReal::g_wiimotes[i] == NULL)
      
        +		if (WiimoteReal::g_wiimotes[i] == nullptr)
      
         			continue;
      
         		if ([device isEqual: WiimoteReal::g_wiimotes[i]->btd] == TRUE)
      
         			wm = WiimoteReal::g_wiimotes[i];
      
         	}
      
        -	if (wm == NULL) {
      
        +	if (wm == nullptr) {
      
         		ERROR_LOG(WIIMOTE, "Channel for unknown wiimote was closed");
      
         		return;
      
         	}
      
    @@ -123,7 +123,7 @@ - (void) l2capChannelClosed: (IOBluetoothL2CAPChannel *) l2capChannel
  
         	IOBluetoothDeviceInquiry *bti;
      
         	SearchBT *sbt;
      
         	NSEnumerator *en;
      
        -	found_board = NULL;
      
        +	found_board = nullptr;
      
         	bth = [[IOBluetoothHostController alloc] init];
      
         	if ([bth addressAsString] == nil)
      
    @@ -191,7 +191,7 @@ - (void) l2capChannelClosed: (IOBluetoothL2CAPChannel *) l2capChannel
  
         {
      
         	inputlen = 0;
      
         	m_connected = false;
      
        -	m_wiimote_thread_run_loop = NULL;
      
        +	m_wiimote_thread_run_loop = nullptr;
      
         	btd = nil;
      
         }
      
    @@ -200,7 +200,7 @@ - (void) l2capChannelClosed: (IOBluetoothL2CAPChannel *) l2capChannel
  
         	if (m_wiimote_thread_run_loop)
      
         	{
      
         		CFRelease(m_wiimote_thread_run_loop);
      
        -		m_wiimote_thread_run_loop = NULL;
      
        +		m_wiimote_thread_run_loop = nullptr;
      
         	}
      
         	[btd release];
      
         	btd = nil;

14  Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp

show inline notes

View

              
    @@ -445,7 +445,7 @@ void WiimoteScanner::ThreadFunc()
  
         	while (m_run_thread)
      
         	{
      
         		std::vector<Wiimote*> found_wiimotes;
      
        -		Wiimote* found_board = NULL;
      
        +		Wiimote* found_board = nullptr;
      
         		//NOTICE_LOG(WIIMOTE, "In loop");
      
    @@ -592,7 +592,7 @@ void Initialize(bool wait)
  
         	{
      
         		int timeout = 100;
      
         		std::vector<Wiimote*> found_wiimotes;
      
        -		Wiimote* found_board = NULL;
      
        +		Wiimote* found_board = nullptr;
      
         		g_wiimote_scanner.FindWiimotes(found_wiimotes, found_board);
      
         		if (SConfig::GetInstance().m_WiimoteContinuousScanning)
      
         		{
      
    @@ -694,7 +694,7 @@ void TryToConnectWiimote(Wiimote* wm)
  
         	{
      
         		if (TryToConnectWiimoteN(wm, i))
      
         		{
      
        -			wm = NULL;
      
        +			wm = nullptr;
      
         			break;
      
         		}
      
         	}
      
    @@ -712,7 +712,7 @@ void TryToConnectBalanceBoard(Wiimote* wm)
  
         	if (TryToConnectWiimoteN(wm, WIIMOTE_BALANCE_BOARD))
      
         	{
      
        -		wm = NULL;
      
        +		wm = nullptr;
      
         	}
      
         	g_wiimote_scanner.WantBB(0 != CalculateWantedBB());
      
    @@ -730,7 +730,7 @@ void DoneWithWiimote(int index)
  
         	if (wm)
      
         	{
      
        -		g_wiimotes[index] = NULL;
      
        +		g_wiimotes[index] = nullptr;
      
         		// First see if we can use this real Wiimote in another slot.
      
         		TryToConnectWiimote(wm);
      
         	}
      
    @@ -741,7 +741,7 @@ void DoneWithWiimote(int index)
  
         void HandleWiimoteDisconnect(int index)
      
         {
      
        -	Wiimote* wm = NULL;
      
        +	Wiimote* wm = nullptr;
      
         	{
      
         		std::lock_guard<std::recursive_mutex> lk(g_refresh_lock);
      
    @@ -771,7 +771,7 @@ void Refresh()
  
         	{
      
         		std::unique_lock<std::recursive_mutex> lk(g_refresh_lock);
      
         		std::vector<Wiimote*> found_wiimotes;
      
        -		Wiimote* found_board = NULL;
      
        +		Wiimote* found_board = nullptr;
      
         		if (0 != CalculateWantedWiimotes() || 0 != CalculateWantedBB())
      
         		{

2  Source/Core/Core/IPC_HLE/ICMPWin.cpp

show inline notes

View

              
    @@ -82,7 +82,7 @@ int icmp_echo_rep(const u32 s, sockaddr_in *addr, const u32 timeout, const u32 d
  
         	timeval t;
      
         	t.tv_sec = timeout / 1000;
      
        -	if (select(0, &read_fds, NULL, NULL, &t) > 0)
      
        +	if (select(0, &read_fds, nullptr, nullptr, &t) > 0)
      
         	{
      
         		num_bytes = recvfrom((SOCKET)s, (LPSTR)workspace,
      
         			IP_HDR_LEN + ICMP_HDR_LEN + data_length,

56  Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp

show inline notes

View

              
    @@ -92,20 +92,20 @@ void Init()
  
         {
      
         	_dbg_assert_msg_(WII_IPC_HLE, g_DeviceMap.empty(), "DeviceMap isn't empty on init");
      
         	CWII_IPC_HLE_Device_es::m_ContentFile = "";
      
        -	u32 i;
      
        -	for (i=0; i<IPC_MAX_FDS; i++)
      
        +
      
        +	for (IWII_IPC_HLE_Device*& dev : g_FdMap)
      
         	{
      
        -		g_FdMap[i] = NULL;
      
        +		dev = nullptr;
      
         	}
      
        -	i = 0;
      
        +	u32 i = 0;
      
         	// Build hardware devices
      
         	g_DeviceMap[i] = new CWII_IPC_HLE_Device_usb_oh1_57e_305(i, std::string("/dev/usb/oh1/57e/305")); i++;
      
         	g_DeviceMap[i] = new CWII_IPC_HLE_Device_stm_immediate(i, std::string("/dev/stm/immediate")); i++;
      
         	g_DeviceMap[i] = new CWII_IPC_HLE_Device_stm_eventhook(i, std::string("/dev/stm/eventhook")); i++;
      
         	g_DeviceMap[i] = new CWII_IPC_HLE_Device_fs(i, std::string("/dev/fs")); i++;
      
        -	// IOS allows two ES devices at a time<
      
        +	// IOS allows two ES devices at a time
      
         	for (u32 j=0; j<ES_MAX_COUNT; j++)
      
         	{
      
         		g_DeviceMap[i] = es_handles[j] = new CWII_IPC_HLE_Device_es(i, std::string("/dev/es")); i++;
      
    @@ -137,21 +137,21 @@ void Reset(bool _bHard)
  
         {
      
         	CoreTiming::RemoveAllEvents(enque_reply);
      
        -	for (u32 i=0; i<IPC_MAX_FDS; i++)
      
        +	for (IWII_IPC_HLE_Device*& dev : g_FdMap)
      
         	{
      
        -		if (g_FdMap[i] != NULL && !g_FdMap[i]->IsHardware())
      
        +		if (dev != nullptr && !dev->IsHardware())
      
         		{
      
         			// close all files and delete their resources
      
        -			g_FdMap[i]->Close(0, true);
      
        -			delete g_FdMap[i];
      
        +			dev->Close(0, true);
      
        +			delete dev;
      
         		}
      
        -		g_FdMap[i] = NULL;
      
        +		dev = nullptr;
      
         	}
      
        -	for (u32 j=0; j<ES_MAX_COUNT; j++)
      
        +	for (bool& in_use : es_inuse)
      
         	{
      
        -		es_inuse[j] = false;
      
        +		in_use = false;
      
         	}
      
         	for (const auto& entry : g_DeviceMap)
      
    @@ -214,7 +214,7 @@ int getFreeDeviceId()
  
         {
      
         	for (u32 i=0; i<IPC_MAX_FDS; i++)
      
         	{
      
        -		if (g_FdMap[i] == NULL)
      
        +		if (g_FdMap[i] == nullptr)
      
         		{
      
         			return i;
      
         		}
      
    @@ -228,25 +228,29 @@ IWII_IPC_HLE_Device* GetDeviceByName(const std::string& _rDeviceName)
  
         	for (const auto& entry : g_DeviceMap)
      
         	{
      
         		if (entry.second && entry.second->GetDeviceName() == _rDeviceName)
      
        +		{
      
         			return entry.second;
      
        +		}
      
         	}
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
         IWII_IPC_HLE_Device* AccessDeviceByID(u32 _ID)
      
         {
      
         	if (g_DeviceMap.find(_ID) != g_DeviceMap.end())
      
        +	{
      
         		return g_DeviceMap[_ID];
      
        +	}
      
        -		return NULL;
      
        +	return nullptr;
      
         }
      
         // This is called from ExecuteCommand() COMMAND_OPEN_DEVICE
      
         IWII_IPC_HLE_Device* CreateFileIO(u32 _DeviceID, const std::string& _rDeviceName)
      
         {
      
         	// scan device name and create the right one
      
        -	IWII_IPC_HLE_Device* pDevice = NULL;
      
        +	IWII_IPC_HLE_Device* pDevice = nullptr;
      
         	INFO_LOG(WII_IPC_FILEIO, "IOP: Create FileIO %s", _rDeviceName.c_str());
      
         	pDevice = new CWII_IPC_HLE_Device_FileIO(_DeviceID, _rDeviceName);
      
    @@ -295,7 +299,7 @@ void DoState(PointerWrap &p)
  
         			}
      
         			else
      
         			{
      
        -				g_FdMap[i] = NULL;
      
        +				g_FdMap[i] = nullptr;
      
         			}
      
         		}
      
    @@ -310,22 +314,22 @@ void DoState(PointerWrap &p)
  
         	}
      
         	else
      
         	{
      
        -		for (u32 i=0; i<IPC_MAX_FDS; i++)
      
        +		for (IWII_IPC_HLE_Device*& dev : g_FdMap)
      
         		{
      
        -			u32 exists = g_FdMap[i] ? 1 : 0;
      
        +			u32 exists = dev ? 1 : 0;
      
         			p.Do(exists);
      
         			if (exists)
      
         			{
      
        -				u32 isHw = g_FdMap[i]->IsHardware() ? 1 : 0;
      
        +				u32 isHw = dev->IsHardware() ? 1 : 0;
      
         				p.Do(isHw);
      
         				if (isHw)
      
         				{
      
        -					u32 hwId = g_FdMap[i]->GetDeviceID();
      
        +					u32 hwId = dev->GetDeviceID();
      
         					p.Do(hwId);
      
         				}
      
         				else
      
         				{
      
        -					g_FdMap[i]->DoState(p);
      
        +					dev->DoState(p);
      
         				}
      
         			}
      
         		}
      
    @@ -346,7 +350,7 @@ void ExecuteCommand(u32 _Address)
  
         	ECommandType Command = static_cast<ECommandType>(Memory::Read_U32(_Address));
      
         	volatile s32 DeviceID = Memory::Read_U32(_Address + 8);
      
        -	IWII_IPC_HLE_Device* pDevice = (DeviceID >= 0 && DeviceID < IPC_MAX_FDS) ? g_FdMap[DeviceID] : NULL;
      
        +	IWII_IPC_HLE_Device* pDevice = (DeviceID >= 0 && DeviceID < IPC_MAX_FDS) ? g_FdMap[DeviceID] : nullptr;
      
         	INFO_LOG(WII_IPC_HLE, "-->> Execute Command Address: 0x%08x (code: %x, device: %x) %p", _Address, Command, DeviceID, pDevice);
      
    @@ -416,7 +420,7 @@ void ExecuteCommand(u32 _Address)
  
         				else
      
         				{
      
         					delete pDevice;
      
        -					pDevice = NULL;
      
        +					pDevice = nullptr;
      
         				}
      
         			}
      
         		}
      
    @@ -441,13 +445,13 @@ void ExecuteCommand(u32 _Address)
  
         				}
      
         			}
      
        -			g_FdMap[DeviceID] = NULL;
      
        +			g_FdMap[DeviceID] = nullptr;
      
         			// Don't delete hardware
      
         			if (!pDevice->IsHardware())
      
         			{
      
         				delete pDevice;
      
        -				pDevice = NULL;
      
        +				pDevice = nullptr;
      
         			}
      
         		}
      
         		else

8  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h

show inline notes

View

              
    @@ -224,7 +224,7 @@ class CWII_IPC_HLE_Device_stub : public IWII_IPC_HLE_Device
  
         	{
      
         	}
      
        -	bool Open(u32 CommandAddress, u32 Mode)
      
        +	bool Open(u32 CommandAddress, u32 Mode) override
      
         	{
      
         		(void)Mode;
      
         		WARN_LOG(WII_IPC_HLE, "%s faking Open()", m_Name.c_str());
      
    @@ -232,7 +232,7 @@ class CWII_IPC_HLE_Device_stub : public IWII_IPC_HLE_Device
  
         		m_Active = true;
      
         		return true;
      
         	}
      
        -	bool Close(u32 CommandAddress, bool bForce = false)
      
        +	bool Close(u32 CommandAddress, bool bForce = false) override
      
         	{
      
         		WARN_LOG(WII_IPC_HLE, "%s faking Close()", m_Name.c_str());
      
         		if (!bForce)
      
    @@ -241,13 +241,13 @@ class CWII_IPC_HLE_Device_stub : public IWII_IPC_HLE_Device
  
         		return true;
      
         	}
      
        -	bool IOCtl(u32 CommandAddress)
      
        +	bool IOCtl(u32 CommandAddress) override
      
         	{
      
         		WARN_LOG(WII_IPC_HLE, "%s faking IOCtl()", m_Name.c_str());
      
         		Memory::Write_U32(FS_SUCCESS, CommandAddress + 4);
      
         		return true;
      
         	}
      
        -	bool IOCtlV(u32 CommandAddress)
      
        +	bool IOCtlV(u32 CommandAddress) override
      
         	{
      
         		WARN_LOG(WII_IPC_HLE, "%s faking IOCtlV()", m_Name.c_str());
      
         		Memory::Write_U32(FS_SUCCESS, CommandAddress + 4);

16  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp

show inline notes

View

              
    @@ -29,7 +29,7 @@
  
         CWII_IPC_HLE_Device_di::CWII_IPC_HLE_Device_di(u32 _DeviceID, const std::string& _rDeviceName )
      
         	: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
      
        -	, m_pFileSystem(NULL)
      
        +	, m_pFileSystem(nullptr)
      
         	, m_ErrorStatus(0)
      
         	, m_CoverStatus(DI_COVER_REG_NO_DISC)
      
         {}
      
    @@ -39,7 +39,7 @@
  
         	if (m_pFileSystem)
      
         	{
      
         		delete m_pFileSystem;
      
        -		m_pFileSystem = NULL;
      
        +		m_pFileSystem = nullptr;
      
         	}
      
         }
      
    @@ -61,7 +61,7 @@ bool CWII_IPC_HLE_Device_di::Close(u32 _CommandAddress, bool _bForce)
  
         	if (m_pFileSystem)
      
         	{
      
         		delete m_pFileSystem;
      
        -		m_pFileSystem = NULL;
      
        +		m_pFileSystem = nullptr;
      
         	}
      
         	m_ErrorStatus = 0;
      
         	if (!_bForce)
      
    @@ -159,7 +159,7 @@ u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32
  
         	if(m_pFileSystem && !VolumeHandler::IsValid())
      
         	{
      
         		delete m_pFileSystem;
      
        -		m_pFileSystem = NULL;
      
        +		m_pFileSystem = nullptr;
      
         		m_CoverStatus |= DI_COVER_REG_NO_DISC;
      
         	}
      
    @@ -201,10 +201,10 @@ u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32
  
         			// Don't do anything if the log is unselected
      
         			if (LogManager::GetInstance()->IsEnabled(LogTypes::FILEMON))
      
         			{
      
        -				const char *pFilename = NULL;
      
        +				const char *pFilename = nullptr;
      
         				if (m_pFileSystem)
      
         					pFilename = m_pFileSystem->GetFileName(DVDAddress);
      
        -				if (pFilename != NULL)
      
        +				if (pFilename != nullptr)
      
         				{
      
         					INFO_LOG(WII_IPC_DVD, "DVDLowRead: %s (0x%" PRIx64 ") - (DVDAddr: 0x%" PRIx64 ", Size: 0x%x)",
      
         						pFilename, m_pFileSystem->GetFileSize(pFilename), DVDAddress, Size);
      
    @@ -339,10 +339,10 @@ u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32
  
         	case DVDLowSeek:
      
         		{
      
         			u64 DVDAddress = Memory::Read_U32(_BufferIn + 0x4) << 2;
      
        -			const char *pFilename = NULL;
      
        +			const char *pFilename = nullptr;
      
         			if (m_pFileSystem)
      
         				pFilename = m_pFileSystem->GetFileName(DVDAddress);
      
        -			if (pFilename != NULL)
      
        +			if (pFilename != nullptr)
      
         			{
      
         				INFO_LOG(WII_IPC_DVD, "DVDLowSeek: %s (0x%" PRIx64 ") - (DVDAddr: 0x%" PRIx64 ")",
      
         					pFilename, m_pFileSystem->GetFileSize(pFilename), DVDAddress);

10  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h

show inline notes

View

              
    @@ -20,13 +20,13 @@ class CWII_IPC_HLE_Device_di : public IWII_IPC_HLE_Device
  
         	virtual ~CWII_IPC_HLE_Device_di();
      
        -	bool Open(u32 _CommandAddress, u32 _Mode);
      
        -	bool Close(u32 _CommandAddress, bool _bForce);
      
        +	bool Open(u32 _CommandAddress, u32 _Mode) override;
      
        +	bool Close(u32 _CommandAddress, bool _bForce) override;
      
        -	bool IOCtl(u32 _CommandAddress);
      
        -	bool IOCtlV(u32 _CommandAddress);
      
        +	bool IOCtl(u32 _CommandAddress) override;
      
        +	bool IOCtlV(u32 _CommandAddress) override;
      
        -	int GetCmdDelay(u32);
      
        +	int GetCmdDelay(u32) override;
      
         private:

14  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h

show inline notes

View

              
    @@ -17,13 +17,13 @@ class CWII_IPC_HLE_Device_FileIO : public IWII_IPC_HLE_Device
  
         	virtual ~CWII_IPC_HLE_Device_FileIO();
      
        -	bool Close(u32 _CommandAddress, bool _bForce);
      
        -	bool Open(u32 _CommandAddress, u32 _Mode);
      
        -	bool Seek(u32 _CommandAddress);
      
        -	bool Read(u32 _CommandAddress);
      
        -	bool Write(u32 _CommandAddress);
      
        -	bool IOCtl(u32 _CommandAddress);
      
        -	void DoState(PointerWrap &p);
      
        +	bool Close(u32 _CommandAddress, bool _bForce) override;
      
        +	bool Open(u32 _CommandAddress, u32 _Mode) override;
      
        +	bool Seek(u32 _CommandAddress) override;
      
        +	bool Read(u32 _CommandAddress) override;
      
        +	bool Write(u32 _CommandAddress) override;
      
        +	bool IOCtl(u32 _CommandAddress) override;
      
        +	void DoState(PointerWrap &p) override;
      
         	File::IOFile OpenFile();

10  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp

show inline notes

View

              
    @@ -61,7 +61,7 @@
  
         CWII_IPC_HLE_Device_es::CWII_IPC_HLE_Device_es(u32 _DeviceID, const std::string& _rDeviceName)
      
         	: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
      
        -	, m_pContentLoader(NULL)
      
        +	, m_pContentLoader(nullptr)
      
         	, m_TitleID(-1)
      
         	, m_AccessIdentID(0x6000000)
      
         {
      
    @@ -190,7 +190,7 @@ bool CWII_IPC_HLE_Device_es::Close(u32 _CommandAddress, bool _bForce)
  
         		delete pair.second.m_pFile;
      
         	}
      
         	m_ContentAccessMap.clear();
      
        -	m_pContentLoader = NULL;
      
        +	m_pContentLoader = nullptr;
      
         	m_TitleIDs.clear();
      
         	m_TitleID = -1;
      
         	m_AccessIdentID = 0x6000000;
      
    @@ -214,7 +214,7 @@ u32 CWII_IPC_HLE_Device_es::OpenTitleContent(u32 CFD, u64 TitleID, u16 Index)
  
         	const DiscIO::SNANDContent* pContent = Loader.GetContentByIndex(Index);
      
        -	if (pContent == NULL)
      
        +	if (pContent == nullptr)
      
         	{
      
         		return 0xffffffff; //TODO: what is the correct error value here?
      
         	}
      
    @@ -223,7 +223,7 @@ u32 CWII_IPC_HLE_Device_es::OpenTitleContent(u32 CFD, u64 TitleID, u16 Index)
  
         	Access.m_Position = 0;
      
         	Access.m_pContent = pContent;
      
         	Access.m_TitleID = TitleID;
      
        -	Access.m_pFile = NULL;
      
        +	Access.m_pFile = nullptr;
      
         	if (!pContent->m_pData)
      
         	{
      
    @@ -393,7 +393,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
  
         			}
      
         			SContentAccess& rContent = itr->second;
      
        -			_dbg_assert_(WII_IPC_ES, rContent.m_pContent->m_pData != NULL);
      
        +			_dbg_assert_(WII_IPC_ES, rContent.m_pContent->m_pData != nullptr);
      
         			u8* pDest = Memory::GetPointer(Addr);

8  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h

show inline notes

View

              
    @@ -22,13 +22,13 @@ class CWII_IPC_HLE_Device_es : public IWII_IPC_HLE_Device
  
         	void OpenInternal();
      
        -	virtual void DoState(PointerWrap& p);
      
        +	virtual void DoState(PointerWrap& p) override;
      
        -	virtual bool Open(u32 _CommandAddress, u32 _Mode);
      
        +	virtual bool Open(u32 _CommandAddress, u32 _Mode) override;
      
        -	virtual bool Close(u32 _CommandAddress, bool _bForce);
      
        +	virtual bool Close(u32 _CommandAddress, bool _bForce) override;
      
        -	virtual bool IOCtlV(u32 _CommandAddress);
      
        +	virtual bool IOCtlV(u32 _CommandAddress) override;
      
         	static u32 ES_DIVerify(u8 *_pTMD, u32 _sz);
      
         	// This should only be cleared on power reset

2  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.cpp

show inline notes

View

              
    @@ -138,7 +138,7 @@ bool CWII_IPC_HLE_Device_fs::IOCtlV(u32 _CommandAddress)
  
         						break;
      
         					std::string name, ext;
      
        -					SplitPath(FileSearch.GetFileNames()[i], NULL, &name, &ext);
      
        +					SplitPath(FileSearch.GetFileNames()[i], nullptr, &name, &ext);
      
         					std::string FileName = name + ext;
      
         					// Decode entities of invalid file system characters so that

12  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h

show inline notes

View

              
    @@ -36,15 +36,15 @@ class CWII_IPC_HLE_Device_fs : public IWII_IPC_HLE_Device
  
         	CWII_IPC_HLE_Device_fs(u32 _DeviceID, const std::string& _rDeviceName);
      
         	virtual ~CWII_IPC_HLE_Device_fs();
      
        -	virtual void DoState(PointerWrap& p);
      
        +	virtual void DoState(PointerWrap& p) override;
      
        -	virtual bool Open(u32 _CommandAddress, u32 _Mode);
      
        -	virtual bool Close(u32 _CommandAddress, bool _bForce);
      
        +	virtual bool Open(u32 _CommandAddress, u32 _Mode) override;
      
        +	virtual bool Close(u32 _CommandAddress, bool _bForce) override;
      
        -	virtual bool IOCtl(u32 _CommandAddress);
      
        -	virtual bool IOCtlV(u32 _CommandAddress);
      
        +	virtual bool IOCtl(u32 _CommandAddress) override;
      
        +	virtual bool IOCtlV(u32 _CommandAddress) override;
      
        -	virtual int GetCmdDelay(u32);
      
        +	virtual int GetCmdDelay(u32) override;
      
         private:

28  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp

show inline notes

View

              
    @@ -41,7 +41,7 @@ void CWII_IPC_HLE_Device_hid::checkUsbUpdates(CWII_IPC_HLE_Device_hid* hid)
  
         			}
      
         		}
      
         		timeToFill+=8;
      
        -		libusb_handle_events_timeout(NULL, &tv);
      
        +		libusb_handle_events_timeout(nullptr, &tv);
      
         	}
      
         	return;
      
    @@ -73,7 +73,7 @@ void CWII_IPC_HLE_Device_hid::handleUsbUpdates(struct libusb_transfer *transfer)
  
         {
      
         	deviceCommandAddress = 0;
      
         	memset(hidDeviceAliases, 0, sizeof(hidDeviceAliases));
      
        -	int ret = libusb_init(NULL);
      
        +	int ret = libusb_init(nullptr);
      
         	if (ret)
      
         	{
      
         		ERROR_LOG(WII_IPC_HID, "libusb_init failed with error: %d", ret);
      
    @@ -102,7 +102,7 @@ void CWII_IPC_HLE_Device_hid::handleUsbUpdates(struct libusb_transfer *transfer)
  
         	open_devices.clear();
      
         	if (deinit_libusb)
      
        -		libusb_exit(NULL);
      
        +		libusb_exit(nullptr);
      
         }
      
         bool CWII_IPC_HLE_Device_hid::Open(u32 _CommandAddress, u32 _Mode)
      
    @@ -190,7 +190,7 @@ bool CWII_IPC_HLE_Device_hid::IOCtl(u32 _CommandAddress)
  
         		libusb_device_handle * dev_handle = GetDeviceByDevNum(dev_num);
      
        -		if (dev_handle == NULL)
      
        +		if (dev_handle == nullptr)
      
         		{
      
         			DEBUG_LOG(WII_IPC_HID, "Could not find handle: %X", dev_num);
      
         			break;
      
    @@ -223,7 +223,7 @@ bool CWII_IPC_HLE_Device_hid::IOCtl(u32 _CommandAddress)
  
         		libusb_device_handle * dev_handle = GetDeviceByDevNum(dev_num);
      
        -		if (dev_handle == NULL)
      
        +		if (dev_handle == nullptr)
      
         		{
      
         			DEBUG_LOG(WII_IPC_HID, "Could not find handle: %X", dev_num);
      
         			break;
      
    @@ -359,8 +359,8 @@ void CWII_IPC_HLE_Device_hid::FillOutDevices(u32 BufferOut, u32 BufferOutSize)
  
         	int d,c,ic,i,e; /* config, interface container, interface, endpoint  */
      
         	libusb_device **list;
      
        -	//libusb_device *found = NULL;
      
        -	ssize_t cnt = libusb_get_device_list(NULL, &list);
      
        +	//libusb_device *found = nullptr;
      
        +	ssize_t cnt = libusb_get_device_list(nullptr, &list);
      
         	DEBUG_LOG(WII_IPC_HID, "Found %ld viable USB devices.", cnt);
      
         	for (d = 0; d < cnt; d++)
      
         	{
      
    @@ -387,7 +387,7 @@ void CWII_IPC_HLE_Device_hid::FillOutDevices(u32 BufferOut, u32 BufferOutSize)
  
         		for (c = 0; deviceValid && c < desc.bNumConfigurations; c++)
      
         		{
      
        -			struct libusb_config_descriptor *config = NULL;
      
        +			struct libusb_config_descriptor *config = nullptr;
      
         			int cRet = libusb_get_config_descriptor(device, c, &config);
      
         			// do not try to use usb devices with more than one interface, games can crash
      
         			if(cRet == 0 && config->bNumInterfaces <= MAX_HID_INTERFACES)
      
    @@ -426,7 +426,7 @@ void CWII_IPC_HLE_Device_hid::FillOutDevices(u32 BufferOut, u32 BufferOutSize)
  
         					} // interfaces
      
         				} // interface containters
      
         				libusb_free_config_descriptor(config);
      
        -				config = NULL;
      
        +				config = nullptr;
      
         			}
      
         			else
      
         			{
      
    @@ -502,11 +502,11 @@ int CWII_IPC_HLE_Device_hid::Align(int num, int alignment)
  
         libusb_device_handle * CWII_IPC_HLE_Device_hid::GetDeviceByDevNum(u32 devNum)
      
         {
      
         	libusb_device **list;
      
        -	libusb_device_handle *handle = NULL;
      
        +	libusb_device_handle *handle = nullptr;
      
         	ssize_t cnt;
      
         	if(devNum >= MAX_DEVICE_DEVNUM)
      
        -		return NULL;
      
        +		return nullptr;
      
         	std::lock_guard<std::mutex> lk(s_open_devices);
      
    @@ -525,10 +525,10 @@ libusb_device_handle * CWII_IPC_HLE_Device_hid::GetDeviceByDevNum(u32 devNum)
  
         		}
      
         	}
      
        -	cnt = libusb_get_device_list(NULL, &list);
      
        +	cnt = libusb_get_device_list(nullptr, &list);
      
         	if (cnt < 0)
      
        -		return NULL;
      
        +		return nullptr;
      
         #ifdef _WIN32
      
         	static bool has_warned_about_drivers = false;
      
    @@ -596,7 +596,7 @@ libusb_device_handle * CWII_IPC_HLE_Device_hid::GetDeviceByDevNum(u32 devNum)
  
         		}
      
         		else
      
         		{
      
        -			handle = NULL;
      
        +			handle = nullptr;
      
         		}
      
         	}

10  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h

show inline notes

View

              
    @@ -25,12 +25,12 @@ class CWII_IPC_HLE_Device_hid : public IWII_IPC_HLE_Device
  
         	virtual ~CWII_IPC_HLE_Device_hid();
      
        -	virtual bool Open(u32 _CommandAddress, u32 _Mode);
      
        -	virtual bool Close(u32 _CommandAddress, bool _bForce);
      
        -	virtual u32 Update();
      
        +	virtual bool Open(u32 _CommandAddress, u32 _Mode) override;
      
        +	virtual bool Close(u32 _CommandAddress, bool _bForce) override;
      
        +	virtual u32 Update() override;
      
        -	virtual bool IOCtlV(u32 _CommandAddress);
      
        -	virtual bool IOCtl(u32 _CommandAddress);
      
        +	virtual bool IOCtlV(u32 _CommandAddress) override;
      
        +	virtual bool IOCtl(u32 _CommandAddress) override;
      
         private:
      
         	enum

38  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp

show inline notes

View

              
    @@ -864,9 +864,9 @@ bool CWII_IPC_HLE_Device_net_ip_top::IOCtl(u32 _CommandAddress)
  
         		Memory::Write_U32(Common::swap32(*(u32 *)remoteHost->h_addr_list[0]), BufferOut);
      
         		INFO_LOG(WII_IPC_NET, "IOCTL_SO_INETATON = %d "
      
        -			"%s, BufferIn: (%08x, %i), BufferOut: (%08x, %i), IP Found: %08X",remoteHost->h_addr_list[0] == 0 ? -1 : 0,
      
        +			"%s, BufferIn: (%08x, %i), BufferOut: (%08x, %i), IP Found: %08X",remoteHost->h_addr_list[0] == nullptr ? -1 : 0,
      
         			(char*)Memory::GetPointer(BufferIn), BufferIn, BufferInSize, BufferOut, BufferOutSize, Common::swap32(*(u32 *)remoteHost->h_addr_list[0]));
      
        -		ReturnValue = remoteHost->h_addr_list[0] == 0 ? 0 : 1;
      
        +		ReturnValue = remoteHost->h_addr_list[0] == nullptr ? 0 : 1;
      
         		break;
      
         	}
      
    @@ -913,7 +913,7 @@ bool CWII_IPC_HLE_Device_net_ip_top::IOCtl(u32 _CommandAddress)
  
         				ERROR_LOG(WII_IPC_NET, "Hidden POLL");
      
         			pollfd_t* ufds = (pollfd_t *)malloc(sizeof(pollfd_t) * nfds);
      
        -			if (ufds == NULL)
      
        +			if (ufds == nullptr)
      
         			{
      
         				ReturnValue = -1;
      
         				break;
      
    @@ -1008,7 +1008,7 @@ bool CWII_IPC_HLE_Device_net_ip_top::IOCtl(u32 _CommandAddress)
  
         				Memory::Write_U32(wii_addr, BufferOut + 4);
      
         				Memory::Write_U32(wii_addr + sizeof(u32), wii_addr);
      
         				wii_addr += sizeof(u32);
      
        -				Memory::Write_U32((u32)NULL, wii_addr);
      
        +				Memory::Write_U32(0, wii_addr);
      
         				wii_addr += sizeof(u32);
      
         				// hardcode to ipv4
      
    @@ -1028,8 +1028,8 @@ bool CWII_IPC_HLE_Device_net_ip_top::IOCtl(u32 _CommandAddress)
  
         					Memory::Write_U32(wii_addr + sizeof(u32) * (num_addr + 1), wii_addr);
      
         					wii_addr += sizeof(u32);
      
         				}
      
        -				// NULL terminated list
      
        -				Memory::Write_U32((u32)NULL, wii_addr);
      
        +				// null-terminated list
      
        +				Memory::Write_U32(0, wii_addr);
      
         				wii_addr += sizeof(u32);
      
         				// The actual IPs
      
         				for (int i = 0; remoteHost->h_addr_list[i]; i++)
      
    @@ -1144,7 +1144,7 @@ bool CWII_IPC_HLE_Device_net_ip_top::IOCtlV(u32 CommandAddress)
  
         		{
      
         			u32 address = 0;
      
         #ifdef _WIN32
      
        -			PIP_ADAPTER_ADDRESSES AdapterAddresses = NULL;
      
        +			PIP_ADAPTER_ADDRESSES AdapterAddresses = nullptr;
      
         			ULONG OutBufferLength = 0;
      
         			ULONG RetVal = 0, i;
      
         			for (i = 0; i < 5; i++)
      
    @@ -1152,7 +1152,7 @@ bool CWII_IPC_HLE_Device_net_ip_top::IOCtlV(u32 CommandAddress)
  
         				RetVal = GetAdaptersAddresses(
      
         					AF_INET,
      
         					0,
      
        -					NULL,
      
        +					nullptr,
      
         					AdapterAddresses,
      
         					&OutBufferLength);
      
    @@ -1160,12 +1160,12 @@ bool CWII_IPC_HLE_Device_net_ip_top::IOCtlV(u32 CommandAddress)
  
         					break;
      
         				}
      
        -				if (AdapterAddresses != NULL) {
      
        +				if (AdapterAddresses != nullptr) {
      
         					FREE(AdapterAddresses);
      
         				}
      
         				AdapterAddresses = (PIP_ADAPTER_ADDRESSES)MALLOC(OutBufferLength);
      
        -				if (AdapterAddresses == NULL) {
      
        +				if (AdapterAddresses == nullptr) {
      
         					RetVal = GetLastError();
      
         					break;
      
         				}
      
    @@ -1197,7 +1197,7 @@ bool CWII_IPC_HLE_Device_net_ip_top::IOCtlV(u32 CommandAddress)
  
         					}
      
         				}
      
         			}
      
        -			if (AdapterAddresses != NULL) {
      
        +			if (AdapterAddresses != nullptr) {
      
         				FREE(AdapterAddresses);
      
         			}
      
         #endif
      
    @@ -1253,7 +1253,7 @@ bool CWII_IPC_HLE_Device_net_ip_top::IOCtlV(u32 CommandAddress)
  
         	case IOCTLV_SO_GETADDRINFO:
      
         	{
      
         		struct addrinfo hints;
      
        -		struct addrinfo *result = NULL;
      
        +		struct addrinfo *result = nullptr;
      
         		if (BufferInSize3)
      
         		{
      
    @@ -1262,25 +1262,25 @@ bool CWII_IPC_HLE_Device_net_ip_top::IOCtlV(u32 CommandAddress)
  
         			hints.ai_socktype  = Memory::Read_U32(_BufferIn3 + 0x8);
      
         			hints.ai_protocol  = Memory::Read_U32(_BufferIn3 + 0xC);
      
         			hints.ai_addrlen   = Memory::Read_U32(_BufferIn3 + 0x10);
      
        -			hints.ai_canonname = NULL;
      
        -			hints.ai_addr      = NULL;
      
        -			hints.ai_next      = NULL;
      
        +			hints.ai_canonname = nullptr;
      
        +			hints.ai_addr      = nullptr;
      
        +			hints.ai_next      = nullptr;
      
         		}
      
        -		char* pNodeName = NULL;
      
        +		char* pNodeName = nullptr;
      
         		if (BufferInSize > 0)
      
         			pNodeName = (char*)Memory::GetPointer(_BufferIn);
      
        -		char* pServiceName = NULL;
      
        +		char* pServiceName = nullptr;
      
         		if (BufferInSize2 > 0)
      
         			pServiceName = (char*)Memory::GetPointer(_BufferIn2);
      
        -		int ret = getaddrinfo(pNodeName, pServiceName, BufferInSize3 ? &hints : NULL, &result);
      
        +		int ret = getaddrinfo(pNodeName, pServiceName, BufferInSize3 ? &hints : nullptr, &result);
      
         		u32 addr = _BufferOut;
      
         		u32 sockoffset = addr + 0x460;
      
         		if (ret == 0)
      
         		{
      
        -			while (result != NULL)
      
        +			while (result != nullptr)
      
         			{
      
         				Memory::Write_U32(result->ai_flags, addr);
      
         				Memory::Write_U32(result->ai_family, addr + 0x04);

34  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.h

show inline notes

View

              
    @@ -394,9 +394,9 @@ class CWII_IPC_HLE_Device_net_kd_request : public IWII_IPC_HLE_Device
  
         	virtual ~CWII_IPC_HLE_Device_net_kd_request();
      
        -	virtual bool Open(u32 _CommandAddress, u32 _Mode);
      
        -	virtual bool Close(u32 _CommandAddress, bool _bForce);
      
        -	virtual bool IOCtl(u32 _CommandAddress);
      
        +	virtual bool Open(u32 _CommandAddress, u32 _Mode) override;
      
        +	virtual bool Close(u32 _CommandAddress, bool _bForce) override;
      
        +	virtual bool IOCtl(u32 _CommandAddress) override;
      
         private:
      
         	enum
      
    @@ -456,14 +456,14 @@ class CWII_IPC_HLE_Device_net_kd_time : public IWII_IPC_HLE_Device
  
         	virtual ~CWII_IPC_HLE_Device_net_kd_time()
      
         	{}
      
        -	virtual bool Open(u32 _CommandAddress, u32 _Mode)
      
        +	virtual bool Open(u32 _CommandAddress, u32 _Mode) override
      
         	{
      
         		INFO_LOG(WII_IPC_NET, "NET_KD_TIME: Open");
      
         		Memory::Write_U32(GetDeviceID(), _CommandAddress+4);
      
         		return true;
      
         	}
      
        -	virtual bool Close(u32 _CommandAddress, bool _bForce)
      
        +	virtual bool Close(u32 _CommandAddress, bool _bForce) override
      
         	{
      
         		INFO_LOG(WII_IPC_NET, "NET_KD_TIME: Close");
      
         		if (!_bForce)
      
    @@ -471,7 +471,7 @@ class CWII_IPC_HLE_Device_net_kd_time : public IWII_IPC_HLE_Device
  
         		return true;
      
         	}
      
        -	virtual bool IOCtl(u32 _CommandAddress)
      
        +	virtual bool IOCtl(u32 _CommandAddress) override
      
         	{
      
         		u32 Parameter = Memory::Read_U32(_CommandAddress + 0x0C);
      
         		u32 BufferIn  = Memory::Read_U32(_CommandAddress + 0x10);
      
    @@ -596,12 +596,12 @@ class CWII_IPC_HLE_Device_net_ip_top : public IWII_IPC_HLE_Device
  
         	virtual ~CWII_IPC_HLE_Device_net_ip_top();
      
        -	virtual bool Open(u32 _CommandAddress, u32 _Mode);
      
        -	virtual bool Close(u32 _CommandAddress, bool _bForce);
      
        -	virtual bool IOCtl(u32 _CommandAddress);
      
        -	virtual bool IOCtlV(u32 _CommandAddress);
      
        +	virtual bool Open(u32 _CommandAddress, u32 _Mode) override;
      
        +	virtual bool Close(u32 _CommandAddress, bool _bForce) override;
      
        +	virtual bool IOCtl(u32 _CommandAddress) override;
      
        +	virtual bool IOCtlV(u32 _CommandAddress) override;
      
        -	virtual u32 Update();
      
        +	virtual u32 Update() override;
      
         private:
      
         #ifdef _WIN32
      
    @@ -620,9 +620,9 @@ class CWII_IPC_HLE_Device_net_ncd_manage : public IWII_IPC_HLE_Device
  
         	virtual ~CWII_IPC_HLE_Device_net_ncd_manage();
      
        -	virtual bool Open(u32 _CommandAddress, u32 _Mode);
      
        -	virtual bool Close(u32 _CommandAddress, bool _bForce);
      
        -	virtual bool IOCtlV(u32 _CommandAddress);
      
        +	virtual bool Open(u32 _CommandAddress, u32 _Mode) override;
      
        +	virtual bool Close(u32 _CommandAddress, bool _bForce) override;
      
        +	virtual bool IOCtlV(u32 _CommandAddress) override;
      
         private:
      
         	enum
      
    @@ -648,9 +648,9 @@ class CWII_IPC_HLE_Device_net_wd_command : public IWII_IPC_HLE_Device
  
         	virtual ~CWII_IPC_HLE_Device_net_wd_command();
      
        -	virtual bool Open(u32 CommandAddress, u32 Mode);
      
        -	virtual bool Close(u32 CommandAddress, bool Force);
      
        -	virtual bool IOCtlV(u32 CommandAddress);
      
        +	virtual bool Open(u32 CommandAddress, u32 Mode) override;
      
        +	virtual bool Close(u32 CommandAddress, bool Force) override;
      
        +	virtual bool IOCtlV(u32 CommandAddress) override;
      
         private:
      
         	enum

139  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp

show inline notes

View

              
    @@ -11,32 +11,32 @@
  
         CWII_IPC_HLE_Device_net_ssl::CWII_IPC_HLE_Device_net_ssl(u32 _DeviceID, const std::string& _rDeviceName)
      
         	: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
      
         {
      
        -	for (int i = 0; i < NET_SSL_MAXINSTANCES; ++i)
      
        +	for (WII_SSL& ssl : _SSL)
      
         	{
      
        -		memset(&_SSL[i], 0, sizeof(WII_SSL));
      
        +		memset(&ssl, 0, sizeof(WII_SSL));
      
         	}
      
         }
      
         CWII_IPC_HLE_Device_net_ssl::~CWII_IPC_HLE_Device_net_ssl()
      
         {
      
         	// Cleanup sessions
      
        -	for (int i = 0; i < NET_SSL_MAXINSTANCES; i++)
      
        +	for (WII_SSL& ssl : _SSL)
      
         	{
      
        -		if (_SSL[i].active)
      
        +		if (ssl.active)
      
         		{
      
        -			ssl_close_notify(&_SSL[i].ctx);
      
        -			ssl_session_free(&_SSL[i].session);
      
        -			ssl_free(&_SSL[i].ctx);
      
        +			ssl_close_notify(&ssl.ctx);
      
        +			ssl_session_free(&ssl.session);
      
        +			ssl_free(&ssl.ctx);
      
        -			x509_crt_free(&_SSL[i].cacert);
      
        -			x509_crt_free(&_SSL[i].clicert);
      
        +			x509_crt_free(&ssl.cacert);
      
        +			x509_crt_free(&ssl.clicert);
      
        -			memset(&_SSL[i].ctx, 0, sizeof(ssl_context));
      
        -			memset(&_SSL[i].session, 0, sizeof(ssl_session));
      
        -			memset(&_SSL[i].entropy, 0, sizeof(entropy_context));
      
        -			memset(_SSL[i].hostname, 0, NET_SSL_MAX_HOSTNAME_LEN);
      
        +			memset(&ssl.ctx, 0, sizeof(ssl_context));
      
        +			memset(&ssl.session, 0, sizeof(ssl_session));
      
        +			memset(&ssl.entropy, 0, sizeof(entropy_context));
      
        +			memset(ssl.hostname, 0, NET_SSL_MAX_HOSTNAME_LEN);
      
        -			_SSL[i].active = false;
      
        +			ssl.active = false;
      
         		}
      
         	}
      
         }
      
    @@ -79,9 +79,9 @@ bool CWII_IPC_HLE_Device_net_ssl::IOCtl(u32 _CommandAddress)
  
         	u32 Command       = Memory::Read_U32(_CommandAddress + 0x0C);
      
         	INFO_LOG(WII_IPC_SSL, "%s unknown %i "
      
        -	"(BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
      
        -			 GetDeviceName().c_str(), Command,
      
        -			 BufferIn, BufferInSize, BufferOut, BufferOutSize);
      
        +	         "(BufferIn: (%08x, %i), BufferOut: (%08x, %i)",
      
        +	         GetDeviceName().c_str(), Command,
      
        +	         BufferIn, BufferInSize, BufferOut, BufferOutSize);
      
         	Memory::Write_U32(0, _CommandAddress + 0x4);
      
         	return true;
      
         }
      
    @@ -139,45 +139,46 @@ bool CWII_IPC_HLE_Device_net_ssl::IOCtlV(u32 _CommandAddress)
  
         		if (freeSSL)
      
         		{
      
         			int sslID = freeSSL - 1;
      
        -			int ret = ssl_init(&_SSL[sslID].ctx);
      
        +			WII_SSL* ssl = &_SSL[sslID];
      
        +			int ret = ssl_init(&ssl->ctx);
      
         			if (ret)
      
         			{
      
         				// Cleanup possibly dirty ctx
      
        -				memset(&_SSL[sslID].ctx, 0, sizeof(ssl_context));
      
        +				memset(&ssl->ctx, 0, sizeof(ssl_context));
      
         				goto _SSL_NEW_ERROR;
      
         			}
      
        -			entropy_init(&_SSL[sslID].entropy);
      
        +			entropy_init(&ssl->entropy);
      
         			const char* pers = "dolphin-emu";
      
        -			ret = ctr_drbg_init(&_SSL[sslID].ctr_drbg, entropy_func,
      
        -			                    &_SSL[sslID].entropy,
      
        +			ret = ctr_drbg_init(&ssl->ctr_drbg, entropy_func,
      
        +			                    &ssl->entropy,
      
         			                    (const unsigned char*)pers,
      
         			                    strlen(pers));
      
         			if (ret)
      
         			{
      
        -				ssl_free(&_SSL[sslID].ctx);
      
        +				ssl_free(&ssl->ctx);
      
         				// Cleanup possibly dirty ctx
      
        -				memset(&_SSL[sslID].ctx, 0, sizeof(ssl_context));
      
        -				entropy_free(&_SSL[sslID].entropy);
      
        +				memset(&ssl->ctx, 0, sizeof(ssl_context));
      
        +				entropy_free(&ssl->entropy);
      
         				goto _SSL_NEW_ERROR;
      
         			}
      
        -			ssl_set_rng(&_SSL[sslID].ctx, ctr_drbg_random, &_SSL[sslID].ctr_drbg);
      
        +			ssl_set_rng(&ssl->ctx, ctr_drbg_random, &ssl->ctr_drbg);
      
         			// For some reason we can't use TLSv1.2, v1.1 and below are fine!
      
        -			ssl_set_max_version(&_SSL[sslID].ctx, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_2);
      
        +			ssl_set_max_version(&ssl->ctx, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_2);
      
        -			ssl_set_session(&_SSL[sslID].ctx, &_SSL[sslID].session);
      
        +			ssl_set_session(&ssl->ctx, &ssl->session);
      
        -			ssl_set_endpoint(&_SSL[sslID].ctx, SSL_IS_CLIENT);
      
        -			ssl_set_authmode(&_SSL[sslID].ctx, SSL_VERIFY_NONE);
      
        -			ssl_set_renegotiation(&_SSL[sslID].ctx, SSL_RENEGOTIATION_ENABLED);
      
        +			ssl_set_endpoint(&ssl->ctx, SSL_IS_CLIENT);
      
        +			ssl_set_authmode(&ssl->ctx, SSL_VERIFY_NONE);
      
        +			ssl_set_renegotiation(&ssl->ctx, SSL_RENEGOTIATION_ENABLED);
      
        -			memcpy(_SSL[sslID].hostname, hostname, min((int)BufferOutSize2, NET_SSL_MAX_HOSTNAME_LEN));
      
        -			_SSL[sslID].hostname[NET_SSL_MAX_HOSTNAME_LEN-1] = '\0';
      
        -			ssl_set_hostname(&_SSL[sslID].ctx, _SSL[sslID].hostname);
      
        +			memcpy(ssl->hostname, hostname, min((int)BufferOutSize2, NET_SSL_MAX_HOSTNAME_LEN));
      
        +			ssl->hostname[NET_SSL_MAX_HOSTNAME_LEN-1] = '\0';
      
        +			ssl_set_hostname(&ssl->ctx, ssl->hostname);
      
        -			_SSL[sslID].active = true;
      
        +			ssl->active = true;
      
         			Memory::Write_U32(freeSSL, _BufferIn);
      
         		}
      
         		else
      
    @@ -201,21 +202,22 @@ bool CWII_IPC_HLE_Device_net_ssl::IOCtlV(u32 _CommandAddress)
  
         		int sslID = Memory::Read_U32(BufferOut) - 1;
      
         		if (SSLID_VALID(sslID))
      
         		{
      
        -			ssl_close_notify(&_SSL[sslID].ctx);
      
        -			ssl_session_free(&_SSL[sslID].session);
      
        -			ssl_free(&_SSL[sslID].ctx);
      
        +			WII_SSL* ssl = &_SSL[sslID];
      
        +			ssl_close_notify(&ssl->ctx);
      
        +			ssl_session_free(&ssl->session);
      
        +			ssl_free(&ssl->ctx);
      
        -			entropy_free(&_SSL[sslID].entropy);
      
        +			entropy_free(&ssl->entropy);
      
        -			x509_crt_free(&_SSL[sslID].cacert);
      
        -			x509_crt_free(&_SSL[sslID].clicert);
      
        +			x509_crt_free(&ssl->cacert);
      
        +			x509_crt_free(&ssl->clicert);
      
        -			memset(&_SSL[sslID].ctx, 0, sizeof(ssl_context));
      
        -			memset(&_SSL[sslID].session, 0, sizeof(ssl_session));
      
        -			memset(&_SSL[sslID].entropy, 0, sizeof(entropy_context));
      
        -			memset(_SSL[sslID].hostname, 0, NET_SSL_MAX_HOSTNAME_LEN);
      
        +			memset(&ssl->ctx, 0, sizeof(ssl_context));
      
        +			memset(&ssl->session, 0, sizeof(ssl_session));
      
        +			memset(&ssl->entropy, 0, sizeof(entropy_context));
      
        +			memset(ssl->hostname, 0, NET_SSL_MAX_HOSTNAME_LEN);
      
        -			_SSL[sslID].active = false;
      
        +			ssl->active = false;
      
         			Memory::Write_U32(SSL_OK, _BufferIn);
      
         		}
      
    @@ -246,8 +248,9 @@ bool CWII_IPC_HLE_Device_net_ssl::IOCtlV(u32 _CommandAddress)
  
         		int sslID = Memory::Read_U32(BufferOut) - 1;
      
         		if (SSLID_VALID(sslID))
      
         		{
      
        +			WII_SSL* ssl = &_SSL[sslID];
      
         			int ret = x509_crt_parse_der(
      
        -				&_SSL[sslID].cacert,
      
        +				&ssl->cacert,
      
         				Memory::GetPointer(BufferOut2),
      
         				BufferOutSize2);
      
    @@ -257,7 +260,7 @@ bool CWII_IPC_HLE_Device_net_ssl::IOCtlV(u32 _CommandAddress)
  
         			}
      
         			else
      
         			{
      
        -				ssl_set_ca_chain(&_SSL[sslID].ctx, &_SSL[sslID].cacert, NULL, _SSL[sslID].hostname);
      
        +				ssl_set_ca_chain(&ssl->ctx, &ssl->cacert, nullptr, ssl->hostname);
      
         				Memory::Write_U32(SSL_OK, _BufferIn);
      
         			}
      
    @@ -282,20 +285,21 @@ bool CWII_IPC_HLE_Device_net_ssl::IOCtlV(u32 _CommandAddress)
  
         		int sslID = Memory::Read_U32(BufferOut) - 1;
      
         		if (SSLID_VALID(sslID))
      
         		{
      
        +			WII_SSL* ssl = &_SSL[sslID];
      
         			std::string cert_base_path(File::GetUserPath(D_WIIUSER_IDX));
      
        -			int ret = x509_crt_parse_file(&_SSL[sslID].clicert, (cert_base_path + "clientca.pem").c_str());
      
        -			int pk_ret = pk_parse_keyfile(&_SSL[sslID].pk, (cert_base_path + "clientcakey.pem").c_str(), NULL);
      
        +			int ret = x509_crt_parse_file(&ssl->clicert, (cert_base_path + "clientca.pem").c_str());
      
        +			int pk_ret = pk_parse_keyfile(&ssl->pk, (cert_base_path + "clientcakey.pem").c_str(), nullptr);
      
         			if (ret || pk_ret)
      
         			{
      
        -				x509_crt_free(&_SSL[sslID].clicert);
      
        -				pk_free(&_SSL[sslID].pk);
      
        -				memset(&_SSL[sslID].clicert, 0, sizeof(x509_crt));
      
        -				memset(&_SSL[sslID].pk, 0, sizeof(pk_context));
      
        +				x509_crt_free(&ssl->clicert);
      
        +				pk_free(&ssl->pk);
      
        +				memset(&ssl->clicert, 0, sizeof(x509_crt));
      
        +				memset(&ssl->pk, 0, sizeof(pk_context));
      
         				Memory::Write_U32(SSL_ERR_FAILED, _BufferIn);
      
         			}
      
         			else
      
         			{
      
        -				ssl_set_own_cert(&_SSL[sslID].ctx, &_SSL[sslID].clicert, &_SSL[sslID].pk);
      
        +				ssl_set_own_cert(&ssl->ctx, &ssl->clicert, &ssl->pk);
      
         				Memory::Write_U32(SSL_OK, _BufferIn);
      
         			}
      
    @@ -321,12 +325,13 @@ bool CWII_IPC_HLE_Device_net_ssl::IOCtlV(u32 _CommandAddress)
  
         		int sslID = Memory::Read_U32(BufferOut) - 1;
      
         		if (SSLID_VALID(sslID))
      
         		{
      
        -			x509_crt_free(&_SSL[sslID].clicert);
      
        -			pk_free(&_SSL[sslID].pk);
      
        -			memset(&_SSL[sslID].clicert, 0, sizeof(x509_crt));
      
        -			memset(&_SSL[sslID].pk, 0, sizeof(pk_context));
      
        +			WII_SSL* ssl = &_SSL[sslID];
      
        +			x509_crt_free(&ssl->clicert);
      
        +			pk_free(&ssl->pk);
      
        +			memset(&ssl->clicert, 0, sizeof(x509_crt));
      
        +			memset(&ssl->pk, 0, sizeof(pk_context));
      
        -			ssl_set_own_cert(&_SSL[sslID].ctx, NULL, NULL);
      
        +			ssl_set_own_cert(&ssl->ctx, nullptr, nullptr);
      
         			Memory::Write_U32(SSL_OK, _BufferIn);
      
         		}
      
         		else
      
    @@ -341,17 +346,18 @@ bool CWII_IPC_HLE_Device_net_ssl::IOCtlV(u32 _CommandAddress)
  
         		int sslID = Memory::Read_U32(BufferOut) - 1;
      
         		if (SSLID_VALID(sslID))
      
         		{
      
        +			WII_SSL* ssl = &_SSL[sslID];
      
         			std::string cert_base_path(File::GetUserPath(D_WIIUSER_IDX));
      
        -			int ret = x509_crt_parse_file(&_SSL[sslID].cacert, (cert_base_path + "rootca.pem").c_str());
      
        +			int ret = x509_crt_parse_file(&ssl->cacert, (cert_base_path + "rootca.pem").c_str());
      
         			if (ret)
      
         			{
      
        -				x509_crt_free(&_SSL[sslID].clicert);
      
        +				x509_crt_free(&ssl->clicert);
      
         				Memory::Write_U32(SSL_ERR_FAILED, _BufferIn);
      
         			}
      
         			else
      
         			{
      
        -				ssl_set_ca_chain(&_SSL[sslID].ctx, &_SSL[sslID].cacert, NULL, _SSL[sslID].hostname);
      
        +				ssl_set_ca_chain(&ssl->ctx, &ssl->cacert, nullptr, ssl->hostname);
      
         				Memory::Write_U32(SSL_OK, _BufferIn);
      
         			}
      
         			INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_SETBUILTINROOTCA = %d", ret);
      
    @@ -374,9 +380,10 @@ bool CWII_IPC_HLE_Device_net_ssl::IOCtlV(u32 _CommandAddress)
  
         		int sslID = Memory::Read_U32(BufferOut) - 1;
      
         		if (SSLID_VALID(sslID))
      
         		{
      
        -			_SSL[sslID].sockfd = Memory::Read_U32(BufferOut2);
      
        -			INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_CONNECT socket = %d", _SSL[sslID].sockfd);
      
        -			ssl_set_bio(&_SSL[sslID].ctx, net_recv, &_SSL[sslID].sockfd, net_send, &_SSL[sslID].sockfd);
      
        +			WII_SSL* ssl = &_SSL[sslID];
      
        +			ssl->sockfd = Memory::Read_U32(BufferOut2);
      
        +			INFO_LOG(WII_IPC_SSL, "IOCTLV_NET_SSL_CONNECT socket = %d", ssl->sockfd);
      
        +			ssl_set_bio(&ssl->ctx, net_recv, &ssl->sockfd, net_send, &ssl->sockfd);
      
         			Memory::Write_U32(SSL_OK, _BufferIn);
      
         		}
      
         		else

8  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h

show inline notes

View

              
    @@ -76,12 +76,12 @@ class CWII_IPC_HLE_Device_net_ssl : public IWII_IPC_HLE_Device
  
         	virtual ~CWII_IPC_HLE_Device_net_ssl();
      
        -	virtual bool Open(u32 _CommandAddress, u32 _Mode);
      
        +	virtual bool Open(u32 _CommandAddress, u32 _Mode) override;
      
        -	virtual bool Close(u32 _CommandAddress, bool _bForce);
      
        +	virtual bool Close(u32 _CommandAddress, bool _bForce) override;
      
        -	virtual bool IOCtl(u32 _CommandAddress);
      
        -	virtual bool IOCtlV(u32 _CommandAddress);
      
        +	virtual bool IOCtl(u32 _CommandAddress) override;
      
        +	virtual bool IOCtlV(u32 _CommandAddress) override;
      
         	int getSSLFreeID();
      
         	static WII_SSL _SSL[NET_SSL_MAXINSTANCES];

2  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp

show inline notes

View

              
    @@ -18,7 +18,7 @@
  
         	, m_Status(CARD_NOT_EXIST)
      
         	, m_BlockLength(0)
      
         	, m_BusWidth(0)
      
        -	, m_Card(NULL)
      
        +	, m_Card(nullptr)
      
         {}
      
         void CWII_IPC_HLE_Device_sdio_slot0::DoState(PointerWrap& p)

10  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h

show inline notes

View

              
    @@ -14,12 +14,12 @@ class CWII_IPC_HLE_Device_sdio_slot0 : public IWII_IPC_HLE_Device
  
         	CWII_IPC_HLE_Device_sdio_slot0(u32 _DeviceID, const std::string& _rDeviceName);
      
        -	virtual void DoState(PointerWrap& p);
      
        +	virtual void DoState(PointerWrap& p) override;
      
        -	bool Open(u32 _CommandAddress, u32 _Mode);
      
        -	bool Close(u32 _CommandAddress, bool _bForce);
      
        -	bool IOCtl(u32 _CommandAddress);
      
        -	bool IOCtlV(u32 _CommandAddress);
      
        +	bool Open(u32 _CommandAddress, u32 _Mode) override;
      
        +	bool Close(u32 _CommandAddress, bool _bForce) override;
      
        +	bool IOCtl(u32 _CommandAddress) override;
      
        +	bool IOCtlV(u32 _CommandAddress) override;
      
         	void EventNotify();

12  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h

show inline notes

View

              
    @@ -36,7 +36,7 @@ class CWII_IPC_HLE_Device_stm_immediate : public IWII_IPC_HLE_Device
  
         	virtual ~CWII_IPC_HLE_Device_stm_immediate()
      
         	{}
      
        -	virtual bool Open(u32 _CommandAddress, u32 _Mode)
      
        +	virtual bool Open(u32 _CommandAddress, u32 _Mode) override
      
         	{
      
         		INFO_LOG(WII_IPC_STM, "STM immediate: Open");
      
         		Memory::Write_U32(GetDeviceID(), _CommandAddress+4);
      
    @@ -44,7 +44,7 @@ class CWII_IPC_HLE_Device_stm_immediate : public IWII_IPC_HLE_Device
  
         		return true;
      
         	}
      
        -	virtual bool Close(u32 _CommandAddress, bool _bForce)
      
        +	virtual bool Close(u32 _CommandAddress, bool _bForce) override
      
         	{
      
         		INFO_LOG(WII_IPC_STM, "STM immediate: Close");
      
         		if (!_bForce)
      
    @@ -53,7 +53,7 @@ class CWII_IPC_HLE_Device_stm_immediate : public IWII_IPC_HLE_Device
  
         		return true;
      
         	}
      
        -	virtual bool IOCtl(u32 _CommandAddress)
      
        +	virtual bool IOCtl(u32 _CommandAddress) override
      
         	{
      
         		u32 Parameter     = Memory::Read_U32(_CommandAddress + 0x0C);
      
         		u32 BufferIn      = Memory::Read_U32(_CommandAddress + 0x10);
      
    @@ -125,14 +125,14 @@ class CWII_IPC_HLE_Device_stm_eventhook : public IWII_IPC_HLE_Device
  
         	{
      
         	}
      
        -	virtual bool Open(u32 _CommandAddress, u32 _Mode)
      
        +	virtual bool Open(u32 _CommandAddress, u32 _Mode) override
      
         	{
      
         		Memory::Write_U32(GetDeviceID(), _CommandAddress + 4);
      
         		m_Active = true;
      
         		return true;
      
         	}
      
        -	virtual bool Close(u32 _CommandAddress, bool _bForce)
      
        +	virtual bool Close(u32 _CommandAddress, bool _bForce) override
      
         	{
      
         		m_EventHookAddress = 0;
      
    @@ -143,7 +143,7 @@ class CWII_IPC_HLE_Device_stm_eventhook : public IWII_IPC_HLE_Device
  
         		return true;
      
         	}
      
        -	virtual bool IOCtl(u32 _CommandAddress)
      
        +	virtual bool IOCtl(u32 _CommandAddress) override
      
         	{
      
         		u32 Parameter     = Memory::Read_U32(_CommandAddress + 0x0C);
      
         		u32 BufferIn      = Memory::Read_U32(_CommandAddress + 0x10);

34  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp

show inline notes

View

              
    @@ -90,7 +90,7 @@
  
         CWII_IPC_HLE_Device_usb_oh1_57e_305::~CWII_IPC_HLE_Device_usb_oh1_57e_305()
      
         {
      
         	m_WiiMotes.clear();
      
        -	SetUsbPointer(NULL);
      
        +	SetUsbPointer(nullptr);
      
         }
      
         void CWII_IPC_HLE_Device_usb_oh1_57e_305::DoState(PointerWrap &p)
      
    @@ -299,7 +299,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::IOCtlV(u32 _CommandAddress)
  
         void CWII_IPC_HLE_Device_usb_oh1_57e_305::SendToDevice(u16 _ConnectionHandle, u8* _pData, u32 _Size)
      
         {
      
         	CWII_IPC_HLE_WiiMote* pWiiMote = AccessWiiMote(_ConnectionHandle);
      
        -	if (pWiiMote == NULL)
      
        +	if (pWiiMote == nullptr)
      
         		return;
      
         	INFO_LOG(WII_IPC_WIIMOTE, "Send ACL Packet to ConnectionHandle 0x%04x", _ConnectionHandle);
      
    @@ -584,7 +584,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventInquiryResponse()
  
         bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventConnectionComplete(const bdaddr_t& _bd)
      
         {
      
         	CWII_IPC_HLE_WiiMote* pWiiMote = AccessWiiMote(_bd);
      
        -	if (pWiiMote == NULL)
      
        +	if (pWiiMote == nullptr)
      
         		return false;
      
         	SQueuedEvent Event(sizeof(SHCIEventConnectionComplete), 0);
      
    @@ -662,7 +662,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventRequestConnection(CWII_IPC_HL
  
         bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventDisconnect(u16 _connectionHandle, u8 _Reason)
      
         {
      
         	CWII_IPC_HLE_WiiMote* pWiiMote = AccessWiiMote(_connectionHandle);
      
        -	if (pWiiMote == NULL)
      
        +	if (pWiiMote == nullptr)
      
         		return false;
      
         	SQueuedEvent Event(sizeof(SHCIEventDisconnectCompleted), _connectionHandle);
      
    @@ -686,7 +686,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventDisconnect(u16 _connectionHan
  
         bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventAuthenticationCompleted(u16 _connectionHandle)
      
         {
      
         	CWII_IPC_HLE_WiiMote* pWiiMote = AccessWiiMote(_connectionHandle);
      
        -	if (pWiiMote == NULL)
      
        +	if (pWiiMote == nullptr)
      
         		return false;
      
         	SQueuedEvent Event(sizeof(SHCIEventAuthenticationCompleted), _connectionHandle);
      
    @@ -708,7 +708,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventAuthenticationCompleted(u16 _
  
         bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventRemoteNameReq(const bdaddr_t& _bd)
      
         {
      
         	CWII_IPC_HLE_WiiMote* pWiiMote = AccessWiiMote(_bd);
      
        -	if (pWiiMote == NULL)
      
        +	if (pWiiMote == nullptr)
      
         		return false;
      
         	SQueuedEvent Event(sizeof(SHCIEventRemoteNameReq), 0);
      
    @@ -735,7 +735,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventRemoteNameReq(const bdaddr_t&
  
         bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventReadRemoteFeatures(u16 _connectionHandle)
      
         {
      
         	CWII_IPC_HLE_WiiMote* pWiiMote = AccessWiiMote(_connectionHandle);
      
        -	if (pWiiMote == NULL)
      
        +	if (pWiiMote == nullptr)
      
         		return false;
      
         	SQueuedEvent Event(sizeof(SHCIEventReadRemoteFeatures), _connectionHandle);
      
    @@ -770,7 +770,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventReadRemoteFeatures(u16 _conne
  
         bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventReadRemoteVerInfo(u16 _connectionHandle)
      
         {
      
         	CWII_IPC_HLE_WiiMote* pWiiMote = AccessWiiMote(_connectionHandle);
      
        -	if (pWiiMote == NULL)
      
        +	if (pWiiMote == nullptr)
      
         		return false;
      
         	SQueuedEvent Event(sizeof(SHCIEventReadRemoteVerInfo), _connectionHandle);
      
    @@ -808,7 +808,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventCommandComplete(u16 _OpCode,
  
         	pHCIEvent->Opcode = _OpCode;
      
         	// add the payload
      
        -	if ((_pData != NULL) && (_DataSize > 0))
      
        +	if ((_pData != nullptr) && (_DataSize > 0))
      
         	{
      
         		u8* pPayload = Event.m_buffer + sizeof(SHCIEventCommand);
      
         		memcpy(pPayload, _pData, _DataSize);
      
    @@ -840,7 +840,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventCommandStatus(u16 _Opcode)
  
         bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventRoleChange(bdaddr_t _bd, bool _master)
      
         {
      
         	CWII_IPC_HLE_WiiMote* pWiiMote = AccessWiiMote(_bd);
      
        -	if (pWiiMote == NULL)
      
        +	if (pWiiMote == nullptr)
      
         		return false;
      
         	SQueuedEvent Event(sizeof(SHCIEventRoleChange), 0);
      
    @@ -910,7 +910,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventNumberOfCompletedPackets()
  
         bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventModeChange(u16 _connectionHandle, u8 _mode, u16 _value)
      
         {
      
         	CWII_IPC_HLE_WiiMote* pWiiMote = AccessWiiMote(_connectionHandle);
      
        -	if (pWiiMote == NULL)
      
        +	if (pWiiMote == nullptr)
      
         		return false;
      
         	SQueuedEvent Event(sizeof(SHCIEventModeChange), _connectionHandle);
      
    @@ -988,7 +988,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventRequestLinkKey(const bdaddr_t
  
         bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventReadClockOffsetComplete(u16 _connectionHandle)
      
         {
      
         	CWII_IPC_HLE_WiiMote* pWiiMote = AccessWiiMote(_connectionHandle);
      
        -	if (pWiiMote == NULL)
      
        +	if (pWiiMote == nullptr)
      
         		return false;
      
         	SQueuedEvent Event(sizeof(SHCIEventReadClockOffsetComplete), _connectionHandle);
      
    @@ -1012,7 +1012,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventReadClockOffsetComplete(u16 _
  
         bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventConPacketTypeChange(u16 _connectionHandle, u16 _packetType)
      
         {
      
         	CWII_IPC_HLE_WiiMote* pWiiMote = AccessWiiMote(_connectionHandle);
      
        -	if (pWiiMote == NULL)
      
        +	if (pWiiMote == nullptr)
      
         		return false;
      
         	SQueuedEvent Event(sizeof(SHCIEventConPacketTypeChange), _connectionHandle);
      
    @@ -1195,7 +1195,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::ExecuteHCICommandMessage(const SHCICom
  
         	default:
      
         		// send fake okay msg...
      
        -		SendEventCommandComplete(pMsg->Opcode, NULL, 0);
      
        +		SendEventCommandComplete(pMsg->Opcode, nullptr, 0);
      
         		if (ogf == HCI_OGF_VENDOR)
      
         		{
      
    @@ -1536,7 +1536,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::CommandDeleteStoredLinkKey(u8* _Input)
  
         	CWII_IPC_HLE_WiiMote* pWiiMote = AccessWiiMote(pDeleteStoredLinkKey->bdaddr);
      
        -	if (pWiiMote == NULL)
      
        +	if (pWiiMote == nullptr)
      
         		return;
      
         	hci_delete_stored_link_key_rp Reply;
      
    @@ -1832,7 +1832,7 @@ CWII_IPC_HLE_WiiMote* CWII_IPC_HLE_Device_usb_oh1_57e_305::AccessWiiMote(const b
  
         	ERROR_LOG(WII_IPC_WIIMOTE,"Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x",
      
         		_rAddr.b[0], _rAddr.b[1], _rAddr.b[2], _rAddr.b[3], _rAddr.b[4], _rAddr.b[5]);
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
         CWII_IPC_HLE_WiiMote* CWII_IPC_HLE_Device_usb_oh1_57e_305::AccessWiiMote(u16 _ConnectionHandle)
      
    @@ -1845,7 +1845,7 @@ CWII_IPC_HLE_WiiMote* CWII_IPC_HLE_Device_usb_oh1_57e_305::AccessWiiMote(u16 _Co
  
         	ERROR_LOG(WII_IPC_WIIMOTE, "Can't find WiiMote by connection handle %02x", _ConnectionHandle);
      
         	PanicAlertT("Can't find WiiMote by connection handle %02x", _ConnectionHandle);
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
         void CWII_IPC_HLE_Device_usb_oh1_57e_305::LOG_LinkKey(const u8* _pLinkKey)

12  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.h

show inline notes

View

              
    @@ -50,13 +50,13 @@ class CWII_IPC_HLE_Device_usb_oh1_57e_305 : public IWII_IPC_HLE_Device
  
         	virtual ~CWII_IPC_HLE_Device_usb_oh1_57e_305();
      
        -	virtual bool Open(u32 _CommandAddress, u32 _Mode);
      
        -	virtual bool Close(u32 _CommandAddress, bool _bForce);
      
        +	virtual bool Open(u32 _CommandAddress, u32 _Mode) override;
      
        +	virtual bool Close(u32 _CommandAddress, bool _bForce) override;
      
        -	virtual bool IOCtlV(u32 _CommandAddress);
      
        -	virtual bool IOCtl(u32 _CommandAddress);
      
        +	virtual bool IOCtlV(u32 _CommandAddress) override;
      
        +	virtual bool IOCtl(u32 _CommandAddress) override;
      
        -	virtual u32 Update();
      
        +	virtual u32 Update() override;
      
         	// Send ACL data back to bt stack
      
         	void SendACLPacket(u16 _ConnectionHandle, u8* _pData, u32 _Size);
      
    @@ -69,7 +69,7 @@ class CWII_IPC_HLE_Device_usb_oh1_57e_305 : public IWII_IPC_HLE_Device
  
         	CWII_IPC_HLE_WiiMote* AccessWiiMote(const bdaddr_t& _rAddr);
      
         	CWII_IPC_HLE_WiiMote* AccessWiiMote(u16 _ConnectionHandle);
      
        -	void DoState(PointerWrap &p);
      
        +	void DoState(PointerWrap &p) override;
      
         	void NetPlay_WiimoteUpdate(int _number);

8  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp

show inline notes

View

              
    @@ -27,12 +27,14 @@ bool CWII_IPC_HLE_Device_usb_kbd::Open(u32 _CommandAddress, u32 _Mode)
  
         	ini.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));
      
         	ini.Get("USB Keyboard", "Layout", &m_KeyboardLayout, KBD_LAYOUT_QWERTY);
      
        -	for(int i = 0; i < 256; i++)
      
        -		m_OldKeyBuffer[i] = false;
      
        +	for (bool& pressed : m_OldKeyBuffer)
      
        +	{
      
        +		pressed = false;
      
        +	}
      
         	m_OldModifiers = 0x00;
      
        -	//m_MessageQueue.push(SMessageData(MSG_KBD_CONNECT, 0, NULL));
      
        +	//m_MessageQueue.push(SMessageData(MSG_KBD_CONNECT, 0, nullptr));
      
         	Memory::Write_U32(m_DeviceID, _CommandAddress+4);
      
         	m_Active = true;
      
         	return true;

10  Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h

show inline notes

View

              
    @@ -10,11 +10,11 @@ class CWII_IPC_HLE_Device_usb_kbd : public IWII_IPC_HLE_Device
  
         	CWII_IPC_HLE_Device_usb_kbd(u32 _DeviceID, const std::string& _rDeviceName);
      
         	virtual ~CWII_IPC_HLE_Device_usb_kbd();
      
        -	virtual bool Open(u32 _CommandAddress, u32 _Mode);
      
        -	virtual bool Close(u32 _CommandAddress, bool _bForce);
      
        -	virtual bool Write(u32 _CommandAddress);
      
        -	virtual bool IOCtl(u32 _CommandAddress);
      
        -	virtual u32 Update();
      
        +	virtual bool Open(u32 _CommandAddress, u32 _Mode) override;
      
        +	virtual bool Close(u32 _CommandAddress, bool _bForce) override;
      
        +	virtual bool Write(u32 _CommandAddress) override;
      
        +	virtual bool IOCtl(u32 _CommandAddress) override;
      
        +	virtual u32 Update() override;
      
         private:
      
         	enum

4  Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp

show inline notes

View

              
    @@ -14,7 +14,7 @@
  
         #include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
      
         #include "Core/IPC_HLE/WiiMote_HID_Attr.h"
      
        -static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = NULL;
      
        +static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = nullptr;
      
         CWII_IPC_HLE_Device_usb_oh1_57e_305* GetUsbPointer()
      
         {
      
    @@ -198,7 +198,7 @@ void CWII_IPC_HLE_WiiMote::EventConnectionAccepted()
  
         void CWII_IPC_HLE_WiiMote::EventDisconnect()
      
         {
      
         	// Send disconnect message to plugin
      
        -	Wiimote::ControlChannel(m_ConnectionHandle & 0xFF, 99, NULL, 0);
      
        +	Wiimote::ControlChannel(m_ConnectionHandle & 0xFF, 99, nullptr, 0);
      
         	m_ConnectionState = CONN_INACTIVE;
      
         	// Clear channel flags

12  Source/Core/Core/IPC_HLE/WII_Socket.cpp

show inline notes

View

              
    @@ -29,8 +29,8 @@ char* WiiSockMan::DecodeError(s32 ErrorCode)
  
         	// instead of a static buffer here.
      
         	// (And of course, free the buffer when we were done with it)
      
         	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS |
      
        -		FORMAT_MESSAGE_MAX_WIDTH_MASK, NULL, ErrorCode,
      
        -		MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPWSTR)Message, 1024, NULL);
      
        +		FORMAT_MESSAGE_MAX_WIDTH_MASK, nullptr, ErrorCode,
      
        +		MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPWSTR)Message, 1024, nullptr);
      
         	return Message;
      
         #else
      
         	return strerror(ErrorCode);
      
    @@ -242,7 +242,7 @@ void WiiSocket::update(bool read, bool write, bool except)
  
         				}
      
         				else
      
         				{
      
        -					int ret = (s32)accept(fd, NULL, 0);
      
        +					int ret = (s32)accept(fd, nullptr, 0);
      
         					ReturnValue = WiiSockMan::getNetErrorCode(ret, "SO_ACCEPT", true);
      
         				}
      
    @@ -440,7 +440,7 @@ void WiiSocket::update(bool read, bool write, bool except)
  
         					}
      
         					int ret = sendto(fd, data, BufferInSize, flags,
      
        -						has_destaddr ? (struct sockaddr*)&local_name : NULL,
      
        +						has_destaddr ? (struct sockaddr*)&local_name : nullptr,
      
         						has_destaddr ? sizeof(sockaddr) :  0);
      
         					ReturnValue = WiiSockMan::getNetErrorCode(ret, "SO_SENDTO", true);
      
    @@ -486,8 +486,8 @@ void WiiSocket::update(bool read, bool write, bool except)
  
         #endif
      
         					socklen_t addrlen = sizeof(sockaddr_in);
      
         					int ret = recvfrom(fd, data, data_len, flags,
      
        -									BufferOutSize2 ? (struct sockaddr*) &local_name : NULL,
      
        -									BufferOutSize2 ? &addrlen : 0);
      
        +									BufferOutSize2 ? (struct sockaddr*) &local_name : nullptr,
      
        +									BufferOutSize2 ? &addrlen : nullptr);
      
         					ReturnValue = WiiSockMan::getNetErrorCode(ret, BufferOutSize2 ? "SO_RECVFROM" : "SO_RECV", true);
      
         					INFO_LOG(WII_IPC_NET, "%s(%d, %p) Socket: %08X, Flags: %08X, "

2  Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp

show inline notes

View

              
    @@ -234,7 +234,7 @@ const u8* GetAttribPacket(u32 serviceHandle, u32 cont, u32& _size)
  
         		return packet4_0x10001;
      
         	}
      
        -	return 0;
      
        +	return nullptr;
      
         }
      
         // XXX keep these?

12  Source/Core/Core/IPC_HLE/fakepoll.h

show inline notes

View

              
    @@ -60,10 +60,10 @@ inline int poll(struct pollfd *pollSet, int pollCount, int pollTimeout)
  
         	int maxFD;
      
         	if (!pollSet) {
      
        -		pollEnd = NULL;
      
        -		readp = NULL;
      
        -		writep = NULL;
      
        -		exceptp = NULL;
      
        +		pollEnd = nullptr;
      
        +		readp = nullptr;
      
        +		writep = nullptr;
      
        +		exceptp = nullptr;
      
         		maxFD = 0;
      
         	}
      
         	else {
      
    @@ -97,14 +97,14 @@ inline int poll(struct pollfd *pollSet, int pollCount, int pollTimeout)
  
         	}
      
         	// poll timeout is in milliseconds. Convert to struct timeval.
      
        -	// poll timeout == -1 : wait forever : select timeout of NULL
      
        +	// poll timeout == -1 : wait forever : select timeout of nullptr
      
         	// poll timeout == 0  : return immediately : select timeout of zero
      
         	if (pollTimeout >= 0) {
      
         		tv.tv_sec = pollTimeout / 1000;
      
         		tv.tv_usec = (pollTimeout % 1000) * 1000;
      
         		tvp = &tv;
      
         	} else {
      
        -		tvp = NULL;
      
        +		tvp = nullptr;
      
         	}

28  Source/Core/Core/Movie.cpp

show inline notes

View

              
    @@ -45,7 +45,7 @@
  
         u8 g_numPads = 0;
      
         ControllerState g_padState;
      
         DTMHeader tmpHeader;
      
        -u8* tmpInput = NULL;
      
        +u8* tmpInput = nullptr;
      
         size_t tmpInputAllocated = 0;
      
         u64 g_currentByte = 0, g_totalBytes = 0;
      
         u64 g_currentFrame = 0, g_totalFrames = 0; // VI
      
    @@ -72,7 +72,7 @@
  
         std::string g_InputDisplay[8];
      
        -ManipFunction mfunc = NULL;
      
        +ManipFunction mfunc = nullptr;
      
         void EnsureTmpInputSize(size_t bound)
      
         {
      
    @@ -86,7 +86,7 @@ void EnsureTmpInputSize(size_t bound)
  
         	u8* newTmpInput = new u8[newAlloc];
      
         	tmpInputAllocated = newAlloc;
      
        -	if (tmpInput != NULL)
      
        +	if (tmpInput != nullptr)
      
         	{
      
         		if (g_totalBytes > 0)
      
         			memcpy(newTmpInput, tmpInput, (size_t)g_totalBytes);
      
    @@ -654,9 +654,9 @@ void RecordInput(SPADStatus *PadStatus, int controllerID)
  
         void CheckWiimoteStatus(int wiimote, u8 *data, const WiimoteEmu::ReportFeatures& rptf, int irMode)
      
         {
      
        -	u8* const coreData = rptf.core?(data+rptf.core):NULL;
      
        -	u8* const accelData = rptf.accel?(data+rptf.accel):NULL;
      
        -	u8* const irData = rptf.ir?(data+rptf.ir):NULL;
      
        +	u8* const coreData = rptf.core?(data+rptf.core):nullptr;
      
        +	u8* const accelData = rptf.accel?(data+rptf.accel):nullptr;
      
        +	u8* const irData = rptf.ir?(data+rptf.ir):nullptr;
      
         	u8 size = rptf.size;
      
         	SetWiiInputDisplayString(wiimote, coreData, accelData, irData);
      
    @@ -819,7 +819,7 @@ void LoadInput(const char *filename)
  
         		afterEnd = true;
      
         	}
      
        -	if (!g_bReadOnly || tmpInput == NULL)
      
        +	if (!g_bReadOnly || tmpInput == nullptr)
      
         	{
      
         		g_totalFrames = tmpHeader.frameCount;
      
         		g_totalLagCount = tmpHeader.lagCount;
      
    @@ -926,7 +926,7 @@ void PlayController(SPADStatus *PadStatus, int controllerID)
  
         {
      
         	// Correct playback is entirely dependent on the emulator polling the controllers
      
         	// in the same order done during recording
      
        -	if (!IsPlayingInput() || !IsUsingPad(controllerID) || tmpInput == NULL)
      
        +	if (!IsPlayingInput() || !IsUsingPad(controllerID) || tmpInput == nullptr)
      
         		return;
      
         	if (g_currentByte + 8 > g_totalBytes)
      
    @@ -1022,7 +1022,7 @@ void PlayController(SPADStatus *PadStatus, int controllerID)
  
         bool PlayWiimote(int wiimote, u8 *data, const WiimoteEmu::ReportFeatures& rptf, int irMode)
      
         {
      
        -	if(!IsPlayingInput() || !IsUsingWiimote(wiimote) || tmpInput == NULL)
      
        +	if(!IsPlayingInput() || !IsUsingWiimote(wiimote) || tmpInput == nullptr)
      
         		return false;
      
         	if (g_currentByte > g_totalBytes)
      
    @@ -1032,9 +1032,9 @@ bool PlayWiimote(int wiimote, u8 *data, const WiimoteEmu::ReportFeatures& rptf,
  
         		return false;
      
         	}
      
        -	u8* const coreData = rptf.core?(data+rptf.core):NULL;
      
        -	u8* const accelData = rptf.accel?(data+rptf.accel):NULL;
      
        -	u8* const irData = rptf.ir?(data+rptf.ir):NULL;
      
        +	u8* const coreData = rptf.core?(data+rptf.core):nullptr;
      
        +	u8* const accelData = rptf.accel?(data+rptf.accel):nullptr;
      
        +	u8* const irData = rptf.ir?(data+rptf.ir):nullptr;
      
         	u8 size = rptf.size;
      
         	u8 sizeInMovie = tmpInput[g_currentByte];
      
    @@ -1084,7 +1084,7 @@ void EndPlayInput(bool cont)
  
         		// we don't clear these things because otherwise we can't resume playback if we load a movie state later
      
         		//g_totalFrames = g_totalBytes = 0;
      
         		//delete tmpInput;
      
        -		//tmpInput = NULL;
      
        +		//tmpInput = nullptr;
      
         	}
      
         }
      
    @@ -1235,7 +1235,7 @@ void Shutdown()
  
         {
      
         	g_currentInputCount = g_totalInputCount = g_totalFrames = g_totalBytes = 0;
      
         	delete [] tmpInput;
      
        -	tmpInput = NULL;
      
        +	tmpInput = nullptr;
      
         	tmpInputAllocated = 0;
      
         }
      
         };

30  Source/Core/Core/NetPlayClient.cpp

show inline notes

View

              
    @@ -18,7 +18,7 @@
  
         std::mutex crit_netplay_client;
      
        -static NetPlayClient * netplay_client = NULL;
      
        +static NetPlayClient * netplay_client = nullptr;
      
         NetSettings g_NetPlaySettings;
      
         #define RPT_SIZE_HACK  (1 << 16)
      
    @@ -184,8 +184,10 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet)
  
         	case NP_MSG_PAD_MAPPING :
      
         		{
      
        -			for (PadMapping i = 0; i < 4; i++)
      
        -				packet >> m_pad_map[i];
      
        +			for (PadMapping& mapping : m_pad_map)
      
        +			{
      
        +				packet >> mapping;
      
        +			}
      
         			UpdateDevices();
      
    @@ -195,8 +197,10 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet)
  
         	case NP_MSG_WIIMOTE_MAPPING :
      
         		{
      
        -			for (PadMapping i = 0; i < 4; i++)
      
        -				packet >> m_wiimote_map[i];
      
        +			for (PadMapping& mapping : m_wiimote_map)
      
        +			{
      
        +				packet >> mapping;
      
        +			}
      
         			m_dialog->Update();
      
         		}
      
    @@ -759,15 +763,19 @@ void NetPlayClient::Stop()
  
         	if (m_is_running == false)
      
         		return;
      
         	bool isPadMapped = false;
      
        -	for (unsigned int i = 0; i < 4; ++i)
      
        +	for (PadMapping mapping : m_pad_map)
      
         	{
      
        -		if (m_pad_map[i] == m_local_player->pid)
      
        +		if (mapping == m_local_player->pid)
      
        +		{
      
         			isPadMapped = true;
      
        +		}
      
         	}
      
        -	for (unsigned int i = 0; i < 4; ++i)
      
        +	for (PadMapping mapping : m_wiimote_map)
      
         	{
      
        -		if (m_wiimote_map[i] == m_local_player->pid)
      
        +		if (mapping == m_local_player->pid)
      
        +		{
      
         			isPadMapped = true;
      
        +		}
      
         	}
      
         	// tell the server to stop if we have a pad mapped in game.
      
         	if (isPadMapped)
      
    @@ -904,7 +912,7 @@ u8 CSIDevice_DanceMat::NetPlay_InGamePadToLocalPad(u8 numPAD)
  
         bool NetPlay::IsNetPlayRunning()
      
         {
      
        -	return netplay_client != NULL;
      
        +	return netplay_client != nullptr;
      
         }
      
         void NetPlay_Enable(NetPlayClient* const np)
      
    @@ -916,5 +924,5 @@ void NetPlay_Enable(NetPlayClient* const np)
  
         void NetPlay_Disable()
      
         {
      
         	std::lock_guard<std::mutex> lk(crit_netplay_client);
      
        -	netplay_client = NULL;
      
        +	netplay_client = nullptr;
      
         }

64  Source/Core/Core/NetPlayServer.cpp

show inline notes

View

              
    @@ -156,11 +156,11 @@ unsigned int NetPlayServer::OnConnect(sf::SocketTCP& socket)
  
         	player.pid = (PlayerId)(m_players.size() + 1);
      
         	// try to automatically assign new user a pad
      
        -	for (unsigned int m = 0; m < 4; ++m)
      
        +	for (PadMapping& mapping : m_pad_map)
      
         	{
      
        -		if (m_pad_map[m] == -1)
      
        +		if (mapping == -1)
      
         		{
      
        -			m_pad_map[m] = player.pid;
      
        +			mapping = player.pid;
      
         			break;
      
         		}
      
         	}
      
    @@ -229,9 +229,9 @@ unsigned int NetPlayServer::OnDisconnect(sf::SocketTCP& socket)
  
         	if (m_is_running)
      
         	{
      
        -		for (int i = 0; i < 4; i++)
      
        +		for (PadMapping mapping : m_pad_map)
      
         		{
      
        -			if (m_pad_map[i] == pid)
      
        +			if (mapping == pid)
      
         			{
      
         				PanicAlertT("Client disconnect while game is running!! NetPlay is disabled. You must manually stop the game.");
      
         				std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
      
    @@ -260,14 +260,22 @@ unsigned int NetPlayServer::OnDisconnect(sf::SocketTCP& socket)
  
         	std::lock_guard<std::recursive_mutex> lks(m_crit.send);
      
         	SendToClients(spac);
      
        -	for (int i = 0; i < 4; i++)
      
        -		if (m_pad_map[i] == pid)
      
        -			m_pad_map[i] = -1;
      
        +	for (PadMapping& mapping : m_pad_map)
      
        +	{
      
        +		if (mapping == pid)
      
        +		{
      
        +			mapping = -1;
      
        +		}
      
        +	}
      
         	UpdatePadMapping();
      
        -	for (int i = 0; i < 4; i++)
      
        -		if (m_wiimote_map[i] == pid)
      
        -			m_wiimote_map[i] = -1;
      
        +	for (PadMapping& mapping : m_wiimote_map)
      
        +	{
      
        +		if (mapping == pid)
      
        +		{
      
        +			mapping = -1;
      
        +		}
      
        +	}
      
         	UpdateWiimoteMapping();
      
         	return 0;
      
    @@ -307,8 +315,10 @@ void NetPlayServer::UpdatePadMapping()
  
         {
      
         	sf::Packet spac;
      
         	spac << (MessageId)NP_MSG_PAD_MAPPING;
      
        -	for (int i = 0; i < 4; i++)
      
        -		spac << m_pad_map[i];
      
        +	for (PadMapping mapping : m_pad_map)
      
        +	{
      
        +		spac << mapping;
      
        +	}
      
         	SendToClients(spac);
      
         }
      
    @@ -317,8 +327,10 @@ void NetPlayServer::UpdateWiimoteMapping()
  
         {
      
         	sf::Packet spac;
      
         	spac << (MessageId)NP_MSG_WIIMOTE_MAPPING;
      
        -	for (int i = 0; i < 4; i++)
      
        -		spac << m_wiimote_map[i];
      
        +	for (PadMapping mapping : m_wiimote_map)
      
        +	{
      
        +		spac << mapping;
      
        +	}
      
         	SendToClients(spac);
      
         }
      
    @@ -552,12 +564,14 @@ bool NetPlayServer::StartGame(const std::string &path)
  
         // called from multiple threads
      
         void NetPlayServer::SendToClients(sf::Packet& packet, const PlayerId skip_pid)
      
         {
      
        -	std::map<sf::SocketTCP, Client>::iterator
      
        -		i = m_players.begin(),
      
        -		e = m_players.end();
      
        -	for ( ; i!=e; ++i)
      
        -		if (i->second.pid && (i->second.pid != skip_pid))
      
        -			i->second.socket.Send(packet);
      
        +	for (std::pair<const sf::SocketTCP, Client>& p : m_players)
      
        +	{
      
        +		if (p.second.pid &&
      
        +		    p.second.pid != skip_pid)
      
        +		{
      
        +			p.second.socket.Send(packet);
      
        +		}
      
        +	}
      
         }
      
         #ifdef USE_UPNP
      
    @@ -625,7 +639,7 @@ bool NetPlayServer::initUPnP()
  
         	memset(&m_upnp_data, 0, sizeof(IGDdatas));
      
         	// Find all UPnP devices
      
        -	UPNPDev *devlist = upnpDiscover(2000, NULL, NULL, 0, 0, &upnperror);
      
        +	UPNPDev *devlist = upnpDiscover(2000, nullptr, nullptr, 0, 0, &upnperror);
      
         	if (!devlist)
      
         	{
      
         		WARN_LOG(NETPLAY, "An error occured trying to discover UPnP devices.");
      
    @@ -650,7 +664,7 @@ bool NetPlayServer::initUPnP()
  
         		{
      
         			parserootdesc(descXML, descXMLsize, &m_upnp_data);
      
         			free(descXML);
      
        -			descXML = 0;
      
        +			descXML = nullptr;
      
         			GetUPNPUrls(&m_upnp_urls, &m_upnp_data, dev->descURL, 0);
      
         			NOTICE_LOG(NETPLAY, "Got info from IGD at %s.", dev->descURL);
      
    @@ -681,7 +695,7 @@ bool NetPlayServer::UPnPMapPort(const std::string& addr, const u16 port)
  
         	result = UPNP_AddPortMapping(m_upnp_urls.controlURL, m_upnp_data.first.servicetype,
      
         	                             port_str, port_str, addr.c_str(),
      
         	                             (std::string("dolphin-emu TCP on ") + addr).c_str(),
      
        -	                             "TCP", NULL, NULL);
      
        +	                             "TCP", nullptr, nullptr);
      
         	if(result != 0)
      
         		return false;
      
    @@ -705,7 +719,7 @@ bool NetPlayServer::UPnPUnmapPort(const u16 port)
  
         	sprintf(port_str, "%d", port);
      
         	UPNP_DeletePortMapping(m_upnp_urls.controlURL, m_upnp_data.first.servicetype,
      
        -	                       port_str, "TCP", NULL);
      
        +	                       port_str, "TCP", nullptr);
      
         	return true;
      
         }

24  Source/Core/Core/PowerPC/GDBStub.cpp

show inline notes

View

              
    @@ -134,7 +134,7 @@ static gdb_bp_t *gdb_bp_ptr(u32 type)
  
         		case GDB_BP_TYPE_A:
      
         			return bp_x;
      
         		default:
      
        -			return NULL;
      
        +			return nullptr;
      
         	}
      
         }
      
    @@ -144,15 +144,15 @@ static gdb_bp_t *gdb_bp_empty_slot(u32 type)
  
         	u32 i;
      
         	p = gdb_bp_ptr(type);
      
        -	if (p == NULL)
      
        -		return NULL;
      
        +	if (p == nullptr)
      
        +		return nullptr;
      
         	for (i = 0; i < GDB_MAX_BP; i++) {
      
         		if (p[i].active == 0)
      
         			return &p[i];
      
         	}
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
         static gdb_bp_t *gdb_bp_find(u32 type, u32 addr, u32 len)
      
    @@ -161,8 +161,8 @@ static gdb_bp_t *gdb_bp_find(u32 type, u32 addr, u32 len)
  
         	u32 i;
      
         	p = gdb_bp_ptr(type);
      
        -	if (p == NULL)
      
        -		return NULL;
      
        +	if (p == nullptr)
      
        +		return nullptr;
      
         	for (i = 0; i < GDB_MAX_BP; i++) {
      
         		if (p[i].active == 1 &&
      
    @@ -171,7 +171,7 @@ static gdb_bp_t *gdb_bp_find(u32 type, u32 addr, u32 len)
  
         			return &p[i];
      
         	}
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
         static void gdb_bp_remove(u32 type, u32 addr, u32 len)
      
    @@ -180,12 +180,12 @@ static void gdb_bp_remove(u32 type, u32 addr, u32 len)
  
         	do {
      
         		p = gdb_bp_find(type, addr, len);
      
        -		if (p != NULL) {
      
        +		if (p != nullptr) {
      
         			DEBUG_LOG(GDB_STUB, "gdb: removed a breakpoint: %08x bytes at %08x\n", len, addr);
      
         			p->active = 0;
      
         			memset(p, 0, sizeof(gdb_bp_t));
      
         		}
      
        -	} while (p != NULL);
      
        +	} while (p != nullptr);
      
         }
      
         static int gdb_bp_check(u32 addr, u32 type)
      
    @@ -194,7 +194,7 @@ static int gdb_bp_check(u32 addr, u32 type)
  
         	u32 i;
      
         	p = gdb_bp_ptr(type);
      
        -	if (p == NULL)
      
        +	if (p == nullptr)
      
         		return 0;
      
         	for (i = 0; i < GDB_MAX_BP; i++) {
      
    @@ -288,7 +288,7 @@ static int gdb_data_available() {
  
         	t.tv_sec = 0;
      
         	t.tv_usec = 20;
      
        -	if (select(sock + 1, fds, NULL, NULL, &t) < 0)
      
        +	if (select(sock + 1, fds, nullptr, nullptr, &t) < 0)
      
         	{
      
         		ERROR_LOG(GDB_STUB, "select failed");
      
         		return 0;
      
    @@ -631,7 +631,7 @@ bool gdb_add_bp(u32 type, u32 addr, u32 len)
  
         {
      
         	gdb_bp_t *bp;
      
         	bp = gdb_bp_empty_slot(type);
      
        -	if (bp == NULL)
      
        +	if (bp == nullptr)
      
         		return false;
      
         	bp->active = 1;

2  Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp

show inline notes

View

              
    @@ -313,7 +313,7 @@ void Interpreter::mtspr(UGeckoInstruction _inst)
  
         			//_assert_msg_(POWERPC, WriteGatherPipeEnable, "Write gather pipe not enabled!");
      
         			//if ((HID2.PSE == 0))
      
        -			//	MessageBox(NULL, "PSE in HID2 is set", "Warning", MB_OK);
      
        +			//	MessageBox(nullptr, "PSE in HID2 is set", "Warning", MB_OK);
      
         		}
      
         		break;

10  Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp

show inline notes

View

              
    @@ -367,7 +367,7 @@ void InitTables()
  
         	for (int i = 0; i < 32; i++)
      
         	{
      
         		Interpreter::m_opTable59[i] = Interpreter::unknown_instruction;
      
        -		m_infoTable59[i] = 0;
      
        +		m_infoTable59[i] = nullptr;
      
         	}
      
         	for (int i = 0; i < 1024; i++)
      
    @@ -376,10 +376,10 @@ void InitTables()
  
         		Interpreter::m_opTable19[i] = Interpreter::unknown_instruction;
      
         		Interpreter::m_opTable31[i] = Interpreter::unknown_instruction;
      
         		Interpreter::m_opTable63[i] = Interpreter::unknown_instruction;
      
        -		m_infoTable4[i] = 0;
      
        -		m_infoTable19[i] = 0;
      
        -		m_infoTable31[i] = 0;
      
        -		m_infoTable63[i] = 0;
      
        +		m_infoTable4[i] = nullptr;
      
        +		m_infoTable19[i] = nullptr;
      
        +		m_infoTable31[i] = nullptr;
      
        +		m_infoTable63[i] = nullptr;
      
         	}
      
         	for (auto& tpl : primarytable)

2  Source/Core/Core/PowerPC/Jit64/JitRegCache.cpp

show inline notes

View

              
    @@ -9,7 +9,7 @@
  
         using namespace Gen;
      
         using namespace PowerPC;
      
        -RegCache::RegCache() : emit(0)
      
        +RegCache::RegCache() : emit(nullptr)
      
         {
      
         	memset(locks, 0, sizeof(locks));
      
         	memset(xlocks, 0, sizeof(xlocks));

26  Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp

show inline notes

View

              
    @@ -48,8 +48,8 @@ struct RegInfo {
  
         	RegInfo(JitIL* j, InstLoc f, unsigned insts) : Jit(j), FirstI(f), IInfo(insts), lastUsed(insts) {
      
         		for (unsigned i = 0; i < MAX_NUMBER_OF_REGS; i++) {
      
        -			regs[i] = 0;
      
        -			fregs[i] = 0;
      
        +			regs[i] = nullptr;
      
        +			fregs[i] = nullptr;
      
         		}
      
         		numSpills = 0;
      
         		numFSpills = 0;
      
    @@ -65,9 +65,9 @@ static u32 regsInUse(RegInfo& R) {
  
         	u32 result = 0;
      
         	for (unsigned i = 0; i < MAX_NUMBER_OF_REGS; i++)
      
         	{
      
        -		if (R.regs[i] != 0)
      
        +		if (R.regs[i] != nullptr)
      
         			result |= (1 << i);
      
        -		if (R.fregs[i] != 0)
      
        +		if (R.fregs[i] != nullptr)
      
         			result |= (1 << (16 + i));
      
         	}
      
         	return result;
      
    @@ -112,7 +112,7 @@ static void regSpill(RegInfo& RI, X64Reg reg) {
  
         		slot = regCreateSpill(RI, RI.regs[reg]);
      
         		RI.Jit->MOV(32, regLocForSlot(RI, slot), R(reg));
      
         	}
      
        -	RI.regs[reg] = 0;
      
        +	RI.regs[reg] = nullptr;
      
         }
      
         static OpArg fregLocForSlot(RegInfo& RI, unsigned slot) {
      
    @@ -136,7 +136,7 @@ static void fregSpill(RegInfo& RI, X64Reg reg) {
  
         		slot = fregCreateSpill(RI, RI.fregs[reg]);
      
         		RI.Jit->MOVAPD(fregLocForSlot(RI, slot), reg);
      
         	}
      
        -	RI.fregs[reg] = 0;
      
        +	RI.fregs[reg] = nullptr;
      
         }
      
         // ECX is scratch, so we don't allocate it
      
    @@ -164,11 +164,11 @@ static void fregSpill(RegInfo& RI, X64Reg reg) {
  
         static X64Reg regFindFreeReg(RegInfo& RI) {
      
         	for (auto& reg : RegAllocOrder)
      
        -		if (RI.regs[reg] == 0)
      
        +		if (RI.regs[reg] == nullptr)
      
         			return reg;
      
         	int bestIndex = -1;
      
        -	InstLoc bestEnd = 0;
      
        +	InstLoc bestEnd = nullptr;
      
         	for (int i = 0; i < RegAllocSize; ++i) {
      
         		const InstLoc start = RI.regs[RegAllocOrder[i]];
      
         		const InstLoc end = RI.lastUsed[start - RI.FirstI];
      
    @@ -185,11 +185,11 @@ static X64Reg regFindFreeReg(RegInfo& RI) {
  
         static X64Reg fregFindFreeReg(RegInfo& RI) {
      
         	for (auto& reg : FRegAllocOrder)
      
        -		if (RI.fregs[reg] == 0)
      
        +		if (RI.fregs[reg] == nullptr)
      
         			return reg;
      
         	int bestIndex = -1;
      
        -	InstLoc bestEnd = 0;
      
        +	InstLoc bestEnd = nullptr;
      
         	for (int i = 0; i < FRegAllocSize; ++i) {
      
         		const InstLoc start = RI.fregs[FRegAllocOrder[i]];
      
         		const InstLoc end = RI.lastUsed[start - RI.FirstI];
      
    @@ -229,13 +229,13 @@ static OpArg fregLocForInst(RegInfo& RI, InstLoc I) {
  
         static void regClearInst(RegInfo& RI, InstLoc I) {
      
         	for (auto& reg : RegAllocOrder)
      
         		if (RI.regs[reg] == I)
      
        -			RI.regs[reg] = 0;
      
        +			RI.regs[reg] = nullptr;
      
         }
      
         static void fregClearInst(RegInfo& RI, InstLoc I) {
      
         	for (auto& reg : FRegAllocOrder)
      
         		if (RI.fregs[reg] == I)
      
        -			RI.fregs[reg] = 0;
      
        +			RI.fregs[reg] = nullptr;
      
         }
      
         static X64Reg regEnsureInReg(RegInfo& RI, InstLoc I) {
      
    @@ -490,7 +490,7 @@ static OpArg regImmForConst(RegInfo& RI, InstLoc I, unsigned Size) {
  
         }
      
         static void regEmitMemStore(RegInfo& RI, InstLoc I, unsigned Size) {
      
        -	auto info = regBuildMemAddress(RI, I, getOp2(I), 2, Size, 0);
      
        +	auto info = regBuildMemAddress(RI, I, getOp2(I), 2, Size, nullptr);
      
         	if (info.first.IsImm())
      
         		RI.Jit->MOV(32, R(ECX), info.first);
      
         	else

4  Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp

show inline notes

View

              
    @@ -206,9 +206,9 @@ static inline uint64_t __rdtsc()
  
         		virtual ~JitILProfilerFinalizer()
      
         		{
      
         			char buffer[1024];
      
        -			sprintf(buffer, "JitIL_profiling_%d.csv", (int)time(NULL));
      
        +			sprintf(buffer, "JitIL_profiling_%d.csv", (int)time(nullptr));
      
         			File::IOFile file(buffer, "w");
      
        -			setvbuf(file.GetHandle(), NULL, _IOFBF, 1024 * 1024);
      
        +			setvbuf(file.GetHandle(), nullptr, _IOFBF, 1024 * 1024);
      
         			fprintf(file.GetHandle(), "code hash,total elapsed,number of calls,elapsed per call\n");
      
         			for (auto& block : blocks)
      
         			{

2  Source/Core/Core/PowerPC/Jit64IL/JitIL.h

show inline notes

View

              
    @@ -69,7 +69,7 @@ class JitIL : public JitILBase, public EmuCodeBlock
  
         	JitBlockCache *GetBlockCache() override { return &blocks; }
      
        -	const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx) override { return NULL; };
      
        +	const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx) override { return nullptr; };
      
         	bool IsInCodeSpace(u8 *ptr) override { return IsInSpace(ptr); }

2  Source/Core/Core/PowerPC/JitArmIL/JitIL.h

show inline notes

View

              
    @@ -37,7 +37,7 @@ class JitArmIL : public JitILBase, public ArmGen::ARMXCodeBlock
  
         	JitBaseBlockCache *GetBlockCache() { return &blocks; }
      
        -	const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx) { return NULL; }
      
        +	const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx) { return nullptr; }
      
         	bool IsInCodeSpace(u8 *ptr) { return IsInSpace(ptr); }

8  Source/Core/Core/PowerPC/JitCommon/JitBackpatch.cpp

show inline notes

View

              
    @@ -171,27 +171,27 @@ const u8 *Jitx86Base::BackPatch(u8 *codePtr, u32 emAddress, void *ctx_void)
  
         	SContext *ctx = (SContext *)ctx_void;
      
         	if (!jit->IsInCodeSpace(codePtr))
      
        -		return 0;  // this will become a regular crash real soon after this
      
        +		return nullptr;  // this will become a regular crash real soon after this
      
         	InstructionInfo info = {};
      
         	if (!DisassembleMov(codePtr, &info)) {
      
         		BackPatchError("BackPatch - failed to disassemble MOV instruction", codePtr, emAddress);
      
        -		return 0;
      
        +		return nullptr;
      
         	}
      
         	if (info.otherReg != RBX)
      
         	{
      
         		PanicAlert("BackPatch : Base reg not RBX."
      
         		           "\n\nAttempted to access %08x.", emAddress);
      
        -		return 0;
      
        +		return nullptr;
      
         	}
      
         	auto it = registersInUseAtLoc.find(codePtr);
      
         	if (it == registersInUseAtLoc.end())
      
         	{
      
         		PanicAlert("BackPatch: no register use entry for address %p", codePtr);
      
        -		return 0;
      
        +		return nullptr;
      
         	}
      
         	u32 registersInUse = it->second;

22  Source/Core/Core/PowerPC/JitCommon/JitCache.cpp

show inline notes

View

              
    @@ -46,7 +46,7 @@
  
         #endif
      
         		blocks = new JitBlock[MAX_NUM_BLOCKS];
      
         		blockCodePointers = new const u8*[MAX_NUM_BLOCKS];
      
        -		if (iCache == 0 && iCacheEx == 0 && iCacheVMEM == 0)
      
        +		if (iCache == nullptr && iCacheEx == nullptr && iCacheVMEM == nullptr)
      
         		{
      
         			iCache = new u8[JIT_ICACHE_SIZE];
      
         			iCacheEx = new u8[JIT_ICACHEEX_SIZE];
      
    @@ -56,7 +56,7 @@
  
         		{
      
         			PanicAlert("JitBaseBlockCache::Init() - iCache is already initialized");
      
         		}
      
        -		if (iCache == 0 || iCacheEx == 0 || iCacheVMEM == 0)
      
        +		if (iCache == nullptr || iCacheEx == nullptr || iCacheVMEM == nullptr)
      
         		{
      
         			PanicAlert("JitBaseBlockCache::Init() - unable to allocate iCache");
      
         		}
      
    @@ -70,24 +70,24 @@
  
         	{
      
         		delete[] blocks;
      
         		delete[] blockCodePointers;
      
        -		if (iCache != 0)
      
        +		if (iCache != nullptr)
      
         			delete[] iCache;
      
        -		iCache = 0;
      
        -		if (iCacheEx != 0)
      
        +		iCache = nullptr;
      
        +		if (iCacheEx != nullptr)
      
         			delete[] iCacheEx;
      
        -		iCacheEx = 0;
      
        -		if (iCacheVMEM != 0)
      
        +		iCacheEx = nullptr;
      
        +		if (iCacheVMEM != nullptr)
      
         			delete[] iCacheVMEM;
      
        -		iCacheVMEM = 0;
      
        -		blocks = 0;
      
        -		blockCodePointers = 0;
      
        +		iCacheVMEM = nullptr;
      
        +		blocks = nullptr;
      
        +		blockCodePointers = nullptr;
      
         		num_blocks = 0;
      
         #if defined USE_OPROFILE && USE_OPROFILE
      
         		op_close_agent(agent);
      
         #endif
      
         #ifdef USE_VTUNE
      
        -		iJIT_NotifyEvent(iJVM_EVENT_TYPE_SHUTDOWN, NULL);
      
        +		iJIT_NotifyEvent(iJVM_EVENT_TYPE_SHUTDOWN, nullptr);
      
         #endif
      
         	}

4  Source/Core/Core/PowerPC/JitCommon/JitCache.h

show inline notes

View

              
    @@ -89,8 +89,8 @@ class JitBaseBlockCache
  
         public:
      
         	JitBaseBlockCache() :
      
        -		blockCodePointers(0), blocks(0), num_blocks(0),
      
        -		iCache(0), iCacheEx(0), iCacheVMEM(0) {}
      
        +		blockCodePointers(nullptr), blocks(nullptr), num_blocks(0),
      
        +		iCache(nullptr), iCacheEx(nullptr), iCacheVMEM(nullptr) {}
      
         	int AllocateBlock(u32 em_address);
      
         	void FinalizeBlock(int block_num, bool block_link, const u8 *code_ptr);

32  Source/Core/Core/PowerPC/JitILCommon/IR.cpp

show inline notes

View

              
    @@ -261,7 +261,7 @@ InstLoc IRBuilder::FoldZeroOp(unsigned Opcode, unsigned extra) {
  
         		return FRegCache[extra];
      
         	}
      
         	if (Opcode == LoadFRegDENToZero) {
      
        -		FRegCacheStore[extra] = 0; // prevent previous store operation from zapping
      
        +		FRegCacheStore[extra] = nullptr; // prevent previous store operation from zapping
      
         		FRegCache[extra] = EmitZeroOp(LoadFRegDENToZero, extra);
      
         		return FRegCache[extra];
      
         	}
      
    @@ -844,7 +844,7 @@ InstLoc IRBuilder::FoldBranchCond(InstLoc Op1, InstLoc Op2) {
  
         	if (isImm(*Op1)) {
      
         		if (GetImmValue(Op1))
      
         			return EmitBranchUncond(Op2);
      
        -		return 0;
      
        +		return nullptr;
      
         	}
      
         	if (getOpcode(*Op1) == And &&
      
         	    isImm(*getOp2(Op1)) &&
      
    @@ -999,19 +999,19 @@ InstLoc IRBuilder::FoldICmpCRUnsigned(InstLoc Op1, InstLoc Op2) {
  
         InstLoc IRBuilder::FoldFallBackToInterpreter(InstLoc Op1, InstLoc Op2) {
      
         	for (unsigned i = 0; i < 32; i++) {
      
        -		GRegCache[i] = 0;
      
        -		GRegCacheStore[i] = 0;
      
        -		FRegCache[i] = 0;
      
        -		FRegCacheStore[i] = 0;
      
        +		GRegCache[i] = nullptr;
      
        +		GRegCacheStore[i] = nullptr;
      
        +		FRegCache[i] = nullptr;
      
        +		FRegCacheStore[i] = nullptr;
      
         	}
      
        -	CarryCache = 0;
      
        -	CarryCacheStore = 0;
      
        +	CarryCache = nullptr;
      
        +	CarryCacheStore = nullptr;
      
         	for (unsigned i = 0; i < 8; i++) {
      
        -		CRCache[i] = 0;
      
        -		CRCacheStore[i] = 0;
      
        +		CRCache[i] = nullptr;
      
        +		CRCacheStore[i] = nullptr;
      
         	}
      
        -	CTRCache = 0;
      
        -	CTRCacheStore = 0;
      
        +	CTRCache = nullptr;
      
        +	CTRCacheStore = nullptr;
      
         	return EmitBiOp(FallBackToInterpreter, Op1, Op2);
      
         }
      
    @@ -1210,19 +1210,19 @@ InstLoc IRBuilder::isNeg(InstLoc I) const {
  
         		return getOp2(I);
      
         	}
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
         // TODO: Move the following code to a separated file.
      
         struct Writer
      
         {
      
         	File::IOFile file;
      
        -	Writer() : file(NULL)
      
        +	Writer() : file(nullptr)
      
         	{
      
         		char buffer[1024];
      
        -		sprintf(buffer, "JitIL_IR_%d.txt", (int)time(NULL));
      
        +		sprintf(buffer, "JitIL_IR_%d.txt", (int)time(nullptr));
      
         		file.Open(buffer, "w");
      
        -		setvbuf(file.GetHandle(), NULL, _IOFBF, 1024 * 1024);
      
        +		setvbuf(file.GetHandle(), nullptr, _IOFBF, 1024 * 1024);
      
         	}
      
         	virtual ~Writer() {}

20  Source/Core/Core/PowerPC/JitILCommon/IR.h

show inline notes

View

              
    @@ -547,19 +547,19 @@ class IRBuilder {
  
         		MarkUsed.clear();
      
         		MarkUsed.reserve(100000);
      
         		for (unsigned i = 0; i < 32; i++) {
      
        -			GRegCache[i] = 0;
      
        -			GRegCacheStore[i] = 0;
      
        -			FRegCache[i] = 0;
      
        -			FRegCacheStore[i] = 0;
      
        +			GRegCache[i] = nullptr;
      
        +			GRegCacheStore[i] = nullptr;
      
        +			FRegCache[i] = nullptr;
      
        +			FRegCacheStore[i] = nullptr;
      
         		}
      
        -		CarryCache = 0;
      
        -		CarryCacheStore = 0;
      
        +		CarryCache = nullptr;
      
        +		CarryCacheStore = nullptr;
      
         		for (unsigned i = 0; i < 8; i++) {
      
        -			CRCache[i] = 0;
      
        -			CRCacheStore[i] = 0;
      
        +			CRCache[i] = nullptr;
      
        +			CRCacheStore[i] = nullptr;
      
         		}
      
        -		CTRCache = 0;
      
        -		CTRCacheStore = 0;
      
        +		CTRCache = nullptr;
      
        +		CTRCacheStore = nullptr;
      
         	}
      
         	IRBuilder() { Reset(); }

2  Source/Core/Core/PowerPC/JitILCommon/JitILBase_Branch.cpp

show inline notes

View

              
    @@ -62,7 +62,7 @@ void JitILBase::bx(UGeckoInstruction inst)
  
         }
      
         static IREmitter::InstLoc TestBranch(IREmitter::IRBuilder& ibuild, UGeckoInstruction inst) {
      
        -	IREmitter::InstLoc CRTest = 0, CTRTest = 0;
      
        +	IREmitter::InstLoc CRTest = nullptr, CTRTest = nullptr;
      
         	if ((inst.BO & 16) == 0)  // Test a CR bit
      
         	{
      
         		IREmitter::InstLoc CRReg = ibuild.EmitLoadCR(inst.BI >> 2);

2  Source/Core/Core/PowerPC/JitILCommon/JitILBase_Integer.cpp

show inline notes

View

              
    @@ -123,7 +123,7 @@ void JitILBase::boolX(UGeckoInstruction inst)
  
         	INSTRUCTION_START
      
         	JITDISABLE(bJITIntegerOff)
      
        -	IREmitter::InstLoc a = NULL;
      
        +	IREmitter::InstLoc a = nullptr;
      
         	IREmitter::InstLoc s = ibuild.EmitLoadGReg(inst.RS);
      
         	IREmitter::InstLoc b = ibuild.EmitLoadGReg(inst.RB);

2  Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStore.cpp

show inline notes

View

              
    @@ -48,7 +48,7 @@ void JitILBase::lXz(UGeckoInstruction inst)
  
         	case 32: val = ibuild.EmitLoad32(addr); break; //lwz
      
         	case 40: val = ibuild.EmitLoad16(addr); break; //lhz
      
         	case 34: val = ibuild.EmitLoad8(addr);  break; //lbz
      
        -	default: PanicAlert("lXz: invalid access size"); val = 0; break;
      
        +	default: PanicAlert("lXz: invalid access size"); val = nullptr; break;
      
         	}
      
         	ibuild.EmitStoreGReg(val, inst.RD);
      
         }

8  Source/Core/Core/PowerPC/JitInterface.cpp

show inline notes

View

              
    @@ -45,7 +45,7 @@
  
         		bFakeVMEM = SConfig::GetInstance().m_LocalCoreStartupParameter.bTLBHack == true;
      
         		bMMU = SConfig::GetInstance().m_LocalCoreStartupParameter.bMMU;
      
        -		CPUCoreBase *ptr = NULL;
      
        +		CPUCoreBase *ptr = nullptr;
      
         		switch(core)
      
         		{
      
         			#if _M_X86
      
    @@ -75,8 +75,8 @@
  
         			default:
      
         			{
      
         				PanicAlert("Unrecognizable cpu_core: %d", core);
      
        -				jit = NULL;
      
        -				return NULL;
      
        +				jit = nullptr;
      
        +				return nullptr;
      
         			}
      
         		}
      
         		jit = static_cast<JitBase*>(ptr);
      
    @@ -239,7 +239,7 @@
  
         		{
      
         			jit->Shutdown();
      
         			delete jit;
      
        -			jit = NULL;
      
        +			jit = nullptr;
      
         		}
      
         	}
      
         }

12  Source/Core/Core/PowerPC/PPCSymbolDB.cpp

show inline notes

View

              
    @@ -34,19 +34,19 @@
  
         Symbol *PPCSymbolDB::AddFunction(u32 startAddr)
      
         {
      
         	if (startAddr < 0x80000010)
      
        -		return 0;
      
        +		return nullptr;
      
         	XFuncMap::iterator iter = functions.find(startAddr);
      
         	if (iter != functions.end())
      
         	{
      
         		// it's already in the list
      
        -		return 0;
      
        +		return nullptr;
      
         	}
      
         	else
      
         	{
      
         		Symbol tempFunc; //the current one we're working on
      
         		u32 targetEnd = PPCAnalyst::AnalyzeFunction(startAddr, tempFunc);
      
         		if (targetEnd == 0)
      
        -			return 0;  //found a dud :(
      
        +			return nullptr;  //found a dud :(
      
         		//LOG(OSHLE, "Symbol found at %08x", startAddr);
      
         		functions[startAddr] = tempFunc;
      
         		tempFunc.type = Symbol::SYMBOL_FUNCTION;
      
    @@ -86,7 +86,7 @@ void PPCSymbolDB::AddKnownSymbol(u32 startAddr, u32 size, const char *name, int
  
         Symbol *PPCSymbolDB::GetSymbolFromAddr(u32 addr)
      
         {
      
         	if (!Memory::IsRAMAddress(addr))
      
        -		return 0;
      
        +		return nullptr;
      
         	XFuncMap::iterator it = functions.find(addr);
      
         	if (it != functions.end())
      
    @@ -101,7 +101,7 @@ Symbol *PPCSymbolDB::GetSymbolFromAddr(u32 addr)
  
         				return &p.second;
      
         		}
      
         	}
      
        -	return 0;
      
        +	return nullptr;
      
         }
      
         const std::string PPCSymbolDB::GetDescription(u32 addr)
      
    @@ -237,7 +237,7 @@ bool PPCSymbolDB::LoadMap(const char *filename)
  
         		sscanf(line, "%08x %08x %08x %i %511s", &address, &size, &vaddress, &unknown, name);
      
         		const char *namepos = strstr(line, name);
      
        -		if (namepos != 0) //would be odd if not :P
      
        +		if (namepos != nullptr) //would be odd if not :P
      
         			strcpy(name, namepos);
      
         		name[strlen(name) - 1] = 0;

12  Source/Core/Core/PowerPC/PPCTables.cpp

show inline notes

View

              
    @@ -40,7 +40,7 @@ GekkoOPInfo *GetOpInfo(UGeckoInstruction _inst)
  
         		case 63: return m_infoTable63[_inst.SUBOP10];
      
         		default:
      
         			_assert_msg_(POWERPC,0,"GetOpInfo - invalid subtable op %08x @ %08x", _inst.hex, PC);
      
        -			return 0;
      
        +			return nullptr;
      
         		}
      
         	}
      
         	else
      
    @@ -48,7 +48,7 @@ GekkoOPInfo *GetOpInfo(UGeckoInstruction _inst)
  
         		if ((info->type & 0xFFFFFF) == OPTYPE_INVALID)
      
         		{
      
         			_assert_msg_(POWERPC,0,"GetOpInfo - invalid op %08x @ %08x", _inst.hex, PC);
      
        -			return 0;
      
        +			return nullptr;
      
         		}
      
         		return m_infoTable[_inst.OPCD];
      
         	}
      
    @@ -69,7 +69,7 @@ GekkoOPInfo *GetOpInfo(UGeckoInstruction _inst)
  
         		case 63: return Interpreter::m_opTable63[_inst.SUBOP10];
      
         		default:
      
         			_assert_msg_(POWERPC,0,"GetInterpreterOp - invalid subtable op %08x @ %08x", _inst.hex, PC);
      
        -			return 0;
      
        +			return nullptr;
      
         		}
      
         	}
      
         	else
      
    @@ -77,7 +77,7 @@ GekkoOPInfo *GetOpInfo(UGeckoInstruction _inst)
  
         		if ((info->type & 0xFFFFFF) == OPTYPE_INVALID)
      
         		{
      
         			_assert_msg_(POWERPC,0,"GetInterpreterOp - invalid op %08x @ %08x", _inst.hex, PC);
      
        -			return 0;
      
        +			return nullptr;
      
         		}
      
         		return Interpreter::m_opTable[_inst.OPCD];
      
         	}
      
    @@ -161,13 +161,13 @@ void InitTables(int cpu_core)
  
         const char *GetInstructionName(UGeckoInstruction _inst)
      
         {
      
         	const GekkoOPInfo *info = GetOpInfo(_inst);
      
        -	return info ? info->opname : 0;
      
        +	return info ? info->opname : nullptr;
      
         }
      
         bool IsValidInstruction(UGeckoInstruction _inst)
      
         {
      
         	const GekkoOPInfo *info = GetOpInfo(_inst);
      
        -	return info != 0;
      
        +	return info != nullptr;
      
         }
      
         void CountInstruction(UGeckoInstruction _inst)

2  Source/Core/Core/PowerPC/PowerPC.cpp

show inline notes

View

              
    @@ -169,7 +169,7 @@ void Shutdown()
  
         {
      
         	JitInterface::Shutdown();
      
         	interpreter->Shutdown();
      
        -	cpu_core_base = NULL;
      
        +	cpu_core_base = nullptr;
      
         	state = CPU_POWERDOWN;
      
         }

8  Source/Core/Core/State.cpp

show inline notes

View

              
    @@ -47,7 +47,7 @@
  
         static std::string g_last_filename;
      
        -static CallbackFunc g_onAfterLoadCb = NULL;
      
        +static CallbackFunc g_onAfterLoadCb = nullptr;
      
         // Temporary undo state buffer
      
         static std::vector<u8> g_undo_load_buffer;
      
    @@ -131,7 +131,7 @@ void SaveToBuffer(std::vector<u8>& buffer)
  
         {
      
         	bool wasUnpaused = Core::PauseAndLock(true);
      
        -	u8* ptr = NULL;
      
        +	u8* ptr = nullptr;
      
         	PointerWrap p(&ptr, PointerWrap::MODE_MEASURE);
      
         	DoState(p);
      
    @@ -301,7 +301,7 @@ void SaveAs(const std::string& filename, bool wait)
  
         	bool wasUnpaused = Core::PauseAndLock(true);
      
         	// Measure the size of the buffer.
      
        -	u8 *ptr = NULL;
      
        +	u8 *ptr = nullptr;
      
         	PointerWrap p(&ptr, PointerWrap::MODE_MEASURE);
      
         	DoState(p);
      
         	const size_t buffer_size = reinterpret_cast<size_t>(ptr);
      
    @@ -393,7 +393,7 @@ void LoadFileStateData(const std::string& filename, std::vector<u8>& ret_data)
  
         				break;
      
         			f.ReadBytes(out, cur_len);
      
        -			const int res = lzo1x_decompress(out, cur_len, &buffer[i], &new_len, NULL);
      
        +			const int res = lzo1x_decompress(out, cur_len, &buffer[i], &new_len, nullptr);
      
         			if (res != LZO_E_OK)
      
         			{
      
         				// This doesn't seem to happen anymore.

18  Source/Core/Core/VolumeHandler.cpp

show inline notes

View

              
    @@ -8,7 +8,7 @@
  
         namespace VolumeHandler
      
         {
      
        -DiscIO::IVolume* g_pVolume = NULL;
      
        +DiscIO::IVolume* g_pVolume = nullptr;
      
         DiscIO::IVolume *GetVolume()
      
         {
      
    @@ -24,7 +24,7 @@ void EjectVolume()
  
         		// reading location ..." after you have started and stopped two
      
         		// or three games
      
         		delete g_pVolume;
      
        -		g_pVolume = NULL;
      
        +		g_pVolume = nullptr;
      
         	}
      
         }
      
    @@ -33,12 +33,12 @@ bool SetVolumeName(const std::string& _rFullPath)
  
         	if (g_pVolume)
      
         	{
      
         		delete g_pVolume;
      
        -		g_pVolume = NULL;
      
        +		g_pVolume = nullptr;
      
         	}
      
         	g_pVolume = DiscIO::CreateVolumeFromFilename(_rFullPath);
      
        -	return (g_pVolume != NULL);
      
        +	return (g_pVolume != nullptr);
      
         }
      
         void SetVolumeDirectory(const std::string& _rFullPath, bool _bIsWii, const std::string& _rApploader, const std::string& _rDOL)
      
    @@ -46,7 +46,7 @@ void SetVolumeDirectory(const std::string& _rFullPath, bool _bIsWii, const std::
  
         	if (g_pVolume)
      
         	{
      
         		delete g_pVolume;
      
        -		g_pVolume = NULL;
      
        +		g_pVolume = nullptr;
      
         	}
      
         	g_pVolume = DiscIO::CreateVolumeFromDirectory(_rFullPath, _bIsWii, _rApploader, _rDOL);
      
    @@ -54,7 +54,7 @@ void SetVolumeDirectory(const std::string& _rFullPath, bool _bIsWii, const std::
  
         u32 Read32(u64 _Offset)
      
         {
      
        -	if (g_pVolume != NULL)
      
        +	if (g_pVolume != nullptr)
      
         	{
      
         		u32 Temp;
      
         		g_pVolume->Read(_Offset, 4, (u8*)&Temp);
      
    @@ -65,7 +65,7 @@ u32 Read32(u64 _Offset)
  
         bool ReadToPtr(u8* ptr, u64 _dwOffset, u64 _dwLength)
      
         {
      
        -	if (g_pVolume != NULL && ptr)
      
        +	if (g_pVolume != nullptr && ptr)
      
         	{
      
         		g_pVolume->Read(_dwOffset, _dwLength, ptr);
      
         		return true;
      
    @@ -75,7 +75,7 @@ bool ReadToPtr(u8* ptr, u64 _dwOffset, u64 _dwLength)
  
         bool RAWReadToPtr( u8* ptr, u64 _dwOffset, u64 _dwLength )
      
         {
      
        -	if (g_pVolume != NULL && ptr)
      
        +	if (g_pVolume != nullptr && ptr)
      
         	{
      
         		g_pVolume->RAWRead(_dwOffset, _dwLength, ptr);
      
         		return true;
      
    @@ -85,7 +85,7 @@ bool RAWReadToPtr( u8* ptr, u64 _dwOffset, u64 _dwLength )
  
         bool IsValid()
      
         {
      
        -	return (g_pVolume != NULL);
      
        +	return (g_pVolume != nullptr);
      
         }
      
         bool IsWii()

12  Source/Core/Core/ec_wii.cpp

show inline notes

View

              
    @@ -42,12 +42,12 @@
  
         // NG_key_id is the device-unique key_id to use
      
         // NG_priv is the device-unique private key to use
      
         // NG_sig is the device-unique signature blob (from issuer) to use
      
        -// if NG_priv iis NULL or NG_sig is NULL or NG_id is 0 or NG_key_id is 0, default values
      
        +// if NG_priv iis nullptr or NG_sig is nullptr or NG_id is 0 or NG_key_id is 0, default values
      
         // will be used for all of them
      
         void get_ng_cert(u8* ng_cert_out, u32 NG_id, u32 NG_key_id, const u8* NG_priv, const u8* NG_sig)
      
         {
      
         	char name[64];
      
        -	if ((NG_id==0)||(NG_key_id==0)||(NG_priv==NULL)||(NG_sig==NULL))
      
        +	if ((NG_id==0)||(NG_key_id==0)||(NG_priv==nullptr)||(NG_sig==nullptr))
      
         	{
      
         		NG_id = default_NG_id;
      
         		NG_key_id = default_NG_key_id;
      
    @@ -70,7 +70,7 @@ void get_ng_cert(u8* ng_cert_out, u32 NG_id, u32 NG_key_id, const u8* NG_priv, c
  
         // data_size is the length of the buffer
      
         // NG_priv is the device-unique private key to use
      
         // NG_id is the device-unique id to use
      
        -// if NG_priv is NULL or NG_id is 0, it will use builtin defaults
      
        +// if NG_priv is nullptr or NG_id is 0, it will use builtin defaults
      
         void get_ap_sig_and_cert(u8 *sig_out, u8 *ap_cert_out, u64 title_id, u8 *data, u32 data_size, const u8 *NG_priv, u32 NG_id)
      
         {
      
         	u8 hash[20];
      
    @@ -78,7 +78,7 @@ void get_ap_sig_and_cert(u8 *sig_out, u8 *ap_cert_out, u64 title_id, u8 *data, u
  
         	char signer[64];
      
         	char name[64];
      
        -	if ((NG_id==0)||(NG_priv == NULL))
      
        +	if ((NG_id==0)||(NG_priv == nullptr))
      
         	{
      
         		NG_priv = default_NG_priv;
      
         		NG_id = default_NG_id;
      
    @@ -122,10 +122,10 @@ void make_blanksig_ec_cert(u8 *cert_out, const char *signer, const char *name, c
  
         // shared_secret_out is a pointer to 0x3c long buffer
      
         // remote_public_key is a pointer to the remote party's public key (0x3c bytes)
      
         // NG_priv is the device-unique private key to use
      
        -// if NG_priv is NULL, default builtin will be used
      
        +// if NG_priv is nullptr, default builtin will be used
      
         void get_shared_secret(u8* shared_secret_out, u8* remote_public_key, u8* NG_priv)
      
         {
      
        -	if (NG_priv==NULL)
      
        +	if (NG_priv==nullptr)
      
         	{
      
         		NG_priv = default_NG_priv;
      
         	}

6  Source/Core/Core/x64MemTools.cpp

show inline notes

View

              
    @@ -183,7 +183,7 @@ void ExceptionThread(mach_port_t port)
  
         	#pragma pack()
      
         	memset(&msg_in, 0xee, sizeof(msg_in));
      
         	memset(&msg_out, 0xee, sizeof(msg_out));
      
        -	mach_msg_header_t *send_msg = NULL;
      
        +	mach_msg_header_t *send_msg = nullptr;
      
         	mach_msg_size_t send_size = 0;
      
         	mach_msg_option_t option = MACH_RCV_MSG;
      
         	while (1)
      
    @@ -303,11 +303,11 @@ void InstallExceptionHandler()
  
         	PanicAlertT("InstallExceptionHandler called, but this platform does not yet support it.");
      
         #else
      
         	struct sigaction sa;
      
        -	sa.sa_handler = 0;
      
        +	sa.sa_handler = nullptr;
      
         	sa.sa_sigaction = &sigsegv_handler;
      
         	sa.sa_flags = SA_SIGINFO;
      
         	sigemptyset(&sa.sa_mask);
      
        -	sigaction(SIGSEGV, &sa, NULL);
      
        +	sigaction(SIGSEGV, &sa, nullptr);
      
         #endif
      
         }

2  Source/Core/DiscIO/BannerLoader.cpp

show inline notes

View

              
    @@ -27,7 +27,7 @@ IBannerLoader* CreateBannerLoader(DiscIO::IFileSystem& _rFileSystem, DiscIO::IVo
  
         		return new CBannerLoaderGC(_rFileSystem, pVolume);
      
         	}
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
         } // namespace

4  Source/Core/DiscIO/BannerLoaderGC.cpp

show inline notes

View

              
    @@ -16,7 +16,7 @@
  
         namespace DiscIO
      
         {
      
         CBannerLoaderGC::CBannerLoaderGC(DiscIO::IFileSystem& _rFileSystem, DiscIO::IVolume* volume)
      
        -	: m_pBannerFile(NULL)
      
        +	: m_pBannerFile(nullptr)
      
         	, m_IsValid(false)
      
         	, m_country(volume->GetCountry())
      
         {
      
    @@ -45,7 +45,7 @@
  
         	if (m_pBannerFile)
      
         	{
      
         		delete [] m_pBannerFile;
      
        -		m_pBannerFile = NULL;
      
        +		m_pBannerFile = nullptr;
      
         	}
      
         }

10  Source/Core/DiscIO/BannerLoaderGC.h

show inline notes

View

              
    @@ -26,13 +26,13 @@ class CBannerLoaderGC
  
         		CBannerLoaderGC(DiscIO::IFileSystem& _rFileSystem, DiscIO::IVolume* volume);
      
         		virtual ~CBannerLoaderGC();
      
        -		virtual bool IsValid();
      
        +		virtual bool IsValid() override;
      
        -		virtual std::vector<u32> GetBanner(int* pWidth, int* pHeight);
      
        +		virtual std::vector<u32> GetBanner(int* pWidth, int* pHeight) override;
      
        -		virtual std::vector<std::string> GetNames();
      
        -		virtual std::string GetCompany();
      
        -		virtual std::vector<std::string> GetDescriptions();
      
        +		virtual std::vector<std::string> GetNames() override;
      
        +		virtual std::string GetCompany() override;
      
        +		virtual std::vector<std::string> GetDescriptions() override;
      
         	private:
      
         		enum

6  Source/Core/DiscIO/BannerLoaderWii.cpp

show inline notes

View

              
    @@ -21,7 +21,7 @@
  
         {
      
         CBannerLoaderWii::CBannerLoaderWii(DiscIO::IVolume *pVolume)
      
        -	: m_pBannerFile(NULL)
      
        +	: m_pBannerFile(nullptr)
      
         	, m_IsValid(false)
      
         {
      
         	char Filename[260];
      
    @@ -94,7 +94,7 @@
  
         	if (m_pBannerFile)
      
         	{
      
         		delete [] m_pBannerFile;
      
        -		m_pBannerFile = NULL;
      
        +		m_pBannerFile = nullptr;
      
         	}
      
         }
      
    @@ -121,7 +121,7 @@ bool CBannerLoaderWii::GetStringFromComments(const CommentIndex index, std::stri
  
         		auto const banner = reinterpret_cast<const SWiiBanner*>(m_pBannerFile);
      
         		auto const src_ptr = banner->m_Comment[index];
      
        -		// Trim at first NULL
      
        +		// Trim at first nullptr
      
         		auto const length = std::find(src_ptr, src_ptr + COMMENT_SIZE, 0x0) - src_ptr;
      
         		std::wstring src;

10  Source/Core/DiscIO/BannerLoaderWii.h

show inline notes

View

              
    @@ -24,13 +24,13 @@ class CBannerLoaderWii
  
         		virtual ~CBannerLoaderWii();
      
        -		virtual bool IsValid();
      
        +		virtual bool IsValid() override;
      
        -		virtual std::vector<u32> GetBanner(int* pWidth, int* pHeight);
      
        +		virtual std::vector<u32> GetBanner(int* pWidth, int* pHeight) override;
      
        -		virtual std::vector<std::string> GetNames();
      
        -		virtual std::string GetCompany();
      
        -		virtual std::vector<std::string> GetDescriptions();
      
        +		virtual std::vector<std::string> GetNames() override;
      
        +		virtual std::string GetCompany() override;
      
        +		virtual std::vector<std::string> GetDescriptions() override;
      
         	private:

8  Source/Core/DiscIO/Blob.cpp

show inline notes

View

              
    @@ -34,8 +34,10 @@ void SectorReader::SetSectorSize(int blocksize)
  
         }
      
         SectorReader::~SectorReader() {
      
        -	for (int i = 0; i < CACHE_SIZE; i++)
      
        -		delete [] cache[i];
      
        +	for (u8*& block : cache)
      
        +	{
      
        +		delete [] block;
      
        +	}
      
         }
      
         const u8 *SectorReader::GetBlockData(u64 block_num)
      
    @@ -119,7 +121,7 @@ IBlobReader* CreateBlobReader(const char* filename)
  
         		return DriveReader::Create(filename);
      
         	if (!File::Exists(filename))
      
        -		return 0;
      
        +		return nullptr;
      
         	if (IsWbfsBlob(filename))
      
         		return WbfsFileReader::Create(filename);

6  Source/Core/DiscIO/Blob.h

show inline notes

View

              
    @@ -58,7 +58,7 @@ class SectorReader : public IBlobReader
  
         	// A pointer returned by GetBlockData is invalidated as soon as GetBlockData, Read, or ReadMultipleAlignedBlocks is called again.
      
         	const u8 *GetBlockData(u64 block_num);
      
        -	virtual bool Read(u64 offset, u64 size, u8 *out_ptr);
      
        +	virtual bool Read(u64 offset, u64 size, u8 *out_ptr) override;
      
         	friend class DriveReader;
      
         };
      
    @@ -68,8 +68,8 @@ class SectorReader : public IBlobReader
  
         typedef void (*CompressCB)(const char *text, float percent, void* arg);
      
         bool CompressFileToBlob(const char *infile, const char *outfile, u32 sub_type = 0, int sector_size = 16384,
      
        -		CompressCB callback = 0, void *arg = 0);
      
        +		CompressCB callback = nullptr, void *arg = nullptr);
      
         bool DecompressBlobToFile(const char *infile, const char *outfile,
      
        -		CompressCB callback = 0, void *arg = 0);
      
        +		CompressCB callback = nullptr, void *arg = nullptr);
      
         }  // namespace

2  Source/Core/DiscIO/CISOBlob.cpp

show inline notes

View

              
    @@ -37,7 +37,7 @@ CISOFileReader* CISOFileReader::Create(const char* filename)
  
         		return new CISOFileReader(f.ReleaseHandle());
      
         	}
      
         	else
      
        -		return NULL;
      
        +		return nullptr;
      
         }
      
         u64 CISOFileReader::GetDataSize() const

6  Source/Core/DiscIO/CISOBlob.h

show inline notes

View

              
    @@ -35,9 +35,9 @@ class CISOFileReader : public IBlobReader
  
         public:
      
         	static CISOFileReader* Create(const char* filename);
      
        -	u64 GetDataSize() const;
      
        -	u64 GetRawSize() const;
      
        -	bool Read(u64 offset, u64 nbytes, u8* out_ptr);
      
        +	u64 GetDataSize() const override;
      
        +	u64 GetRawSize() const override;
      
        +	bool Read(u64 offset, u64 nbytes, u8* out_ptr) override;
      
         private:
      
         	CISOFileReader(std::FILE* file);

2  Source/Core/DiscIO/CompressedBlob.cpp

show inline notes

View

              
    @@ -55,7 +55,7 @@ CompressedBlobReader* CompressedBlobReader::Create(const char* filename)
  
         	if (IsCompressedBlob(filename))
      
         		return new CompressedBlobReader(filename);
      
         	else
      
        -		return 0;
      
        +		return nullptr;
      
         }
      
         CompressedBlobReader::~CompressedBlobReader()

6  Source/Core/DiscIO/CompressedBlob.h

show inline notes

View

              
    @@ -49,10 +49,10 @@ class CompressedBlobReader : public SectorReader
  
         	static CompressedBlobReader* Create(const char *filename);
      
         	~CompressedBlobReader();
      
         	const CompressedBlobHeader &GetHeader() const { return header; }
      
        -	u64 GetDataSize() const { return header.data_size; }
      
        -	u64 GetRawSize() const { return file_size; }
      
        +	u64 GetDataSize() const override { return header.data_size; }
      
        +	u64 GetRawSize() const override { return file_size; }
      
         	u64 GetBlockCompressedSize(u64 block_num) const;
      
        -	void GetBlock(u64 block_num, u8 *out_ptr);
      
        +	void GetBlock(u64 block_num, u8 *out_ptr) override;
      
         private:
      
         	CompressedBlobReader(const char *filename);

8  Source/Core/DiscIO/DiscScrubber.cpp

show inline notes

View

              
    @@ -24,7 +24,7 @@
  
         #define CLUSTER_SIZE 0x8000
      
        -u8* m_FreeTable = NULL;
      
        +u8* m_FreeTable = nullptr;
      
         u64 m_FileSize;
      
         u64 m_BlockCount;
      
         u32 m_BlockSize;
      
    @@ -32,7 +32,7 @@
  
         bool m_isScrubbing = false;
      
         std::string m_Filename;
      
        -IVolume* m_Disc = NULL;
      
        +IVolume* m_Disc = nullptr;
      
         struct SPartitionHeader
      
         {
      
    @@ -112,7 +112,7 @@ bool SetupScrub(const char* filename, int block_size)
  
         	success = ParseDisc();
      
         	// Done with it; need it closed for the next part
      
         	delete m_Disc;
      
        -	m_Disc = NULL;
      
        +	m_Disc = nullptr;
      
         	m_BlockCount = 0;
      
         	// Let's not touch the file if we've failed up to here :p
      
    @@ -146,7 +146,7 @@ void GetNextBlock(File::IOFile& in, u8* buffer)
  
         void Cleanup()
      
         {
      
         	if (m_FreeTable) delete[] m_FreeTable;
      
        -	m_FreeTable = NULL;
      
        +	m_FreeTable = nullptr;
      
         	m_FileSize = 0;
      
         	m_BlockCount = 0;
      
         	m_BlockSize = 0;

18  Source/Core/DiscIO/DriveBlob.cpp

show inline notes

View

              
    @@ -23,14 +23,14 @@
  
         	SectorReader::SetSectorSize(2048);
      
         	auto const path = UTF8ToTStr(std::string("\\\\.\\") + drive);
      
         	hDisc = CreateFile(path.c_str(), GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
      
        -						NULL, OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS, NULL);
      
        +						nullptr, OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS, nullptr);
      
         	if (hDisc != INVALID_HANDLE_VALUE)
      
         	{
      
         		// Do a test read to make sure everything is OK, since it seems you can get
      
         		// handles to empty drives.
      
         		DWORD not_used;
      
         		u8 *buffer = new u8[m_blocksize];
      
        -		if (!ReadFile(hDisc, buffer, m_blocksize, (LPDWORD)&not_used, NULL))
      
        +		if (!ReadFile(hDisc, buffer, m_blocksize, (LPDWORD)&not_used, nullptr))
      
         		{
      
         			delete [] buffer;
      
         			// OK, something is wrong.
      
    @@ -45,8 +45,8 @@
  
         		// removal while reading from it.
      
         		pmrLockCDROM.PreventMediaRemoval = TRUE;
      
         		DeviceIoControl(hDisc, IOCTL_CDROM_MEDIA_REMOVAL,
      
        -					&pmrLockCDROM, sizeof(pmrLockCDROM), NULL,
      
        -					0, &dwNotUsed, NULL);
      
        +					&pmrLockCDROM, sizeof(pmrLockCDROM), nullptr,
      
        +					0, &dwNotUsed, nullptr);
      
         	#endif
      
         #else
      
         	SectorReader::SetSectorSize(2048);
      
    @@ -66,8 +66,8 @@
  
         	// Unlock the disc in the CD-ROM drive.
      
         	pmrLockCDROM.PreventMediaRemoval = FALSE;
      
         	DeviceIoControl (hDisc, IOCTL_CDROM_MEDIA_REMOVAL,
      
        -		&pmrLockCDROM, sizeof(pmrLockCDROM), NULL,
      
        -		0, &dwNotUsed, NULL);
      
        +		&pmrLockCDROM, sizeof(pmrLockCDROM), nullptr,
      
        +		0, &dwNotUsed, nullptr);
      
         #endif
      
         	if (hDisc != INVALID_HANDLE_VALUE)
      
         	{
      
    @@ -85,7 +85,7 @@ DriveReader *DriveReader::Create(const char *drive)
  
         	if (!reader->IsOK())
      
         	{
      
         		delete reader;
      
        -		return 0;
      
        +		return nullptr;
      
         	}
      
         	return reader;
      
         }
      
    @@ -99,7 +99,7 @@ void DriveReader::GetBlock(u64 block_num, u8 *out_ptr)
  
         	LONG off_low = (LONG)offset & 0xFFFFFFFF;
      
         	LONG off_high = (LONG)(offset >> 32);
      
         	SetFilePointer(hDisc, off_low, &off_high, FILE_BEGIN);
      
        -	if (!ReadFile(hDisc, lpSector, m_blocksize, (LPDWORD)&NotUsed, NULL))
      
        +	if (!ReadFile(hDisc, lpSector, m_blocksize, (LPDWORD)&NotUsed, nullptr))
      
         		PanicAlertT("Disc Read Error");
      
         #else
      
         	file_.Seek(m_blocksize * block_num, SEEK_SET);
      
    @@ -117,7 +117,7 @@ bool DriveReader::ReadMultipleAlignedBlocks(u64 block_num, u64 num_blocks, u8 *o
  
         	LONG off_low = (LONG)offset & 0xFFFFFFFF;
      
         	LONG off_high = (LONG)(offset >> 32);
      
         	SetFilePointer(hDisc, off_low, &off_high, FILE_BEGIN);
      
        -	if (!ReadFile(hDisc, out_ptr, (DWORD)(m_blocksize * num_blocks), (LPDWORD)&NotUsed, NULL))
      
        +	if (!ReadFile(hDisc, out_ptr, (DWORD)(m_blocksize * num_blocks), (LPDWORD)&NotUsed, nullptr))
      
         	{
      
         		PanicAlertT("Disc Read Error");
      
         		return false;

10  Source/Core/DiscIO/DriveBlob.h

show inline notes

View

              
    @@ -20,7 +20,7 @@ class DriveReader : public SectorReader
  
         {
      
         private:
      
         	DriveReader(const char *drive);
      
        -	void GetBlock(u64 block_num, u8 *out_ptr);
      
        +	void GetBlock(u64 block_num, u8 *out_ptr) override;
      
         #ifdef _WIN32
      
         	HANDLE hDisc;
      
    @@ -28,17 +28,17 @@ class DriveReader : public SectorReader
  
         	bool IsOK() {return hDisc != INVALID_HANDLE_VALUE;}
      
         #else
      
         	File::IOFile file_;
      
        -	bool IsOK() {return file_ != 0;}
      
        +	bool IsOK() {return file_ != nullptr;}
      
         #endif
      
         	s64 size;
      
         public:
      
         	static DriveReader *Create(const char *drive);
      
         	~DriveReader();
      
        -	u64 GetDataSize() const { return size; }
      
        -	u64 GetRawSize() const { return size; }
      
        +	u64 GetDataSize() const override { return size; }
      
        +	u64 GetRawSize() const override { return size; }
      
        -	virtual bool ReadMultipleAlignedBlocks(u64 block_num, u64 num_blocks, u8 *out_ptr);
      
        +	virtual bool ReadMultipleAlignedBlocks(u64 block_num, u64 num_blocks, u8 *out_ptr) override;
      
         };
      
         }  // namespace

2  Source/Core/DiscIO/FileBlob.cpp

show inline notes

View

              
    @@ -19,7 +19,7 @@ PlainFileReader* PlainFileReader::Create(const char* filename)
  
         	if (f)
      
         		return new PlainFileReader(f.ReleaseHandle());
      
         	else
      
        -		return NULL;
      
        +		return nullptr;
      
         }
      
         bool PlainFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr)

6  Source/Core/DiscIO/FileBlob.h

show inline notes

View

              
    @@ -23,9 +23,9 @@ class PlainFileReader : public IBlobReader
  
         public:
      
         	static PlainFileReader* Create(const char* filename);
      
        -	u64 GetDataSize() const { return m_size; }
      
        -	u64 GetRawSize() const { return m_size; }
      
        -	bool Read(u64 offset, u64 nbytes, u8* out_ptr);
      
        +	u64 GetDataSize() const override { return m_size; }
      
        +	u64 GetRawSize() const override { return m_size; }
      
        +	bool Read(u64 offset, u64 nbytes, u8* out_ptr) override;
      
         };
      
         }  // namespace

24  Source/Core/DiscIO/FileHandlerARC.cpp

show inline notes

View

              
    @@ -18,11 +18,11 @@
  
         namespace DiscIO
      
         {
      
         CARCFile::CARCFile(const std::string& _rFilename)
      
        -	: m_pBuffer(NULL)
      
        +	: m_pBuffer(nullptr)
      
         	, m_Initialized(false)
      
         {
      
         	DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rFilename.c_str());
      
        -	if (pReader != NULL)
      
        +	if (pReader != nullptr)
      
         	{
      
         		u64 FileSize = pReader->GetDataSize();
      
         		m_pBuffer = new u8[(u32)FileSize];
      
    @@ -34,11 +34,11 @@
  
         }
      
         CARCFile::CARCFile(const std::string& _rFilename, u32 offset)
      
        -	: m_pBuffer(NULL)
      
        +	: m_pBuffer(nullptr)
      
         	, m_Initialized(false)
      
         {
      
         	DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rFilename.c_str());
      
        -	if (pReader != NULL)
      
        +	if (pReader != nullptr)
      
         	{
      
         		u64 FileSize = pReader->GetDataSize() - offset;
      
         		m_pBuffer = new u8[(u32)FileSize];
      
    @@ -50,7 +50,7 @@
  
         }
      
         CARCFile::CARCFile(const u8* _pBuffer, size_t _BufferSize)
      
        -	: m_pBuffer(NULL)
      
        +	: m_pBuffer(nullptr)
      
         	, m_Initialized(false)
      
         {
      
         	m_pBuffer = new u8[_BufferSize];
      
    @@ -86,7 +86,7 @@
  
         	const SFileInfo* pFileInfo = FindFileInfo(_rFullPath);
      
        -	if (pFileInfo != NULL)
      
        +	if (pFileInfo != nullptr)
      
         	{
      
         		return((size_t) pFileInfo->m_FileSize);
      
         	}
      
    @@ -105,7 +105,7 @@
  
         	const SFileInfo* pFileInfo = FindFileInfo(_rFullPath);
      
        -	if (pFileInfo == NULL)
      
        +	if (pFileInfo == nullptr)
      
         	{
      
         		return(0);
      
         	}
      
    @@ -130,7 +130,7 @@
  
         	const SFileInfo* pFileInfo = FindFileInfo(_rFullPath);
      
        -	if (pFileInfo == NULL)
      
        +	if (pFileInfo == nullptr)
      
         	{
      
         		return(false);
      
         	}
      
    @@ -183,7 +183,7 @@
  
         			szNameTable += 0xC;
      
         		}
      
        -		BuildFilenames(1, m_FileInfoVector.size(), NULL, szNameTable);
      
        +		BuildFilenames(1, m_FileInfoVector.size(), nullptr, szNameTable);
      
         	}
      
         	return(true);
      
    @@ -204,7 +204,7 @@
  
         		if (rFileInfo.IsDirectory())
      
         		{
      
         			// this is a directory, build up the new szDirectory
      
        -			if (_szDirectory != NULL)
      
        +			if (_szDirectory != nullptr)
      
         			{
      
         				sprintf(rFileInfo.m_FullPath, "%s%s/", _szDirectory, &_szNameTable[uOffset]);
      
         			}
      
    @@ -218,7 +218,7 @@
  
         		else
      
         		{
      
         			// this is a filename
      
        -			if (_szDirectory != NULL)
      
        +			if (_szDirectory != nullptr)
      
         			{
      
         				sprintf(rFileInfo.m_FullPath, "%s%s", _szDirectory, &_szNameTable[uOffset]);
      
         			}
      
    @@ -246,6 +246,6 @@
  
         		}
      
         	}
      
        -	return(NULL);
      
        +	return(nullptr);
      
         }
      
         } // namespace

22  Source/Core/DiscIO/FileMonitor.cpp

show inline notes

View

              
    @@ -24,8 +24,8 @@
  
         namespace FileMon
      
         {
      
        -DiscIO::IVolume *OpenISO = NULL;
      
        -DiscIO::IFileSystem *pFileSystem = NULL;
      
        +DiscIO::IVolume *OpenISO = nullptr;
      
        +DiscIO::IFileSystem *pFileSystem = nullptr;
      
         std::vector<const DiscIO::SFileInfo *> GCFiles;
      
         std::string ISOFile = "", CurrentFile = "";
      
         bool FileAccess = true;
      
    @@ -34,7 +34,7 @@
  
         bool IsSoundFile(const std::string& filename)
      
         {
      
         	std::string extension;
      
        -	SplitPath(filename, NULL, NULL, &extension);
      
        +	SplitPath(filename, nullptr, nullptr, &extension);
      
         	std::transform(extension.begin(), extension.end(), extension.begin(), ::tolower);
      
         	std::unordered_set<std::string> extensions = {
      
    @@ -57,15 +57,15 @@ bool IsSoundFile(const std::string& filename)
  
         void ReadGC(const std::string& filename)
      
         {
      
         	// Should have an actual Shutdown procedure or something
      
        -	if (OpenISO != NULL)
      
        +	if (OpenISO != nullptr)
      
         	{
      
         		delete OpenISO;
      
        -		OpenISO = NULL;
      
        +		OpenISO = nullptr;
      
         	}
      
        -	if (pFileSystem != NULL)
      
        +	if (pFileSystem != nullptr)
      
         	{
      
         		delete pFileSystem;
      
        -		pFileSystem = NULL;
      
        +		pFileSystem = nullptr;
      
         	}
      
         	// GCFiles' pointers are no longer valid after pFileSystem is cleared
      
    @@ -149,16 +149,16 @@ void FindFilename(u64 offset)
  
         void Close()
      
         {
      
        -	if (OpenISO != NULL)
      
        +	if (OpenISO != nullptr)
      
         	{
      
         		delete OpenISO;
      
        -		OpenISO = NULL;
      
        +		OpenISO = nullptr;
      
         	}
      
        -	if (pFileSystem != NULL)
      
        +	if (pFileSystem != nullptr)
      
         	{
      
         		delete pFileSystem;
      
        -		pFileSystem = NULL;
      
        +		pFileSystem = nullptr;
      
         	}
      
         	// GCFiles' pointers are no longer valid after pFileSystem is cleared

14  Source/Core/DiscIO/FileSystemGCWii.cpp

show inline notes

View

              
    @@ -40,7 +40,7 @@ u64 CFileSystemGCWii::GetFileSize(const char* _rFullPath)
  
         	const SFileInfo* pFileInfo = FindFileInfo(_rFullPath);
      
        -	if (pFileInfo != NULL && !pFileInfo->IsDirectory())
      
        +	if (pFileInfo != nullptr && !pFileInfo->IsDirectory())
      
         		return pFileInfo->m_FileSize;
      
         	return 0;
      
    @@ -60,7 +60,7 @@ const char* CFileSystemGCWii::GetFileName(u64 _Address)
  
         		}
      
         	}
      
        -	return 0;
      
        +	return nullptr;
      
         }
      
         u64 CFileSystemGCWii::ReadFile(const char* _rFullPath, u8* _pBuffer, size_t _MaxBufferSize)
      
    @@ -69,7 +69,7 @@ u64 CFileSystemGCWii::ReadFile(const char* _rFullPath, u8* _pBuffer, size_t _Max
  
         		InitFileSystem();
      
         	const SFileInfo* pFileInfo = FindFileInfo(_rFullPath);
      
        -	if (pFileInfo == NULL)
      
        +	if (pFileInfo == nullptr)
      
         		return 0;
      
         	if (pFileInfo->m_FileSize > _MaxBufferSize)
      
    @@ -243,7 +243,7 @@ const SFileInfo* CFileSystemGCWii::FindFileInfo(const char* _rFullPath)
  
         			return &fileInfo;
      
         	}
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
         bool CFileSystemGCWii::DetectFileSystem()
      
    @@ -297,7 +297,7 @@ void CFileSystemGCWii::InitFileSystem()
  
         			NameTableOffset += 0xC;
      
         		}
      
        -		BuildFilenames(1, m_FileInfoVector.size(), NULL, NameTableOffset);
      
        +		BuildFilenames(1, m_FileInfoVector.size(), nullptr, NameTableOffset);
      
         	}
      
         }
      
    @@ -317,7 +317,7 @@ size_t CFileSystemGCWii::BuildFilenames(const size_t _FirstIndex, const size_t _
  
         		if (rFileInfo->IsDirectory())
      
         		{
      
         			// this is a directory, build up the new szDirectory
      
        -			if (_szDirectory != NULL)
      
        +			if (_szDirectory != nullptr)
      
         				CharArrayFromFormat(rFileInfo->m_FullPath, "%s%s/", _szDirectory, filename.c_str());
      
         			else
      
         				CharArrayFromFormat(rFileInfo->m_FullPath, "%s/", filename.c_str());
      
    @@ -327,7 +327,7 @@ size_t CFileSystemGCWii::BuildFilenames(const size_t _FirstIndex, const size_t _
  
         		else
      
         		{
      
         			// this is a filename
      
        -			if (_szDirectory != NULL)
      
        +			if (_szDirectory != nullptr)
      
         				CharArrayFromFormat(rFileInfo->m_FullPath, "%s%s", _szDirectory, filename.c_str());
      
         			else
      
         				CharArrayFromFormat(rFileInfo->m_FullPath, "%s", filename.c_str());

20  Source/Core/DiscIO/FileSystemGCWii.h

show inline notes

View

              
    @@ -21,16 +21,16 @@ class CFileSystemGCWii : public IFileSystem
  
         public:
      
         	CFileSystemGCWii(const IVolume* _rVolume);
      
         	virtual ~CFileSystemGCWii();
      
        -	virtual bool IsValid() const { return m_Valid; }
      
        -	virtual u64 GetFileSize(const char* _rFullPath);
      
        -	virtual size_t GetFileList(std::vector<const SFileInfo *> &_rFilenames);
      
        -	virtual const char* GetFileName(u64 _Address);
      
        -	virtual u64 ReadFile(const char* _rFullPath, u8* _pBuffer, size_t _MaxBufferSize);
      
        -	virtual bool ExportFile(const char* _rFullPath, const char* _rExportFilename);
      
        -	virtual bool ExportApploader(const char* _rExportFolder) const;
      
        -	virtual bool ExportDOL(const char* _rExportFolder) const;
      
        -	virtual bool GetBootDOL(u8* &buffer, u32 DolSize) const;
      
        -	virtual u32 GetBootDOLSize() const;
      
        +	virtual bool IsValid() const override { return m_Valid; }
      
        +	virtual u64 GetFileSize(const char* _rFullPath) override;
      
        +	virtual size_t GetFileList(std::vector<const SFileInfo *> &_rFilenames) override;
      
        +	virtual const char* GetFileName(u64 _Address) override;
      
        +	virtual u64 ReadFile(const char* _rFullPath, u8* _pBuffer, size_t _MaxBufferSize) override;
      
        +	virtual bool ExportFile(const char* _rFullPath, const char* _rExportFilename) override;
      
        +	virtual bool ExportApploader(const char* _rExportFolder) const override;
      
        +	virtual bool ExportDOL(const char* _rExportFolder) const override;
      
        +	virtual bool GetBootDOL(u8* &buffer, u32 DolSize) const override;
      
        +	virtual u32 GetBootDOLSize() const override;
      
         private:
      
         	bool m_Initialized;

4  Source/Core/DiscIO/Filesystem.cpp

show inline notes

View

              
    @@ -22,12 +22,12 @@ IFileSystem* CreateFileSystem(const IVolume* _rVolume)
  
         	IFileSystem* pFileSystem = new CFileSystemGCWii(_rVolume);
      
         	if (!pFileSystem)
      
        -		return 0;
      
        +		return nullptr;
      
         	if (!pFileSystem->IsValid())
      
         	{
      
         		delete pFileSystem;
      
        -		pFileSystem = NULL;
      
        +		pFileSystem = nullptr;
      
         	}
      
         	return pFileSystem;

18  Source/Core/DiscIO/NANDContentLoader.cpp

show inline notes

View

              
    @@ -157,7 +157,7 @@ class CNANDContentLoader : public INANDContentLoader
  
         	, m_IosVersion(0x09)
      
         	, m_BootIndex(-1)
      
         	, m_TIKSize(0)
      
        -	, m_TIK(NULL)
      
        +	, m_TIK(nullptr)
      
         {
      
         	m_Valid = Initialize(_rName);
      
         }
      
    @@ -172,7 +172,7 @@ class CNANDContentLoader : public INANDContentLoader
  
         	if (m_TIK)
      
         	{
      
         		delete []m_TIK;
      
        -		m_TIK = NULL;
      
        +		m_TIK = nullptr;
      
         	}
      
         }
      
    @@ -185,7 +185,7 @@ const SNANDContent* CNANDContentLoader::GetContentByIndex(int _Index) const
  
         			return &Content;
      
         		}
      
         	}
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
         bool CNANDContentLoader::Initialize(const std::string& _rName)
      
    @@ -194,8 +194,8 @@ bool CNANDContentLoader::Initialize(const std::string& _rName)
  
         		return false;
      
         	m_Path = _rName;
      
         	WiiWAD Wad(_rName);
      
        -	u8* pDataApp = NULL;
      
        -	u8* pTMD = NULL;
      
        +	u8* pDataApp = nullptr;
      
        +	u8* pTMD = nullptr;
      
         	u8 DecryptTitleKey[16];
      
         	u8 IV[16];
      
         	if (Wad.IsValid())
      
    @@ -272,7 +272,7 @@ bool CNANDContentLoader::Initialize(const std::string& _rName)
  
         			continue;
      
         		}
      
        -		rContent.m_pData = NULL;
      
        +		rContent.m_pData = nullptr;
      
         		if (rContent.m_Type & 0x8000)  // shared app
      
         		{
      
    @@ -325,11 +325,9 @@ void CNANDContentLoader::GetKeyFromTicket(u8* pTicket, u8* pTicketKey)
  
         CNANDContentManager::~CNANDContentManager()
      
         {
      
        -	CNANDContentMap::iterator itr = m_Map.begin();
      
        -	while (itr != m_Map.end())
      
        +	for (auto& entry : m_Map)
      
         	{
      
        -		delete itr->second;
      
        -		++itr;
      
        +		delete entry.second;
      
         	}
      
         	m_Map.clear();
      
         }

22  Source/Core/DiscIO/VolumeCreator.cpp

show inline notes

View

              
    @@ -75,8 +75,8 @@ class CBlobBigEndianReader
  
         IVolume* CreateVolumeFromFilename(const std::string& _rFilename, u32 _PartitionGroup, u32 _VolumeNum)
      
         {
      
         	IBlobReader* pReader = CreateBlobReader(_rFilename.c_str());
      
        -	if (pReader == NULL)
      
        -		return NULL;
      
        +	if (pReader == nullptr)
      
        +		return nullptr;
      
         	switch (GetDiscType(*pReader))
      
         	{
      
    @@ -94,7 +94,7 @@ IVolume* CreateVolumeFromFilename(const std::string& _rFilename, u32 _PartitionG
  
         			IVolume* pVolume = CreateVolumeFromCryptedWiiImage(*pReader, _PartitionGroup, 0, _VolumeNum, region == 'K');
      
        -			if (pVolume == NULL)
      
        +			if (pVolume == nullptr)
      
         			{
      
         				delete pReader;
      
         			}
      
    @@ -106,16 +106,16 @@ IVolume* CreateVolumeFromFilename(const std::string& _rFilename, u32 _PartitionG
  
         		case DISC_TYPE_UNK:
      
         		default:
      
         			std::string Filename, ext;
      
        -			SplitPath(_rFilename, NULL, &Filename, &ext);
      
        +			SplitPath(_rFilename, nullptr, &Filename, &ext);
      
         			Filename += ext;
      
         			NOTICE_LOG(DISCIO, "%s does not have the Magic word for a gcm, wiidisc or wad file\n"
      
         						"Set Log Verbosity to Warning and attempt to load the game again to view the values", Filename.c_str());
      
         			delete pReader;
      
        -			return NULL;
      
        +			return nullptr;
      
         	}
      
         	// unreachable code
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
         IVolume* CreateVolumeFromDirectory(const std::string& _rDirectory, bool _bIsWii, const std::string& _rApploader, const std::string& _rDOL)
      
    @@ -123,7 +123,7 @@ IVolume* CreateVolumeFromDirectory(const std::string& _rDirectory, bool _bIsWii,
  
         	if (CVolumeDirectory::IsValidDirectory(_rDirectory))
      
         		return new CVolumeDirectory(_rDirectory, _bIsWii, _rApploader, _rDOL);
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
         bool IsVolumeWiiDisc(const IVolume *_rVolume)
      
    @@ -152,7 +152,7 @@ static IVolume* CreateVolumeFromCryptedWiiImage(IBlobReader& _rReader, u32 _Part
  
         	// Check if we're looking for a valid partition
      
         	if ((int)_VolumeNum != -1 && _VolumeNum > numPartitions)
      
        -		return NULL;
      
        +		return nullptr;
      
         	#ifdef _WIN32
      
         	struct SPartition
      
    @@ -170,14 +170,14 @@ static IVolume* CreateVolumeFromCryptedWiiImage(IBlobReader& _rReader, u32 _Part
  
         	SPartitionGroup PartitionGroup[4];
      
         	// read all partitions
      
        -	for (u32 x = 0; x < 4; x++)
      
        +	for (SPartitionGroup& group : PartitionGroup)
      
         	{
      
         		for (u32 i = 0; i < numPartitions; i++)
      
         		{
      
         			SPartition Partition;
      
         			Partition.Offset = ((u64)Reader.Read32(PartitionsOffset + (i * 8) + 0)) << 2;
      
         			Partition.Type   = Reader.Read32(PartitionsOffset + (i * 8) + 4);
      
        -			PartitionGroup[x].PartitionsVec.push_back(Partition);
      
        +			group.PartitionsVec.push_back(Partition);
      
         		}
      
         	}
      
    @@ -217,7 +217,7 @@ static IVolume* CreateVolumeFromCryptedWiiImage(IBlobReader& _rReader, u32 _Part
  
         		}
      
         	}
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
         EDiscType GetDiscType(IBlobReader& _rReader)

18  Source/Core/DiscIO/VolumeDirectory.cpp

show inline notes

View

              
    @@ -26,11 +26,11 @@
  
         	: m_totalNameSize(0)
      
         	, m_dataStartAddress(-1)
      
         	, m_fstSize(0)
      
        -	, m_FSTData(NULL)
      
        +	, m_FSTData(nullptr)
      
         	, m_apploaderSize(0)
      
        -	, m_apploader(NULL)
      
        +	, m_apploader(nullptr)
      
         	, m_DOLSize(0)
      
        -	, m_DOL(NULL)
      
        +	, m_DOL(nullptr)
      
         	, FST_ADDRESS(0)
      
         	, DOL_ADDRESS(0)
      
         {
      
    @@ -63,19 +63,19 @@
  
         CVolumeDirectory::~CVolumeDirectory()
      
         {
      
         	delete[] m_FSTData;
      
        -	m_FSTData = NULL;
      
        +	m_FSTData = nullptr;
      
         	delete[] m_diskHeader;
      
        -	m_diskHeader = NULL;
      
        +	m_diskHeader = nullptr;
      
         	delete m_diskHeaderInfo;
      
        -	m_diskHeaderInfo = NULL;
      
        +	m_diskHeaderInfo = nullptr;
      
         	delete[] m_DOL;
      
        -	m_DOL = NULL;
      
        +	m_DOL = nullptr;
      
         	delete[] m_apploader;
      
        -	m_apploader = NULL;
      
        +	m_apploader = nullptr;
      
         }
      
         bool CVolumeDirectory::IsValidDirectory(const std::string& _rDirectory)
      
    @@ -134,7 +134,7 @@ bool CVolumeDirectory::Read(u64 _Offset, u64 _Length, u8* _pBuffer) const
  
         		u64 fileOffset = _Offset - fileIter->first;
      
         		PlainFileReader* reader = PlainFileReader::Create(fileIter->second.c_str());
      
        -		if(reader == NULL)
      
        +		if(reader == nullptr)
      
         			return false;
      
         		u64 fileSize = reader->GetDataSize();

20  Source/Core/DiscIO/VolumeDirectory.h

show inline notes

View

              
    @@ -31,25 +31,25 @@ class CVolumeDirectory : public IVolume
  
         	static bool IsValidDirectory(const std::string& _rDirectory);
      
        -	bool Read(u64 _Offset, u64 _Length, u8* _pBuffer) const;
      
        -	bool RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const;
      
        +	bool Read(u64 _Offset, u64 _Length, u8* _pBuffer) const override;
      
        +	bool RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const override;
      
        -	std::string GetUniqueID() const;
      
        +	std::string GetUniqueID() const override;
      
         	void SetUniqueID(std::string _ID);
      
        -	std::string GetMakerID() const;
      
        +	std::string GetMakerID() const override;
      
        -	std::vector<std::string> GetNames() const;
      
        +	std::vector<std::string> GetNames() const override;
      
         	void SetName(std::string);
      
        -	u32 GetFSTSize() const;
      
        +	u32 GetFSTSize() const override;
      
        -	std::string GetApploaderDate() const;
      
        +	std::string GetApploaderDate() const override;
      
        -	ECountry GetCountry() const;
      
        +	ECountry GetCountry() const override;
      
        -	u64 GetSize() const;
      
        -	u64 GetRawSize() const;
      
        +	u64 GetSize() const override;
      
        +	u64 GetRawSize() const override;
      
         	void BuildFST();

14  Source/Core/DiscIO/VolumeGC.cpp

show inline notes

View

              
    @@ -22,12 +22,12 @@
  
         CVolumeGC::~CVolumeGC()
      
         {
      
         	delete m_pReader;
      
        -	m_pReader = NULL; // I don't think this makes any difference, but anyway
      
        +	m_pReader = nullptr; // I don't think this makes any difference, but anyway
      
         }
      
         bool CVolumeGC::Read(u64 _Offset, u64 _Length, u8* _pBuffer) const
      
         {
      
        -	if (m_pReader == NULL)
      
        +	if (m_pReader == nullptr)
      
         		return false;
      
         	FileMon::FindFilename(_Offset);
      
    @@ -43,7 +43,7 @@ bool CVolumeGC::RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const
  
         std::string CVolumeGC::GetUniqueID() const
      
         {
      
         	static const std::string NO_UID("NO_UID");
      
        -	if (m_pReader == NULL)
      
        +	if (m_pReader == nullptr)
      
         		return NO_UID;
      
         	char ID[7];
      
    @@ -77,7 +77,7 @@ bool CVolumeGC::RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const
  
         std::string CVolumeGC::GetMakerID() const
      
         {
      
        -	if (m_pReader == NULL)
      
        +	if (m_pReader == nullptr)
      
         		return std::string();
      
         	char makerID[3];
      
    @@ -107,7 +107,7 @@ int CVolumeGC::GetRevision() const
  
         	auto const string_decoder = GetStringDecoder(GetCountry());
      
         	char name[0x60 + 1] = {};
      
        -	if (m_pReader != NULL && Read(0x20, 0x60, (u8*)name))
      
        +	if (m_pReader != nullptr && Read(0x20, 0x60, (u8*)name))
      
         		names.push_back(string_decoder(name));
      
         	return names;
      
    @@ -115,7 +115,7 @@ int CVolumeGC::GetRevision() const
  
         u32 CVolumeGC::GetFSTSize() const
      
         {
      
        -	if (m_pReader == NULL)
      
        +	if (m_pReader == nullptr)
      
         		return 0;
      
         	u32 size;
      
    @@ -127,7 +127,7 @@ u32 CVolumeGC::GetFSTSize() const
  
         std::string CVolumeGC::GetApploaderDate() const
      
         {
      
        -	if (m_pReader == NULL)
      
        +	if (m_pReader == nullptr)
      
         		return std::string();
      
         	char date[16];

26  Source/Core/DiscIO/VolumeGC.h

show inline notes

View

              
    @@ -22,19 +22,19 @@ class CVolumeGC : public IVolume
  
         public:
      
         	CVolumeGC(IBlobReader* _pReader);
      
         	~CVolumeGC();
      
        -	bool Read(u64 _Offset, u64 _Length, u8* _pBuffer) const;
      
        -	bool RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const;
      
        -	std::string GetUniqueID() const;
      
        -	std::string GetRevisionSpecificUniqueID() const;
      
        -	std::string GetMakerID() const;
      
        -	int GetRevision() const;
      
        -	std::vector<std::string> GetNames() const;
      
        -	u32 GetFSTSize() const;
      
        -	std::string GetApploaderDate() const;
      
        -	ECountry GetCountry() const;
      
        -	u64 GetSize() const;
      
        -	u64 GetRawSize() const;
      
        -	bool IsDiscTwo() const;
      
        +	bool Read(u64 _Offset, u64 _Length, u8* _pBuffer) const override;
      
        +	bool RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const override;
      
        +	std::string GetUniqueID() const override;
      
        +	std::string GetRevisionSpecificUniqueID() const override;
      
        +	std::string GetMakerID() const override;
      
        +	int GetRevision() const override;
      
        +	std::vector<std::string> GetNames() const override;
      
        +	u32 GetFSTSize() const override;
      
        +	std::string GetApploaderDate() const override;
      
        +	ECountry GetCountry() const override;
      
        +	u64 GetSize() const override;
      
        +	u64 GetRawSize() const override;
      
        +	bool IsDiscTwo() const override;
      
         	typedef std::string(*StringDecoder)(const std::string&);

2  Source/Core/DiscIO/VolumeWad.cpp

show inline notes

View

              
    @@ -46,7 +46,7 @@
  
         bool CVolumeWAD::Read(u64 _Offset, u64 _Length, u8* _pBuffer) const
      
         {
      
        -	if (m_pReader == NULL)
      
        +	if (m_pReader == nullptr)
      
         		return false;
      
         	return m_pReader->Read(_Offset, _Length, _pBuffer);

22  Source/Core/DiscIO/VolumeWad.h

show inline notes

View

              
    @@ -24,17 +24,17 @@ class CVolumeWAD : public IVolume
  
         public:
      
         	CVolumeWAD(IBlobReader* _pReader);
      
         	~CVolumeWAD();
      
        -	bool Read(u64 _Offset, u64 _Length, u8* _pBuffer) const;
      
        -	bool RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const { return false; }
      
        -	bool GetTitleID(u8* _pBuffer) const;
      
        -	std::string GetUniqueID() const;
      
        -	std::string GetMakerID() const;
      
        -	std::vector<std::string> GetNames() const;
      
        -	u32 GetFSTSize() const               { return 0; }
      
        -	std::string GetApploaderDate() const { return "0"; }
      
        -	ECountry GetCountry() const;
      
        -	u64 GetSize() const;
      
        -	u64 GetRawSize() const;
      
        +	bool Read(u64 _Offset, u64 _Length, u8* _pBuffer) const override;
      
        +	bool RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const override { return false; }
      
        +	bool GetTitleID(u8* _pBuffer) const override;
      
        +	std::string GetUniqueID() const override;
      
        +	std::string GetMakerID() const override;
      
        +	std::vector<std::string> GetNames() const override;
      
        +	u32 GetFSTSize() const override               { return 0; }
      
        +	std::string GetApploaderDate() const override { return "0"; }
      
        +	ECountry GetCountry() const override;
      
        +	u64 GetSize() const override;
      
        +	u64 GetRawSize() const override;
      
         private:
      
         	IBlobReader* m_pReader;

20  Source/Core/DiscIO/VolumeWiiCrypted.cpp

show inline notes

View

              
    @@ -21,7 +21,7 @@
  
         CVolumeWiiCrypted::CVolumeWiiCrypted(IBlobReader* _pReader, u64 _VolumeOffset,
      
         									 const unsigned char* _pVolumeKey)
      
         	: m_pReader(_pReader),
      
        -	m_pBuffer(0),
      
        +	m_pBuffer(nullptr),
      
         	m_VolumeOffset(_VolumeOffset),
      
         	dataOffset(0x20000),
      
         	m_LastDecryptedBlockOffset(-1)
      
    @@ -35,11 +35,11 @@
  
         CVolumeWiiCrypted::~CVolumeWiiCrypted()
      
         {
      
         	delete m_pReader; // is this really our responsibility?
      
        -	m_pReader = NULL;
      
        +	m_pReader = nullptr;
      
         	delete[] m_pBuffer;
      
        -	m_pBuffer = NULL;
      
        +	m_pBuffer = nullptr;
      
         	delete m_AES_ctx;
      
        -	m_AES_ctx = NULL;
      
        +	m_AES_ctx = nullptr;
      
         }
      
         bool CVolumeWiiCrypted::RAWRead( u64 _Offset, u64 _Length, u8* _pBuffer ) const
      
    @@ -56,7 +56,7 @@ bool CVolumeWiiCrypted::RAWRead( u64 _Offset, u64 _Length, u8* _pBuffer ) const
  
         bool CVolumeWiiCrypted::Read(u64 _ReadOffset, u64 _Length, u8* _pBuffer) const
      
         {
      
        -	if (m_pReader == NULL)
      
        +	if (m_pReader == nullptr)
      
         	{
      
         		return(false);
      
         	}
      
    @@ -119,7 +119,7 @@ void CVolumeWiiCrypted::GetTMD(u8* _pBuffer, u32 * _sz) const
  
         std::string CVolumeWiiCrypted::GetUniqueID() const
      
         {
      
        -	if (m_pReader == NULL)
      
        +	if (m_pReader == nullptr)
      
         	{
      
         		return std::string();
      
         	}
      
    @@ -150,7 +150,7 @@ void CVolumeWiiCrypted::GetTMD(u8* _pBuffer, u32 * _sz) const
  
         std::string CVolumeWiiCrypted::GetMakerID() const
      
         {
      
        -	if (m_pReader == NULL)
      
        +	if (m_pReader == nullptr)
      
         	{
      
         		return std::string();
      
         	}
      
    @@ -174,7 +174,7 @@ void CVolumeWiiCrypted::GetTMD(u8* _pBuffer, u32 * _sz) const
  
         	auto const string_decoder = CVolumeGC::GetStringDecoder(GetCountry());
      
         	char name[0xFF] = {};
      
        -	if (m_pReader != NULL && Read(0x20, 0x60, (u8*)&name))
      
        +	if (m_pReader != nullptr && Read(0x20, 0x60, (u8*)&name))
      
         		names.push_back(string_decoder(name));
      
         	return names;
      
    @@ -182,7 +182,7 @@ void CVolumeWiiCrypted::GetTMD(u8* _pBuffer, u32 * _sz) const
  
         u32 CVolumeWiiCrypted::GetFSTSize() const
      
         {
      
        -	if (m_pReader == NULL)
      
        +	if (m_pReader == nullptr)
      
         	{
      
         		return 0;
      
         	}
      
    @@ -199,7 +199,7 @@ u32 CVolumeWiiCrypted::GetFSTSize() const
  
         std::string CVolumeWiiCrypted::GetApploaderDate() const
      
         {
      
        -	if (m_pReader == NULL)
      
        +	if (m_pReader == nullptr)
      
         	{
      
         		return std::string();
      
         	}

30  Source/Core/DiscIO/VolumeWiiCrypted.h

show inline notes

View

              
    @@ -23,21 +23,21 @@ class CVolumeWiiCrypted : public IVolume
  
         public:
      
         	CVolumeWiiCrypted(IBlobReader* _pReader, u64 _VolumeOffset, const unsigned char* _pVolumeKey);
      
         	~CVolumeWiiCrypted();
      
        -	bool Read(u64 _Offset, u64 _Length, u8* _pBuffer) const;
      
        -	bool RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const;
      
        -	bool GetTitleID(u8* _pBuffer) const;
      
        -	void GetTMD(u8* _pBuffer, u32* _sz) const;
      
        -	std::string GetUniqueID() const;
      
        -	std::string GetMakerID() const;
      
        -	std::vector<std::string> GetNames() const;
      
        -	u32 GetFSTSize() const;
      
        -	std::string GetApploaderDate() const;
      
        -	ECountry GetCountry() const;
      
        -	u64 GetSize() const;
      
        -	u64 GetRawSize() const;
      
        -
      
        -	bool SupportsIntegrityCheck() const { return true; }
      
        -	bool CheckIntegrity() const;
      
        +	bool Read(u64 _Offset, u64 _Length, u8* _pBuffer) const override;
      
        +	bool RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const override;
      
        +	bool GetTitleID(u8* _pBuffer) const override;
      
        +	void GetTMD(u8* _pBuffer, u32* _sz) const override;
      
        +	std::string GetUniqueID() const override;
      
        +	std::string GetMakerID() const override;
      
        +	std::vector<std::string> GetNames() const override;
      
        +	u32 GetFSTSize() const override;
      
        +	std::string GetApploaderDate() const override;
      
        +	ECountry GetCountry() const override;
      
        +	u64 GetSize() const override;
      
        +	u64 GetRawSize() const override;
      
        +
      
        +	bool SupportsIntegrityCheck() const override { return true; }
      
        +	bool CheckIntegrity() const override;
      
         private:
      
         	IBlobReader* m_pReader;

4  Source/Core/DiscIO/WbfsBlob.cpp

show inline notes

View

              
    @@ -24,7 +24,7 @@ static inline u64 align(u64 value, u64 bounds)
  
         }
      
         WbfsFileReader::WbfsFileReader(const char* filename)
      
        -	: m_total_files(0), m_size(0), m_wlba_table(0), m_good(true)
      
        +	: m_total_files(0), m_size(0), m_wlba_table(nullptr), m_good(true)
      
         {
      
         	if(!filename || (strlen(filename) < 4) || !OpenFiles(filename) || !ReadHeader())
      
         	{
      
    @@ -182,7 +182,7 @@ WbfsFileReader* WbfsFileReader::Create(const char* filename)
  
         	else
      
         	{
      
         		delete reader;
      
        -		return NULL;
      
        +		return nullptr;
      
         	}
      
         }

6  Source/Core/DiscIO/WbfsBlob.h

show inline notes

View

              
    @@ -56,9 +56,9 @@ class WbfsFileReader : public IBlobReader
  
         public:
      
         	static WbfsFileReader* Create(const char* filename);
      
        -	u64 GetDataSize() const { return m_size; }
      
        -	u64 GetRawSize() const { return m_size; }
      
        -	bool Read(u64 offset, u64 nbytes, u8* out_ptr);
      
        +	u64 GetDataSize() const override { return m_size; }
      
        +	u64 GetRawSize() const override { return m_size; }
      
        +	bool Read(u64 offset, u64 nbytes, u8* out_ptr) override;
      
         };
      
         bool IsWbfsBlob(const char* filename);

8  Source/Core/DiscIO/WiiWad.cpp

show inline notes

View

              
    @@ -35,7 +35,7 @@ class CBlobBigEndianReader
  
         WiiWAD::WiiWAD(const std::string& _rName)
      
         {
      
         	DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rName.c_str());
      
        -	if (pReader == NULL || File::IsDirectory(_rName))
      
        +	if (pReader == nullptr || File::IsDirectory(_rName))
      
         	{
      
         		m_Valid = false;
      
         		if(pReader) delete pReader;
      
    @@ -63,7 +63,7 @@ u8* WiiWAD::CreateWADEntry(DiscIO::IBlobReader& _rReader, u32 _Size, u64 _Offset
  
         	if (_Size > 0)
      
         	{
      
         		u8* pTmpBuffer = new u8[_Size];
      
        -		_dbg_assert_msg_(BOOT, pTmpBuffer!=0, "WiiWAD: Cant allocate memory for WAD entry");
      
        +		_dbg_assert_msg_(BOOT, pTmpBuffer!=nullptr, "WiiWAD: Cant allocate memory for WAD entry");
      
         		if (!_rReader.Read(_Offset, _Size, pTmpBuffer))
      
         		{
      
    @@ -72,7 +72,7 @@ u8* WiiWAD::CreateWADEntry(DiscIO::IBlobReader& _rReader, u32 _Size, u64 _Offset
  
         		}
      
         		return pTmpBuffer;
      
         	}
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
    @@ -121,7 +121,7 @@ bool WiiWAD::ParseWAD(DiscIO::IBlobReader& _rReader)
  
         bool WiiWAD::IsWiiWAD(const std::string& _rName)
      
         {
      
         	DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rName.c_str());
      
        -	if (pReader == NULL)
      
        +	if (pReader == nullptr)
      
         		return false;
      
         	CBlobBigEndianReader Reader(*pReader);

4  Source/Core/DolphinWX/ARCodeAddEdit.cpp

show inline notes

View

              
    @@ -112,8 +112,8 @@ void CARCodeAddEdit::SaveCheatData(wxCommandEvent& WXUNUSED (event))
  
         		if (pieces.size() == 2 && pieces[0].size() == 8 && pieces[1].size() == 8)
      
         		{
      
         			// Decrypted code line.
      
        -			u32 addr = strtoul(pieces[0].c_str(), NULL, 16);
      
        -			u32 value = strtoul(pieces[1].c_str(), NULL, 16);
      
        +			u32 addr = strtoul(pieces[0].c_str(), nullptr, 16);
      
        +			u32 value = strtoul(pieces[1].c_str(), nullptr, 16);
      
         			decryptedLines.push_back(ActionReplay::AREntry(addr, value));
      
         			continue;

49  Source/Core/DolphinWX/CheatsWindow.cpp

show inline notes

View

              
    @@ -72,8 +72,8 @@
  
         wxCheatsWindow::~wxCheatsWindow()
      
         {
      
        -	main_frame->g_CheatsWindow = NULL;
      
        -	::g_cheat_window = NULL;
      
        +	main_frame->g_CheatsWindow = nullptr;
      
        +	::g_cheat_window = nullptr;
      
         }
      
         void wxCheatsWindow::Init_ChildControls()
      
    @@ -95,7 +95,7 @@ void wxCheatsWindow::Init_ChildControls()
  
         	m_GroupBox_Info = new wxStaticBox(m_Tab_Cheats, wxID_ANY, _("Code Info"));
      
         	m_Label_NumCodes = new wxStaticText(m_Tab_Cheats, wxID_ANY, _("Number Of Codes: "));
      
        -	m_ListBox_CodesList = new wxListBox(m_Tab_Cheats, wxID_ANY, wxDefaultPosition, wxSize(120, 150), 0, 0, wxLB_HSCROLL);
      
        +	m_ListBox_CodesList = new wxListBox(m_Tab_Cheats, wxID_ANY, wxDefaultPosition, wxSize(120, 150), 0, nullptr, wxLB_HSCROLL);
      
         	wxStaticBoxSizer* sGroupBoxInfo = new wxStaticBoxSizer(m_GroupBox_Info, wxVERTICAL);
      
         	sGroupBoxInfo->Add(m_Label_Codename, 0, wxALL, 5);
      
    @@ -338,11 +338,11 @@ void wxCheatsWindow::OnEvent_CheatsList_ItemSelected(wxCommandEvent& WXUNUSED (e
  
         			m_Label_NumCodes->SetLabel(StrToWxStr(numcodes));
      
         			m_ListBox_CodesList->Clear();
      
        -			for (size_t j = 0; j < code.ops.size(); j++)
      
        +			for (const AREntry& entry : code.ops)
      
         			{
      
         				char text2[CHAR_MAX];
      
         				char* ops = text2;
      
        -				sprintf(ops, "%08x %08x", code.ops[j].cmd_addr, code.ops[j].value);
      
        +				sprintf(ops, "%08x %08x", entry.cmd_addr, entry.value);
      
         				m_ListBox_CodesList->Append(StrToWxStr(ops));
      
         			}
      
         		}
      
    @@ -352,11 +352,11 @@ void wxCheatsWindow::OnEvent_CheatsList_ItemSelected(wxCommandEvent& WXUNUSED (e
  
         void wxCheatsWindow::OnEvent_CheatsList_ItemToggled(wxCommandEvent& WXUNUSED (event))
      
         {
      
         	int index = m_CheckListBox_CheatsList->GetSelection();
      
        -	for (size_t i = 0; i < indexList.size(); i++)
      
        +	for (const ARCodeIndex& code_index : indexList)
      
         	{
      
        -		if ((int)indexList[i].uiIndex == index)
      
        +		if ((int)code_index.uiIndex == index)
      
         		{
      
        -			ActionReplay::SetARCode_IsActive(m_CheckListBox_CheatsList->IsChecked(index), indexList[i].index);
      
        +			ActionReplay::SetARCode_IsActive(m_CheckListBox_CheatsList->IsChecked(index), code_index.index);
      
         		}
      
         	}
      
         }
      
    @@ -364,9 +364,9 @@ void wxCheatsWindow::OnEvent_CheatsList_ItemToggled(wxCommandEvent& WXUNUSED (ev
  
         void wxCheatsWindow::OnEvent_ApplyChanges_Press(wxCommandEvent& ev)
      
         {
      
         	// Apply AR Code changes
      
        -	for (size_t i = 0; i < indexList.size(); i++)
      
        +	for (const ARCodeIndex& code_index : indexList)
      
         	{
      
        -		ActionReplay::SetARCode_IsActive(m_CheckListBox_CheatsList->IsChecked(indexList[i].uiIndex), indexList[i].index);
      
        +		ActionReplay::SetARCode_IsActive(m_CheckListBox_CheatsList->IsChecked(code_index.uiIndex), code_index.index);
      
         	}
      
         	// Apply Gecko Code changes
      
    @@ -385,10 +385,9 @@ void wxCheatsWindow::OnEvent_ApplyChanges_Press(wxCommandEvent& ev)
  
         void wxCheatsWindow::OnEvent_ButtonUpdateLog_Press(wxCommandEvent& WXUNUSED (event))
      
         {
      
         	m_TextCtrl_Log->Clear();
      
        -	const std::vector<std::string> &arLog = ActionReplay::GetSelfLog();
      
        -	for (u32 i = 0; i < arLog.size(); i++)
      
        +	for (const std::string& text : ActionReplay::GetSelfLog())
      
         	{
      
        -		m_TextCtrl_Log->AppendText(StrToWxStr(arLog[i]));
      
        +		m_TextCtrl_Log->AppendText(StrToWxStr(text));
      
         	}
      
         }
      
    @@ -400,7 +399,7 @@ void wxCheatsWindow::OnEvent_CheckBoxEnableLogging_StateChange(wxCommandEvent& W
  
         void CheatSearchTab::StartNewSearch(wxCommandEvent& WXUNUSED (event))
      
         {
      
         	const u8* const memptr = Memory::GetPointer(0);
      
        -	if (NULL == memptr)
      
        +	if (nullptr == memptr)
      
         	{
      
         		PanicAlertT("A game is not currently running.");
      
         		return;
      
    @@ -434,16 +433,12 @@ void CheatSearchTab::StartNewSearch(wxCommandEvent& WXUNUSED (event))
  
         void CheatSearchTab::FilterCheatSearchResults(wxCommandEvent&)
      
         {
      
         	const u8* const memptr = Memory::GetPointer(0);
      
        -	if (NULL == memptr)
      
        +	if (nullptr == memptr)
      
         	{
      
         		PanicAlertT("A game is not currently running.");
      
         		return;
      
         	}
      
        -	std::vector<CheatSearchResult>::iterator
      
        -		i = search_results.begin(),
      
        -		e = search_results.end();
      
        -
      
         	// Set up the sub-search results efficiently to prevent automatic re-allocations.
      
         	std::vector<CheatSearchResult> filtered_results;
      
         	filtered_results.reserve(search_results.size());
      
    @@ -459,10 +454,10 @@ void CheatSearchTab::FilterCheatSearchResults(wxCommandEvent&)
  
         	if (value_x_radiobtn.rad_oldvalue->GetValue()) // using old value comparison
      
         	{
      
        -		for (; i!=e; ++i)
      
        +		for (CheatSearchResult& result : search_results)
      
         		{
      
         			// with big endian, can just use memcmp for ><= comparison
      
        -			int cmp_result = memcmp(memptr + i->address, &i->old_value, search_type_size);
      
        +			int cmp_result = memcmp(memptr + result.address, &result.old_value, search_type_size);
      
         			if (cmp_result < 0)
      
         				cmp_result = 4;
      
         			else
      
    @@ -470,8 +465,8 @@ void CheatSearchTab::FilterCheatSearchResults(wxCommandEvent&)
  
         			if (cmp_result & filter_mask)
      
         			{
      
        -				memcpy(&i->old_value, memptr + i->address, search_type_size);
      
        -				filtered_results.push_back(*i);
      
        +				memcpy(&result.old_value, memptr + result.address, search_type_size);
      
        +				filtered_results.push_back(result);
      
         			}
      
         		}
      
         	}
      
    @@ -510,10 +505,10 @@ void CheatSearchTab::FilterCheatSearchResults(wxCommandEvent&)
  
         			// #endif
      
         		}
      
        -		for (; i!=e; ++i)
      
        +		for (CheatSearchResult& result : search_results)
      
         		{
      
         			// with big endian, can just use memcmp for ><= comparison
      
        -			int cmp_result = memcmp(memptr + i->address, &user_x_val, search_type_size);
      
        +			int cmp_result = memcmp(memptr + result.address, &user_x_val, search_type_size);
      
         			if (cmp_result < 0)
      
         				cmp_result = 4;
      
         			else if (cmp_result)
      
    @@ -523,8 +518,8 @@ void CheatSearchTab::FilterCheatSearchResults(wxCommandEvent&)
  
         			if (cmp_result & filter_mask)
      
         			{
      
        -				memcpy(&i->old_value, memptr + i->address, search_type_size);
      
        -				filtered_results.push_back(*i);
      
        +				memcpy(&result.old_value, memptr + result.address, search_type_size);
      
        +				filtered_results.push_back(result);
      
         			}
      
         		}
      
         	}

2  Source/Core/DolphinWX/ConfigMain.cpp

show inline notes

View

              
    @@ -616,7 +616,7 @@ void CConfigMain::CreateGUIControls()
  
         	std::for_each(sv.begin(), sv.end(), [theme_selection](const std::string& filename)
      
         	{
      
         		std::string name, ext;
      
        -		SplitPath(filename, NULL, &name, &ext);
      
        +		SplitPath(filename, nullptr, &name, &ext);
      
         		name += ext;
      
         		auto const wxname = StrToWxStr(name);

2  Source/Core/DolphinWX/Debugger/BreakpointView.h

show inline notes

View

              
    @@ -14,6 +14,6 @@ class CBreakPointView : public wxListCtrl
  
         public:
      
         	CBreakPointView(wxWindow* parent, const wxWindowID id);
      
        -	void Update();
      
        +	void Update() override;
      
         	void DeleteCurrentSelection();
      
         };

4  Source/Core/DolphinWX/Debugger/CodeView.cpp

show inline notes

View

              
    @@ -335,7 +335,7 @@ void CCodeView::OnPopupMenu(wxCommandEvent& event)
  
         void CCodeView::OnMouseUpR(wxMouseEvent& event)
      
         {
      
        -	bool isSymbol = symbol_db->GetSymbolFromAddr(selection) != 0;
      
        +	bool isSymbol = symbol_db->GetSymbolFromAddr(selection) != nullptr;
      
         	// popup menu
      
         	wxMenu* menu = new wxMenu;
      
         	//menu->Append(IDM_GOTOINMEMVIEW, "&Goto in mem view");
      
    @@ -482,7 +482,7 @@ void CCodeView::OnPaint(wxPaintEvent& event)
  
         						}
      
         						if (!found)
      
         						{
      
        -							mojs = 0;
      
        +							mojs = nullptr;
      
         							break;
      
         						}
      
         					}

20  Source/Core/DolphinWX/Debugger/CodeWindow.cpp

show inline notes

View

              
    @@ -89,13 +89,13 @@
  
         	wxWindowID id, const wxPoint& position, const wxSize& size, long style, const wxString& name)
      
         	: wxPanel((wxWindow*)parent, id, position, size, style, name)
      
         	, Parent(parent)
      
        -	, m_RegisterWindow(NULL)
      
        -	, m_BreakpointWindow(NULL)
      
        -	, m_MemoryWindow(NULL)
      
        -	, m_JitWindow(NULL)
      
        -	, m_SoundWindow(NULL)
      
        -	, m_VideoWindow(NULL)
      
        -	, codeview(NULL)
      
        +	, m_RegisterWindow(nullptr)
      
        +	, m_BreakpointWindow(nullptr)
      
        +	, m_MemoryWindow(nullptr)
      
        +	, m_JitWindow(nullptr)
      
        +	, m_SoundWindow(nullptr)
      
        +	, m_VideoWindow(nullptr)
      
        +	, codeview(nullptr)
      
         {
      
         	InitBitmaps();
      
    @@ -111,11 +111,11 @@
  
         	sizerLeft->Add(callstack = new wxListBox(this, ID_CALLSTACKLIST,
      
         				wxDefaultPosition, wxSize(90, 100)), 0, wxEXPAND);
      
         	sizerLeft->Add(symbols = new wxListBox(this, ID_SYMBOLLIST,
      
        -				wxDefaultPosition, wxSize(90, 100), 0, NULL, wxLB_SORT), 1, wxEXPAND);
      
        +				wxDefaultPosition, wxSize(90, 100), 0, nullptr, wxLB_SORT), 1, wxEXPAND);
      
         	sizerLeft->Add(calls = new wxListBox(this, ID_CALLSLIST, wxDefaultPosition,
      
        -				wxSize(90, 100), 0, NULL, wxLB_SORT), 0, wxEXPAND);
      
        +				wxSize(90, 100), 0, nullptr, wxLB_SORT), 0, wxEXPAND);
      
         	sizerLeft->Add(callers = new wxListBox(this, ID_CALLERSLIST, wxDefaultPosition,
      
        -				wxSize(90, 100), 0, NULL, wxLB_SORT), 0, wxEXPAND);
      
        +				wxSize(90, 100), 0, nullptr, wxLB_SORT), 0, wxEXPAND);
      
         	SetSizer(sizerBig);

2  Source/Core/DolphinWX/Debugger/CodeWindow.h

show inline notes

View

              
    @@ -62,7 +62,7 @@ class CCodeWindow
  
         		bool JITBlockLinking();
      
         		void JumpToAddress(u32 _Address);
      
        -		void Update();
      
        +		void Update() override;
      
         		void NotifyMapLoaded();
      
         		void CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParameter, wxMenuBar *pMenuBar);
      
         		void CreateMenuOptions(wxMenu *pMenu);

20  Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp

show inline notes

View

              
    @@ -180,7 +180,7 @@ void CCodeWindow::OnProfilerMenu(wxCommandEvent& event)
  
         	{
      
         	case IDM_PROFILEBLOCKS:
      
         		Core::SetState(Core::CORE_PAUSE);
      
        -		if (jit != NULL)
      
        +		if (jit != nullptr)
      
         			jit->ClearCache();
      
         		Profiler::g_ProfileBlocks = GetMenuBar()->IsChecked(IDM_PROFILEBLOCKS);
      
         		Core::SetState(Core::CORE_RUN);
      
    @@ -191,13 +191,13 @@ void CCodeWindow::OnProfilerMenu(wxCommandEvent& event)
  
         		if (Core::GetState() == Core::CORE_PAUSE && PowerPC::GetMode() == PowerPC::MODE_JIT)
      
         		{
      
        -			if (jit != NULL)
      
        +			if (jit != nullptr)
      
         			{
      
         				std::string filename = File::GetUserPath(D_DUMP_IDX) + "Debug/profiler.txt";
      
         				File::CreateFullPath(filename);
      
         				Profiler::WriteProfileResults(filename.c_str());
      
        -				wxFileType* filetype = NULL;
      
        +				wxFileType* filetype = nullptr;
      
         				if (!(filetype = wxTheMimeTypesManager->GetFileTypeFromExtension(_T("txt"))))
      
         				{
      
         					// From extension failed, trying with MIME type now
      
    @@ -379,7 +379,7 @@ void CCodeWindow::OnSymbolListChange(wxCommandEvent& event)
  
         	int index = symbols->GetSelection();
      
         	if (index >= 0) {
      
         		Symbol* pSymbol = static_cast<Symbol *>(symbols->GetClientData(index));
      
        -		if (pSymbol != NULL)
      
        +		if (pSymbol != nullptr)
      
         		{
      
         			if(pSymbol->type == Symbol::SYMBOL_DATA)
      
         			{
      
    @@ -456,7 +456,7 @@ void CCodeWindow::ToggleRegisterWindow(bool bShow)
  
         	else // Close
      
         	{
      
         		Parent->DoRemovePage(m_RegisterWindow, false);
      
        -		m_RegisterWindow = NULL;
      
        +		m_RegisterWindow = nullptr;
      
         	}
      
         }
      
    @@ -474,7 +474,7 @@ void CCodeWindow::ToggleBreakPointWindow(bool bShow)
  
         	else // Close
      
         	{
      
         		Parent->DoRemovePage(m_BreakpointWindow, false);
      
        -		m_BreakpointWindow = NULL;
      
        +		m_BreakpointWindow = nullptr;
      
         	}
      
         }
      
    @@ -492,7 +492,7 @@ void CCodeWindow::ToggleMemoryWindow(bool bShow)
  
         	else // Close
      
         	{
      
         		Parent->DoRemovePage(m_MemoryWindow, false);
      
        -		m_MemoryWindow = NULL;
      
        +		m_MemoryWindow = nullptr;
      
         	}
      
         }
      
    @@ -510,7 +510,7 @@ void CCodeWindow::ToggleJitWindow(bool bShow)
  
         	else // Close
      
         	{
      
         		Parent->DoRemovePage(m_JitWindow, false);
      
        -		m_JitWindow = NULL;
      
        +		m_JitWindow = nullptr;
      
         	}
      
         }
      
    @@ -529,7 +529,7 @@ void CCodeWindow::ToggleSoundWindow(bool bShow)
  
         	else // Close
      
         	{
      
         		Parent->DoRemovePage(m_SoundWindow, false);
      
        -		m_SoundWindow = NULL;
      
        +		m_SoundWindow = nullptr;
      
         	}
      
         }
      
    @@ -547,6 +547,6 @@ void CCodeWindow::ToggleVideoWindow(bool bShow)
  
         	else // Close
      
         	{
      
         		Parent->DoRemovePage(m_VideoWindow, false);
      
        -		m_VideoWindow = NULL;
      
        +		m_VideoWindow = nullptr;
      
         	}
      
         }

10  Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp

show inline notes

View

              
    @@ -34,7 +34,7 @@
  
         class wxWindow;
      
        -DSPDebuggerLLE* m_DebuggerFrame = NULL;
      
        +DSPDebuggerLLE* m_DebuggerFrame = nullptr;
      
         BEGIN_EVENT_TABLE(DSPDebuggerLLE, wxPanel)
      
         	EVT_CLOSE(DSPDebuggerLLE::OnClose)
      
    @@ -69,7 +69,7 @@
  
         	m_Toolbar->Realize();
      
         	m_SymbolList = new wxListBox(this, ID_SYMBOLLIST, wxDefaultPosition,
      
        -		wxSize(140, 100), 0, NULL, wxLB_SORT);
      
        +		wxSize(140, 100), 0, nullptr, wxLB_SORT);
      
         	m_MainNotebook = new wxAuiNotebook(this, wxID_ANY,
      
         		wxDefaultPosition, wxDefaultSize,
      
    @@ -118,7 +118,7 @@
  
         DSPDebuggerLLE::~DSPDebuggerLLE()
      
         {
      
         	m_mgr.UnInit();
      
        -	m_DebuggerFrame = NULL;
      
        +	m_DebuggerFrame = nullptr;
      
         }
      
         void DSPDebuggerLLE::OnClose(wxCloseEvent& event)
      
    @@ -217,7 +217,7 @@ void DSPDebuggerLLE::UpdateDisAsmListView()
  
         void DSPDebuggerLLE::UpdateSymbolMap()
      
         {
      
        -	if (g_dsp.dram == NULL)
      
        +	if (g_dsp.dram == nullptr)
      
         		return;
      
         	m_SymbolList->Freeze(); // HyperIris: wx style fast filling
      
    @@ -235,7 +235,7 @@ void DSPDebuggerLLE::OnSymbolListChange(wxCommandEvent& event)
  
         	int index = m_SymbolList->GetSelection();
      
         	if (index >= 0) {
      
         		Symbol* pSymbol = static_cast<Symbol *>(m_SymbolList->GetClientData(index));
      
        -		if (pSymbol != NULL)
      
        +		if (pSymbol != nullptr)
      
         		{
      
         			if (pSymbol->type == Symbol::SYMBOL_FUNCTION)
      
         			{

2  Source/Core/DolphinWX/Debugger/DSPDebugWindow.h

show inline notes

View

              
    @@ -27,7 +27,7 @@ class DSPDebuggerLLE : public wxPanel
  
         	DSPDebuggerLLE(wxWindow *parent, wxWindowID id = wxID_ANY);
      
         	virtual ~DSPDebuggerLLE();
      
        -	void Update();
      
        +	void Update() override;
      
         private:
      
         	DECLARE_EVENT_TABLE();

14  Source/Core/DolphinWX/Debugger/DSPRegisterView.h

show inline notes

View

              
    @@ -30,12 +30,12 @@ class CDSPRegTable : public wxGridTableBase
  
         		memset(m_CachedRegHasChanged, 0, sizeof(m_CachedRegHasChanged));
      
         	}
      
        -	int GetNumberCols(void) {return 2;}
      
        -	int GetNumberRows(void) {return 32;}
      
        -	bool IsEmptyCell(int row, int col) {return false;}
      
        -	wxString GetValue(int row, int col);
      
        -	void SetValue(int row, int col, const wxString &);
      
        -	wxGridCellAttr *GetAttr(int, int, wxGridCellAttr::wxAttrKind);
      
        +	int GetNumberCols(void) override {return 2;}
      
        +	int GetNumberRows(void) override {return 32;}
      
        +	bool IsEmptyCell(int row, int col) override {return false;}
      
        +	wxString GetValue(int row, int col) override;
      
        +	void SetValue(int row, int col, const wxString &) override;
      
        +	wxGridCellAttr *GetAttr(int, int, wxGridCellAttr::wxAttrKind) override;
      
         	void UpdateCachedRegs();
      
         };
      
    @@ -43,5 +43,5 @@ class DSPRegisterView : public wxGrid
  
         {
      
         public:
      
         	DSPRegisterView(wxWindow* parent, wxWindowID id);
      
        -	void Update();
      
        +	void Update() override;
      
         };

6  Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp

show inline notes

View

              
    @@ -62,7 +62,7 @@
  
         GFXDebuggerPanel::~GFXDebuggerPanel()
      
         {
      
        -	g_pdebugger = NULL;
      
        +	g_pdebugger = nullptr;
      
         	GFXDebuggerPauseFlag = false;
      
         }
      
    @@ -154,7 +154,7 @@ void GFXDebuggerPanel::CreateGUIControls()
  
         	m_pCount = new wxTextCtrl(this, ID_COUNT, wxT("1"), wxDefaultPosition, wxSize(50,25), wxTE_RIGHT, wxDefaultValidator, _("Count"));
      
        -	m_pPauseAtList = new wxChoice(this, ID_PAUSE_AT_LIST, wxDefaultPosition, wxSize(100,25), 0, NULL,0,wxDefaultValidator, _("PauseAtList"));
      
        +	m_pPauseAtList = new wxChoice(this, ID_PAUSE_AT_LIST, wxDefaultPosition, wxSize(100,25), 0, nullptr,0,wxDefaultValidator, _("PauseAtList"));
      
         	for (int i=0; i<numPauseEventMap; i++)
      
         	{
      
         		m_pPauseAtList->Append(pauseEventMap[i].ListStr);
      
    @@ -168,7 +168,7 @@ void GFXDebuggerPanel::CreateGUIControls()
  
         	m_pButtonClearVertexShaderCache = new wxButton(this, ID_CLEAR_VERTEX_SHADER_CACHE, _("Clear V Shaders"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Clear V Shaders"));
      
         	m_pButtonClearPixelShaderCache = new wxButton(this, ID_CLEAR_PIXEL_SHADER_CACHE, _("Clear P Shaders"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Clear P Shaders"));
      
        -	m_pDumpList = new wxChoice(this, ID_DUMP_LIST, wxDefaultPosition, wxSize(120,25), 0, NULL, 0 ,wxDefaultValidator, _("DumpList"));
      
        +	m_pDumpList = new wxChoice(this, ID_DUMP_LIST, wxDefaultPosition, wxSize(120,25), 0, nullptr, 0 ,wxDefaultValidator, _("DumpList"));
      
         	m_pDumpList->Insert(_("Pixel Shader"),0);
      
         	m_pDumpList->Append(_("Vertex Shader"));
      
         	m_pDumpList->Append(_("Pixel Shader Constants"));

4  Source/Core/DolphinWX/Debugger/DebuggerPanel.h

show inline notes

View

              
    @@ -40,10 +40,10 @@ class GFXDebuggerPanel : public wxPanel, public GFXDebuggerBase
  
         	bool bSaveTargets;
      
         	bool bSaveShaders;
      
        -	void OnPause();
      
        +	void OnPause() override;
      
         	// Called from GFX thread once the GFXDebuggerPauseFlag spin lock has finished
      
        -	void OnContinue();
      
        +	void OnContinue() override;
      
         private:
      
         	DECLARE_EVENT_TABLE();

4  Source/Core/DolphinWX/Debugger/JitWindow.h

show inline notes

View

              
    @@ -27,7 +27,7 @@ class JitBlockList : public wxListCtrl
  
         public:
      
         	JitBlockList(wxWindow* parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, long style);
      
         	void Init();
      
        -	void Update();
      
        +	void Update() override;
      
         };
      
         class CJitWindow : public wxPanel
      
    @@ -41,7 +41,7 @@ class CJitWindow : public wxPanel
  
         		const wxString& name = _("JIT block viewer"));
      
         	void ViewAddr(u32 em_address);
      
        -	void Update();
      
        +	void Update() override;
      
         private:
      
         	void OnRefresh(wxCommandEvent& /*event*/);

4  Source/Core/DolphinWX/Debugger/MemoryView.cpp

show inline notes

View

              
    @@ -213,10 +213,10 @@ void CMemoryView::OnPaint(wxPaintEvent& event)
  
         	hFont.SetFamily(wxFONTFAMILY_TELETYPE);
      
         	wxCoord w,h;
      
        -	dc.GetTextExtent(_T("0WJyq"),&w,&h,NULL,NULL,&hFont);
      
        +	dc.GetTextExtent(_T("0WJyq"),&w,&h,nullptr,nullptr,&hFont);
      
         	if (h > rowHeight)
      
         		rowHeight = h;
      
        -	dc.GetTextExtent(_T("0WJyq"),&w,&h,NULL,NULL,&DebuggerFont);
      
        +	dc.GetTextExtent(_T("0WJyq"),&w,&h,nullptr,nullptr,&DebuggerFont);
      
         	if (h > rowHeight)
      
         		rowHeight = h;

10  Source/Core/DolphinWX/Debugger/MemoryWindow.cpp

show inline notes

View

              
    @@ -87,7 +87,7 @@ enum
  
         	DebugInterface* di = &PowerPC::debug_interface;
      
         	//symbols = new wxListBox(this, IDM_SYMBOLLIST, wxDefaultPosition,
      
        -	//      wxSize(20, 100), 0, NULL, wxLB_SORT);
      
        +	//      wxSize(20, 100), 0, nullptr, wxLB_SORT);
      
         	//sizerLeft->Add(symbols, 1, wxEXPAND);
      
         	memview = new CMemoryView(di, this);
      
         	memview->dataType = 0;
      
    @@ -220,7 +220,7 @@ void CMemoryWindow::OnSymbolListChange(wxCommandEvent& event)
  
         	if (index >= 0)
      
         	{
      
         		Symbol* pSymbol = static_cast<Symbol *>(symbols->GetClientData(index));
      
        -		if (pSymbol != NULL)
      
        +		if (pSymbol != nullptr)
      
         		{
      
         			memview->Center(pSymbol->address);
      
         		}
      
    @@ -297,7 +297,7 @@ void CMemoryWindow::U32(wxCommandEvent& event)
  
         void CMemoryWindow::onSearch(wxCommandEvent& event)
      
         {
      
        -	u8* TheRAM = 0;
      
        +	u8* TheRAM = nullptr;
      
         	u32 szRAM = 0;
      
         	switch (memview->GetMemoryType())
      
         	{
      
    @@ -331,8 +331,8 @@ void CMemoryWindow::onSearch(wxCommandEvent& event)
  
         	long count = 0;
      
         	char copy[3] = {0};
      
         	long newsize = 0;
      
        -	unsigned char *tmp2 = 0;
      
        -	char* tmpstr = 0;
      
        +	unsigned char *tmp2 = nullptr;
      
        +	char* tmpstr = nullptr;
      
         	if (chkHex->GetValue())
      
         	{

2  Source/Core/DolphinWX/Debugger/MemoryWindow.h

show inline notes

View

              
    @@ -43,7 +43,7 @@ class CMemoryWindow
  
         		void Save(IniFile& _IniFile) const;
      
         		void Load(IniFile& _IniFile);
      
        -		void Update();
      
        +		void Update() override;
      
         		void NotifyMapLoaded();
      
         		void JumpToAddress(u32 _Address);

14  Source/Core/DolphinWX/Debugger/RegisterView.h

show inline notes

View

              
    @@ -45,12 +45,12 @@ class CRegTable : public wxGridTableBase
  
         		memset(m_CachedSpecialRegHasChanged, 0, sizeof(m_CachedSpecialRegHasChanged));
      
         		memset(m_CachedFRegHasChanged, 0, sizeof(m_CachedFRegHasChanged));
      
         	}
      
        -    int GetNumberCols(void) {return 5;}
      
        -    int GetNumberRows(void) {return 32 + NUM_SPECIALS;}
      
        -	bool IsEmptyCell(int row, int col) {return row > 31 && col > 2;}
      
        -    wxString GetValue(int row, int col);
      
        -    void SetValue(int row, int col, const wxString &);
      
        -	wxGridCellAttr *GetAttr(int, int, wxGridCellAttr::wxAttrKind);
      
        +    int GetNumberCols(void) override {return 5;}
      
        +    int GetNumberRows(void) override {return 32 + NUM_SPECIALS;}
      
        +	bool IsEmptyCell(int row, int col) override {return row > 31 && col > 2;}
      
        +    wxString GetValue(int row, int col) override;
      
        +    void SetValue(int row, int col, const wxString &) override;
      
        +	wxGridCellAttr *GetAttr(int, int, wxGridCellAttr::wxAttrKind) override;
      
         	void UpdateCachedRegs();
      
         private:
      
    @@ -68,5 +68,5 @@ class CRegisterView : public wxGrid
  
         {
      
         public:
      
         	CRegisterView(wxWindow* parent, wxWindowID id);
      
        -	void Update();
      
        +	void Update() override;
      
         };

4  Source/Core/DolphinWX/Debugger/RegisterWindow.cpp

show inline notes

View

              
    @@ -26,7 +26,7 @@
  
         		const wxPoint& position, const wxSize& size,
      
         		long style, const wxString& name)
      
         	: wxPanel(parent, id, position, size, style, name)
      
        -	, m_GPRGridView(NULL)
      
        +	, m_GPRGridView(nullptr)
      
         {
      
         	CreateGUIControls();
      
         }
      
    @@ -43,6 +43,6 @@ void CRegisterWindow::CreateGUIControls()
  
         void CRegisterWindow::NotifyUpdate()
      
         {
      
        -	if (m_GPRGridView != NULL)
      
        +	if (m_GPRGridView != nullptr)
      
         		m_GPRGridView->Update();
      
         }

8  Source/Core/DolphinWX/FifoPlayerDlg.cpp

show inline notes

View

              
    @@ -53,7 +53,7 @@
  
         using namespace std;
      
         std::recursive_mutex sMutex;
      
        -wxEvtHandler *volatile FifoPlayerDlg::m_EvtHandler = NULL;
      
        +wxEvtHandler *volatile FifoPlayerDlg::m_EvtHandler = nullptr;
      
         FifoPlayerDlg::FifoPlayerDlg(wxWindow * const parent) :
      
         	wxDialog(parent, wxID_ANY, _("FIFO Player")),
      
    @@ -90,10 +90,10 @@
  
         	m_objectsList->Unbind(wxEVT_COMMAND_LISTBOX_SELECTED, &FifoPlayerDlg::OnObjectListSelectionChanged, this);
      
         	m_objectCmdList->Unbind(wxEVT_COMMAND_LISTBOX_SELECTED, &FifoPlayerDlg::OnObjectCmdListSelectionChanged, this);
      
        -	FifoPlayer::GetInstance().SetFrameWrittenCallback(NULL);
      
        +	FifoPlayer::GetInstance().SetFrameWrittenCallback(nullptr);
      
         	sMutex.lock();
      
        -	m_EvtHandler = NULL;
      
        +	m_EvtHandler = nullptr;
      
         	sMutex.unlock();
      
         }
      
    @@ -978,7 +978,7 @@ wxString FifoPlayerDlg::CreateIntegerLabel(size_t size, const wxString& label) c
  
         bool FifoPlayerDlg::GetSaveButtonEnabled() const
      
         {
      
        -	return (FifoRecorder::GetInstance().GetRecordedFile() != NULL);
      
        +	return (FifoRecorder::GetInstance().GetRecordedFile() != nullptr);
      
         }
      
         void FifoPlayerDlg::RecordingFinished()

26  Source/Core/DolphinWX/Frame.cpp

show inline notes

View

              
    @@ -139,7 +139,7 @@ HWND MSWGetParent_(HWND Parent)
  
         	SetIcon(IconTemp);
      
         	DragAcceptFiles(true);
      
        -	Connect(wxEVT_DROP_FILES, wxDropFilesEventHandler(CRenderFrame::OnDropFiles), NULL, this);
      
        +	Connect(wxEVT_DROP_FILES, wxDropFilesEventHandler(CRenderFrame::OnDropFiles), nullptr, this);
      
         }
      
         void CRenderFrame::OnDropFiles(wxDropFilesEvent& event)
      
    @@ -298,12 +298,12 @@ WXLRESULT CRenderFrame::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPa
  
         		bool ShowLogWindow,
      
         		long style)
      
         	: CRenderFrame(parent, id, title, pos, size, style)
      
        -	, g_pCodeWindow(NULL), g_NetPlaySetupDiag(NULL), g_CheatsWindow(NULL)
      
        -	, m_ToolBar(NULL), m_ToolBarDebug(NULL), m_ToolBarAui(NULL)
      
        -	, m_GameListCtrl(NULL), m_Panel(NULL)
      
        -	, m_RenderFrame(NULL), m_RenderParent(NULL)
      
        -	, m_LogWindow(NULL), m_LogConfigWindow(NULL)
      
        -	, m_FifoPlayerDlg(NULL), UseDebugger(_UseDebugger)
      
        +	, g_pCodeWindow(nullptr), g_NetPlaySetupDiag(nullptr), g_CheatsWindow(nullptr)
      
        +	, m_ToolBar(nullptr), m_ToolBarDebug(nullptr), m_ToolBarAui(nullptr)
      
        +	, m_GameListCtrl(nullptr), m_Panel(nullptr)
      
        +	, m_RenderFrame(nullptr), m_RenderParent(nullptr)
      
        +	, m_LogWindow(nullptr), m_LogConfigWindow(nullptr)
      
        +	, m_FifoPlayerDlg(nullptr), UseDebugger(_UseDebugger)
      
         	, m_bBatchMode(_BatchMode), m_bEdit(false), m_bTabSplit(false), m_bNoDocking(false)
      
         	, m_bGameLoading(false)
      
         {
      
    @@ -442,7 +442,7 @@ bool CFrame::RendererIsFullscreen()
  
         	}
      
         #if defined(__APPLE__)
      
        -	if (m_RenderFrame != NULL)
      
        +	if (m_RenderFrame != nullptr)
      
         	{
      
         		NSView *view = (NSView *) m_RenderFrame->GetHandle();
      
         		NSWindow *window = [view window];
      
    @@ -512,7 +512,7 @@ void CFrame::OnClose(wxCloseEvent& event)
  
         	{
      
         		// Close the log window now so that its settings are saved
      
         		m_LogWindow->Close();
      
        -		m_LogWindow = NULL;
      
        +		m_LogWindow = nullptr;
      
         	}
      
    @@ -608,12 +608,12 @@ void CFrame::OnHostMessage(wxCommandEvent& event)
  
         		break;
      
         	case IDM_UPDATESTATUSBAR:
      
        -		if (GetStatusBar() != NULL)
      
        +		if (GetStatusBar() != nullptr)
      
         			GetStatusBar()->SetStatusText(event.GetString(), event.GetInt());
      
         		break;
      
         	case IDM_UPDATETITLE:
      
        -		if (m_RenderFrame != NULL)
      
        +		if (m_RenderFrame != nullptr)
      
         			m_RenderFrame->SetTitle(event.GetString());
      
         		break;
      
    @@ -700,13 +700,13 @@ void CFrame::OnRenderWindowSizeRequest(int width, int height)
  
         bool CFrame::RendererHasFocus()
      
         {
      
        -	if (m_RenderParent == NULL)
      
        +	if (m_RenderParent == nullptr)
      
         		return false;
      
         #ifdef _WIN32
      
         	if (m_RenderParent->GetParent()->GetHWND() == GetForegroundWindow())
      
         		return true;
      
         #else
      
        -	if (wxWindow::FindFocus() == NULL)
      
        +	if (wxWindow::FindFocus() == nullptr)
      
         		return false;
      
         	// Why these different cases?
      
         	if (m_RenderParent == wxWindow::FindFocus() ||

4  Source/Core/DolphinWX/Frame.h

show inline notes

View

              
    @@ -138,7 +138,7 @@ class CFrame : public CRenderFrame
  
         	bool RendererHasFocus();
      
         	void DoFullscreen(bool bF);
      
         	void ToggleDisplayMode (bool bFullscreen);
      
        -	void UpdateWiiMenuChoice(wxMenuItem *WiiMenuItem=NULL);
      
        +	void UpdateWiiMenuChoice(wxMenuItem *WiiMenuItem=nullptr);
      
         	static void ConnectWiimote(int wm_idx, bool connect);
      
         	const CGameListCtrl *GetGameListCtrl() const;
      
    @@ -244,7 +244,7 @@ class CFrame : public CRenderFrame
  
         	void DoFloatNotebookPage(wxWindowID Id);
      
         	wxFrame * CreateParentFrame(wxWindowID Id = wxID_ANY,
      
         			const wxString& title = wxT(""),
      
        -			wxWindow * = NULL);
      
        +			wxWindow * = nullptr);
      
         	wxString AuiFullscreen, AuiCurrent;
      
         	void AddPane();
      
         	void UpdateCurrentPerspective();

8  Source/Core/DolphinWX/FrameAui.cpp

show inline notes

View

              
    @@ -151,7 +151,7 @@ void CFrame::ToggleLogConfigWindow(bool bShow)
  
         	else
      
         	{
      
         		DoRemovePage(m_LogConfigWindow, false);
      
        -		m_LogConfigWindow = NULL;
      
        +		m_LogConfigWindow = nullptr;
      
         	}
      
         	// Hide or Show the pane
      
    @@ -388,7 +388,7 @@ void CFrame::ShowResizePane()
  
         void CFrame::TogglePane()
      
         {
      
         	// Get the first notebook
      
        -	wxAuiNotebook * NB = NULL;
      
        +	wxAuiNotebook * NB = nullptr;
      
         	for (u32 i = 0; i < m_Mgr->GetAllPanes().GetCount(); i++)
      
         	{
      
         		if (m_Mgr->GetAllPanes()[i].window->IsKindOf(CLASSINFO(wxAuiNotebook)))
      
    @@ -983,7 +983,7 @@ wxWindow * CFrame::GetNotebookPageFromId(wxWindowID Id)
  
         				return NB->GetPage(j);
      
         		}
      
         	}
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
         wxFrame* CFrame::CreateParentFrame(wxWindowID Id, const wxString& Title, wxWindow* Child)
      
    @@ -1088,5 +1088,5 @@ wxAuiNotebook * CFrame::GetNotebookFromId(u32 NBId)
  
         			return (wxAuiNotebook*)m_Mgr->GetAllPanes()[i].window;
      
         		j++;
      
         	}
      
        -	return NULL;
      
        +	return nullptr;
      
         }

16  Source/Core/DolphinWX/FrameTools.cpp

show inline notes

View

              
    @@ -584,7 +584,7 @@ void CFrame::InitBitmaps()
  
         	m_Bitmaps[Toolbar_FullScreen].LoadFile(dir + "fullscreen.png", wxBITMAP_TYPE_PNG);
      
         	// Update in case the bitmap has been updated
      
        -	if (m_ToolBar != NULL)
      
        +	if (m_ToolBar != nullptr)
      
         		RecreateToolbar();
      
         }
      
    @@ -608,7 +608,7 @@ void CFrame::BootGame(const std::string& filename)
  
         	// If all that fails, ask to add a dir and don't boot
      
         	if (bootfile.empty())
      
         	{
      
        -		if (m_GameListCtrl->GetSelectedISO() != NULL)
      
        +		if (m_GameListCtrl->GetSelectedISO() != nullptr)
      
         		{
      
         			if (m_GameListCtrl->GetSelectedISO()->IsValid())
      
         				bootfile = m_GameListCtrl->GetSelectedISO()->GetFileName();
      
    @@ -872,7 +872,7 @@ void CFrame::ToggleDisplayMode(bool bFullscreen)
  
         	else
      
         	{
      
         		// Change to default resolution
      
        -		ChangeDisplaySettings(NULL, CDS_FULLSCREEN);
      
        +		ChangeDisplaySettings(nullptr, CDS_FULLSCREEN);
      
         	}
      
         #elif defined(HAVE_XRANDR) && HAVE_XRANDR
      
         	if (SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution != "Auto")
      
    @@ -967,7 +967,7 @@ void CFrame::StartGame(const std::string& filename)
  
         		// Destroy the renderer frame when not rendering to main
      
         		if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain)
      
         			m_RenderFrame->Destroy();
      
        -		m_RenderParent = NULL;
      
        +		m_RenderParent = nullptr;
      
         		m_bGameLoading = false;
      
         		UpdateGUI();
      
         	}
      
    @@ -1060,7 +1060,7 @@ void CFrame::DoStop()
  
         	m_bGameLoading = false;
      
         	if (Core::GetState() != Core::CORE_UNINITIALIZED ||
      
        -			m_RenderParent != NULL)
      
        +			m_RenderParent != nullptr)
      
         	{
      
         #if defined __WXGTK__
      
         		wxMutexGuiLeave();
      
    @@ -1140,7 +1140,7 @@ void CFrame::DoStop()
  
         			// Make sure the window is not longer set to stay on top
      
         			m_RenderFrame->SetWindowStyle(m_RenderFrame->GetWindowStyle() & ~wxSTAY_ON_TOP);
      
         		}
      
        -		m_RenderParent = NULL;
      
        +		m_RenderParent = nullptr;
      
         		// Clean framerate indications from the status bar.
      
         		GetStatusBar()->SetStatusText(wxT(" "), 0);
      
    @@ -1339,7 +1339,7 @@ void CFrame::OnNetPlay(wxCommandEvent& WXUNUSED (event))
  
         {
      
         	if (!g_NetPlaySetupDiag)
      
         	{
      
        -		if (NetPlayDiag::GetInstance() != NULL)
      
        +		if (NetPlayDiag::GetInstance() != nullptr)
      
         			NetPlayDiag::GetInstance()->Raise();
      
         		else
      
         			g_NetPlaySetupDiag = new NetPlaySetupDiag(this, m_GameListCtrl);
      
    @@ -1736,7 +1736,7 @@ void CFrame::UpdateGUI()
  
         			m_GameListCtrl->Show();
      
         		}
      
         		// Game has been selected but not started, enable play button
      
        -		if (m_GameListCtrl->GetSelectedISO() != NULL && m_GameListCtrl->IsEnabled())
      
        +		if (m_GameListCtrl->GetSelectedISO() != nullptr && m_GameListCtrl->IsEnabled())
      
         		{
      
         			if (m_ToolBar)
      
         				m_ToolBar->EnableTool(IDM_PLAY, true);

8  Source/Core/DolphinWX/GLInterface/EGL.cpp

show inline notes

View

              
    @@ -31,7 +31,7 @@ void cInterfaceEGL::DetectMode()
  
         		return;
      
         	EGLint num_configs;
      
        -	EGLConfig *config = NULL;
      
        +	EGLConfig *config = nullptr;
      
         	bool supportsGL = false, supportsGLES2 = false, supportsGLES3 = false;
      
         	// attributes for a visual in RGBA format with at least
      
    @@ -43,7 +43,7 @@ void cInterfaceEGL::DetectMode()
  
         		EGL_NONE };
      
         	// Get how many configs there are
      
        -	if (!eglChooseConfig( GLWin.egl_dpy, attribs, NULL, 0, &num_configs))
      
        +	if (!eglChooseConfig( GLWin.egl_dpy, attribs, nullptr, 0, &num_configs))
      
         	{
      
         		INFO_LOG(VIDEO, "Error: couldn't get an EGL visual config\n");
      
         		goto err_exit;
      
    @@ -186,7 +186,7 @@ bool cInterfaceEGL::Create(void *&window_handle)
  
         	GLWin.native_window = Platform.CreateWindow();
      
        -	GLWin.egl_surf = eglCreateWindowSurface(GLWin.egl_dpy, config, GLWin.native_window, NULL);
      
        +	GLWin.egl_surf = eglCreateWindowSurface(GLWin.egl_dpy, config, GLWin.native_window, nullptr);
      
         	if (!GLWin.egl_surf)
      
         	{
      
         		INFO_LOG(VIDEO, "Error: eglCreateWindowSurface failed\n");
      
    @@ -218,6 +218,6 @@ void cInterfaceEGL::Shutdown()
  
         			NOTICE_LOG(VIDEO, "Could not destroy window surface.");
      
         		if(!eglTerminate(GLWin.egl_dpy))
      
         			NOTICE_LOG(VIDEO, "Could not destroy display connection.");
      
        -		GLWin.egl_ctx = NULL;
      
        +		GLWin.egl_ctx = nullptr;
      
         	}
      
         }

18  Source/Core/DolphinWX/GLInterface/GLX.cpp

show inline notes

View

              
    @@ -10,7 +10,7 @@
  
         #include "VideoCommon/VideoConfig.h"
      
         typedef int ( * PFNGLXSWAPINTERVALSGIPROC) (int interval);
      
        -PFNGLXSWAPINTERVALSGIPROC glXSwapIntervalSGI = NULL;
      
        +PFNGLXSWAPINTERVALSGIPROC glXSwapIntervalSGI = nullptr;
      
         // Show the current FPS
      
         void cInterfaceGLX::UpdateFPSDisplay(const char *text)
      
    @@ -71,8 +71,8 @@ bool cInterfaceGLX::Create(void *&window_handle)
  
         		GLX_DOUBLEBUFFER,
      
         		None };
      
        -	GLWin.dpy = XOpenDisplay(0);
      
        -	GLWin.evdpy = XOpenDisplay(0);
      
        +	GLWin.dpy = XOpenDisplay(nullptr);
      
        +	GLWin.evdpy = XOpenDisplay(nullptr);
      
         	GLWin.parent = (Window)window_handle;
      
         	GLWin.screen = DefaultScreen(GLWin.dpy);
      
         	if (GLWin.parent == 0)
      
    @@ -83,17 +83,17 @@ bool cInterfaceGLX::Create(void *&window_handle)
  
         	// Get an appropriate visual
      
         	GLWin.vi = glXChooseVisual(GLWin.dpy, GLWin.screen, attrListDbl);
      
        -	if (GLWin.vi == NULL)
      
        +	if (GLWin.vi == nullptr)
      
         	{
      
         		GLWin.vi = glXChooseVisual(GLWin.dpy, GLWin.screen, attrListSgl);
      
        -		if (GLWin.vi != NULL)
      
        +		if (GLWin.vi != nullptr)
      
         		{
      
         			ERROR_LOG(VIDEO, "Only single buffered visual!");
      
         		}
      
         		else
      
         		{
      
         			GLWin.vi = glXChooseVisual(GLWin.dpy, GLWin.screen, attrListDefault);
      
        -			if (GLWin.vi == NULL)
      
        +			if (GLWin.vi == nullptr)
      
         			{
      
         				ERROR_LOG(VIDEO, "Could not choose visual (glXChooseVisual)");
      
         				return false;
      
    @@ -104,7 +104,7 @@ bool cInterfaceGLX::Create(void *&window_handle)
  
         		NOTICE_LOG(VIDEO, "Got double buffered visual!");
      
         	// Create a GLX context.
      
        -	GLWin.ctx = glXCreateContext(GLWin.dpy, GLWin.vi, 0, GL_TRUE);
      
        +	GLWin.ctx = glXCreateContext(GLWin.dpy, GLWin.vi, nullptr, GL_TRUE);
      
         	if (!GLWin.ctx)
      
         	{
      
         		PanicAlert("Unable to create GLX context.");
      
    @@ -142,7 +142,7 @@ bool cInterfaceGLX::MakeCurrent()
  
         bool cInterfaceGLX::ClearCurrent()
      
         {
      
        -	return glXMakeCurrent(GLWin.dpy, None, NULL);
      
        +	return glXMakeCurrent(GLWin.dpy, None, nullptr);
      
         }
      
    @@ -155,7 +155,7 @@ void cInterfaceGLX::Shutdown()
  
         		glXDestroyContext(GLWin.dpy, GLWin.ctx);
      
         		XCloseDisplay(GLWin.dpy);
      
         		XCloseDisplay(GLWin.evdpy);
      
        -		GLWin.ctx = NULL;
      
        +		GLWin.ctx = nullptr;
      
         	}
      
         }

16  Source/Core/DolphinWX/GLInterface/GLX.h

show inline notes

View

              
    @@ -13,12 +13,12 @@ class cInterfaceGLX : public cInterfaceBase
  
         	cX11Window XWindow;
      
         public:
      
         	friend class cX11Window;
      
        -	void SwapInterval(int Interval);
      
        -	void Swap();
      
        -	void UpdateFPSDisplay(const char *Text);
      
        -	void* GetFuncAddress(std::string name);
      
        -	bool Create(void *&window_handle);
      
        -	bool MakeCurrent();
      
        -	bool ClearCurrent();
      
        -	void Shutdown();
      
        +	void SwapInterval(int Interval) override;
      
        +	void Swap() override;
      
        +	void UpdateFPSDisplay(const char *Text) override;
      
        +	void* GetFuncAddress(std::string name) override;
      
        +	bool Create(void *&window_handle) override;
      
        +	bool MakeCurrent() override;
      
        +	bool ClearCurrent() override;
      
        +	void Shutdown() override;
      
         };

2  Source/Core/DolphinWX/GLInterface/InterfaceBase.h

show inline notes

View

              
    @@ -26,7 +26,7 @@ class cInterfaceBase
  
         	virtual void UpdateFPSDisplay(const char *Text) {}
      
         	virtual void SetMode(u32 mode) { s_opengl_mode = GLInterfaceMode::MODE_OPENGL; }
      
         	virtual u32 GetMode() { return s_opengl_mode; }
      
        -	virtual void* GetFuncAddress(std::string name) { return NULL; }
      
        +	virtual void* GetFuncAddress(std::string name) { return nullptr; }
      
         	virtual bool Create(void *&window_handle) { return true; }
      
         	virtual bool MakeCurrent() { return true; }
      
         	virtual bool ClearCurrent() { return true; }

4  Source/Core/DolphinWX/GLInterface/Platform.cpp

show inline notes

View

              
    @@ -62,7 +62,7 @@ bool cPlatform::SelectDisplay(void)
  
         #endif
      
         			platform_env);
      
         			free(platform_env);
      
        -			platform_env = NULL;
      
        +			platform_env = nullptr;
      
         		}
      
         #if HAVE_WAYLAND
      
         		if (wayland_possible)
      
    @@ -154,7 +154,7 @@ EGLDisplay cPlatform::EGLGetDisplay(void)
  
         #ifdef ANDROID
      
         	return eglGetDisplay(EGL_DEFAULT_DISPLAY);
      
         #endif
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
         EGLNativeWindowType cPlatform::CreateWindow(void)

22  Source/Core/DolphinWX/GLInterface/WGL.cpp

show inline notes

View

              
    @@ -11,13 +11,13 @@
  
         #include "VideoCommon/VertexShaderManager.h"
      
         #include "VideoCommon/VideoConfig.h"
      
        -static HDC hDC = NULL;       // Private GDI Device Context
      
        -static HGLRC hRC = NULL;     // Permanent Rendering Context
      
        -static HINSTANCE dllHandle = NULL; // Handle to OpenGL32.dll 
      
        +static HDC hDC = nullptr;       // Private GDI Device Context
      
        +static HGLRC hRC = nullptr;     // Permanent Rendering Context
      
        +static HINSTANCE dllHandle = nullptr; // Handle to OpenGL32.dll
      
         // typedef from wglext.h
      
         typedef BOOL(WINAPI * PFNWGLSWAPINTERVALEXTPROC) (int interval);
      
        -static PFNWGLSWAPINTERVALEXTPROC wglSwapIntervalEXT = NULL;
      
        +static PFNWGLSWAPINTERVALEXTPROC wglSwapIntervalEXT = nullptr;
      
         void cInterfaceWGL::SwapInterval(int Interval)
      
         {
      
    @@ -34,9 +34,9 @@ void cInterfaceWGL::Swap()
  
         void* cInterfaceWGL::GetFuncAddress(std::string name)
      
         {
      
         	void* func = (void*)wglGetProcAddress((LPCSTR)name.c_str());
      
        -	if (func == NULL)
      
        +	if (func == nullptr)
      
         		func = (void*)GetProcAddress(dllHandle, (LPCSTR)name.c_str());
      
        -	return func; 
      
        +	return func;
      
         }
      
         // Draw messages on top of the screen
      
    @@ -78,7 +78,7 @@ bool cInterfaceWGL::Create(void *&window_handle)
  
         #endif
      
         	window_handle = (void*)EmuWindow::Create((HWND)window_handle, GetModuleHandle(0), _T("Please wait..."));
      
        -	if (window_handle == NULL)
      
        +	if (window_handle == nullptr)
      
         	{
      
         		Host_SysMessage("failed to create window");
      
         		return false;
      
    @@ -138,7 +138,7 @@ bool cInterfaceWGL::MakeCurrent()
  
         bool cInterfaceWGL::ClearCurrent()
      
         {
      
        -	bool success = wglMakeCurrent(hDC, NULL) ? true : false;
      
        +	bool success = wglMakeCurrent(hDC, nullptr) ? true : false;
      
         	if (success)
      
         	{
      
         		// Grab the swap interval function pointer
      
    @@ -183,19 +183,19 @@ void cInterfaceWGL::Shutdown()
  
         {
      
         	if (hRC)
      
         	{
      
        -		if (!wglMakeCurrent(NULL, NULL))
      
        +		if (!wglMakeCurrent(nullptr, nullptr))
      
         			NOTICE_LOG(VIDEO, "Could not release drawing context.");
      
         		if (!wglDeleteContext(hRC))
      
         			ERROR_LOG(VIDEO, "Attempt to release rendering context failed.");
      
        -		hRC = NULL;
      
        +		hRC = nullptr;
      
         	}
      
         	if (hDC && !ReleaseDC(EmuWindow::GetWnd(), hDC))
      
         	{
      
         		ERROR_LOG(VIDEO, "Attempt to release device context failed.");
      
        -		hDC = NULL;
      
        +		hDC = nullptr;
      
         	}
      
         }

32  Source/Core/DolphinWX/GLInterface/Wayland_Util.cpp

show inline notes

View

              
    @@ -16,7 +16,7 @@
  
         		return;
      
         	wl_pointer_set_cursor(GLWin.pointer.wl_pointer,
      
        -			      GLWin.pointer.serial, NULL, 0, 0);
      
        +			      GLWin.pointer.serial, nullptr, 0, 0);
      
         }
      
         static void
      
    @@ -104,10 +104,10 @@
  
         	if (fullscreen) {
      
         		wl_shell_surface_set_fullscreen(GLWin.wl_shell_surface,
      
         						WL_SHELL_SURFACE_FULLSCREEN_METHOD_DEFAULT,
      
        -						0, NULL);
      
        +						0, nullptr);
      
         	} else {
      
         		wl_shell_surface_set_toplevel(GLWin.wl_shell_surface);
      
        -		handle_configure(NULL, GLWin.wl_shell_surface, 0,
      
        +		handle_configure(nullptr, GLWin.wl_shell_surface, 0,
      
         				 GLWin.window_size.width,
      
         				 GLWin.window_size.height);
      
         	}
      
    @@ -124,7 +124,7 @@
  
         		return;
      
         	}
      
        -	map_str = (char *) mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
      
        +	map_str = (char *) mmap(nullptr, size, PROT_READ, MAP_SHARED, fd, 0);
      
         	if (map_str == MAP_FAILED) {
      
         		close(fd);
      
         		return;
      
    @@ -146,7 +146,7 @@
  
         	if (!GLWin.keyboard.xkb.state) {
      
         		fprintf(stderr, "failed to create XKB state\n");
      
         		xkb_map_unref(GLWin.keyboard.xkb.keymap);
      
        -		GLWin.keyboard.xkb.keymap = NULL;
      
        +		GLWin.keyboard.xkb.keymap = nullptr;
      
         		return;
      
         	}
      
    @@ -244,15 +244,15 @@
  
         seat_handle_capabilities(void *data, struct wl_seat *seat,
      
         			 uint32_t caps)
      
         {
      
        -	struct wl_pointer *wl_pointer = NULL;
      
        -	struct wl_keyboard *wl_keyboard = NULL;
      
        +	struct wl_pointer *wl_pointer = nullptr;
      
        +	struct wl_keyboard *wl_keyboard = nullptr;
      
         	if ((caps & WL_SEAT_CAPABILITY_POINTER) && !wl_pointer) {
      
         		wl_pointer = wl_seat_get_pointer(seat);
      
         		wl_pointer_add_listener(wl_pointer, &pointer_listener, 0);
      
         	} else if (!(caps & WL_SEAT_CAPABILITY_POINTER) && wl_pointer) {
      
         		wl_pointer_destroy(wl_pointer);
      
        -		wl_pointer = NULL;
      
        +		wl_pointer = nullptr;
      
         	}
      
         	GLWin.pointer.wl_pointer = wl_pointer;
      
    @@ -262,7 +262,7 @@
  
         		wl_keyboard_add_listener(wl_keyboard, &keyboard_listener, 0);
      
         	} else if (!(caps & WL_SEAT_CAPABILITY_KEYBOARD) && wl_keyboard) {
      
         		wl_keyboard_destroy(wl_keyboard);
      
        -		wl_keyboard = NULL;
      
        +		wl_keyboard = nullptr;
      
         	}
      
         	GLWin.keyboard.wl_keyboard = wl_keyboard;
      
    @@ -290,7 +290,7 @@
  
         	} else if (strcmp(interface, "wl_shm") == 0) {
      
         		GLWin.wl_shm = (wl_shm *) wl_registry_bind(registry, name,
      
         					  &wl_shm_interface, 1);
      
        -		GLWin.wl_cursor_theme = (wl_cursor_theme *) wl_cursor_theme_load(NULL, 32, GLWin.wl_shm);
      
        +		GLWin.wl_cursor_theme = (wl_cursor_theme *) wl_cursor_theme_load(nullptr, 32, GLWin.wl_shm);
      
         		GLWin.wl_cursor = (wl_cursor *)
      
         			wl_cursor_theme_get_cursor(GLWin.wl_cursor_theme, "left_ptr");
      
         	}
      
    @@ -309,7 +309,7 @@
  
         bool cWaylandInterface::ServerConnect(void)
      
         {
      
        -	GLWin.wl_display = wl_display_connect(NULL);
      
        +	GLWin.wl_display = wl_display_connect(nullptr);
      
         	if (!GLWin.wl_display)
      
         		return false;
      
    @@ -324,18 +324,18 @@ bool cWaylandInterface::Initialize(void *config)
  
         		return false;
      
         	}
      
        -	GLWin.pointer.wl_pointer = NULL;
      
        -	GLWin.keyboard.wl_keyboard = NULL;
      
        +	GLWin.pointer.wl_pointer = nullptr;
      
        +	GLWin.keyboard.wl_keyboard = nullptr;
      
         	GLWin.keyboard.xkb.context = xkb_context_new((xkb_context_flags) 0);
      
        -	if (GLWin.keyboard.xkb.context == NULL) {
      
        +	if (GLWin.keyboard.xkb.context == nullptr) {
      
         		fprintf(stderr, "Failed to create XKB context\n");
      
        -		return NULL;
      
        +		return nullptr;
      
         	}
      
         	GLWin.wl_registry = wl_display_get_registry(GLWin.wl_display);
      
         	wl_registry_add_listener(GLWin.wl_registry,
      
        -				 &registry_listener, NULL);
      
        +				 &registry_listener, nullptr);
      
         	while (!GLWin.wl_compositor)
      
         		wl_display_dispatch(GLWin.wl_display);

8  Source/Core/DolphinWX/GLInterface/X11_Util.cpp

show inline notes

View

              
    @@ -9,7 +9,7 @@
  
         #if USE_EGL
      
         bool cXInterface::ServerConnect(void)
      
         {
      
        -	GLWin.dpy = XOpenDisplay(NULL);
      
        +	GLWin.dpy = XOpenDisplay(nullptr);
      
         	if (!GLWin.dpy)
      
         		return false;
      
    @@ -49,7 +49,7 @@ bool cXInterface::Initialize(void *config, void *window_handle)
  
         	GLWin.width = _twidth;
      
         	GLWin.height = _theight;
      
        -	GLWin.evdpy = XOpenDisplay(NULL);
      
        +	GLWin.evdpy = XOpenDisplay(nullptr);
      
         	GLWin.parent = (Window) window_handle;
      
         	GLWin.screen = DefaultScreen(GLWin.dpy);
      
    @@ -86,7 +86,7 @@ void *cXInterface::CreateWindow(void)
  
         			CWBorderPixel | CWBackPixel | CWColormap | CWEventMask, &GLWin.attr);
      
         	wmProtocols[0] = XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", True);
      
         	XSetWMProtocols(GLWin.evdpy, GLWin.win, wmProtocols, 1);
      
        -	XSetStandardProperties(GLWin.evdpy, GLWin.win, "GPU", "GPU", None, NULL, 0, NULL);
      
        +	XSetStandardProperties(GLWin.evdpy, GLWin.win, "GPU", "GPU", None, nullptr, 0, nullptr);
      
         	XMapRaised(GLWin.evdpy, GLWin.win);
      
         	XSync(GLWin.evdpy, True);
      
    @@ -136,7 +136,7 @@ void cX11Window::CreateXWindow(void)
  
         			CWBorderPixel | CWBackPixel | CWColormap | CWEventMask, &GLWin.attr);
      
         	wmProtocols[0] = XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", True);
      
         	XSetWMProtocols(GLWin.evdpy, GLWin.win, wmProtocols, 1);
      
        -	XSetStandardProperties(GLWin.evdpy, GLWin.win, "GPU", "GPU", None, NULL, 0, NULL);
      
        +	XSetStandardProperties(GLWin.evdpy, GLWin.win, "GPU", "GPU", None, nullptr, 0, nullptr);
      
         	XMapRaised(GLWin.evdpy, GLWin.win);
      
         	XSync(GLWin.evdpy, True);

22  Source/Core/DolphinWX/GameListCtrl.cpp

show inline notes

View

              
    @@ -211,10 +211,10 @@ static int CompareGameListItems(const GameListItem* iso1, const GameListItem* is
  
         CGameListCtrl::CGameListCtrl(wxWindow* parent, const wxWindowID id, const
      
         		wxPoint& pos, const wxSize& size, long style)
      
        -	: wxListCtrl(parent, id, pos, size, style), toolTip(0)
      
        +	: wxListCtrl(parent, id, pos, size, style), toolTip(nullptr)
      
         {
      
         	DragAcceptFiles(true);
      
        -	Connect(wxEVT_DROP_FILES, wxDropFilesEventHandler(CGameListCtrl::OnDropFiles), NULL, this);
      
        +	Connect(wxEVT_DROP_FILES, wxDropFilesEventHandler(CGameListCtrl::OnDropFiles), nullptr, this);
      
         }
      
         CGameListCtrl::~CGameListCtrl()
      
    @@ -292,7 +292,7 @@ void CGameListCtrl::Update()
  
         	if (m_imageListSmall)
      
         	{
      
         		delete m_imageListSmall;
      
        -		m_imageListSmall = NULL;
      
        +		m_imageListSmall = nullptr;
      
         	}
      
         	Hide();
      
    @@ -381,7 +381,7 @@ void CGameListCtrl::Update()
  
         		SetItemFont(index, *wxITALIC_FONT);
      
         		SetColumnWidth(0, wxLIST_AUTOSIZE);
      
         	}
      
        -	if (GetSelectedISO() == NULL)
      
        +	if (GetSelectedISO() == nullptr)
      
         		main_frame->UpdateGUI();
      
         	Show();
      
    @@ -549,7 +549,7 @@ void CGameListCtrl::ScanForISOs()
  
         		for (u32 i = 0; i < rFilenames.size(); i++)
      
         		{
      
         			std::string FileName;
      
        -			SplitPath(rFilenames[i], NULL, &FileName, NULL);
      
        +			SplitPath(rFilenames[i], nullptr, &FileName, nullptr);
      
         			// Update with the progress (i) and the message
      
         			dialog.Update(i, wxString::Format(_("Scanning %s"),
      
    @@ -644,7 +644,7 @@ const GameListItem *CGameListCtrl::GetISO(size_t index) const
  
         	if (index < m_ISOFiles.size())
      
         		return m_ISOFiles[index];
      
         	else
      
        -		return NULL;
      
        +		return nullptr;
      
         }
      
         CGameListCtrl *caller;
      
    @@ -914,18 +914,18 @@ const GameListItem * CGameListCtrl::GetSelectedISO()
  
         {
      
         	if (m_ISOFiles.size() == 0)
      
         	{
      
        -		return NULL;
      
        +		return nullptr;
      
         	}
      
         	else if (GetSelectedItemCount() == 0)
      
         	{
      
        -		return NULL;
      
        +		return nullptr;
      
         	}
      
         	else
      
         	{
      
         		long item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
      
         		if (item == wxNOT_FOUND)
      
         		{
      
        -			return NULL;
      
        +			return nullptr;
      
         		}
      
         		else
      
         		{
      
    @@ -1111,7 +1111,7 @@ void CGameListCtrl::CompressSelection(bool _compress)
  
         			if (!iso->IsCompressed() && _compress)
      
         			{
      
         				std::string FileName, FileExt;
      
        -				SplitPath(iso->GetFileName(), NULL, &FileName, &FileExt);
      
        +				SplitPath(iso->GetFileName(), nullptr, &FileName, &FileExt);
      
         				m_currentFilename = FileName;
      
         				FileName.append(".gcz");
      
    @@ -1136,7 +1136,7 @@ void CGameListCtrl::CompressSelection(bool _compress)
  
         			else if (iso->IsCompressed() && !_compress)
      
         			{
      
         				std::string FileName, FileExt;
      
        -				SplitPath(iso->GetFileName(), NULL, &FileName, &FileExt);
      
        +				SplitPath(iso->GetFileName(), nullptr, &FileName, &FileExt);
      
         				m_currentFilename = FileName;
      
         				if (iso->GetPlatform() == GameListItem::WII_DISC)
      
         					FileName.append(".iso");

2  Source/Core/DolphinWX/GameListCtrl.h

show inline notes

View

              
    @@ -38,7 +38,7 @@ class CGameListCtrl : public wxListCtrl
  
         	CGameListCtrl(wxWindow* parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, long style);
      
         	~CGameListCtrl();
      
        -	void Update();
      
        +	void Update() override;
      
         	void BrowseForDirectory();
      
         	const GameListItem *GetSelectedISO();

2  Source/Core/DolphinWX/Globals.h

show inline notes

View

              
    @@ -256,7 +256,7 @@ enum
  
         	DECLARE_EVENT_TABLE_ENTRY(\
      
         			wxEVT_HOST_COMMAND, id, wxID_ANY, \
      
         			(wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent(wxCommandEventFunction, &fn), \
      
        -			(wxObject*) NULL \
      
        +			(wxObject*) nullptr \
      
         			),
      
         extern const wxEventType wxEVT_HOST_COMMAND;

6  Source/Core/DolphinWX/HotkeyDlg.cpp

show inline notes

View

              
    @@ -45,7 +45,7 @@
  
         	m_ButtonMappingTimer = new wxTimer(this, wxID_ANY);
      
         	g_Pressed = 0;
      
         	g_Modkey = 0;
      
        -	ClickedButton = NULL;
      
        +	ClickedButton = nullptr;
      
         	GetButtonWaitingID = 0;
      
         	GetButtonWaitingTimer = 0;
      
         #endif
      
    @@ -69,13 +69,13 @@ void HotkeyConfigDialog::EndGetButtons(void)
  
         	m_ButtonMappingTimer->Stop();
      
         	GetButtonWaitingTimer = 0;
      
         	GetButtonWaitingID = 0;
      
        -	ClickedButton = NULL;
      
        +	ClickedButton = nullptr;
      
         	SetEscapeId(wxID_ANY);
      
         }
      
         void HotkeyConfigDialog::OnKeyDown(wxKeyEvent& event)
      
         {
      
        -	if(ClickedButton != NULL)
      
        +	if(ClickedButton != nullptr)
      
         	{
      
         		// Save the key
      
         		g_Pressed = event.GetKeyCode();

10  Source/Core/DolphinWX/ISOFile.cpp

show inline notes

View

              
    @@ -57,7 +57,7 @@
  
         	{
      
         		DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(_rFileName);
      
        -		if (pVolume != NULL)
      
        +		if (pVolume != nullptr)
      
         		{
      
         			if (!DiscIO::IsVolumeWadFile(pVolume))
      
         				m_Platform = DiscIO::IsVolumeWiiDisc(pVolume) ? WII_DISC : GAMECUBE_DISC;
      
    @@ -80,11 +80,11 @@
  
         			// check if we can get some info from the banner file too
      
         			DiscIO::IFileSystem* pFileSystem = DiscIO::CreateFileSystem(pVolume);
      
        -			if (pFileSystem != NULL || m_Platform == WII_WAD)
      
        +			if (pFileSystem != nullptr || m_Platform == WII_WAD)
      
         			{
      
         				DiscIO::IBannerLoader* pBannerLoader = DiscIO::CreateBannerLoader(*pFileSystem, pVolume);
      
        -				if (pBannerLoader != NULL)
      
        +				if (pBannerLoader != nullptr)
      
         				{
      
         					if (pBannerLoader->IsValid())
      
         					{
      
    @@ -270,7 +270,7 @@ void GameListItem::DoState(PointerWrap &p)
  
         	if (name.empty())
      
         	{
      
         		// No usable name, return filename (better than nothing)
      
        -		SplitPath(GetFileName(), NULL, &name, NULL);
      
        +		SplitPath(GetFileName(), nullptr, &name, nullptr);
      
         	}
      
         	return name;
      
    @@ -281,7 +281,7 @@ const std::string GameListItem::GetWiiFSPath() const
  
         	DiscIO::IVolume *Iso = DiscIO::CreateVolumeFromFilename(m_FileName);
      
         	std::string ret;
      
        -	if (Iso == NULL)
      
        +	if (Iso == nullptr)
      
         		return ret;
      
         	if (DiscIO::IsVolumeWiiDisc(Iso) || DiscIO::IsVolumeWadFile(Iso))

24  Source/Core/DolphinWX/ISOProperties.cpp

show inline notes

View

              
    @@ -88,8 +88,8 @@ struct WiiPartition
  
         };
      
         std::vector<WiiPartition> WiiDisc;
      
        -DiscIO::IVolume *OpenISO = NULL;
      
        -DiscIO::IFileSystem *pFileSystem = NULL;
      
        +DiscIO::IVolume *OpenISO = nullptr;
      
        +DiscIO::IFileSystem *pFileSystem = nullptr;
      
         std::vector<PatchEngine::Patch> onFrame;
      
         std::vector<ActionReplay::ARCode> arCodes;
      
    @@ -135,9 +135,9 @@ struct WiiPartition
  
         		for (u32 i = 0; i < 0xFFFFFFFF; i++) // yes, technically there can be OVER NINE THOUSAND partitions...
      
         		{
      
         			WiiPartition temp;
      
        -			if ((temp.Partition = DiscIO::CreateVolumeFromFilename(fileName, 0, i)) != NULL)
      
        +			if ((temp.Partition = DiscIO::CreateVolumeFromFilename(fileName, 0, i)) != nullptr)
      
         			{
      
        -				if ((temp.FileSystem = DiscIO::CreateFileSystem(temp.Partition)) != NULL)
      
        +				if ((temp.FileSystem = DiscIO::CreateFileSystem(temp.Partition)) != nullptr)
      
         				{
      
         					temp.FileSystem->GetFileList(temp.Files);
      
         					WiiDisc.push_back(temp);
      
    @@ -611,7 +611,7 @@ void CISOProperties::CreateGUIControls(bool IsWad)
  
         		// Filesystem tree
      
         		m_Treectrl = new wxTreeCtrl(m_Filesystem, ID_TREECTRL);
      
         		m_Treectrl->AssignImageList(m_iconList);
      
        -		RootId = m_Treectrl->AddRoot(_("Disc"), 0, 0, 0);
      
        +		RootId = m_Treectrl->AddRoot(_("Disc"), 0, 0, nullptr);
      
         		wxBoxSizer* sTreePage = new wxBoxSizer(wxVERTICAL);
      
         		sTreePage->Add(m_Treectrl, 1, wxEXPAND|wxALL, 5);
      
    @@ -748,7 +748,7 @@ void CISOProperties::ExportDir(const char* _rFullPath, const char* _rExportFolde
  
         	char exportName[512];
      
         	u32 index[2] = {0, 0};
      
         	std::vector<const DiscIO::SFileInfo *> fst;
      
        -	DiscIO::IFileSystem *FS = 0;
      
        +	DiscIO::IFileSystem *FS = nullptr;
      
         	if (DiscIO::IsVolumeWiiDisc(OpenISO))
      
         	{
      
    @@ -854,9 +854,9 @@ void CISOProperties::OnExtractDir(wxCommandEvent& event)
  
         	{
      
         		if (DiscIO::IsVolumeWiiDisc(OpenISO))
      
         			for (u32 i = 0; i < WiiDisc.size(); i++)
      
        -				ExportDir(NULL, WxStrToStr(Path).c_str(), i);
      
        +				ExportDir(nullptr, WxStrToStr(Path).c_str(), i);
      
         		else
      
        -			ExportDir(NULL, WxStrToStr(Path).c_str());
      
        +			ExportDir(nullptr, WxStrToStr(Path).c_str());
      
         		return;
      
         	}
      
    @@ -884,7 +884,7 @@ void CISOProperties::OnExtractDir(wxCommandEvent& event)
  
         void CISOProperties::OnExtractDataFromHeader(wxCommandEvent& event)
      
         {
      
        -	DiscIO::IFileSystem *FS = NULL;
      
        +	DiscIO::IFileSystem *FS = nullptr;
      
         	wxString Path = wxDirSelector(_("Choose the folder to extract to"));
      
         	if (Path.empty())
      
    @@ -1153,10 +1153,10 @@ void CISOProperties::LaunchExternalEditor(const std::string& filename)
  
         		withApplication: @"TextEdit"];
      
         #else
      
         	wxFileType* filetype = wxTheMimeTypesManager->GetFileTypeFromExtension(_T("ini"));
      
        -	if(filetype == NULL) // From extension failed, trying with MIME type now
      
        +	if(filetype == nullptr) // From extension failed, trying with MIME type now
      
         	{
      
         		filetype = wxTheMimeTypesManager->GetFileTypeFromMimeType(_T("text/plain"));
      
        -		if(filetype == NULL) // MIME type failed, aborting mission
      
        +		if(filetype == nullptr) // MIME type failed, aborting mission
      
         		{
      
         			PanicAlertT("Filetype 'ini' is unknown! Will not open!");
      
         			return;
      
    @@ -1415,7 +1415,7 @@ void CISOProperties::ChangeBannerDetails(int lang)
  
         	m_Maker->SetValue(maker);//dev too
      
         	std::string filename, extension;
      
        -	SplitPath(OpenGameListItem->GetFileName(), 0, &filename, &extension);
      
        +	SplitPath(OpenGameListItem->GetFileName(), nullptr, &filename, &extension);
      
         	// Also sets the window's title
      
         	SetTitle(StrToWxStr(StringFromFormat("%s%s: %s - ", filename.c_str(),
      
         		extension.c_str(), OpenGameListItem->GetUniqueID().c_str())) + shortName);

10  Source/Core/DolphinWX/InputConfigDiag.cpp

show inline notes

View

              
    @@ -381,8 +381,8 @@ inline bool IsAlphabetic(wxString &str)
  
         inline void GetExpressionForControl(wxString &expr,
      
         				    wxString &control_name,
      
        -				    DeviceQualifier *control_device = NULL,
      
        -				    DeviceQualifier *default_device = NULL)
      
        +				    DeviceQualifier *control_device = nullptr,
      
        +				    DeviceQualifier *default_device = nullptr)
      
         {
      
         	expr = "";
      
    @@ -748,7 +748,7 @@ void GamepadPage::RefreshDevices(wxCommandEvent&)
  
         	: wxBoxSizer(wxVERTICAL)
      
         	, control_group(group)
      
         {
      
        -	static_bitmap = NULL;
      
        +	static_bitmap = nullptr;
      
         	wxFont m_SmallFont(7, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
      
         	for (auto& control : group->controls)
      
    @@ -915,7 +915,7 @@ void GamepadPage::RefreshDevices(wxCommandEvent&)
  
         {
      
         	size_t col_size = 0;
      
        -	wxBoxSizer* stacked_groups = NULL;
      
        +	wxBoxSizer* stacked_groups = nullptr;
      
         	for (auto& group : controller->groups)
      
         	{
      
         		ControlGroupBox* control_group_box = new ControlGroupBox(group.get(), parent, eventsink);
      
    @@ -925,7 +925,7 @@ void GamepadPage::RefreshDevices(wxCommandEvent&)
  
         		const size_t grp_size = group->controls.size() + group->settings.size();
      
         		col_size += grp_size;
      
        -		if (col_size > 8 || NULL == stacked_groups)
      
        +		if (col_size > 8 || nullptr == stacked_groups)
      
         		{
      
         			if (stacked_groups)
      
         				Add(stacked_groups, 0, /*wxEXPAND|*/wxBOTTOM|wxRIGHT, 5);

18  Source/Core/DolphinWX/InputConfigDiag.h

show inline notes

View

              
    @@ -61,8 +61,8 @@ class PadSettingExtension : public PadSetting
  
         {
      
         public:
      
         	PadSettingExtension(wxWindow* const parent, ControllerEmu::Extension* const ext);
      
        -	void UpdateGUI();
      
        -	void UpdateValue();
      
        +	void UpdateGUI() override;
      
        +	void UpdateValue() override;
      
         	ControllerEmu::Extension* const extension;
      
         };
      
    @@ -75,8 +75,8 @@ class PadSettingSpin : public PadSetting
  
         			, wxSize(54, -1), 0, setting->low, setting->high, (int)(setting->value * 100)))
      
         			, value(setting->value) {}
      
        -	void UpdateGUI();
      
        -	void UpdateValue();
      
        +	void UpdateGUI() override;
      
        +	void UpdateValue() override;
      
         	ControlState& value;
      
         };
      
    @@ -85,8 +85,8 @@ class PadSettingCheckBox : public PadSetting
  
         {
      
         public:
      
         	PadSettingCheckBox(wxWindow* const parent, ControlState& _value, const char* const label);
      
        -	void UpdateGUI();
      
        -	void UpdateValue();
      
        +	void UpdateGUI() override;
      
        +	void UpdateValue() override;
      
         	ControlState& value;
      
         };
      
    @@ -100,7 +100,7 @@ class ControlDialog : public wxDialog
  
         	wxStaticBoxSizer* CreateControlChooser(GamepadPage* const parent);
      
        -	virtual bool Validate();
      
        +	virtual bool Validate() override;
      
         	void DetectControl(wxCommandEvent& event);
      
         	void ClearControl(wxCommandEvent& event);
      
    @@ -173,7 +173,7 @@ class ControlGroupBox : public wxBoxSizer
  
         class ControlGroupsSizer : public wxBoxSizer
      
         {
      
         public:
      
        -	ControlGroupsSizer(ControllerEmu* const controller, wxWindow* const parent, GamepadPage* const eventsink, std::vector<ControlGroupBox*>* const groups = NULL);
      
        +	ControlGroupsSizer(ControllerEmu* const controller, wxWindow* const parent, GamepadPage* const eventsink, std::vector<ControlGroupBox*>* const groups = nullptr);
      
         };
      
         class InputConfigDialog;
      
    @@ -234,7 +234,7 @@ class InputConfigDialog : public wxDialog
  
         	InputConfigDialog(wxWindow* const parent, InputPlugin& plugin, const std::string& name, const int tab_num = 0);
      
         	//~InputConfigDialog();
      
        -	bool Destroy();
      
        +	bool Destroy() override;
      
         	void ClickSave(wxCommandEvent& event);

133  Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp

show inline notes

View

              
    @@ -42,16 +42,13 @@ void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event))
  
         	GamepadPage* const current_page = (GamepadPage*)m_pad_notebook->GetPage(m_pad_notebook->GetSelection());
      
        -	std::vector< ControlGroupBox* >::iterator
      
        -		g = current_page->control_groups.begin(),
      
        -		ge = current_page->control_groups.end();
      
        -	for ( ; g != ge; ++g  )
      
        +	for (ControlGroupBox* g : current_page->control_groups)
      
         	{
      
         		// if this control group has a bitmap
      
        -		if ( (*g)->static_bitmap )
      
        +		if (g->static_bitmap)
      
         		{
      
         			wxMemoryDC dc;
      
        -			wxBitmap bitmap((*g)->static_bitmap->GetBitmap());
      
        +			wxBitmap bitmap(g->static_bitmap->GetBitmap());
      
         			dc.SelectObject(bitmap);
      
         			dc.Clear();
      
    @@ -60,9 +57,9 @@ void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event))
  
         			// label for sticks and stuff
      
         			if (64 == bitmap.GetHeight())
      
        -				dc.DrawText(StrToWxStr((*g)->control_group->name).Upper(), 4, 2);
      
        +				dc.DrawText(StrToWxStr(g->control_group->name).Upper(), 4, 2);
      
        -			switch ( (*g)->control_group->type )
      
        +			switch (g->control_group->type)
      
         			{
      
         			case GROUP_TYPE_TILT :
      
         			case GROUP_TYPE_STICK :
      
    @@ -73,32 +70,32 @@ void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event))
  
         					float x = 0, y = 0, z = 0;
      
         					float xx, yy;
      
        -					switch ((*g)->control_group->type)
      
        +					switch (g->control_group->type)
      
         					{
      
         					case GROUP_TYPE_STICK :
      
        -						((ControllerEmu::AnalogStick*)(*g)->control_group)->GetState( &x, &y, 32.0, 32-1.5 );
      
        +						((ControllerEmu::AnalogStick*)g->control_group)->GetState(&x, &y, 32.0, 32-1.5);
      
         						break;
      
         					case GROUP_TYPE_TILT :
      
        -						((ControllerEmu::Tilt*)(*g)->control_group)->GetState( &x, &y, 32.0, 32-1.5 );
      
        +						((ControllerEmu::Tilt*)g->control_group)->GetState(&x, &y, 32.0, 32-1.5);
      
         						break;
      
         					case GROUP_TYPE_CURSOR :
      
        -						((ControllerEmu::Cursor*)(*g)->control_group)->GetState( &x, &y, &z );
      
        +						((ControllerEmu::Cursor*)g->control_group)->GetState(&x, &y, &z);
      
         						x *= (32-1.5); x+= 32;
      
         						y *= (32-1.5); y+= 32;
      
         						break;
      
         					}
      
        -					xx = (*g)->control_group->controls[3]->control_ref->State();
      
        -					xx -= (*g)->control_group->controls[2]->control_ref->State();
      
        -					yy = (*g)->control_group->controls[1]->control_ref->State();
      
        -					yy -= (*g)->control_group->controls[0]->control_ref->State();
      
        +					xx = g->control_group->controls[3]->control_ref->State();
      
        +					xx -= g->control_group->controls[2]->control_ref->State();
      
        +					yy = g->control_group->controls[1]->control_ref->State();
      
        +					yy -= g->control_group->controls[0]->control_ref->State();
      
         					xx *= 32 - 1; xx += 32;
      
         					yy *= 32 - 1; yy += 32;
      
         					// draw the shit
      
         					// ir cursor forward movement
      
        -					if (GROUP_TYPE_CURSOR == (*g)->control_group->type)
      
        +					if (GROUP_TYPE_CURSOR == g->control_group->type)
      
         					{
      
         						if (z)
      
         						{
      
    @@ -110,13 +107,13 @@ void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event))
  
         							dc.SetPen(*wxGREY_PEN);
      
         							dc.SetBrush(*wxGREY_BRUSH);
      
         						}
      
        -						dc.DrawRectangle( 0, 31 - z*31, 64, 2);
      
        +						dc.DrawRectangle(0, 31 - z*31, 64, 2);
      
         					}
      
         					// octagon for visual aid for diagonal adjustment
      
         					dc.SetPen(*wxLIGHT_GREY_PEN);
      
         					dc.SetBrush(*wxWHITE_BRUSH);
      
        -					if ( GROUP_TYPE_STICK == (*g)->control_group->type )
      
        +					if (GROUP_TYPE_STICK == g->control_group->type)
      
         					{
      
         						// outline and fill colors
      
         						wxBrush LightGrayBrush(_T("#dddddd"));
      
    @@ -131,12 +128,12 @@ void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event))
  
         							, d_of = box / 256.0
      
         							, x_of = box / 2.0;
      
        -						if (strcmp((*g)->control_group->name, "Main Stick") == 0)
      
        +						if (strcmp(g->control_group->name, "Main Stick") == 0)
      
         						{
      
         							max = (87.0f / 127.0f) * 100;
      
         							diagonal = (55.0f / 127.0f) * 100.0;
      
         						}
      
        -						else if (strcmp((*g)->control_group->name,"C-Stick") == 0)
      
        +						else if (strcmp(g->control_group->name,"C-Stick") == 0)
      
         						{
      
         							max = (74.0f / 127.0f) * 100;
      
         							diagonal = (46.0f / 127.0f) * 100;
      
    @@ -163,33 +160,33 @@ void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event))
  
         					}
      
         					else
      
         					{
      
        -						dc.DrawRectangle( 16, 16, 32, 32 );
      
        +						dc.DrawRectangle(16, 16, 32, 32);
      
         					}
      
        -					if ( GROUP_TYPE_CURSOR != (*g)->control_group->type )
      
        +					if (GROUP_TYPE_CURSOR != g->control_group->type)
      
         					{
      
         						// deadzone circle
      
         						dc.SetBrush(*wxLIGHT_GREY_BRUSH);
      
        -						dc.DrawCircle( 32, 32, ((*g)->control_group)->settings[SETTING_DEADZONE]->value * 32 );
      
        +						dc.DrawCircle(32, 32, g->control_group->settings[SETTING_DEADZONE]->value * 32);
      
         					}
      
         					// raw dot
      
         					dc.SetPen(*wxGREY_PEN);
      
         					dc.SetBrush(*wxGREY_BRUSH);
      
         					// i like the dot better than the cross i think
      
        -					dc.DrawRectangle( xx - 2, yy - 2, 4, 4 );
      
        -					//dc.DrawRectangle( xx-1, 64-yy-4, 2, 8 );
      
        -					//dc.DrawRectangle( xx-4, 64-yy-1, 8, 2 );
      
        +					dc.DrawRectangle(xx - 2, yy - 2, 4, 4);
      
        +					//dc.DrawRectangle(xx-1, 64-yy-4, 2, 8);
      
        +					//dc.DrawRectangle(xx-4, 64-yy-1, 8, 2);
      
         					// adjusted dot
      
         					if (x!=32 || y!=32)
      
         					{
      
         						dc.SetPen(*wxRED_PEN);
      
         						dc.SetBrush(*wxRED_BRUSH);
      
        -						dc.DrawRectangle( x-2, 64-y-2, 4, 4 );
      
        +						dc.DrawRectangle(x-2, 64-y-2, 4, 4);
      
         						// i like the dot better than the cross i think
      
        -						//dc.DrawRectangle( x-1, 64-y-4, 2, 8 );
      
        -						//dc.DrawRectangle( x-4, 64-y-1, 8, 2 );
      
        +						//dc.DrawRectangle(x-1, 64-y-4, 2, 8);
      
        +						//dc.DrawRectangle(x-4, 64-y-1, 8, 2);
      
         					}
      
         				}
      
    @@ -198,64 +195,64 @@ void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event))
  
         				{
      
         					float raw_dot[3];
      
         					float adj_dot[3];
      
        -					const float deadzone = 32 * ((*g)->control_group)->settings[0]->value;
      
        +					const float deadzone = 32 * g->control_group->settings[0]->value;
      
         					// adjusted
      
        -					((ControllerEmu::Force*)(*g)->control_group)->GetState( adj_dot, 32.0, 32-1.5 );
      
        +					((ControllerEmu::Force*)g->control_group)->GetState(adj_dot, 32.0, 32-1.5);
      
         					// raw
      
        -					for ( unsigned int i=0; i<3; ++i )
      
        +					for (unsigned int i=0; i<3; ++i)
      
         					{
      
        -						raw_dot[i] = (*g)->control_group->controls[i*2 + 1]->control_ref->State()
      
        -							- (*g)->control_group->controls[i*2]->control_ref->State();
      
        +						raw_dot[i] = g->control_group->controls[i*2 + 1]->control_ref->State()
      
        +							- g->control_group->controls[i*2]->control_ref->State();
      
         						raw_dot[i] *= 32 - 1; raw_dot[i] += 32;
      
         					}
      
         					// deadzone rect for forward/backward visual
      
         					dc.SetBrush(*wxLIGHT_GREY_BRUSH);
      
         					dc.SetPen(*wxLIGHT_GREY_PEN);
      
        -					dc.DrawRectangle( 0, 32 - deadzone, 64, deadzone * 2 );
      
        +					dc.DrawRectangle(0, 32 - deadzone, 64, deadzone * 2);
      
         					// raw forward/background line
      
         					dc.SetPen(*wxGREY_PEN);
      
         					dc.SetBrush(*wxGREY_BRUSH);
      
        -					dc.DrawRectangle( 0, raw_dot[2] - 1, 64, 2 );
      
        +					dc.DrawRectangle(0, raw_dot[2] - 1, 64, 2);
      
         					// adjusted forward/background line
      
        -					if ( adj_dot[2]!=32 )
      
        +					if (adj_dot[2]!=32)
      
         					{
      
         						dc.SetPen(*wxRED_PEN);
      
         						dc.SetBrush(*wxRED_BRUSH);
      
        -						dc.DrawRectangle( 0, adj_dot[2] - 1, 64, 2 );
      
        +						dc.DrawRectangle(0, adj_dot[2] - 1, 64, 2);
      
         					}
      
         					// a rectangle, for looks i guess
      
         					dc.SetBrush(*wxWHITE_BRUSH);
      
         					dc.SetPen(*wxLIGHT_GREY_PEN);
      
        -					dc.DrawRectangle( 16, 16, 32, 32 );
      
        +					dc.DrawRectangle(16, 16, 32, 32);
      
         					// deadzone square
      
         					dc.SetBrush(*wxLIGHT_GREY_BRUSH);
      
        -					dc.DrawRectangle( 32 - deadzone, 32 - deadzone, deadzone * 2, deadzone * 2 );
      
        +					dc.DrawRectangle(32 - deadzone, 32 - deadzone, deadzone * 2, deadzone * 2);
      
         					// raw dot
      
         					dc.SetPen(*wxGREY_PEN);
      
         					dc.SetBrush(*wxGREY_BRUSH);
      
        -					dc.DrawRectangle( raw_dot[1] - 2, raw_dot[0] - 2, 4, 4 );
      
        +					dc.DrawRectangle(raw_dot[1] - 2, raw_dot[0] - 2, 4, 4);
      
         					// adjusted dot
      
        -					if ( adj_dot[1]!=32 || adj_dot[0]!=32 )
      
        +					if (adj_dot[1]!=32 || adj_dot[0]!=32)
      
         					{
      
         						dc.SetPen(*wxRED_PEN);
      
         						dc.SetBrush(*wxRED_BRUSH);
      
        -						dc.DrawRectangle( adj_dot[1]-2, adj_dot[0]-2, 4, 4 );
      
        +						dc.DrawRectangle(adj_dot[1]-2, adj_dot[0]-2, 4, 4);
      
         					}
      
         				}
      
         				break;
      
         			case GROUP_TYPE_BUTTONS :
      
         				{
      
        -					const unsigned int button_count = ((unsigned int)(*g)->control_group->controls.size());
      
        +					const unsigned int button_count = ((unsigned int)g->control_group->controls.size());
      
         					// draw the shit
      
         					dc.SetPen(*wxGREY_PEN);
      
    @@ -265,23 +262,23 @@ void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event))
  
         						bitmasks[n] = (1 << n);
      
         					unsigned int buttons = 0;
      
        -					((ControllerEmu::Buttons*)(*g)->control_group)->GetState( &buttons, bitmasks );
      
        +					((ControllerEmu::Buttons*)g->control_group)->GetState(&buttons, bitmasks);
      
         					for (unsigned int n = 0; n<button_count; ++n)
      
         					{
      
        -						if ( buttons & bitmasks[n] )
      
        +						if (buttons & bitmasks[n])
      
         						{
      
        -							dc.SetBrush( *wxRED_BRUSH );
      
        +							dc.SetBrush(*wxRED_BRUSH);
      
         						}
      
         						else
      
         						{
      
        -							unsigned char amt = 255 - (*g)->control_group->controls[n]->control_ref->State() * 128;
      
        +							unsigned char amt = 255 - g->control_group->controls[n]->control_ref->State() * 128;
      
         							dc.SetBrush(wxBrush(wxColor(amt, amt, amt)));
      
         						}
      
         						dc.DrawRectangle(n * 12, 0, 14, 12);
      
         						// text
      
        -						const char* const name = (*g)->control_group->controls[n]->name;
      
        +						const char* const name = g->control_group->controls[n]->name;
      
         						// bit of hax so ZL, ZR show up as L, R
      
         						dc.DrawText(StrToWxStr(std::string(1, (name[1] && name[1] < 'a') ? name[1] : name[0])), n*12 + 2, 1);
      
         					}
      
    @@ -292,18 +289,18 @@ void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event))
  
         				break;
      
         			case GROUP_TYPE_TRIGGERS :
      
         				{
      
        -					const unsigned int trigger_count = ((unsigned int)((*g)->control_group->controls.size()));
      
        +					const unsigned int trigger_count = ((unsigned int)(g->control_group->controls.size()));
      
         					// draw the shit
      
         					dc.SetPen(*wxGREY_PEN);
      
        -					ControlState deadzone =  (*g)->control_group->settings[0]->value;
      
        +					ControlState deadzone =  g->control_group->settings[0]->value;
      
         					unsigned int* const trigs = new unsigned int[trigger_count];
      
        -					((ControllerEmu::Triggers*)(*g)->control_group)->GetState( trigs, 64 );
      
        +					((ControllerEmu::Triggers*)g->control_group)->GetState(trigs, 64);
      
        -					for ( unsigned int n = 0; n < trigger_count; ++n )
      
        +					for (unsigned int n = 0; n < trigger_count; ++n)
      
         					{
      
        -						ControlState trig_r = (*g)->control_group->controls[n]->control_ref->State();
      
        +						ControlState trig_r = g->control_group->controls[n]->control_ref->State();
      
         						// outline
      
         						dc.SetPen(*wxGREY_PEN);
      
    @@ -319,7 +316,7 @@ void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event))
  
         						dc.DrawRectangle(0, n*12, trigs[n], 14);
      
         						// text
      
        -						dc.DrawText(StrToWxStr((*g)->control_group->controls[n]->name), 3, n*12 + 1);
      
        +						dc.DrawText(StrToWxStr(g->control_group->controls[n]->name), 3, n*12 + 1);
      
         					}
      
         					delete[] trigs;
      
    @@ -333,29 +330,29 @@ void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event))
  
         				break;
      
         			case GROUP_TYPE_MIXED_TRIGGERS :
      
         				{
      
        -					const unsigned int trigger_count = ((unsigned int)((*g)->control_group->controls.size() / 2));
      
        +					const unsigned int trigger_count = ((unsigned int)(g->control_group->controls.size() / 2));
      
         					// draw the shit
      
         					dc.SetPen(*wxGREY_PEN);
      
        -					ControlState thresh =  (*g)->control_group->settings[0]->value;
      
        +					ControlState thresh = g->control_group->settings[0]->value;
      
        -					for ( unsigned int n = 0; n < trigger_count; ++n )
      
        +					for (unsigned int n = 0; n < trigger_count; ++n)
      
         					{
      
         						dc.SetBrush(*wxRED_BRUSH);
      
        -						ControlState trig_d = (*g)->control_group->controls[n]->control_ref->State();
      
        +						ControlState trig_d = g->control_group->controls[n]->control_ref->State();
      
         						ControlState trig_a = trig_d > thresh ? 1
      
        -							: (*g)->control_group->controls[n+trigger_count]->control_ref->State();
      
        +							: g->control_group->controls[n+trigger_count]->control_ref->State();
      
         						dc.DrawRectangle(0, n*12, 64+20, 14);
      
        -						if ( trig_d <= thresh )
      
        +						if (trig_d <= thresh)
      
         							dc.SetBrush(*wxWHITE_BRUSH);
      
         						dc.DrawRectangle(trig_a*64, n*12, 64+20, 14);
      
         						dc.DrawRectangle(64, n*12, 32, 14);
      
         						// text
      
        -						dc.DrawText(StrToWxStr((*g)->control_group->controls[n+trigger_count]->name), 3, n*12 + 1);
      
        -						dc.DrawText(StrToWxStr(std::string(1, (*g)->control_group->controls[n]->name[0])), 64 + 3, n*12 + 1);
      
        +						dc.DrawText(StrToWxStr(g->control_group->controls[n+trigger_count]->name), 3, n*12 + 1);
      
        +						dc.DrawText(StrToWxStr(std::string(1, g->control_group->controls[n]->name[0])), 64 + 3, n*12 + 1);
      
         					}
      
         					// threshold box
      
    @@ -367,14 +364,14 @@ void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event))
  
         				break;
      
         			case GROUP_TYPE_SLIDER:
      
         				{
      
        -					const ControlState deadzone =  (*g)->control_group->settings[0]->value;
      
        +					const ControlState deadzone = g->control_group->settings[0]->value;
      
        -					ControlState state = (*g)->control_group->controls[1]->control_ref->State() - (*g)->control_group->controls[0]->control_ref->State();
      
        +					ControlState state = g->control_group->controls[1]->control_ref->State() - g->control_group->controls[0]->control_ref->State();
      
         					dc.SetPen(*wxGREY_PEN);
      
         					dc.SetBrush(*wxGREY_BRUSH);
      
         					dc.DrawRectangle(31 + state * 30, 0, 2, 14);
      
        -					((ControllerEmu::Slider*)(*g)->control_group)->GetState(&state, 1);
      
        +					((ControllerEmu::Slider*)g->control_group)->GetState(&state, 1);
      
         					if (state)
      
         					{
      
         						dc.SetPen(*wxRED_PEN);
      
    @@ -399,7 +396,7 @@ void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event))
  
         			dc.DrawRectangle(0, 0, bitmap.GetWidth(), bitmap.GetHeight());
      
         			dc.SelectObject(wxNullBitmap);
      
        -			(*g)->static_bitmap->SetBitmap(bitmap);
      
        +			g->static_bitmap->SetBitmap(bitmap);
      
         		}
      
         	}
      
         }

2  Source/Core/DolphinWX/LogConfigWindow.cpp

show inline notes

View

              
    @@ -66,7 +66,7 @@ void LogConfigWindow::CreateGUIControls()
  
         	m_writeConsoleCB->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &LogConfigWindow::OnWriteConsoleChecked, this);
      
         	m_writeWindowCB = new wxCheckBox(this, wxID_ANY, _("Write to Window"));
      
         	m_writeWindowCB->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &LogConfigWindow::OnWriteWindowChecked, this);
      
        -	m_writeDebuggerCB = NULL;
      
        +	m_writeDebuggerCB = nullptr;
      
         #ifdef _MSC_VER
      
         	if (IsDebuggerPresent())
      
         	{

2  Source/Core/DolphinWX/LogWindow.cpp

show inline notes

View

              
    @@ -54,7 +54,7 @@
  
         	: wxPanel(parent, id, pos, size, style, name)
      
         	, x(0), y(0), winpos(0)
      
         	, Parent(parent), m_ignoreLogTimer(false), m_LogAccess(true)
      
        -	, m_Log(NULL), m_cmdline(NULL), m_FontChoice(NULL)
      
        +	, m_Log(nullptr), m_cmdline(nullptr), m_FontChoice(nullptr)
      
         {
      
         	m_LogManager = LogManager::GetInstance();

2  Source/Core/DolphinWX/LogWindow.h

show inline notes

View

              
    @@ -53,7 +53,7 @@ class CLogWindow : public wxPanel, LogListener
  
         	~CLogWindow();
      
         	void SaveSettings();
      
        -	void Log(LogTypes::LOG_LEVELS, const char *text);
      
        +	void Log(LogTypes::LOG_LEVELS, const char *text) override;
      
         	int x, y, winpos;

16  Source/Core/DolphinWX/Main.cpp

show inline notes

View

              
    @@ -102,7 +102,7 @@
  
         bool wxMsgAlert(const char*, const char*, bool, int);
      
         std::string wxStringTranslator(const char *);
      
        -CFrame* main_frame = NULL;
      
        +CFrame* main_frame = nullptr;
      
         #ifdef WIN32
      
         //Has no error handling.
      
    @@ -204,7 +204,7 @@ bool DolphinApp::OnInit()
  
         			wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
      
         		},
      
         		{
      
        -			wxCMD_LINE_NONE, NULL, NULL, NULL, wxCMD_LINE_VAL_NONE, 0
      
        +			wxCMD_LINE_NONE, nullptr, nullptr, nullptr, wxCMD_LINE_VAL_NONE, 0
      
         		}
      
         	};
      
    @@ -327,11 +327,11 @@ bool DolphinApp::OnInit()
  
         	if (File::Exists("www.dolphin-emulator.com.txt"))
      
         	{
      
         		File::Delete("www.dolphin-emulator.com.txt");
      
        -		MessageBox(NULL,
      
        +		MessageBox(nullptr,
      
         				   L"This version of Dolphin was downloaded from a website stealing money from developers of the emulator. Please "
      
         				   L"download Dolphin from the official website instead: http://dolphin-emu.org/",
      
         				   L"Unofficial version detected", MB_OK | MB_ICONWARNING);
      
        -		ShellExecute(NULL, L"open", L"http://dolphin-emu.org/?ref=badver", NULL, NULL, SW_SHOWDEFAULT);
      
        +		ShellExecute(nullptr, L"open", L"http://dolphin-emu.org/?ref=badver", nullptr, nullptr, SW_SHOWDEFAULT);
      
         		exit(0);
      
         	}
      
         #endif
      
    @@ -351,7 +351,7 @@ bool DolphinApp::OnInit()
  
         		y = wxDefaultCoord;
      
         #endif
      
        -	main_frame = new CFrame((wxFrame*)NULL, wxID_ANY,
      
        +	main_frame = new CFrame((wxFrame*)nullptr, wxID_ANY,
      
         				StrToWxStr(scm_rev_str),
      
         				wxPoint(x, y), wxSize(w, h),
      
         				UseDebugger, BatchMode, UseLogger);
      
    @@ -372,14 +372,14 @@ void DolphinApp::MacOpenFile(const wxString &fileName)
  
         	FileToLoad = fileName;
      
         	LoadFile = true;
      
        -	if (m_afterinit == NULL)
      
        +	if (m_afterinit == nullptr)
      
         		main_frame->BootGame(WxStrToStr(FileToLoad));
      
         }
      
         void DolphinApp::AfterInit(wxTimerEvent& WXUNUSED(event))
      
         {
      
         	delete m_afterinit;
      
        -	m_afterinit = NULL;
      
        +	m_afterinit = nullptr;
      
         	if (!BatchMode)
      
         		main_frame->UpdateGameList();
      
    @@ -538,7 +538,7 @@ void* Host_GetInstance()
  
         #else
      
         void* Host_GetInstance()
      
         {
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
         #endif

8  Source/Core/DolphinWX/Main.h

show inline notes

View

              
    @@ -22,10 +22,10 @@ class DolphinApp : public wxApp
  
         	CFrame* GetCFrame();
      
         private:
      
        -	bool OnInit();
      
        -	int OnExit();
      
        -	void OnFatalException();
      
        -	bool Initialize(int& c, wxChar **v);
      
        +	bool OnInit() override;
      
        +	int OnExit() override;
      
        +	void OnFatalException() override;
      
        +	bool Initialize(int& c, wxChar **v) override;
      
         	void InitLanguageSupport();
      
         	void MacOpenFile(const wxString &fileName);

36  Source/Core/DolphinWX/MainAndroid.cpp

show inline notes

View

              
    @@ -68,7 +68,7 @@ void* Host_GetRenderHandle()
  
         	return surf;
      
         }
      
        -void* Host_GetInstance() { return NULL; }
      
        +void* Host_GetInstance() { return nullptr; }
      
         void Host_UpdateTitle(const char* title)
      
         {
      
    @@ -153,7 +153,7 @@ bool LoadBanner(std::string filename, u32 *Banner)
  
         {
      
         	DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(filename);
      
        -	if (pVolume != NULL)
      
        +	if (pVolume != nullptr)
      
         	{
      
         		bool bIsWad = false;
      
         		if (DiscIO::IsVolumeWadFile(pVolume))
      
    @@ -164,11 +164,11 @@ bool LoadBanner(std::string filename, u32 *Banner)
  
         		// check if we can get some info from the banner file too
      
         		DiscIO::IFileSystem* pFileSystem = DiscIO::CreateFileSystem(pVolume);
      
        -		if (pFileSystem != NULL || bIsWad)
      
        +		if (pFileSystem != nullptr || bIsWad)
      
         		{
      
         			DiscIO::IBannerLoader* pBannerLoader = DiscIO::CreateBannerLoader(*pFileSystem, pVolume);
      
        -			if (pBannerLoader != NULL)
      
        +			if (pBannerLoader != nullptr)
      
         				if (pBannerLoader->IsValid())
      
         				{
      
         					m_names = pBannerLoader->GetNames();
      
    @@ -213,7 +213,7 @@ bool LoadBanner(std::string filename, u32 *Banner)
  
         		return m_volume_names[0];
      
         	// No usable name, return filename (better than nothing)
      
         	std::string name;
      
        -	SplitPath(filename, NULL, &name, NULL);
      
        +	SplitPath(filename, nullptr, &name, nullptr);
      
         	return name;
      
         }
      
    @@ -247,14 +247,14 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onTouchAxisE
  
         }
      
         JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onGamePadEvent(JNIEnv *env, jobject obj, jstring jDevice, jint Button, jint Action)
      
         {
      
        -	const char *Device = env->GetStringUTFChars(jDevice, NULL);
      
        +	const char *Device = env->GetStringUTFChars(jDevice, nullptr);
      
         	std::string strDevice = std::string(Device);
      
         	ButtonManager::GamepadEvent(strDevice, Button, Action);
      
         	env->ReleaseStringUTFChars(jDevice, Device);
      
         }
      
         JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onGamePadMoveEvent(JNIEnv *env, jobject obj, jstring jDevice, jint Axis, jfloat Value)
      
         {
      
        -	const char *Device = env->GetStringUTFChars(jDevice, NULL);
      
        +	const char *Device = env->GetStringUTFChars(jDevice, nullptr);
      
         	std::string strDevice = std::string(Device);
      
         	ButtonManager::GamepadAxisEvent(strDevice, Axis, Value);
      
         	env->ReleaseStringUTFChars(jDevice, Device);
      
    @@ -262,7 +262,7 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onGamePadMov
  
         JNIEXPORT jintArray JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetBanner(JNIEnv *env, jobject obj, jstring jFile)
      
         {
      
        -	const char *File = env->GetStringUTFChars(jFile, NULL);
      
        +	const char *File = env->GetStringUTFChars(jFile, nullptr);
      
         	jintArray Banner = env->NewIntArray(DVD_BANNER_WIDTH * DVD_BANNER_HEIGHT);
      
         	u32 uBanner[DVD_BANNER_WIDTH * DVD_BANNER_HEIGHT];
      
         	if (LoadBanner(File, uBanner))
      
    @@ -274,7 +274,7 @@ JNIEXPORT jintArray JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetBann
  
         }
      
         JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetTitle(JNIEnv *env, jobject obj, jstring jFile)
      
         {
      
        -	const char *File = env->GetStringUTFChars(jFile, NULL);
      
        +	const char *File = env->GetStringUTFChars(jFile, nullptr);
      
         	std::string Name = GetName(File);
      
         	m_names.clear();
      
         	m_volume_names.clear();
      
    @@ -306,10 +306,10 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_eglBindAPI(J
  
         JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetConfig(JNIEnv *env, jobject obj, jstring jFile, jstring jKey, jstring jValue, jstring jDefault)
      
         {
      
         	IniFile ini;
      
        -	const char *File = env->GetStringUTFChars(jFile, NULL);
      
        -	const char *Key = env->GetStringUTFChars(jKey, NULL);
      
        -	const char *Value = env->GetStringUTFChars(jValue, NULL);
      
        -	const char *Default = env->GetStringUTFChars(jDefault, NULL);
      
        +	const char *File = env->GetStringUTFChars(jFile, nullptr);
      
        +	const char *Key = env->GetStringUTFChars(jKey, nullptr);
      
        +	const char *Value = env->GetStringUTFChars(jValue, nullptr);
      
        +	const char *Default = env->GetStringUTFChars(jDefault, nullptr);
      
         	ini.Load(File::GetUserPath(D_CONFIG_IDX) + std::string(File));
      
         	std::string value;
      
    @@ -326,10 +326,10 @@ JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetConfig
  
         JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetConfig(JNIEnv *env, jobject obj, jstring jFile, jstring jKey, jstring jValue, jstring jDefault)
      
         {
      
         	IniFile ini;
      
        -	const char *File = env->GetStringUTFChars(jFile, NULL);
      
        -	const char *Key = env->GetStringUTFChars(jKey, NULL);
      
        -	const char *Value = env->GetStringUTFChars(jValue, NULL);
      
        -	const char *Default = env->GetStringUTFChars(jDefault, NULL);
      
        +	const char *File = env->GetStringUTFChars(jFile, nullptr);
      
        +	const char *Key = env->GetStringUTFChars(jKey, nullptr);
      
        +	const char *Value = env->GetStringUTFChars(jValue, nullptr);
      
        +	const char *Default = env->GetStringUTFChars(jDefault, nullptr);
      
         	ini.Load(File::GetUserPath(D_CONFIG_IDX) + std::string(File));
      
    @@ -344,7 +344,7 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetConfig(JN
  
         JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetFilename(JNIEnv *env, jobject obj, jstring jFile)
      
         {
      
        -	const char *File = env->GetStringUTFChars(jFile, NULL);
      
        +	const char *File = env->GetStringUTFChars(jFile, nullptr);
      
         	g_filename = std::string(File);

14  Source/Core/DolphinWX/MainNoGUI.cpp

show inline notes

View

              
    @@ -60,10 +60,10 @@ void Host_Message(int Id)
  
         void* Host_GetRenderHandle()
      
         {
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
        -void* Host_GetInstance() { return NULL; }
      
        +void* Host_GetInstance() { return nullptr; }
      
         void Host_UpdateTitle(const char* title){};
      
    @@ -293,10 +293,10 @@ int main(int argc, char* argv[])
  
         #endif
      
         	int ch, help = 0;
      
         	struct option longopts[] = {
      
        -		{ "exec",    no_argument, NULL, 'e' },
      
        -		{ "help",    no_argument, NULL, 'h' },
      
        -		{ "version", no_argument, NULL, 'v' },
      
        -		{ NULL,      0,           NULL,  0  }
      
        +		{ "exec",    no_argument, nullptr, 'e' },
      
        +		{ "help",    no_argument, nullptr, 'h' },
      
        +		{ "version", no_argument, nullptr, 'v' },
      
        +		{ nullptr,      0,           nullptr,  0  }
      
         	};
      
         	while ((ch = getopt_long(argc, argv, "eh?v", longopts, 0)) != -1)
      
    @@ -337,7 +337,7 @@ int main(int argc, char* argv[])
  
         	GLWin.platform = EGL_PLATFORM_NONE;
      
         #endif
      
         #if HAVE_WAYLAND
      
        -	GLWin.wl_display = NULL;
      
        +	GLWin.wl_display = nullptr;
      
         #endif
      
         	// No use running the loop when booting fails

14  Source/Core/DolphinWX/MemcardManager.cpp

show inline notes

View

              
    @@ -113,8 +113,8 @@ wxBitmap wxBitmapFromMemoryRGBA(const unsigned char* data, u32 width, u32 height
  
         CMemcardManager::CMemcardManager(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& position, const wxSize& size, long style)
      
         	: wxDialog(parent, id, title, position, size, style)
      
         {
      
        -	memoryCard[SLOT_A]=NULL;
      
        -	memoryCard[SLOT_B]=NULL;
      
        +	memoryCard[SLOT_A]=nullptr;
      
        +	memoryCard[SLOT_B]=nullptr;
      
         	mcmSettings.twoCardsLoaded = false;
      
         	if (!LoadSettings())
      
    @@ -135,12 +135,12 @@ wxBitmap wxBitmapFromMemoryRGBA(const unsigned char* data, u32 width, u32 height
  
         	if (memoryCard[SLOT_A])
      
         	{
      
         		delete memoryCard[SLOT_A];
      
        -		memoryCard[SLOT_A] = NULL;
      
        +		memoryCard[SLOT_A] = nullptr;
      
         	}
      
         	if (memoryCard[SLOT_B])
      
         	{
      
         		delete memoryCard[SLOT_B];
      
        -		memoryCard[SLOT_B] = NULL;
      
        +		memoryCard[SLOT_B] = nullptr;
      
         	}
      
         	SaveSettings();
      
         }
      
    @@ -320,7 +320,7 @@ void CMemcardManager::ChangePath(int slot)
  
         			if (memoryCard[slot])
      
         			{
      
         				delete memoryCard[slot];
      
        -				memoryCard[slot] = NULL;
      
        +				memoryCard[slot] = nullptr;
      
         			}
      
         			mcmSettings.twoCardsLoaded = false;
      
         			m_MemcardPath[slot]->SetPath(wxEmptyString);
      
    @@ -598,14 +598,14 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
  
         	{
      
         		std::string path1, path2, mpath;
      
         		mpath = WxStrToStr(m_MemcardPath[slot]->GetPath());
      
        -		SplitPath(mpath, &path1, &path2, NULL);
      
        +		SplitPath(mpath, &path1, &path2, nullptr);
      
         		path1 += path2;
      
         		File::CreateDir(path1);
      
         		if(PanicYesNoT("Warning: This will overwrite any existing saves that are in the folder:\n"
      
         					"%s\nand have the same name as a file on your memcard\nContinue?", path1.c_str()))
      
         		for (int i = 0; i < DIRLEN; i++)
      
         		{
      
        -			CopyDeleteSwitch(memoryCard[slot]->ExportGci(i, NULL, path1), -1);
      
        +			CopyDeleteSwitch(memoryCard[slot]->ExportGci(i, nullptr, path1), -1);
      
         		}
      
         		break;
      
         	}

18  Source/Core/DolphinWX/NetWindow.cpp

show inline notes

View

              
    @@ -54,10 +54,10 @@
  
         	EVT_COMMAND(wxID_ANY, wxEVT_THREAD, NetPlayDiag::OnThread)
      
         END_EVENT_TABLE()
      
        -static NetPlayServer* netplay_server = NULL;
      
        -static NetPlayClient* netplay_client = NULL;
      
        +static NetPlayServer* netplay_server = nullptr;
      
        +static NetPlayClient* netplay_client = nullptr;
      
         extern CFrame* main_frame;
      
        -NetPlayDiag *NetPlayDiag::npd = NULL;
      
        +NetPlayDiag *NetPlayDiag::npd = nullptr;
      
         std::string BuildGameName(const GameListItem& game)
      
         {
      
    @@ -227,7 +227,7 @@ void FillWithGameNames(wxListBox* game_lbox, const CGameListCtrl& game_list)
  
         	netplay_section.Set("HostPort", WxStrToStr(m_host_port_text->GetValue()));
      
         	inifile.Save(dolphin_ini);
      
        -	main_frame->g_NetPlaySetupDiag = NULL;
      
        +	main_frame->g_NetPlaySetupDiag = nullptr;
      
         }
      
         void NetPlaySetupDiag::MakeNetPlayDiag(int port, const std::string &game, bool is_hosting)
      
    @@ -311,7 +311,7 @@ void NetPlaySetupDiag::OnQuit(wxCommandEvent&)
  
         		const std::string& game, const bool is_hosting)
      
         	: wxFrame(parent, wxID_ANY, wxT(NETPLAY_TITLEBAR))
      
         	, m_selected_game(game)
      
        -	, m_start_btn(NULL)
      
        +	, m_start_btn(nullptr)
      
         	, m_game_list(game_list)
      
         {
      
         	wxPanel* const panel = new wxPanel(this);
      
    @@ -409,14 +409,14 @@ void NetPlaySetupDiag::OnQuit(wxCommandEvent&)
  
         	if (netplay_client)
      
         	{
      
         		delete netplay_client;
      
        -		netplay_client = NULL;
      
        +		netplay_client = nullptr;
      
         	}
      
         	if (netplay_server)
      
         	{
      
         		delete netplay_server;
      
        -		netplay_server = NULL;
      
        +		netplay_server = nullptr;
      
         	}
      
        -	npd = NULL;
      
        +	npd = nullptr;
      
         }
      
         void NetPlayDiag::OnChat(wxCommandEvent&)
      
    @@ -724,6 +724,6 @@ void PadMapDiag::OnAdjust(wxCommandEvent& event)
  
         void NetPlay::StopGame()
      
         {
      
        -	if (netplay_client != NULL)
      
        +	if (netplay_client != nullptr)
      
         		netplay_client->Stop();
      
         }

16  Source/Core/DolphinWX/NetWindow.h

show inline notes

View

              
    @@ -67,19 +67,19 @@ class NetPlayDiag : public wxFrame, public NetPlayUI
  
         	void OnStart(wxCommandEvent& event);
      
         	// implementation of NetPlayUI methods
      
        -	void BootGame(const std::string& filename);
      
        -	void StopGame();
      
        +	void BootGame(const std::string& filename) override;
      
        +	void StopGame() override;
      
        -	void Update();
      
        -	void AppendChat(const std::string& msg);
      
        +	void Update() override;
      
        +	void AppendChat(const std::string& msg) override;
      
        -	void OnMsgChangeGame(const std::string& filename);
      
        -	void OnMsgStartGame();
      
        -	void OnMsgStopGame();
      
        +	void OnMsgChangeGame(const std::string& filename) override;
      
        +	void OnMsgStartGame() override;
      
        +	void OnMsgStopGame() override;
      
         	static NetPlayDiag *&GetInstance() { return npd; };
      
        -	bool IsRecording();
      
        +	bool IsRecording() override;
      
         private:
      
             DECLARE_EVENT_TABLE()

2  Source/Core/DolphinWX/TASInputDlg.cpp

show inline notes

View

              
    @@ -736,7 +736,7 @@ bool TASInputDlg::TASHasFocus()
  
         	if (wxWindow::FindFocus() == this)
      
         		return true;
      
        -	else if (wxWindow::FindFocus() != NULL &&
      
        +	else if (wxWindow::FindFocus() != nullptr &&
      
         				wxWindow::FindFocus()->GetParent() == this)
      
         		return true;
      
         	else

4  Source/Core/DolphinWX/VideoConfigDiag.cpp

show inline notes

View

              
    @@ -161,7 +161,7 @@ wxArrayString GetListOfResolutions()
  
         	dmi.dmSize = sizeof(dmi);
      
         	std::vector<std::string> resos;
      
        -	while (EnumDisplaySettings(NULL, iModeNum++, &dmi) != 0)
      
        +	while (EnumDisplaySettings(nullptr, iModeNum++, &dmi) != 0)
      
         	{
      
         		char res[100];
      
         		sprintf(res, "%dx%d", dmi.dmPelsWidth, dmi.dmPelsHeight);
      
    @@ -177,7 +177,7 @@ wxArrayString GetListOfResolutions()
  
         #elif defined(HAVE_XRANDR) && HAVE_XRANDR
      
         	main_frame->m_XRRConfig->AddResolutions(retlist);
      
         #elif defined(__APPLE__)
      
        -	CFArrayRef modes = CGDisplayCopyAllDisplayModes(CGMainDisplayID(), NULL);
      
        +	CFArrayRef modes = CGDisplayCopyAllDisplayModes(CGMainDisplayID(), nullptr);
      
         	for (CFIndex i = 0; i < CFArrayGetCount(modes); i++)
      
         	{
      
         		std::stringstream res;

4  Source/Core/DolphinWX/VideoConfigDiag.h

show inline notes

View

              
    @@ -68,7 +68,7 @@ class IntegerSetting : public wxSpinCtrl
  
         class SettingChoice : public wxChoice
      
         {
      
         public:
      
        -	SettingChoice(wxWindow* parent, int &setting, const wxString& tooltip, int num = 0, const wxString choices[] = NULL, long style = 0);
      
        +	SettingChoice(wxWindow* parent, int &setting, const wxString& tooltip, int num = 0, const wxString choices[] = nullptr, long style = 0);
      
         	void UpdateValue(wxCommandEvent& ev);
      
         private:
      
         	int &m_setting;
      
    @@ -178,7 +178,7 @@ class VideoConfigDiag : public wxDialog
  
         	// Creates controls and connects their enter/leave window events to Evt_Enter/LeaveControl
      
         	SettingCheckBox* CreateCheckBox(wxWindow* parent, const wxString& label, const wxString& description, bool &setting, bool reverse = false, long style = 0);
      
        -	SettingChoice* CreateChoice(wxWindow* parent, int& setting, const wxString& description, int num = 0, const wxString choices[] = NULL, long style = 0);
      
        +	SettingChoice* CreateChoice(wxWindow* parent, int& setting, const wxString& description, int num = 0, const wxString choices[] = nullptr, long style = 0);
      
         	SettingRadioButton* CreateRadioButton(wxWindow* parent, const wxString& label, const wxString& description, bool &setting, bool reverse = false, long style = 0);
      
         	// Same as above but only connects enter/leave window events

12  Source/Core/DolphinWX/X11Utils.cpp

show inline notes

View

              
    @@ -100,9 +100,9 @@ void InhibitScreensaver(Display *dpy, Window win, bool suspend)
  
         		(char *)"xdg-screensaver",
      
         		(char *)(suspend ? "suspend" : "resume"),
      
         		id,
      
        -		NULL};
      
        +		nullptr};
      
         	pid_t pid;
      
        -	if (!posix_spawnp(&pid, "xdg-screensaver", NULL, NULL, argv, environ))
      
        +	if (!posix_spawnp(&pid, "xdg-screensaver", nullptr, nullptr, argv, environ))
      
         	{
      
         		int status;
      
         		while (waitpid (pid, &status, 0) == -1);
      
    @@ -115,7 +115,7 @@ void InhibitScreensaver(Display *dpy, Window win, bool suspend)
  
         XRRConfiguration::XRRConfiguration(Display *_dpy, Window _win)
      
         	: dpy(_dpy)
      
         	, win(_win)
      
        -	, screenResources(NULL), outputInfo(NULL), crtcInfo(NULL)
      
        +	, screenResources(nullptr), outputInfo(nullptr), crtcInfo(nullptr)
      
         	, fullMode(0)
      
         	, fs_fb_width(0), fs_fb_height(0), fs_fb_width_mm(0), fs_fb_height_mm(0)
      
         	, bValid(true), bIsFullscreen(false)
      
    @@ -165,18 +165,18 @@ void XRRConfiguration::Update()
  
         	if (outputInfo)
      
         	{
      
         		XRRFreeOutputInfo(outputInfo);
      
        -		outputInfo = NULL;
      
        +		outputInfo = nullptr;
      
         	}
      
         	if (crtcInfo)
      
         	{
      
         		XRRFreeCrtcInfo(crtcInfo);
      
        -		crtcInfo = NULL;
      
        +		crtcInfo = nullptr;
      
         	}
      
         	fullMode = 0;
      
         	// Get the resolution setings for fullscreen mode
      
         	unsigned int fullWidth, fullHeight;
      
        -	char *output_name = NULL;
      
        +	char *output_name = nullptr;
      
         	if (SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution.find(':') ==
      
         			std::string::npos)
      
         	{

10  Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp

show inline notes

View

              
    @@ -230,7 +230,7 @@ void ControllerInterface::UpdateReference(ControllerInterface::ControlReference*
  
         	, const DeviceQualifier& default_device) const
      
         {
      
         	delete ref->parsed_expression;
      
        -	ref->parsed_expression = NULL;
      
        +	ref->parsed_expression = nullptr;
      
         	ControlFinder finder(*this, default_device, ref->is_input);
      
         	ref->parse_error = ParseExpression(ref->expression, finder, &ref->parsed_expression);
      
    @@ -244,7 +244,7 @@ void ControllerInterface::UpdateReference(ControllerInterface::ControlReference*
  
         // which is useful for those crazy flightsticks that have certain buttons that are always held down
      
         // or some crazy axes or something
      
         // upon input, return pointer to detected Control
      
        -// else return NULL
      
        +// else return nullptr
      
         //
      
         Device::Control* ControllerInterface::InputReference::Detect(const unsigned int ms, Device* const device)
      
         {
      
    @@ -252,7 +252,7 @@ void ControllerInterface::UpdateReference(ControllerInterface::ControlReference*
  
         	std::vector<bool> states(device->Inputs().size());
      
         	if (device->Inputs().size() == 0)
      
        -		return NULL;
      
        +		return nullptr;
      
         	// get starting state of all inputs,
      
         	// so we can ignore those that were activated at time of Detect start
      
    @@ -285,7 +285,7 @@ void ControllerInterface::UpdateReference(ControllerInterface::ControlReference*
  
         	}
      
         	// no input was detected
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
         //
      
    @@ -317,5 +317,5 @@ void ControllerInterface::UpdateReference(ControllerInterface::ControlReference*
  
         		State(0);
      
         		device->UpdateOutput();
      
         	}
      
        -	return NULL;
      
        +	return nullptr;
      
         }

12  Source/Core/InputCommon/ControllerInterface/ControllerInterface.h

show inline notes

View

              
    @@ -83,7 +83,7 @@ class ControllerInterface : public DeviceContainer
  
         		}
      
         	protected:
      
        -		ControlReference(const bool _is_input) : range(1), is_input(_is_input), parsed_expression(NULL) {}
      
        +		ControlReference(const bool _is_input) : range(1), is_input(_is_input), parsed_expression(nullptr) {}
      
         		ciface::ExpressionParser::Expression *parsed_expression;
      
         	};
      
    @@ -96,8 +96,8 @@ class ControllerInterface : public DeviceContainer
  
         	{
      
         	public:
      
         		InputReference() : ControlReference(true) {}
      
        -		ControlState State(const ControlState state);
      
        -		Device::Control* Detect(const unsigned int ms, Device* const device);
      
        +		ControlState State(const ControlState state) override;
      
        +		Device::Control* Detect(const unsigned int ms, Device* const device) override;
      
         	};
      
         	//
      
    @@ -109,11 +109,11 @@ class ControllerInterface : public DeviceContainer
  
         	{
      
         	public:
      
         		OutputReference() : ControlReference(false) {}
      
        -		ControlState State(const ControlState state);
      
        -		Device::Control* Detect(const unsigned int ms, Device* const device);
      
        +		ControlState State(const ControlState state) override;
      
        +		Device::Control* Detect(const unsigned int ms, Device* const device) override;
      
         	};
      
        -	ControllerInterface() : m_is_init(false), m_hwnd(NULL) {}
      
        +	ControllerInterface() : m_is_init(false), m_hwnd(nullptr) {}
      
         	void SetHwnd(void* const hwnd);
      
         	void Initialize();

2  Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp

show inline notes

View

              
    @@ -48,7 +48,7 @@ BOOL CALLBACK DIEnumDevicesCallback(LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef)
  
         void Init(std::vector<Core::Device*>& devices, HWND hwnd)
      
         {
      
         	IDirectInput8* idi8;
      
        -	if (FAILED(DirectInput8Create(GetModuleHandle(NULL), DIRECTINPUT_VERSION, IID_IDirectInput8, (LPVOID*)&idi8, NULL)))
      
        +	if (FAILED(DirectInput8Create(GetModuleHandle(nullptr), DIRECTINPUT_VERSION, IID_IDirectInput8, (LPVOID*)&idi8, nullptr)))
      
         		return;
      
         	InitKeyboardMouse(idi8, devices, hwnd);

46  Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp

show inline notes

View

              
    @@ -24,47 +24,47 @@
  
         void GetXInputGUIDS( std::vector<DWORD>& guids )
      
         {
      
        -#define SAFE_RELEASE(p) { if(p) { (p)->Release(); (p)=NULL; } }
      
        +#define SAFE_RELEASE(p) { if(p) { (p)->Release(); (p)=nullptr; } }
      
        -	IWbemLocator*           pIWbemLocator  = NULL;
      
        -	IEnumWbemClassObject*   pEnumDevices   = NULL;
      
        +	IWbemLocator*           pIWbemLocator  = nullptr;
      
        +	IEnumWbemClassObject*   pEnumDevices   = nullptr;
      
         	IWbemClassObject*       pDevices[20]   = {0};
      
        -	IWbemServices*          pIWbemServices = NULL;
      
        -	BSTR                    bstrNamespace  = NULL;
      
        -	BSTR                    bstrDeviceID   = NULL;
      
        -	BSTR                    bstrClassName  = NULL;
      
        +	IWbemServices*          pIWbemServices = nullptr;
      
        +	BSTR                    bstrNamespace  = nullptr;
      
        +	BSTR                    bstrDeviceID   = nullptr;
      
        +	BSTR                    bstrClassName  = nullptr;
      
         	DWORD                   uReturned      = 0;
      
         	VARIANT                 var;
      
         	HRESULT                 hr;
      
         	// CoInit if needed
      
        -	hr = CoInitialize(NULL);
      
        +	hr = CoInitialize(nullptr);
      
         	bool bCleanupCOM = SUCCEEDED(hr);
      
         	// Create WMI
      
         	hr = CoCreateInstance(__uuidof(WbemLocator),
      
        -	                      NULL,
      
        +	                      nullptr,
      
         	                      CLSCTX_INPROC_SERVER,
      
         	                      __uuidof(IWbemLocator),
      
         	                      (LPVOID*) &pIWbemLocator);
      
        -	if (FAILED(hr) || pIWbemLocator == NULL)
      
        +	if (FAILED(hr) || pIWbemLocator == nullptr)
      
         		goto LCleanup;
      
        -	bstrNamespace = SysAllocString(L"\\\\.\\root\\cimv2");if(bstrNamespace == NULL) goto LCleanup;
      
        -	bstrClassName = SysAllocString(L"Win32_PNPEntity");   if(bstrClassName == NULL) goto LCleanup;
      
        -	bstrDeviceID  = SysAllocString(L"DeviceID");          if(bstrDeviceID == NULL)  goto LCleanup;
      
        +	bstrNamespace = SysAllocString(L"\\\\.\\root\\cimv2");if(bstrNamespace == nullptr) goto LCleanup;
      
        +	bstrClassName = SysAllocString(L"Win32_PNPEntity");   if(bstrClassName == nullptr) goto LCleanup;
      
        +	bstrDeviceID  = SysAllocString(L"DeviceID");          if(bstrDeviceID == nullptr)  goto LCleanup;
      
         	// Connect to WMI
      
        -	hr = pIWbemLocator->ConnectServer(bstrNamespace, NULL, NULL, 0L, 0L, NULL, NULL, &pIWbemServices);
      
        -	if (FAILED(hr) || pIWbemServices == NULL)
      
        +	hr = pIWbemLocator->ConnectServer(bstrNamespace, nullptr, nullptr, 0L, 0L, nullptr, nullptr, &pIWbemServices);
      
        +	if (FAILED(hr) || pIWbemServices == nullptr)
      
         		goto LCleanup;
      
         	// Switch security level to IMPERSONATE.
      
        -	CoSetProxyBlanket(pIWbemServices, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL,
      
        -	                  RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE);
      
        +	CoSetProxyBlanket(pIWbemServices, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, nullptr,
      
        +	                  RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, nullptr, EOAC_NONE);
      
        -	hr = pIWbemServices->CreateInstanceEnum(bstrClassName, 0, NULL, &pEnumDevices);
      
        -	if (FAILED(hr) || pEnumDevices == NULL)
      
        +	hr = pIWbemServices->CreateInstanceEnum(bstrClassName, 0, nullptr, &pEnumDevices);
      
        +	if (FAILED(hr) || pEnumDevices == nullptr)
      
         		goto LCleanup;
      
         	// Loop over all devices
      
    @@ -78,8 +78,8 @@ void GetXInputGUIDS( std::vector<DWORD>& guids )
  
         		for (UINT iDevice = 0; iDevice < uReturned; ++iDevice)
      
         		{
      
         			// For each device, get its device ID
      
        -			hr = pDevices[iDevice]->Get(bstrDeviceID, 0L, &var, NULL, NULL);
      
        -			if (SUCCEEDED(hr) && var.vt == VT_BSTR && var.bstrVal != NULL)
      
        +			hr = pDevices[iDevice]->Get(bstrDeviceID, 0L, &var, nullptr, nullptr);
      
        +			if (SUCCEEDED(hr) && var.vt == VT_BSTR && var.bstrVal != nullptr)
      
         			{
      
         				// Check if the device ID contains "IG_".  If it does, then it's an XInput device
      
         				// This information can not be found from DirectInput
      
    @@ -140,7 +140,7 @@ void InitJoystick(IDirectInput8* const idi8, std::vector<Core::Device*>& devices
  
         			continue;
      
         		LPDIRECTINPUTDEVICE8 js_device;
      
        -		if (SUCCEEDED(idi8->CreateDevice(joystick.guidInstance, &js_device, NULL)))
      
        +		if (SUCCEEDED(idi8->CreateDevice(joystick.guidInstance, &js_device, nullptr)))
      
         		{
      
         			if (SUCCEEDED(js_device->SetDataFormat(&c_dfDIJoystick)))
      
         			{
      
    @@ -148,7 +148,7 @@ void InitJoystick(IDirectInput8* const idi8, std::vector<Core::Device*>& devices
  
         				{
      
         					//PanicAlert("SetCooperativeLevel(DISCL_EXCLUSIVE) failed!");
      
         					// fall back to non-exclusive mode, with no rumble
      
        -					if (FAILED(js_device->SetCooperativeLevel(NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE)))
      
        +					if (FAILED(js_device->SetCooperativeLevel(nullptr, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE)))
      
         					{
      
         						//PanicAlert("SetCooperativeLevel failed!");
      
         						js_device->Release();

12  Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp

show inline notes

View

              
    @@ -52,20 +52,20 @@ void InitKeyboardMouse(IDirectInput8* const idi8, std::vector<Core::Device*>& de
  
         	// if that's dumb, I will make a VirtualDevice class that just uses ranges of inputs/outputs from other devices
      
         	// so there can be a separated Keyboard and mouse, as well as combined KeyboardMouse
      
        -	LPDIRECTINPUTDEVICE8 kb_device = NULL;
      
        -	LPDIRECTINPUTDEVICE8 mo_device = NULL;
      
        +	LPDIRECTINPUTDEVICE8 kb_device = nullptr;
      
        +	LPDIRECTINPUTDEVICE8 mo_device = nullptr;
      
        -	if (SUCCEEDED(idi8->CreateDevice( GUID_SysKeyboard, &kb_device, NULL)))
      
        +	if (SUCCEEDED(idi8->CreateDevice( GUID_SysKeyboard, &kb_device, nullptr)))
      
         	{
      
         		if (SUCCEEDED(kb_device->SetDataFormat(&c_dfDIKeyboard)))
      
         		{
      
        -			if (SUCCEEDED(kb_device->SetCooperativeLevel(NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE)))
      
        +			if (SUCCEEDED(kb_device->SetCooperativeLevel(nullptr, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE)))
      
         			{
      
        -				if (SUCCEEDED(idi8->CreateDevice( GUID_SysMouse, &mo_device, NULL )))
      
        +				if (SUCCEEDED(idi8->CreateDevice( GUID_SysMouse, &mo_device, nullptr )))
      
         				{
      
         					if (SUCCEEDED(mo_device->SetDataFormat(&c_dfDIMouse2)))
      
         					{
      
        -						if (SUCCEEDED(mo_device->SetCooperativeLevel(NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE)))
      
        +						if (SUCCEEDED(mo_device->SetCooperativeLevel(nullptr, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE)))
      
         						{
      
         							devices.push_back(new KeyboardMouse(kb_device, mo_device));
      
         							return;

8  Source/Core/InputCommon/ControllerInterface/Device.cpp

show inline notes

View

              
    @@ -46,7 +46,7 @@ void Device::AddOutput(Device::Output* const o)
  
         			return input;
      
         	}
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
         Device::Output* Device::FindOutput(const std::string &name) const
      
    @@ -57,7 +57,7 @@ void Device::AddOutput(Device::Output* const o)
  
         			return output;
      
         	}
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
         //
      
    @@ -151,7 +151,7 @@ Device* DeviceContainer::FindDevice(const DeviceQualifier& devq) const
  
         			return d;
      
         	}
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
         Device::Input* DeviceContainer::FindInput(const std::string& name, const Device* def_dev) const
      
    @@ -171,7 +171,7 @@ Device* DeviceContainer::FindDevice(const DeviceQualifier& devq) const
  
         			return i;
      
         	}
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
         Device::Output* DeviceContainer::FindOutput(const std::string& name, const Device* def_dev) const

12  Source/Core/InputCommon/ControllerInterface/Device.h

show inline notes

View

              
    @@ -42,8 +42,8 @@ class Device
  
         		virtual std::string GetName() const = 0;
      
         		virtual ~Control() {}
      
        -		virtual Input* ToInput() { return NULL; }
      
        -		virtual Output* ToOutput() { return NULL; }
      
        +		virtual Input* ToInput() { return nullptr; }
      
        +		virtual Output* ToOutput() { return nullptr; }
      
         	};
      
         	//
      
    @@ -59,7 +59,7 @@ class Device
  
         		virtual ControlState GetState() const = 0;
      
        -		Input* ToInput() { return this; }
      
        +		Input* ToInput() override { return this; }
      
         	};
      
         	//
      
    @@ -74,7 +74,7 @@ class Device
  
         		virtual void SetState(ControlState state) = 0;
      
        -		Output* ToOutput() { return this; }
      
        +		Output* ToOutput() override { return this; }
      
         	};
      
         	virtual ~Device();
      
    @@ -104,12 +104,12 @@ class Device
  
         			: m_low(*low), m_high(*high)
      
         		{}
      
        -		ControlState GetState() const
      
        +		ControlState GetState() const override
      
         		{
      
         			return (1 + m_high.GetState() - m_low.GetState()) / 2;
      
         		}
      
        -		std::string GetName() const
      
        +		std::string GetName() const override
      
         		{
      
         			return m_low.GetName() + *m_high.GetName().rbegin();
      
         		}

6  Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp

show inline notes

View

              
    @@ -357,7 +357,7 @@ Device *ControlFinder::FindDevice(ControlQualifier qualifier)
  
         {
      
         	Device *device = FindDevice(qualifier);
      
         	if (!device)
      
        -		return NULL;
      
        +		return nullptr;
      
         	if (is_input)
      
         		return device->FindInput(qualifier.control_name);
      
    @@ -414,7 +414,7 @@ class Parser
  
         		case TOK_CONTROL:
      
         			{
      
         				Device::Control *control = finder.FindControl(tok.qualifier);
      
        -				if (control == NULL)
      
        +				if (control == nullptr)
      
         					return EXPRESSION_PARSE_NO_DEVICE;
      
         				*expr_out = new ControlExpression(tok.qualifier, control);
      
    @@ -539,7 +539,7 @@ ExpressionParseStatus ParseExpressionInner(std::string str, ControlFinder &finde
  
         {
      
         	ExpressionParseStatus status;
      
         	Expression *expr;
      
        -	*expr_out = NULL;
      
        +	*expr_out = nullptr;
      
         	if (str == "")
      
         		return EXPRESSION_PARSE_SUCCESS;

2  Source/Core/InputCommon/ControllerInterface/ExpressionParser.h

show inline notes

View

              
    @@ -47,7 +47,7 @@ class ControlFinder
  
         class Expression
      
         {
      
         public:
      
        -	Expression() : node(NULL) {}
      
        +	Expression() : node(nullptr) {}
      
         	Expression(ExpressionNode *node);
      
         	~Expression();
      
         	ControlState GetValue();

4  Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp

show inline notes

View

              
    @@ -102,7 +102,7 @@ bool ForceFeedbackDevice::InitForceFeedback(const LPDIRECTINPUTDEVICE8 device, i
  
         		}
      
         		LPDIRECTINPUTEFFECT pEffect;
      
        -		if (SUCCEEDED(device->CreateEffect(f.guid, &eff, &pEffect, NULL)))
      
        +		if (SUCCEEDED(device->CreateEffect(f.guid, &eff, &pEffect, nullptr)))
      
         		{
      
         			m_state_out.push_back(EffectState(pEffect));
      
    @@ -155,7 +155,7 @@ bool ForceFeedbackDevice::UpdateOutput()
  
         				ok_count += SUCCEEDED(state.iface->Stop());
      
         			}
      
        -			state.params = NULL;
      
        +			state.params = nullptr;
      
         		}
      
         		else
      
         		{

2  Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h

show inline notes

View

              
    @@ -29,7 +29,7 @@ class ForceFeedbackDevice : public Core::Device
  
         private:
      
         	struct EffectState
      
         	{
      
        -		EffectState(LPDIRECTINPUTEFFECT eff) : iface(eff), params(NULL), size(0) {}
      
        +		EffectState(LPDIRECTINPUTEFFECT eff) : iface(eff), params(nullptr), size(0) {}
      
         		LPDIRECTINPUTEFFECT iface;
      
         		void*               params; // null when force hasn't changed

4  Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h

show inline notes

View

              
    @@ -72,11 +72,11 @@ class IUnknownImpl : public IUnknown
  
         	HRESULT QueryInterface(REFIID iid, LPVOID *ppv)
      
         	{
      
        -		*ppv = NULL;
      
        +		*ppv = nullptr;
      
         		if (CFEqual(&iid, IUnknownUUID))
      
         			*ppv = this;
      
        -		if (NULL == *ppv)
      
        +		if (nullptr == *ppv)
      
         			return E_NOINTERFACE;
      
         		((IUnknown*)*ppv)->AddRef();

12  Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm

show inline notes

View

              
    @@ -18,7 +18,7 @@
  
         {
      
        -static IOHIDManagerRef HIDManager = NULL;
      
        +static IOHIDManagerRef HIDManager = nullptr;
      
         static CFStringRef OurRunLoop = CFSTR("DolphinOSXInput");
      
         static std::map<std::string, int> kbd_name_counts, joy_name_counts;
      
    @@ -90,7 +90,7 @@ void DeviceElementDebugPrint(const void *value, void *context)
  
         		  type == "collection" ? c_type.c_str() : " ",
      
         		  IOHIDElementGetUsagePage(e),
      
         		  IOHIDElementGetUsage(e),
      
        -		  IOHIDElementGetName(e),		// usually just NULL
      
        +		  IOHIDElementGetName(e),		// usually just nullptr
      
         		  IOHIDElementGetLogicalMin(e),
      
         		  IOHIDElementGetLogicalMax(e),
      
         		  IOHIDElementGetPhysicalMin(e),
      
    @@ -102,7 +102,7 @@ void DeviceElementDebugPrint(const void *value, void *context)
  
         		CFRange range = {0, CFArrayGetCount(elements)};
      
         		// this leaks...but it's just debug code, right? :D
      
         		CFArrayApplyFunction(elements, range,
      
        -			DeviceElementDebugPrint, NULL);
      
        +			DeviceElementDebugPrint, nullptr);
      
         	}
      
         }
      
    @@ -146,7 +146,7 @@ static void DeviceMatching_callback(void* inContext,
  
         {
      
         	NSString *pName = (NSString *)
      
         		IOHIDDeviceGetProperty(inIOHIDDeviceRef, CFSTR(kIOHIDProductKey));
      
        -	std::string name = (pName != NULL) ? [pName UTF8String] : "Unknown device";
      
        +	std::string name = (pName != nullptr) ? [pName UTF8String] : "Unknown device";
      
         	DeviceDebugPrint(inIOHIDDeviceRef);
      
    @@ -178,7 +178,7 @@ void Init(std::vector<Core::Device*>& devices, void *window)
  
         	g_window = window;
      
        -	IOHIDManagerSetDeviceMatching(HIDManager, NULL);
      
        +	IOHIDManagerSetDeviceMatching(HIDManager, nullptr);
      
         	// Callbacks for acquisition or loss of a matching device
      
         	IOHIDManagerRegisterDeviceMatchingCallback(HIDManager,
      
    @@ -200,7 +200,7 @@ void Init(std::vector<Core::Device*>& devices, void *window)
  
         	// Things should be configured now
      
         	// Disable hotplugging and other scheduling
      
        -	IOHIDManagerRegisterDeviceMatchingCallback(HIDManager, NULL, NULL);
      
        +	IOHIDManagerRegisterDeviceMatchingCallback(HIDManager, nullptr, nullptr);
      
         	IOHIDManagerUnscheduleFromRunLoop(HIDManager,
      
         		CFRunLoopGetCurrent(), OurRunLoop);
      
         }

4  Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm

show inline notes

View

              
    @@ -39,7 +39,7 @@
  
         		{
      
         			IOHIDElementRef e =
      
         			(IOHIDElementRef)CFArrayGetValueAtIndex(buttons, i);
      
        -			//DeviceElementDebugPrint(e, NULL);
      
        +			//DeviceElementDebugPrint(e, nullptr);
      
         			AddInput(new Button(e, m_device));
      
         		}
      
    @@ -62,7 +62,7 @@
  
         		{
      
         			IOHIDElementRef e =
      
         			(IOHIDElementRef)CFArrayGetValueAtIndex(axes, i);
      
        -			//DeviceElementDebugPrint(e, NULL);
      
        +			//DeviceElementDebugPrint(e, nullptr);
      
         			if (IOHIDElementGetUsage(e) == kHIDUsage_GD_Hatswitch) {
      
         				AddInput(new Hat(e, m_device, Hat::up));

6  Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm

show inline notes

View

              
    @@ -40,7 +40,7 @@
  
         		{
      
         			IOHIDElementRef e =
      
         			(IOHIDElementRef)CFArrayGetValueAtIndex(elements, i);
      
        -			//DeviceElementDebugPrint(e, NULL);
      
        +			//DeviceElementDebugPrint(e, nullptr);
      
         			AddInput(new Key(e, m_device));
      
         		}
      
    @@ -61,7 +61,7 @@
  
         {
      
         	CGRect bounds = CGRectZero;
      
         	uint32_t windowid[1] = { m_windowid };
      
        -	CFArrayRef windowArray = CFArrayCreate(NULL, (const void **) windowid, 1, NULL);
      
        +	CFArrayRef windowArray = CFArrayCreate(nullptr, (const void **) windowid, 1, nullptr);
      
         	CFArrayRef windowDescriptions = CGWindowListCreateDescriptionFromArray(windowArray);
      
         	CFDictionaryRef windowDescription = (CFDictionaryRef) CFArrayGetValueAtIndex((CFArrayRef) windowDescriptions, 0);
      
    @@ -69,7 +69,7 @@
  
         	{
      
         		CFDictionaryRef boundsDictionary = (CFDictionaryRef) CFDictionaryGetValue(windowDescription, kCGWindowBounds);
      
        -		if (boundsDictionary != NULL)
      
        +		if (boundsDictionary != nullptr)
      
         			CGRectMakeWithDictionaryRepresentation(boundsDictionary, &bounds);
      
         	}

16  Source/Core/InputCommon/ControllerInterface/SDL/SDL.h

show inline notes

View

              
    @@ -83,9 +83,9 @@ class Joystick : public Core::Device
  
         	class ConstantEffect : public Output
      
         	{
      
         	public:
      
        -		std::string GetName() const;
      
        +		std::string GetName() const override;
      
         		ConstantEffect(EffectIDState& effect) : m_effect(effect) {}
      
        -		void SetState(ControlState state);
      
        +		void SetState(ControlState state) override;
      
         	private:
      
         		EffectIDState& m_effect;
      
         	};
      
    @@ -93,9 +93,9 @@ class Joystick : public Core::Device
  
         	class RampEffect : public Output
      
         	{
      
         	public:
      
        -		std::string GetName() const;
      
        +		std::string GetName() const override;
      
         		RampEffect(EffectIDState& effect) : m_effect(effect) {}
      
        -		void SetState(ControlState state);
      
        +		void SetState(ControlState state) override;
      
         	private:
      
         		EffectIDState& m_effect;
      
         	};
      
    @@ -103,9 +103,9 @@ class Joystick : public Core::Device
  
         	class SineEffect : public Output
      
         	{
      
         	public:
      
        -		std::string GetName() const;
      
        +		std::string GetName() const override;
      
         		SineEffect(EffectIDState& effect) : m_effect(effect) {}
      
        -		void SetState(ControlState state);
      
        +		void SetState(ControlState state) override;
      
         	private:
      
         		EffectIDState& m_effect;
      
         	};
      
    @@ -125,9 +125,9 @@ class Joystick : public Core::Device
  
         	class TriangleEffect : public Output
      
         	{
      
         	public:
      
        -		std::string GetName() const;
      
        +		std::string GetName() const override;
      
         		TriangleEffect(EffectIDState& effect) : m_effect(effect) {}
      
        -		void SetState(ControlState state);
      
        +		void SetState(ControlState state) override;
      
         	private:
      
         		EffectIDState& m_effect;
      
         	};

6  Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp

show inline notes

View

              
    @@ -48,7 +48,7 @@
  
         // This function will add zero or more KeyboardMouse objects to devices.
      
         void Init(std::vector<Core::Device*>& devices, void* const hwnd)
      
         {
      
        -	Display* dpy = XOpenDisplay(NULL);
      
        +	Display* dpy = XOpenDisplay(nullptr);
      
         	// xi_opcode is important; it will be used to identify XInput events by
      
         	// the polling loop in UpdateInput.
      
    @@ -129,7 +129,7 @@ void KeyboardMouse::SelectEventsForDevice(Window window, XIEventMask *mask, int
  
         	// which it can individually filter to get just the events it's interested
      
         	// in. So be aware that each KeyboardMouse object actually has its own X11
      
         	// "context."
      
        -	m_display = XOpenDisplay(NULL);
      
        +	m_display = XOpenDisplay(nullptr);
      
         	int min_keycode, max_keycode;
      
         	XDisplayKeycodes(m_display, &min_keycode, &max_keycode);
      
    @@ -326,7 +326,7 @@ int KeyboardMouse::GetId() const
  
         	// 0x0110ffff is the top of the unicode character range according
      
         	// to keysymdef.h although it is probably more than we need.
      
         	if (keysym == NoSymbol || keysym > 0x0110ffff ||
      
        -		XKeysymToString(keysym) == NULL)
      
        +		XKeysymToString(keysym) == nullptr)
      
         		m_keyname = std::string();
      
         	else
      
         		m_keyname = std::string(XKeysymToString(keysym));

30  Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h

show inline notes

View

              
    @@ -39,9 +39,9 @@ class KeyboardMouse : public Core::Device
  
         	{
      
         		friend class KeyboardMouse;
      
         	public:
      
        -		std::string GetName() const { return m_keyname; }
      
        +		std::string GetName() const override { return m_keyname; }
      
         		Key(Display* display, KeyCode keycode, const char* keyboard);
      
        -		ControlState GetState() const;
      
        +		ControlState GetState() const override;
      
         	private:
      
         		std::string       m_keyname;
      
    @@ -53,9 +53,9 @@ class KeyboardMouse : public Core::Device
  
         	class Button : public Input
      
         	{
      
         	public:
      
        -		std::string GetName() const { return name; }
      
        +		std::string GetName() const override { return name; }
      
         		Button(unsigned int index, unsigned int& buttons);
      
        -		ControlState GetState() const;
      
        +		ControlState GetState() const override;
      
         	private:
      
         		const unsigned int& m_buttons;
      
    @@ -66,10 +66,10 @@ class KeyboardMouse : public Core::Device
  
         	class Cursor : public Input
      
         	{
      
         	public:
      
        -		std::string GetName() const { return name; }
      
        -		bool IsDetectable() { return false; }
      
        +		std::string GetName() const override { return name; }
      
        +		bool IsDetectable() override { return false; }
      
         		Cursor(u8 index, bool positive, const float& cursor);
      
        -		ControlState GetState() const;
      
        +		ControlState GetState() const override;
      
         	private:
      
         		const float& m_cursor;
      
    @@ -81,10 +81,10 @@ class KeyboardMouse : public Core::Device
  
         	class Axis : public Input
      
         	{
      
         	public:
      
        -		std::string GetName() const { return name; }
      
        -		bool IsDetectable() { return false; }
      
        +		std::string GetName() const override { return name; }
      
        +		bool IsDetectable() override { return false; }
      
         		Axis(u8 index, bool positive, const float& axis);
      
        -		ControlState GetState() const;
      
        +		ControlState GetState() const override;
      
         	private:
      
         		const float& m_axis;
      
    @@ -98,15 +98,15 @@ class KeyboardMouse : public Core::Device
  
         	void UpdateCursor();
      
         public:
      
        -	bool UpdateInput();
      
        -	bool UpdateOutput();
      
        +	bool UpdateInput() override;
      
        +	bool UpdateOutput() override;
      
         	KeyboardMouse(Window window, int opcode, int pointer_deviceid, int keyboard_deviceid);
      
         	~KeyboardMouse();
      
        -	std::string GetName() const;
      
        -	std::string GetSource() const;
      
        -	int GetId() const;
      
        +	std::string GetName() const override;
      
        +	std::string GetSource() const override;
      
        +	int GetId() const override;
      
         private:
      
         	Window      m_window;

4  Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp

show inline notes

View

              
    @@ -16,7 +16,7 @@ void Init(std::vector<Core::Device*>& devices, void* const hwnd)
  
         {
      
         	memset(&m_state, 0, sizeof(m_state));
      
        -	m_display = XOpenDisplay(NULL);
      
        +	m_display = XOpenDisplay(nullptr);
      
         	int min_keycode, max_keycode;
      
         	XDisplayKeycodes(m_display, &min_keycode, &max_keycode);
      
    @@ -107,7 +107,7 @@ int KeyboardMouse::GetId() const
  
         	// 0x0110ffff is the top of the unicode character range according
      
         	// to keysymdef.h although it is probably more than we need.
      
         	if (keysym == NoSymbol || keysym > 0x0110ffff ||
      
        -		XKeysymToString(keysym) == NULL)
      
        +		XKeysymToString(keysym) == nullptr)
      
         		m_keyname = std::string();
      
         	else
      
         		m_keyname = std::string(XKeysymToString(keysym));

24  Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h

show inline notes

View

              
    @@ -30,9 +30,9 @@ class KeyboardMouse : public Core::Device
  
         	{
      
         		friend class KeyboardMouse;
      
         	public:
      
        -		std::string GetName() const;
      
        +		std::string GetName() const override;
      
         		Key(Display* display, KeyCode keycode, const char* keyboard);
      
        -		ControlState GetState() const;
      
        +		ControlState GetState() const override;
      
         	private:
      
         		std::string       m_keyname;
      
    @@ -44,10 +44,10 @@ class KeyboardMouse : public Core::Device
  
         	class Button : public Input
      
         	{
      
         	public:
      
        -		std::string GetName() const;
      
        +		std::string GetName() const override;
      
         		Button(unsigned int index, unsigned int& buttons)
      
         			: m_buttons(buttons), m_index(index) {}
      
        -		ControlState GetState() const;
      
        +		ControlState GetState() const override;
      
         	private:
      
         		const unsigned int& m_buttons;
      
    @@ -57,11 +57,11 @@ class KeyboardMouse : public Core::Device
  
         	class Cursor : public Input
      
         	{
      
         	public:
      
        -		std::string GetName() const;
      
        -		bool IsDetectable() { return false; }
      
        +		std::string GetName() const override;
      
        +		bool IsDetectable() override { return false; }
      
         		Cursor(u8 index, bool positive, const float& cursor)
      
         			: m_cursor(cursor), m_index(index), m_positive(positive) {}
      
        -		ControlState GetState() const;
      
        +		ControlState GetState() const override;
      
         	private:
      
         		const float& m_cursor;
      
    @@ -70,15 +70,15 @@ class KeyboardMouse : public Core::Device
  
         	};
      
         public:
      
        -	bool UpdateInput();
      
        -	bool UpdateOutput();
      
        +	bool UpdateInput() override;
      
        +	bool UpdateOutput() override;
      
         	KeyboardMouse(Window window);
      
         	~KeyboardMouse();
      
        -	std::string GetName() const;
      
        -	std::string GetSource() const;
      
        -	int GetId() const;
      
        +	std::string GetName() const override;
      
        +	std::string GetSource() const override;
      
        +	int GetId() const override;
      
         private:
      
         	Window   m_window;

8  Source/Core/InputCommon/UDPWiimote.cpp

show inline notes

View

              
    @@ -72,7 +72,7 @@ struct UDPWiimote::_d
  
         	static bool sranded=false;
      
         	if (!sranded)
      
         	{
      
        -		srand((unsigned int)time(0));
      
        +		srand((unsigned int)time(nullptr));
      
         		sranded=true;
      
         	}
      
         	bcastMagic=rand() & 0xFFFF;
      
    @@ -107,7 +107,7 @@ struct UDPWiimote::_d
  
         		return;
      
         	}
      
        -	if ((rv = getaddrinfo(NULL, _port, &hints, &servinfo)) != 0)
      
        +	if ((rv = getaddrinfo(nullptr, _port, &hints, &servinfo)) != 0)
      
         	{
      
         		cleanup;
      
         		err=-1;
      
    @@ -115,7 +115,7 @@ struct UDPWiimote::_d
  
         	}
      
         	// loop through all the results and bind to everything we can
      
        -	for(p = servinfo; p != NULL; p = p->ai_next)
      
        +	for(p = servinfo; p != nullptr; p = p->ai_next)
      
         	{
      
         		sock_t sock;
      
         		if ((sock = socket(p->ai_family, p->ai_socktype, p->ai_protocol)) == BAD_SOCK)
      
    @@ -191,7 +191,7 @@ void UDPWiimote::mainThread()
  
         		lk.unlock(); //VERY hacky. don't like it
      
         		if (d->exit) return;
      
        -		int rt=select(maxfd,&fds,NULL,NULL,&timeout);
      
        +		int rt=select(maxfd,&fds,nullptr,nullptr,&timeout);
      
         		if (d->exit) return;
      
         		lk.lock();
      
         		if (d->exit) return;

6  Source/Core/InputCommon/UDPWrapper.cpp

show inline notes

View

              
    @@ -18,7 +18,7 @@ const std::string DefaultPort(const int index)
  
         UDPWrapper::UDPWrapper(int indx, const char* const _name) :
      
         	ControllerEmu::ControlGroup(_name,GROUP_TYPE_UDPWII),
      
        -	inst(NULL), index(indx),
      
        +	inst(nullptr), index(indx),
      
         	updIR(false),updAccel(false),
      
         	updButt(false),udpEn(false)
      
         	, port(DefaultPort(indx))
      
    @@ -68,7 +68,7 @@ void UDPWrapper::SaveConfig(IniFile::Section *sec, const std::string& defdev, co
  
         void UDPWrapper::Refresh()
      
         {
      
        -	bool udpAEn=(inst!=NULL);
      
        +	bool udpAEn=(inst!=nullptr);
      
         	if (udpEn&&udpAEn)
      
         	{
      
         		if (strcmp(inst->getPort(),port.c_str()))
      
    @@ -82,7 +82,7 @@ void UDPWrapper::Refresh()
  
         	{
      
         		if (inst)
      
         			delete inst;
      
        -		inst = NULL;
      
        +		inst = nullptr;
      
         		return;
      
         	}
      
         	//else

4  Source/Core/InputCommon/UDPWrapper.h

show inline notes

View

              
    @@ -20,8 +20,8 @@ class UDPWrapper : public ControllerEmu::ControlGroup
  
         	std::string port;
      
         	UDPWrapper(int index, const char* const _name);
      
        -	virtual void LoadConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "");
      
        -	virtual void SaveConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "");
      
        +	virtual void LoadConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "") override;
      
        +	virtual void SaveConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "") override;
      
         	void Refresh();
      
         	virtual ~UDPWrapper();
      
         };

74  Source/Core/VideoBackends/D3D/D3DBase.cpp

show inline notes

View

              
    @@ -11,29 +11,29 @@
  
         namespace DX11
      
         {
      
        -HINSTANCE hD3DCompilerDll = NULL;
      
        -D3DREFLECT PD3DReflect = NULL;
      
        -pD3DCompile PD3DCompile = NULL;
      
        +HINSTANCE hD3DCompilerDll = nullptr;
      
        +D3DREFLECT PD3DReflect = nullptr;
      
        +pD3DCompile PD3DCompile = nullptr;
      
         int d3dcompiler_dll_ref = 0;
      
        -CREATEDXGIFACTORY PCreateDXGIFactory = NULL;
      
        -HINSTANCE hDXGIDll = NULL;
      
        +CREATEDXGIFACTORY PCreateDXGIFactory = nullptr;
      
        +HINSTANCE hDXGIDll = nullptr;
      
         int dxgi_dll_ref = 0;
      
         typedef HRESULT (WINAPI* D3D11CREATEDEVICEANDSWAPCHAIN)(IDXGIAdapter*, D3D_DRIVER_TYPE, HMODULE, UINT, CONST D3D_FEATURE_LEVEL*, UINT, UINT, CONST DXGI_SWAP_CHAIN_DESC*, IDXGISwapChain**, ID3D11Device**, D3D_FEATURE_LEVEL*, ID3D11DeviceContext**);
      
        -D3D11CREATEDEVICE PD3D11CreateDevice = NULL;
      
        -D3D11CREATEDEVICEANDSWAPCHAIN PD3D11CreateDeviceAndSwapChain = NULL;
      
        -HINSTANCE hD3DDll = NULL;
      
        +D3D11CREATEDEVICE PD3D11CreateDevice = nullptr;
      
        +D3D11CREATEDEVICEANDSWAPCHAIN PD3D11CreateDeviceAndSwapChain = nullptr;
      
        +HINSTANCE hD3DDll = nullptr;
      
         int d3d_dll_ref = 0;
      
         namespace D3D
      
         {
      
        -ID3D11Device* device = NULL;
      
        -ID3D11DeviceContext* context = NULL;
      
        -IDXGISwapChain* swapchain = NULL;
      
        +ID3D11Device* device = nullptr;
      
        +ID3D11DeviceContext* context = nullptr;
      
        +IDXGISwapChain* swapchain = nullptr;
      
         D3D_FEATURE_LEVEL featlevel;
      
        -D3DTexture2D* backbuf = NULL;
      
        +D3DTexture2D* backbuf = nullptr;
      
         HWND hWnd;
      
         std::vector<DXGI_SAMPLE_DESC> aa_modes; // supported AA modes of the current adapter
      
    @@ -59,12 +59,12 @@ HRESULT LoadDXGI()
  
         	hDXGIDll = LoadLibraryA("dxgi.dll");
      
         	if (!hDXGIDll)
      
         	{
      
        -		MessageBoxA(NULL, "Failed to load dxgi.dll", "Critical error", MB_OK | MB_ICONERROR);
      
        +		MessageBoxA(nullptr, "Failed to load dxgi.dll", "Critical error", MB_OK | MB_ICONERROR);
      
         		--dxgi_dll_ref;
      
         		return E_FAIL;
      
         	}
      
         	PCreateDXGIFactory = (CREATEDXGIFACTORY)GetProcAddress(hDXGIDll, "CreateDXGIFactory");
      
        -	if (PCreateDXGIFactory == NULL) MessageBoxA(NULL, "GetProcAddress failed for CreateDXGIFactory!", "Critical error", MB_OK | MB_ICONERROR);
      
        +	if (PCreateDXGIFactory == nullptr) MessageBoxA(nullptr, "GetProcAddress failed for CreateDXGIFactory!", "Critical error", MB_OK | MB_ICONERROR);
      
         	return S_OK;
      
         }
      
    @@ -77,15 +77,15 @@ HRESULT LoadD3D()
  
         	hD3DDll = LoadLibraryA("d3d11.dll");
      
         	if (!hD3DDll)
      
         	{
      
        -		MessageBoxA(NULL, "Failed to load d3d11.dll", "Critical error", MB_OK | MB_ICONERROR);
      
        +		MessageBoxA(nullptr, "Failed to load d3d11.dll", "Critical error", MB_OK | MB_ICONERROR);
      
         		--d3d_dll_ref;
      
         		return E_FAIL;
      
         	}
      
         	PD3D11CreateDevice = (D3D11CREATEDEVICE)GetProcAddress(hD3DDll, "D3D11CreateDevice");
      
        -	if (PD3D11CreateDevice == NULL) MessageBoxA(NULL, "GetProcAddress failed for D3D11CreateDevice!", "Critical error", MB_OK | MB_ICONERROR);
      
        +	if (PD3D11CreateDevice == nullptr) MessageBoxA(nullptr, "GetProcAddress failed for D3D11CreateDevice!", "Critical error", MB_OK | MB_ICONERROR);
      
         	PD3D11CreateDeviceAndSwapChain = (D3D11CREATEDEVICEANDSWAPCHAIN)GetProcAddress(hD3DDll, "D3D11CreateDeviceAndSwapChain");
      
        -	if (PD3D11CreateDeviceAndSwapChain == NULL) MessageBoxA(NULL, "GetProcAddress failed for D3D11CreateDeviceAndSwapChain!", "Critical error", MB_OK | MB_ICONERROR);
      
        +	if (PD3D11CreateDeviceAndSwapChain == nullptr) MessageBoxA(nullptr, "GetProcAddress failed for D3D11CreateDeviceAndSwapChain!", "Critical error", MB_OK | MB_ICONERROR);
      
         	return S_OK;
      
         }
      
    @@ -104,7 +104,7 @@ HRESULT LoadD3DCompiler()
  
         		hD3DCompilerDll = LoadLibraryA("D3DCompiler_42.dll");
      
         		if (!hD3DCompilerDll)
      
         		{
      
        -			MessageBoxA(NULL, "Failed to load D3DCompiler_42.dll, update your DX11 runtime, please", "Critical error", MB_OK | MB_ICONERROR);
      
        +			MessageBoxA(nullptr, "Failed to load D3DCompiler_42.dll, update your DX11 runtime, please", "Critical error", MB_OK | MB_ICONERROR);
      
         			return E_FAIL;
      
         		}
      
         		else
      
    @@ -114,9 +114,9 @@ HRESULT LoadD3DCompiler()
  
         	}
      
         	PD3DReflect = (D3DREFLECT)GetProcAddress(hD3DCompilerDll, "D3DReflect");
      
        -	if (PD3DReflect == NULL) MessageBoxA(NULL, "GetProcAddress failed for D3DReflect!", "Critical error", MB_OK | MB_ICONERROR);
      
        +	if (PD3DReflect == nullptr) MessageBoxA(nullptr, "GetProcAddress failed for D3DReflect!", "Critical error", MB_OK | MB_ICONERROR);
      
         	PD3DCompile = (pD3DCompile)GetProcAddress(hD3DCompilerDll, "D3DCompile");
      
        -	if (PD3DCompile == NULL) MessageBoxA(NULL, "GetProcAddress failed for D3DCompile!", "Critical error", MB_OK | MB_ICONERROR);
      
        +	if (PD3DCompile == nullptr) MessageBoxA(nullptr, "GetProcAddress failed for D3DCompile!", "Critical error", MB_OK | MB_ICONERROR);
      
         	return S_OK;
      
         }
      
    @@ -127,8 +127,8 @@ void UnloadDXGI()
  
         	if (--dxgi_dll_ref != 0) return;
      
         	if(hDXGIDll) FreeLibrary(hDXGIDll);
      
        -	hDXGIDll = NULL;
      
        -	PCreateDXGIFactory = NULL;
      
        +	hDXGIDll = nullptr;
      
        +	PCreateDXGIFactory = nullptr;
      
         }
      
         void UnloadD3D()
      
    @@ -137,9 +137,9 @@ void UnloadD3D()
  
         	if (--d3d_dll_ref != 0) return;
      
         	if(hD3DDll) FreeLibrary(hD3DDll);
      
        -	hD3DDll = NULL;
      
        -	PD3D11CreateDevice = NULL;
      
        -	PD3D11CreateDeviceAndSwapChain = NULL;
      
        +	hD3DDll = nullptr;
      
        +	PD3D11CreateDevice = nullptr;
      
        +	PD3D11CreateDeviceAndSwapChain = nullptr;
      
         }
      
         void UnloadD3DCompiler()
      
    @@ -148,8 +148,8 @@ void UnloadD3DCompiler()
  
         	if (--d3dcompiler_dll_ref != 0) return;
      
         	if (hD3DCompilerDll) FreeLibrary(hD3DCompilerDll);
      
        -	hD3DCompilerDll = NULL;
      
        -	PD3DReflect = NULL;
      
        +	hD3DCompilerDll = nullptr;
      
        +	PD3DReflect = nullptr;
      
         }
      
         std::vector<DXGI_SAMPLE_DESC> EnumAAModes(IDXGIAdapter* adapter)
      
    @@ -161,7 +161,7 @@ void UnloadD3DCompiler()
  
         	ID3D11Device* device;
      
         	ID3D11DeviceContext* context;
      
         	D3D_FEATURE_LEVEL feat_level;
      
        -	HRESULT hr = PD3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, D3D11_CREATE_DEVICE_SINGLETHREADED, supported_feature_levels, NUM_SUPPORTED_FEATURE_LEVELS, D3D11_SDK_VERSION, &device, &feat_level, &context);
      
        +	HRESULT hr = PD3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, nullptr, D3D11_CREATE_DEVICE_SINGLETHREADED, supported_feature_levels, NUM_SUPPORTED_FEATURE_LEVELS, D3D11_SDK_VERSION, &device, &feat_level, &context);
      
         	if (FAILED(hr) || feat_level == D3D_FEATURE_LEVEL_10_0)
      
         	{
      
         		DXGI_SAMPLE_DESC desc;
      
    @@ -193,7 +193,7 @@ void UnloadD3DCompiler()
  
         D3D_FEATURE_LEVEL GetFeatureLevel(IDXGIAdapter* adapter)
      
         {
      
         	D3D_FEATURE_LEVEL feat_level = D3D_FEATURE_LEVEL_9_1;
      
        -	PD3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, D3D11_CREATE_DEVICE_SINGLETHREADED, supported_feature_levels, NUM_SUPPORTED_FEATURE_LEVELS, D3D11_SDK_VERSION, NULL, &feat_level, NULL);
      
        +	PD3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, nullptr, D3D11_CREATE_DEVICE_SINGLETHREADED, supported_feature_levels, NUM_SUPPORTED_FEATURE_LEVELS, D3D11_SDK_VERSION, nullptr, &feat_level, nullptr);
      
         	return feat_level;
      
         }
      
    @@ -269,7 +269,7 @@ HRESULT Create(HWND wnd)
  
         	mode_desc.Height = yres;
      
         	mode_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
      
         	mode_desc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED;
      
        -	hr = output->FindClosestMatchingMode(&mode_desc, &swap_chain_desc.BufferDesc, NULL);
      
        +	hr = output->FindClosestMatchingMode(&mode_desc, &swap_chain_desc.BufferDesc, nullptr);
      
         	if (FAILED(hr)) MessageBox(wnd, _T("Failed to find a supported video mode"), _T("Dolphin Direct3D 11 backend"), MB_OK | MB_ICONERROR);
      
         	// forcing buffer resolution to xres and yres.. TODO: The new video mode might not actually be supported!
      
    @@ -280,7 +280,7 @@ HRESULT Create(HWND wnd)
  
         	// Creating debug devices can sometimes fail if the user doesn't have the correct
      
         	// version of the DirectX SDK. If it does, simply fallback to a non-debug device.
      
         	{
      
        -		hr = PD3D11CreateDeviceAndSwapChain(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL,
      
        +		hr = PD3D11CreateDeviceAndSwapChain(adapter, D3D_DRIVER_TYPE_UNKNOWN, nullptr,
      
         											D3D11_CREATE_DEVICE_SINGLETHREADED | D3D11_CREATE_DEVICE_DEBUG,
      
         											supported_feature_levels, NUM_SUPPORTED_FEATURE_LEVELS,
      
         											D3D11_SDK_VERSION, &swap_chain_desc, &swapchain, &device,
      
    @@ -290,7 +290,7 @@ HRESULT Create(HWND wnd)
  
         	if (FAILED(hr))
      
         #endif
      
         	{
      
        -		hr = PD3D11CreateDeviceAndSwapChain(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL,
      
        +		hr = PD3D11CreateDeviceAndSwapChain(adapter, D3D_DRIVER_TYPE_UNKNOWN, nullptr,
      
         											D3D11_CREATE_DEVICE_SINGLETHREADED,
      
         											supported_feature_levels, NUM_SUPPORTED_FEATURE_LEVELS,
      
         											D3D11_SDK_VERSION, &swap_chain_desc, &swapchain, &device,
      
    @@ -322,11 +322,11 @@ HRESULT Create(HWND wnd)
  
         	}
      
         	backbuf = new D3DTexture2D(buf, D3D11_BIND_RENDER_TARGET);
      
         	SAFE_RELEASE(buf);
      
        -	CHECK(backbuf!=NULL, "Create back buffer texture");
      
        +	CHECK(backbuf!=nullptr, "Create back buffer texture");
      
         	SetDebugObjectName((ID3D11DeviceChild*)backbuf->GetTex(), "backbuffer texture");
      
         	SetDebugObjectName((ID3D11DeviceChild*)backbuf->GetRTV(), "backbuffer render target view");
      
        -	context->OMSetRenderTargets(1, &backbuf->GetRTV(), NULL);
      
        +	context->OMSetRenderTargets(1, &backbuf->GetRTV(), nullptr);
      
         	// BGRA textures are easier to deal with in TextureCache, but might not be supported by the hardware
      
         	UINT format_support;
      
    @@ -356,7 +356,7 @@ void Close()
  
         	{
      
         		NOTICE_LOG(VIDEO, "Successfully released all device references!");
      
         	}
      
        -	device = NULL;
      
        +	device = nullptr;
      
         	// unload DLLs
      
         	UnloadD3D();
      
    @@ -439,7 +439,7 @@ void Reset()
  
         	}
      
         	backbuf = new D3DTexture2D(buf, D3D11_BIND_RENDER_TARGET);
      
         	SAFE_RELEASE(buf);
      
        -	CHECK(backbuf!=NULL, "Create back buffer texture");
      
        +	CHECK(backbuf!=nullptr, "Create back buffer texture");
      
         	SetDebugObjectName((ID3D11DeviceChild*)backbuf->GetTex(), "backbuffer texture");
      
         	SetDebugObjectName((ID3D11DeviceChild*)backbuf->GetRTV(), "backbuffer render target view");
      
         }
      
    @@ -452,7 +452,7 @@ bool BeginFrame()
  
         		return false;
      
         	}
      
         	bFrameInProgress = true;
      
        -	return (device != NULL);
      
        +	return (device != nullptr);
      
         }
      
         void EndFrame()

6  Source/Core/VideoBackends/D3D/D3DBase.h

show inline notes

View

              
    @@ -14,9 +14,9 @@
  
         namespace DX11
      
         {
      
        -#define SAFE_RELEASE(x) { if (x) (x)->Release(); (x) = NULL; }
      
        -#define SAFE_DELETE(x) { delete (x); (x) = NULL; }
      
        -#define SAFE_DELETE_ARRAY(x) { delete[] (x); (x) = NULL; }
      
        +#define SAFE_RELEASE(x) { if (x) (x)->Release(); (x) = nullptr; }
      
        +#define SAFE_DELETE(x) { delete (x); (x) = nullptr; }
      
        +#define SAFE_DELETE_ARRAY(x) { delete[] (x); (x) = nullptr; }
      
         #define CHECK(cond, Message, ...) if (!(cond)) { PanicAlert(__FUNCTION__ "Failed in %s at line %d: " Message, __FILE__, __LINE__, __VA_ARGS__); }
      
         class D3DTexture2D;

2  Source/Core/VideoBackends/D3D/D3DBlob.cpp

show inline notes

View

              
    @@ -9,7 +9,7 @@
  
         namespace DX11
      
         {
      
        -D3DBlob::D3DBlob(unsigned int blob_size, const u8* init_data) : ref(1), size(blob_size), blob(NULL)
      
        +D3DBlob::D3DBlob(unsigned int blob_size, const u8* init_data) : ref(1), size(blob_size), blob(nullptr)
      
         {
      
         	data = new u8[blob_size];
      
         	if (init_data) memcpy(data, init_data, size);

2  Source/Core/VideoBackends/D3D/D3DBlob.h

show inline notes

View

              
    @@ -16,7 +16,7 @@ class D3DBlob
  
         {
      
         public:
      
         	// memory will be copied into an own buffer
      
        -	D3DBlob(unsigned int blob_size, const u8* init_data = NULL);
      
        +	D3DBlob(unsigned int blob_size, const u8* init_data = nullptr);
      
         	// d3dblob will be AddRef'd
      
         	D3DBlob(ID3D10Blob* d3dblob);

48  Source/Core/VideoBackends/D3D/D3DShader.cpp

show inline notes

View

              
    @@ -18,9 +18,9 @@
  
         ID3D11VertexShader* CreateVertexShaderFromByteCode(const void* bytecode, unsigned int len)
      
         {
      
         	ID3D11VertexShader* v_shader;
      
        -	HRESULT hr = D3D::device->CreateVertexShader(bytecode, len, NULL, &v_shader);
      
        +	HRESULT hr = D3D::device->CreateVertexShader(bytecode, len, nullptr, &v_shader);
      
         	if (FAILED(hr))
      
        -		return NULL;
      
        +		return nullptr;
      
         	return v_shader;
      
         }
      
    @@ -28,15 +28,15 @@ ID3D11VertexShader* CreateVertexShaderFromByteCode(const void* bytecode, unsigne
  
         // code->bytecode
      
         bool CompileVertexShader(const char* code, unsigned int len, D3DBlob** blob)
      
         {
      
        -	ID3D10Blob* shaderBuffer = NULL;
      
        -	ID3D10Blob* errorBuffer = NULL;
      
        +	ID3D10Blob* shaderBuffer = nullptr;
      
        +	ID3D10Blob* errorBuffer = nullptr;
      
         #if defined(_DEBUG) || defined(DEBUGFAST)
      
         	UINT flags = D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY|D3D10_SHADER_DEBUG|D3D10_SHADER_WARNINGS_ARE_ERRORS;
      
         #else
      
         	UINT flags = D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY|D3D10_SHADER_OPTIMIZATION_LEVEL3|D3D10_SHADER_SKIP_VALIDATION;
      
         #endif
      
        -	HRESULT hr = PD3DCompile(code, len, NULL, NULL, NULL, "main", D3D::VertexShaderVersionString(),
      
        +	HRESULT hr = PD3DCompile(code, len, nullptr, nullptr, nullptr, "main", D3D::VertexShaderVersionString(),
      
         							flags, 0, &shaderBuffer, &errorBuffer);
      
         	if (errorBuffer)
      
         	{
      
    @@ -59,7 +59,7 @@ bool CompileVertexShader(const char* code, unsigned int len, D3DBlob** blob)
  
         						D3D::VertexShaderVersionString(),
      
         						(char*)errorBuffer->GetBufferPointer());
      
        -		*blob = NULL;
      
        +		*blob = nullptr;
      
         		errorBuffer->Release();
      
         	}
      
         	else
      
    @@ -74,9 +74,9 @@ bool CompileVertexShader(const char* code, unsigned int len, D3DBlob** blob)
  
         ID3D11GeometryShader* CreateGeometryShaderFromByteCode(const void* bytecode, unsigned int len)
      
         {
      
         	ID3D11GeometryShader* g_shader;
      
        -	HRESULT hr = D3D::device->CreateGeometryShader(bytecode, len, NULL, &g_shader);
      
        +	HRESULT hr = D3D::device->CreateGeometryShader(bytecode, len, nullptr, &g_shader);
      
         	if (FAILED(hr))
      
        -		return NULL;
      
        +		return nullptr;
      
         	return g_shader;
      
         }
      
    @@ -85,15 +85,15 @@ ID3D11GeometryShader* CreateGeometryShaderFromByteCode(const void* bytecode, uns
  
         bool CompileGeometryShader(const char* code, unsigned int len, D3DBlob** blob,
      
         	const D3D_SHADER_MACRO* pDefines)
      
         {
      
        -	ID3D10Blob* shaderBuffer = NULL;
      
        -	ID3D10Blob* errorBuffer = NULL;
      
        +	ID3D10Blob* shaderBuffer = nullptr;
      
        +	ID3D10Blob* errorBuffer = nullptr;
      
         #if defined(_DEBUG) || defined(DEBUGFAST)
      
         	UINT flags = D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY|D3D10_SHADER_DEBUG|D3D10_SHADER_WARNINGS_ARE_ERRORS;
      
         #else
      
         	UINT flags = D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY|D3D10_SHADER_OPTIMIZATION_LEVEL3|D3D10_SHADER_SKIP_VALIDATION;
      
         #endif
      
        -	HRESULT hr = PD3DCompile(code, len, NULL, pDefines, NULL, "main", D3D::GeometryShaderVersionString(),
      
        +	HRESULT hr = PD3DCompile(code, len, nullptr, pDefines, nullptr, "main", D3D::GeometryShaderVersionString(),
      
         							flags, 0, &shaderBuffer, &errorBuffer);
      
         	if (errorBuffer)
      
    @@ -117,7 +117,7 @@ bool CompileGeometryShader(const char* code, unsigned int len, D3DBlob** blob,
  
         						D3D::GeometryShaderVersionString(),
      
         						(char*)errorBuffer->GetBufferPointer());
      
        -		*blob = NULL;
      
        +		*blob = nullptr;
      
         		errorBuffer->Release();
      
         	}
      
         	else
      
    @@ -132,11 +132,11 @@ bool CompileGeometryShader(const char* code, unsigned int len, D3DBlob** blob,
  
         ID3D11PixelShader* CreatePixelShaderFromByteCode(const void* bytecode, unsigned int len)
      
         {
      
         	ID3D11PixelShader* p_shader;
      
        -	HRESULT hr = D3D::device->CreatePixelShader(bytecode, len, NULL, &p_shader);
      
        +	HRESULT hr = D3D::device->CreatePixelShader(bytecode, len, nullptr, &p_shader);
      
         	if (FAILED(hr))
      
         	{
      
         		PanicAlert("CreatePixelShaderFromByteCode failed at %s %d\n", __FILE__, __LINE__);
      
        -		p_shader = NULL;
      
        +		p_shader = nullptr;
      
         	}
      
         	return p_shader;
      
         }
      
    @@ -145,15 +145,15 @@ ID3D11PixelShader* CreatePixelShaderFromByteCode(const void* bytecode, unsigned
  
         bool CompilePixelShader(const char* code, unsigned int len, D3DBlob** blob,
      
         	const D3D_SHADER_MACRO* pDefines)
      
         {
      
        -	ID3D10Blob* shaderBuffer = NULL;
      
        -	ID3D10Blob* errorBuffer = NULL;
      
        +	ID3D10Blob* shaderBuffer = nullptr;
      
        +	ID3D10Blob* errorBuffer = nullptr;
      
         #if defined(_DEBUG) || defined(DEBUGFAST)
      
         	UINT flags = D3D10_SHADER_DEBUG|D3D10_SHADER_WARNINGS_ARE_ERRORS;
      
         #else
      
         	UINT flags = D3D10_SHADER_OPTIMIZATION_LEVEL3;
      
         #endif
      
        -	HRESULT hr = PD3DCompile(code, len, NULL, pDefines, NULL, "main", D3D::PixelShaderVersionString(),
      
        +	HRESULT hr = PD3DCompile(code, len, nullptr, pDefines, nullptr, "main", D3D::PixelShaderVersionString(),
      
         							flags, 0, &shaderBuffer, &errorBuffer);
      
         	if (errorBuffer)
      
    @@ -177,7 +177,7 @@ bool CompilePixelShader(const char* code, unsigned int len, D3DBlob** blob,
  
         						D3D::PixelShaderVersionString(),
      
         						(char*)errorBuffer->GetBufferPointer());
      
        -		*blob = NULL;
      
        +		*blob = nullptr;
      
         		errorBuffer->Release();
      
         	}
      
         	else
      
    @@ -192,33 +192,33 @@ bool CompilePixelShader(const char* code, unsigned int len, D3DBlob** blob,
  
         ID3D11VertexShader* CompileAndCreateVertexShader(const char* code,
      
         	unsigned int len)
      
         {
      
        -	D3DBlob* blob = NULL;
      
        +	D3DBlob* blob = nullptr;
      
         	if (CompileVertexShader(code, len, &blob))
      
         	{
      
         		ID3D11VertexShader* v_shader = CreateVertexShaderFromByteCode(blob);
      
         		blob->Release();
      
         		return v_shader;
      
         	}
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
         ID3D11GeometryShader* CompileAndCreateGeometryShader(const char* code,
      
         	unsigned int len, const D3D_SHADER_MACRO* pDefines)
      
         {
      
        -	D3DBlob* blob = NULL;
      
        +	D3DBlob* blob = nullptr;
      
         	if (CompileGeometryShader(code, len, &blob, pDefines))
      
         	{
      
         		ID3D11GeometryShader* g_shader = CreateGeometryShaderFromByteCode(blob);
      
         		blob->Release();
      
         		return g_shader;
      
         	}
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
         ID3D11PixelShader* CompileAndCreatePixelShader(const char* code,
      
         	unsigned int len)
      
         {
      
        -	D3DBlob* blob = NULL;
      
        +	D3DBlob* blob = nullptr;
      
         	CompilePixelShader(code, len, &blob);
      
         	if (blob)
      
         	{
      
    @@ -226,7 +226,7 @@ ID3D11PixelShader* CompileAndCreatePixelShader(const char* code,
  
         		blob->Release();
      
         		return p_shader;
      
         	}
      
        -	return NULL;
      
        +	return nullptr;
      
         }
      
         }  // namespace

8  Source/Core/VideoBackends/D3D/D3DShader.h

show inline notes

View

              
    @@ -23,15 +23,15 @@
  
         	bool CompileVertexShader(const char* code, unsigned int len,
      
         		D3DBlob** blob);
      
         	bool CompileGeometryShader(const char* code, unsigned int len,
      
        -		D3DBlob** blob, const D3D_SHADER_MACRO* pDefines = NULL);
      
        +		D3DBlob** blob, const D3D_SHADER_MACRO* pDefines = nullptr);
      
         	bool CompilePixelShader(const char* code, unsigned int len,
      
        -		D3DBlob** blob, const D3D_SHADER_MACRO* pDefines = NULL);
      
        +		D3DBlob** blob, const D3D_SHADER_MACRO* pDefines = nullptr);
      
         	// Utility functions
      
         	ID3D11VertexShader* CompileAndCreateVertexShader(const char* code,
      
         		unsigned int len);
      
         	ID3D11GeometryShader* CompileAndCreateGeometryShader(const char* code,
      
        -		unsigned int len, const D3D_SHADER_MACRO* pDefines = NULL);
      
        +		unsigned int len, const D3D_SHADER_MACRO* pDefines = nullptr);
      
         	ID3D11PixelShader* CompileAndCreatePixelShader(const char* code,
      
         		unsigned int len);
      
    @@ -44,7 +44,7 @@
  
         	inline ID3D11VertexShader* CompileAndCreateVertexShader(D3DBlob* code)
      
         	{ return CompileAndCreateVertexShader((const char*)code->Data(), code->Size()); }
      
        -	inline ID3D11GeometryShader* CompileAndCreateGeometryShader(D3DBlob* code, const D3D_SHADER_MACRO* pDefines = NULL)
      
        +	inline ID3D11GeometryShader* CompileAndCreateGeometryShader(D3DBlob* code, const D3D_SHADER_MACRO* pDefines = nullptr)
      
         	{ return CompileAndCreateGeometryShader((const char*)code->Data(), code->Size(), pDefines); }
      
         	inline ID3D11PixelShader* CompileAndCreatePixelShader(D3DBlob* code)
      
         	{ return CompileAndCreatePixelShader((const char*)code->Data(), code->Size()); }

8  Source/Core/VideoBackends/D3D/D3DTexture.cpp

show inline notes

View

              
    @@ -39,7 +39,7 @@ void ReplaceRGBATexture2D(ID3D11Texture2D* pTexture, const u8* buffer, unsigned
  
         D3DTexture2D* D3DTexture2D::Create(unsigned int width, unsigned int height, D3D11_BIND_FLAG bind, D3D11_USAGE usage, DXGI_FORMAT fmt, unsigned int levels)
      
         {
      
        -	ID3D11Texture2D* pTexture = NULL;
      
        +	ID3D11Texture2D* pTexture = nullptr;
      
         	HRESULT hr;
      
         	D3D11_CPU_ACCESS_FLAG cpuflags;
      
    @@ -47,11 +47,11 @@ D3DTexture2D* D3DTexture2D::Create(unsigned int width, unsigned int height, D3D1
  
         	else if (usage == D3D11_USAGE_DYNAMIC) cpuflags = D3D11_CPU_ACCESS_WRITE;
      
         	else cpuflags = (D3D11_CPU_ACCESS_FLAG)0;
      
         	D3D11_TEXTURE2D_DESC texdesc = CD3D11_TEXTURE2D_DESC(fmt, width, height, 1, levels, bind, usage, cpuflags);
      
        -	hr = D3D::device->CreateTexture2D(&texdesc, NULL, &pTexture);
      
        +	hr = D3D::device->CreateTexture2D(&texdesc, nullptr, &pTexture);
      
         	if (FAILED(hr))
      
         	{
      
         		PanicAlert("Failed to create texture at %s, line %d: hr=%#x\n", __FILE__, __LINE__, hr);
      
        -		return NULL;
      
        +		return nullptr;
      
         	}
      
         	D3DTexture2D* ret = new D3DTexture2D(pTexture, bind);
      
    @@ -82,7 +82,7 @@ UINT D3DTexture2D::Release()
  
         D3DTexture2D::D3DTexture2D(ID3D11Texture2D* texptr, D3D11_BIND_FLAG bind,
      
         							DXGI_FORMAT srv_format, DXGI_FORMAT dsv_format, DXGI_FORMAT rtv_format, bool multisampled)
      
        -							: ref(1), tex(texptr), srv(NULL), rtv(NULL), dsv(NULL)
      
        +							: ref(1), tex(texptr), srv(nullptr), rtv(nullptr), dsv(nullptr)
      
         {
      
         	D3D11_SRV_DIMENSION srv_dim = multisampled ? D3D11_SRV_DIMENSION_TEXTURE2DMS : D3D11_SRV_DIMENSION_TEXTURE2D;
      
         	D3D11_DSV_DIMENSION dsv_dim = multisampled ? D3D11_DSV_DIMENSION_TEXTURE2DMS : D3D11_DSV_DIMENSION_TEXTURE2D;

64  Source/Core/VideoBackends/D3D/D3DUtil.cpp

show inline notes

View

              
    @@ -21,10 +21,10 @@
  
         class UtilVertexBuffer
      
         {
      
         public:
      
        -	UtilVertexBuffer(int size) : buf(NULL), offset(0), max_size(size)
      
        +	UtilVertexBuffer(int size) : buf(nullptr), offset(0), max_size(size)
      
         	{
      
         		D3D11_BUFFER_DESC desc = CD3D11_BUFFER_DESC(max_size, D3D11_BIND_VERTEX_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE);
      
        -		device->CreateBuffer(&desc, NULL, &buf);
      
        +		device->CreateBuffer(&desc, nullptr, &buf);
      
         	}
      
         	~UtilVertexBuffer()
      
         	{
      
    @@ -72,7 +72,7 @@ class UtilVertexBuffer
  
         };
      
         CD3DFont font;
      
        -UtilVertexBuffer* util_vbuf = NULL;
      
        +UtilVertexBuffer* util_vbuf = nullptr;
      
         #define MAX_NUM_VERTICES 50*6
      
         struct FONT2DVERTEX {
      
    @@ -93,11 +93,11 @@ inline FONT2DVERTEX InitFont2DVertex(float x, float y, u32 color, float tu, floa
  
         CD3DFont::CD3DFont() : m_dwTexWidth(512), m_dwTexHeight(512)
      
         {
      
        -	m_pTexture    = NULL;
      
        -	m_pVB         = NULL;
      
        -	m_InputLayout = NULL;
      
        -	m_pshader     = NULL;
      
        -	m_vshader     = NULL;
      
        +	m_pTexture    = nullptr;
      
        +	m_pVB         = nullptr;
      
        +	m_InputLayout = nullptr;
      
        +	m_pshader     = nullptr;
      
        +	m_vshader     = nullptr;
      
         }
      
         const char fontpixshader[] = {
      
    @@ -161,8 +161,8 @@ int CD3DFont::Init()
  
         	bmi.bmiHeader.biBitCount    = 32;
      
         	// Create a DC and a bitmap for the font
      
        -	HDC hDC = CreateCompatibleDC(NULL);
      
        -	HBITMAP hbmBitmap = CreateDIBSection(hDC, &bmi, DIB_RGB_COLORS, (void**)&pBitmapBits, NULL, 0);
      
        +	HDC hDC = CreateCompatibleDC(nullptr);
      
        +	HBITMAP hbmBitmap = CreateDIBSection(hDC, &bmi, DIB_RGB_COLORS, (void**)&pBitmapBits, nullptr, 0);
      
         	SetMapMode(hDC, MM_TEXT);
      
         	// create a GDI font
      
    @@ -170,7 +170,7 @@ int CD3DFont::Init()
  
         							FALSE, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS,
      
         							CLIP_DEFAULT_PRECIS, PROOF_QUALITY,
      
         							VARIABLE_PITCH, _T("Tahoma"));
      
        -	if (NULL == hFont) return E_FAIL;
      
        +	if (nullptr == hFont) return E_FAIL;
      
         	HGDIOBJ hOldbmBitmap = SelectObject(hDC, hbmBitmap);
      
         	HGDIOBJ hOldFont = SelectObject(hDC, hFont);
      
    @@ -199,7 +199,7 @@ int CD3DFont::Init()
  
         			y += m_LineHeight;
      
         		}
      
        -		ExtTextOutA(hDC, x+1, y+0, ETO_OPAQUE | ETO_CLIPPED, NULL, str, 1, NULL);
      
        +		ExtTextOutA(hDC, x+1, y+0, ETO_OPAQUE | ETO_CLIPPED, nullptr, str, 1, nullptr);
      
         		m_fTexCoords[c][0] = ((float)(x+0))/m_dwTexWidth;
      
         		m_fTexCoords[c][1] = ((float)(y+0))/m_dwTexHeight;
      
         		m_fTexCoords[c][2] = ((float)(x+0+size.cx))/m_dwTexWidth;
      
    @@ -215,7 +215,7 @@ int CD3DFont::Init()
  
         	D3D11_TEXTURE2D_DESC texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, m_dwTexWidth, m_dwTexHeight,
      
         										1, 1, D3D11_BIND_SHADER_RESOURCE, D3D11_USAGE_DYNAMIC,
      
         										D3D11_CPU_ACCESS_WRITE);
      
        -	hr = device->CreateTexture2D(&texdesc, NULL, &buftex);
      
        +	hr = device->CreateTexture2D(&texdesc, nullptr, &buftex);
      
         	if (FAILED(hr))
      
         	{
      
         		PanicAlert("Failed to create font texture");
      
    @@ -240,7 +240,7 @@ int CD3DFont::Init()
  
         	// Done updating texture, so clean up used objects
      
         	context->Unmap(buftex, 0);
      
        -	hr = D3D::device->CreateShaderResourceView(buftex, NULL, &m_pTexture);
      
        +	hr = D3D::device->CreateShaderResourceView(buftex, nullptr, &m_pTexture);
      
         	if (FAILED(hr)) PanicAlert("Failed to create shader resource view at %s %d\n", __FILE__, __LINE__);
      
         	SAFE_RELEASE(buftex);
      
    @@ -252,14 +252,14 @@ int CD3DFont::Init()
  
         	// setup device objects for drawing
      
         	m_pshader = D3D::CompileAndCreatePixelShader(fontpixshader, sizeof(fontpixshader));
      
        -	if (m_pshader == NULL) PanicAlert("Failed to create pixel shader, %s %d\n", __FILE__, __LINE__);
      
        +	if (m_pshader == nullptr) PanicAlert("Failed to create pixel shader, %s %d\n", __FILE__, __LINE__);
      
         	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_pshader, "pixel shader of a CD3DFont object");
      
         	D3DBlob* vsbytecode;
      
         	D3D::CompileVertexShader(fontvertshader, sizeof(fontvertshader), &vsbytecode);
      
        -	if (vsbytecode == NULL) PanicAlert("Failed to compile vertex shader, %s %d\n", __FILE__, __LINE__);
      
        +	if (vsbytecode == nullptr) PanicAlert("Failed to compile vertex shader, %s %d\n", __FILE__, __LINE__);
      
         	m_vshader = D3D::CreateVertexShaderFromByteCode(vsbytecode);
      
        -	if (m_vshader == NULL) PanicAlert("Failed to create vertex shader, %s %d\n", __FILE__, __LINE__);
      
        +	if (m_vshader == nullptr) PanicAlert("Failed to create vertex shader, %s %d\n", __FILE__, __LINE__);
      
         	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_vshader, "vertex shader of a CD3DFont object");
      
         	const D3D11_INPUT_ELEMENT_DESC desc[] =
      
    @@ -293,7 +293,7 @@ int CD3DFont::Init()
  
         	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_raststate, "rasterizer state of a CD3DFont object");
      
         	D3D11_BUFFER_DESC vbdesc = CD3D11_BUFFER_DESC(MAX_NUM_VERTICES*sizeof(FONT2DVERTEX), D3D11_BIND_VERTEX_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE);
      
        -	if (FAILED(hr = device->CreateBuffer(&vbdesc, NULL, &m_pVB)))
      
        +	if (FAILED(hr = device->CreateBuffer(&vbdesc, nullptr, &m_pVB)))
      
         	{
      
         		PanicAlert("Failed to create font vertex buffer at %s, line %d\n", __FILE__, __LINE__);
      
         		return hr;
      
    @@ -347,8 +347,8 @@ int CD3DFont::DrawTextScaled(float x, float y, float size, float spacing, u32 dw
  
         	D3D::stateman->PushRasterizerState(m_raststate);
      
         	D3D::stateman->Apply();
      
        -	D3D::context->PSSetShader(m_pshader, NULL, 0);
      
        -	D3D::context->VSSetShader(m_vshader, NULL, 0);
      
        +	D3D::context->PSSetShader(m_pshader, nullptr, 0);
      
        +	D3D::context->VSSetShader(m_vshader, nullptr, 0);
      
         	D3D::context->IASetInputLayout(m_InputLayout);
      
         	D3D::context->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
      
    @@ -415,8 +415,8 @@ int CD3DFont::DrawTextScaled(float x, float y, float size, float spacing, u32 dw
  
         	return S_OK;
      
         }
      
        -ID3D11SamplerState* linear_copy_sampler = NULL;
      
        -ID3D11SamplerState* point_copy_sampler = NULL;
      
        +ID3D11SamplerState* linear_copy_sampler = nullptr;
      
        +ID3D11SamplerState* point_copy_sampler = nullptr;
      
         typedef struct { float x,y,z,u,v,w; } STQVertex;
      
         typedef struct { float x,y,z,u,v,w; } STSQVertex;
      
    @@ -545,13 +545,13 @@ void drawShadedTexQuad(ID3D11ShaderResourceView* texture,
  
         	D3D::context->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
      
         	D3D::context->IASetInputLayout(layout);
      
         	D3D::context->IASetVertexBuffers(0, 1, &util_vbuf->GetBuffer(), &stride, &offset);
      
        -	D3D::context->PSSetShader(PShader, NULL, 0);
      
        +	D3D::context->PSSetShader(PShader, nullptr, 0);
      
         	D3D::context->PSSetShaderResources(0, 1, &texture);
      
        -	D3D::context->VSSetShader(Vshader, NULL, 0);
      
        +	D3D::context->VSSetShader(Vshader, nullptr, 0);
      
         	D3D::stateman->Apply();
      
         	D3D::context->Draw(4, stq_offset);
      
        -	ID3D11ShaderResourceView* texres = NULL;
      
        +	ID3D11ShaderResourceView* texres = nullptr;
      
         	context->PSSetShaderResources(0, 1, &texres); // immediately unbind the texture
      
         }
      
    @@ -603,12 +603,12 @@ void drawShadedTexSubQuad(ID3D11ShaderResourceView* texture,
  
         	context->IASetVertexBuffers(0, 1, &util_vbuf->GetBuffer(), &stride, &offset);
      
         	context->IASetInputLayout(layout);
      
         	context->PSSetShaderResources(0, 1, &texture);
      
        -	context->PSSetShader(PShader, NULL, 0);
      
        -	context->VSSetShader(Vshader, NULL, 0);
      
        +	context->PSSetShader(PShader, nullptr, 0);
      
        +	context->VSSetShader(Vshader, nullptr, 0);
      
         	stateman->Apply();
      
         	context->Draw(4, stsq_offset);
      
        -	ID3D11ShaderResourceView* texres = NULL;
      
        +	ID3D11ShaderResourceView* texres = nullptr;
      
         	context->PSSetShaderResources(0, 1, &texres); // immediately unbind the texture
      
         }
      
    @@ -638,8 +638,8 @@ void drawColorQuad(u32 Color, float x1, float y1, float x2, float y2)
  
         		draw_quad_data.col = Color;
      
         	}
      
        -	context->VSSetShader(VertexShaderCache::GetClearVertexShader(), NULL, 0);
      
        -	context->PSSetShader(PixelShaderCache::GetClearProgram(), NULL, 0);
      
        +	context->VSSetShader(VertexShaderCache::GetClearVertexShader(), nullptr, 0);
      
        +	context->PSSetShader(PixelShaderCache::GetClearProgram(), nullptr, 0);
      
         	context->IASetInputLayout(VertexShaderCache::GetClearInputLayout());
      
         	UINT stride = sizeof(ColVertex);
      
    @@ -668,8 +668,8 @@ void drawClearQuad(u32 Color, float z, ID3D11PixelShader* PShader, ID3D11VertexS
  
         		clear_quad_data.col = Color;
      
         		clear_quad_data.z = z;
      
         	}
      
        -	context->VSSetShader(Vshader, NULL, 0);
      
        -	context->PSSetShader(PShader, NULL, 0);
      
        +	context->VSSetShader(Vshader, nullptr, 0);
      
        +	context->PSSetShader(PShader, nullptr, 0);
      
         	context->IASetInputLayout(layout);
      
         	UINT stride = sizeof(ClearVertex);

28  Source/Core/VideoBackends/D3D/FramebufferManager.cpp

show inline notes

View

              
    @@ -59,10 +59,10 @@
  
         	// EFB color texture - primary render target
      
         	texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, target_width, target_height, 1, 1, D3D11_BIND_SHADER_RESOURCE|D3D11_BIND_RENDER_TARGET, D3D11_USAGE_DEFAULT, 0, sample_desc.Count, sample_desc.Quality);
      
        -	hr = D3D::device->CreateTexture2D(&texdesc, NULL, &buf);
      
        +	hr = D3D::device->CreateTexture2D(&texdesc, nullptr, &buf);
      
         	CHECK(hr==S_OK, "create EFB color texture (size: %dx%d; hr=%#x)", target_width, target_height, hr);
      
         	m_efb.color_tex = new D3DTexture2D(buf, (D3D11_BIND_FLAG)(D3D11_BIND_SHADER_RESOURCE|D3D11_BIND_RENDER_TARGET), DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_R8G8B8A8_UNORM, (sample_desc.Count > 1));
      
        -	CHECK(m_efb.color_tex!=NULL, "create EFB color texture (size: %dx%d)", target_width, target_height);
      
        +	CHECK(m_efb.color_tex!=nullptr, "create EFB color texture (size: %dx%d)", target_width, target_height);
      
         	SAFE_RELEASE(buf);
      
         	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.color_tex->GetTex(), "EFB color texture");
      
         	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.color_tex->GetSRV(), "EFB color texture shader resource view");
      
    @@ -70,10 +70,10 @@
  
         	// Temporary EFB color texture - used in ReinterpretPixelData
      
         	texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, target_width, target_height, 1, 1, D3D11_BIND_SHADER_RESOURCE|D3D11_BIND_RENDER_TARGET, D3D11_USAGE_DEFAULT, 0, sample_desc.Count, sample_desc.Quality);
      
        -	hr = D3D::device->CreateTexture2D(&texdesc, NULL, &buf);
      
        +	hr = D3D::device->CreateTexture2D(&texdesc, nullptr, &buf);
      
         	CHECK(hr==S_OK, "create EFB color temp texture (size: %dx%d; hr=%#x)", target_width, target_height, hr);
      
         	m_efb.color_temp_tex = new D3DTexture2D(buf, (D3D11_BIND_FLAG)(D3D11_BIND_SHADER_RESOURCE|D3D11_BIND_RENDER_TARGET), DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_R8G8B8A8_UNORM, (sample_desc.Count > 1));
      
        -	CHECK(m_efb.color_temp_tex!=NULL, "create EFB color temp texture (size: %dx%d)", target_width, target_height);
      
        +	CHECK(m_efb.color_temp_tex!=nullptr, "create EFB color temp texture (size: %dx%d)", target_width, target_height);
      
         	SAFE_RELEASE(buf);
      
         	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.color_temp_tex->GetTex(), "EFB color temp texture");
      
         	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.color_temp_tex->GetSRV(), "EFB color temp texture shader resource view");
      
    @@ -81,13 +81,13 @@
  
         	// AccessEFB - Sysmem buffer used to retrieve the pixel data from color_tex
      
         	texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 1, 1, 0, D3D11_USAGE_STAGING, D3D11_CPU_ACCESS_READ);
      
        -	hr = D3D::device->CreateTexture2D(&texdesc, NULL, &m_efb.color_staging_buf);
      
        +	hr = D3D::device->CreateTexture2D(&texdesc, nullptr, &m_efb.color_staging_buf);
      
         	CHECK(hr==S_OK, "create EFB color staging buffer (hr=%#x)", hr);
      
         	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.color_staging_buf, "EFB color staging texture (used for Renderer::AccessEFB)");
      
         	// EFB depth buffer - primary depth buffer
      
         	texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R24G8_TYPELESS, target_width, target_height, 1, 1, D3D11_BIND_DEPTH_STENCIL|D3D11_BIND_SHADER_RESOURCE, D3D11_USAGE_DEFAULT, 0, sample_desc.Count, sample_desc.Quality);
      
        -	hr = D3D::device->CreateTexture2D(&texdesc, NULL, &buf);
      
        +	hr = D3D::device->CreateTexture2D(&texdesc, nullptr, &buf);
      
         	CHECK(hr==S_OK, "create EFB depth texture (size: %dx%d; hr=%#x)", target_width, target_height, hr);
      
         	m_efb.depth_tex = new D3DTexture2D(buf, (D3D11_BIND_FLAG)(D3D11_BIND_DEPTH_STENCIL|D3D11_BIND_SHADER_RESOURCE), DXGI_FORMAT_R24_UNORM_X8_TYPELESS, DXGI_FORMAT_D24_UNORM_S8_UINT, DXGI_FORMAT_UNKNOWN, (sample_desc.Count > 1));
      
         	SAFE_RELEASE(buf);
      
    @@ -97,7 +97,7 @@
  
         	// Render buffer for AccessEFB (depth data)
      
         	texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R32_FLOAT, 1, 1, 1, 1, D3D11_BIND_RENDER_TARGET);
      
        -	hr = D3D::device->CreateTexture2D(&texdesc, NULL, &buf);
      
        +	hr = D3D::device->CreateTexture2D(&texdesc, nullptr, &buf);
      
         	CHECK(hr==S_OK, "create EFB depth read texture (hr=%#x)", hr);
      
         	m_efb.depth_read_texture = new D3DTexture2D(buf, D3D11_BIND_RENDER_TARGET);
      
         	SAFE_RELEASE(buf);
      
    @@ -106,7 +106,7 @@
  
         	// AccessEFB - Sysmem buffer used to retrieve the pixel data from depth_read_texture
      
         	texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R32_FLOAT, 1, 1, 1, 1, 0, D3D11_USAGE_STAGING, D3D11_CPU_ACCESS_READ);
      
        -	hr = D3D::device->CreateTexture2D(&texdesc, NULL, &m_efb.depth_staging_buf);
      
        +	hr = D3D::device->CreateTexture2D(&texdesc, nullptr, &m_efb.depth_staging_buf);
      
         	CHECK(hr==S_OK, "create EFB depth staging buffer (hr=%#x)", hr);
      
         	D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.depth_staging_buf, "EFB depth staging texture (used for Renderer::AccessEFB)");
      
    @@ -114,15 +114,15 @@
  
         	{
      
         		// Framebuffer resolve textures (color+depth)
      
         		texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, target_width, target_height, 1, 1, D3D11_BIND_SHADER_RESOURCE, D3D11_USAGE_DEFAULT, 0, 1);
      
        -		hr = D3D::device->CreateTexture2D(&texdesc, NULL, &buf);
      
        +		hr = D3D::device->CreateTexture2D(&texdesc, nullptr, &buf);
      
         		m_efb.resolved_color_tex = new D3DTexture2D(buf, D3D11_BIND_SHADER_RESOURCE, DXGI_FORMAT_R8G8B8A8_UNORM);
      
        -		CHECK(m_efb.resolved_color_tex!=NULL, "create EFB color resolve texture (size: %dx%d)", target_width, target_height);
      
        +		CHECK(m_efb.resolved_color_tex!=nullptr, "create EFB color resolve texture (size: %dx%d)", target_width, target_height);
      
         		SAFE_RELEASE(buf);
      
         		D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.resolved_color_tex->GetTex(), "EFB color resolve texture");
      
         		D3D::SetDebugObjectName((ID3D11DeviceChild*)m_efb.resolved_color_tex->GetSRV(), "EFB color resolve texture shader resource view");
      
         		texdesc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R24G8_TYPELESS, target_width, target_height, 1, 1, D3D11_BIND_SHADER_RESOURCE);
      
        -		hr = D3D::device->CreateTexture2D(&texdesc, NULL, &buf);
      
        +		hr = D3D::device->CreateTexture2D(&texdesc, nullptr, &buf);
      
         		CHECK(hr==S_OK, "create EFB depth resolve texture (size: %dx%d; hr=%#x)", target_width, target_height, hr);
      
         		m_efb.resolved_depth_tex = new D3DTexture2D(buf, D3D11_BIND_SHADER_RESOURCE, DXGI_FORMAT_R24_UNORM_X8_TYPELESS);
      
         		SAFE_RELEASE(buf);
      
    @@ -131,8 +131,8 @@
  
         	}
      
         	else
      
         	{
      
        -		m_efb.resolved_color_tex = NULL;
      
        -		m_efb.resolved_depth_tex = NULL;
      
        +		m_efb.resolved_color_tex = nullptr;
      
        +		m_efb.resolved_depth_tex = nullptr;
      
         	}
      
         	s_xfbEncoder.Init();
      
    @@ -200,7 +200,7 @@ void XFBSource::CopyEFB(float Gamma)
  
         	const D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.f, 0.f, (float)texWidth, (float)texHeight);
      
         	D3D::context->RSSetViewports(1, &vp);
      
        -	D3D::context->OMSetRenderTargets(1, &tex->GetRTV(), NULL);
      
        +	D3D::context->OMSetRenderTargets(1, &tex->GetRTV(), nullptr);
      
         	D3D::SetLinearCopySampler();
      
         	D3D::drawShadedTexQuad(FramebufferManager::GetEFBColorTexture()->GetSRV(), sourceRc.AsRECT(),

6  Source/Core/VideoBackends/D3D/GfxState.cpp

show inline notes

View

              
    @@ -30,10 +30,10 @@
  
         template<typename T> AutoState<T>::~AutoState()
      
         {
      
         	if(state) ((T*)state)->Release();
      
        -	state = NULL;
      
        +	state = nullptr;
      
         }
      
        -StateManager::StateManager() : cur_blendstate(NULL), cur_depthstate(NULL), cur_raststate(NULL) {}
      
        +StateManager::StateManager() : cur_blendstate(nullptr), cur_depthstate(nullptr), cur_raststate(nullptr) {}
      
         void StateManager::PushBlendState(const ID3D11BlendState* state) { blendstates.push(AutoBlendState(state)); }
      
         void StateManager::PushDepthState(const ID3D11DepthStencilState* state) { depthstates.push(AutoDepthStencilState(state)); }
      
    @@ -49,7 +49,7 @@ void StateManager::Apply()
  
         		if (cur_blendstate != blendstates.top().GetPtr())
      
         		{
      
         			cur_blendstate = (ID3D11BlendState*)blendstates.top().GetPtr();
      
        -			D3D::context->OMSetBlendState(cur_blendstate, NULL, 0xFFFFFFFF);
      
        +			D3D::context->OMSetBlendState(cur_blendstate, nullptr, 0xFFFFFFFF);
      
         		}
      
         	}
      
         	else ERROR_LOG(VIDEO, "Tried to apply without blend state!");

10  Source/Core/VideoBackends/D3D/LineGeometryShader.cpp

show inline notes

View

              
    @@ -125,7 +125,7 @@ struct LineGSParams
  
         ;
      
         LineGeometryShader::LineGeometryShader()
      
        -	: m_ready(false), m_paramsBuffer(NULL)
      
        +	: m_ready(false), m_paramsBuffer(nullptr)
      
         { }
      
         void LineGeometryShader::Init()
      
    @@ -138,7 +138,7 @@ void LineGeometryShader::Init()
  
         	D3D11_BUFFER_DESC bd = CD3D11_BUFFER_DESC(sizeof(LineGSParams_Padded),
      
         		D3D11_BIND_CONSTANT_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE);
      
        -	hr = D3D::device->CreateBuffer(&bd, NULL, &m_paramsBuffer);
      
        +	hr = D3D::device->CreateBuffer(&bd, nullptr, &m_paramsBuffer);
      
         	CHECK(SUCCEEDED(hr), "create line geometry shader params buffer");
      
         	D3D::SetDebugObjectName(m_paramsBuffer, "line geometry shader params buffer");
      
    @@ -184,14 +184,14 @@ bool LineGeometryShader::SetShader(u32 components, float lineWidth,
  
         		const std::string& numTexCoordsStr = numTexCoordsStream.str();
      
         		D3D_SHADER_MACRO macros[] = {
      
         			{ "NUM_TEXCOORDS", numTexCoordsStr.c_str() },
      
        -			{ NULL, NULL }
      
        +			{ nullptr, nullptr }
      
         		};
      
         		ID3D11GeometryShader* newShader = D3D::CompileAndCreateGeometryShader(code.GetBuffer(), unsigned int(strlen(code.GetBuffer())), macros);
      
         		if (!newShader)
      
         		{
      
         			WARN_LOG(VIDEO, "Line geometry shader for components 0x%.08X failed to compile", components);
      
         			// Add dummy shader to prevent trying to compile again
      
        -			m_shaders[components] = NULL;
      
        +			m_shaders[components] = nullptr;
      
         			return false;
      
         		}
      
    @@ -223,7 +223,7 @@ bool LineGeometryShader::SetShader(u32 components, float lineWidth,
  
         			DEBUG_LOG(VIDEO, "Line params: width %f, texOffset %f, vpWidth %f, vpHeight %f",
      
         				lineWidth, texOffset, vpWidth, vpHeight);
      
        -			D3D::context->GSSetShader(shaderIt->second, NULL, 0);
      
        +			D3D::context->GSSetShader(shaderIt->second, nullptr, 0);
      
         			D3D::context->GSSetConstantBuffers(0, 1, &m_paramsBuffer);
      
         			return true;

2  Source/Core/VideoBackends/D3D/NativeVertexFormat.cpp

show inline notes

View

              
    @@ -20,7 +20,7 @@ class D3DVertexFormat : public NativeVertexFormat
  
         	ID3D11InputLayout* m_layout;
      
         public:
      
        -	D3DVertexFormat() : m_num_elems(0), m_vs_bytecode(NULL), m_layout(NULL) {}
      
        +	D3DVertexFormat() : m_num_elems(0), m_vs_bytecode(nullptr), m_layout(nullptr) {}
      
         	~D3DVertexFormat() { SAFE_RELEASE(m_vs_bytecode); SAFE_RELEASE(m_layout); }
      
         	void Initialize(const PortableVertexDeclaration &_vtx_decl);

80  Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp

show inline notes

View

              
    @@ -849,21 +849,21 @@
  
         ;
      
         PSTextureEncoder::PSTextureEncoder()
      
        -	: m_ready(false), m_out(NULL), m_outRTV(NULL), m_outStage(NULL),
      
        -	m_encodeParams(NULL),
      
        -	m_quad(NULL), m_vShader(NULL), m_quadLayout(NULL),
      
        -	m_efbEncodeBlendState(NULL), m_efbEncodeDepthState(NULL),
      
        -	m_efbEncodeRastState(NULL), m_efbSampler(NULL),
      
        -	m_dynamicShader(NULL), m_classLinkage(NULL)
      
        +	: m_ready(false), m_out(nullptr), m_outRTV(nullptr), m_outStage(nullptr),
      
        +	m_encodeParams(nullptr),
      
        +	m_quad(nullptr), m_vShader(nullptr), m_quadLayout(nullptr),
      
        +	m_efbEncodeBlendState(nullptr), m_efbEncodeDepthState(nullptr),
      
        +	m_efbEncodeRastState(nullptr), m_efbSampler(nullptr),
      
        +	m_dynamicShader(nullptr), m_classLinkage(nullptr)
      
         {
      
         	for (size_t i = 0; i < 4; ++i)
      
        -		m_fetchClass[i] = NULL;
      
        +		m_fetchClass[i] = nullptr;
      
         	for (size_t i = 0; i < 2; ++i)
      
        -		m_scaledFetchClass[i] = NULL;
      
        +		m_scaledFetchClass[i] = nullptr;
      
         	for (size_t i = 0; i < 2; ++i)
      
        -		m_intensityClass[i] = NULL;
      
        +		m_intensityClass[i] = nullptr;
      
         	for (size_t i = 0; i < 16; ++i)
      
        -		m_generatorClass[i] = NULL;
      
        +		m_generatorClass[i] = nullptr;
      
         }
      
         static const D3D11_INPUT_ELEMENT_DESC QUAD_LAYOUT_DESC[] = {
      
    @@ -888,7 +888,7 @@ void PSTextureEncoder::Init()
  
         	D3D11_TEXTURE2D_DESC t2dd = CD3D11_TEXTURE2D_DESC(
      
         		DXGI_FORMAT_R32G32B32A32_UINT,
      
         		EFB_WIDTH, EFB_HEIGHT/4, 1, 1, D3D11_BIND_RENDER_TARGET);
      
        -	hr = D3D::device->CreateTexture2D(&t2dd, NULL, &m_out);
      
        +	hr = D3D::device->CreateTexture2D(&t2dd, nullptr, &m_out);
      
         	CHECK(SUCCEEDED(hr), "create efb encode output texture");
      
         	D3D::SetDebugObjectName(m_out, "efb encoder output texture");
      
    @@ -905,7 +905,7 @@ void PSTextureEncoder::Init()
  
         	t2dd.Usage = D3D11_USAGE_STAGING;
      
         	t2dd.BindFlags = 0;
      
         	t2dd.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
      
        -	hr = D3D::device->CreateTexture2D(&t2dd, NULL, &m_outStage);
      
        +	hr = D3D::device->CreateTexture2D(&t2dd, nullptr, &m_outStage);
      
         	CHECK(SUCCEEDED(hr), "create efb encode output staging buffer");
      
         	D3D::SetDebugObjectName(m_outStage, "efb encoder output staging buffer");
      
    @@ -913,7 +913,7 @@ void PSTextureEncoder::Init()
  
         	D3D11_BUFFER_DESC bd = CD3D11_BUFFER_DESC(sizeof(EFBEncodeParams),
      
         		D3D11_BIND_CONSTANT_BUFFER);
      
        -	hr = D3D::device->CreateBuffer(&bd, NULL, &m_encodeParams);
      
        +	hr = D3D::device->CreateBuffer(&bd, nullptr, &m_encodeParams);
      
         	CHECK(SUCCEEDED(hr), "create efb encode params buffer");
      
         	D3D::SetDebugObjectName(m_encodeParams, "efb encoder params buffer");
      
    @@ -929,14 +929,14 @@ void PSTextureEncoder::Init()
  
         	// Create vertex shader
      
        -	D3DBlob* bytecode = NULL;
      
        +	D3DBlob* bytecode = nullptr;
      
         	if (!D3D::CompileVertexShader(EFB_ENCODE_VS, sizeof(EFB_ENCODE_VS), &bytecode))
      
         	{
      
         		ERROR_LOG(VIDEO, "EFB encode vertex shader failed to compile");
      
         		return;
      
         	}
      
        -	hr = D3D::device->CreateVertexShader(bytecode->Data(), bytecode->Size(), NULL, &m_vShader);
      
        +	hr = D3D::device->CreateVertexShader(bytecode->Data(), bytecode->Size(), nullptr, &m_vShader);
      
         	CHECK(SUCCEEDED(hr), "create efb encode vertex shader");
      
         	D3D::SetDebugObjectName(m_vShader, "efb encoder vertex shader");
      
    @@ -1084,7 +1084,7 @@ size_t PSTextureEncoder::Encode(u8* dst, unsigned int dstFormat,
  
         	if (SetStaticShader(dstFormat, srcFormat, isIntensity, scaleByHalf))
      
         #endif
      
         	{
      
        -		D3D::context->VSSetShader(m_vShader, NULL, 0);
      
        +		D3D::context->VSSetShader(m_vShader, nullptr, 0);
      
         		D3D::stateman->PushBlendState(m_efbEncodeBlendState);
      
         		D3D::stateman->PushDepthState(m_efbEncodeDepthState);
      
    @@ -1116,11 +1116,11 @@ size_t PSTextureEncoder::Encode(u8* dst, unsigned int dstFormat,
  
         		params.TexTop = float(targetRect.top) / g_renderer->GetTargetHeight();
      
         		params.TexRight = float(targetRect.right) / g_renderer->GetTargetWidth();
      
         		params.TexBottom = float(targetRect.bottom) / g_renderer->GetTargetHeight();
      
        -		D3D::context->UpdateSubresource(m_encodeParams, 0, NULL, &params, 0, 0);
      
        +		D3D::context->UpdateSubresource(m_encodeParams, 0, nullptr, &params, 0, 0);
      
         		D3D::context->VSSetConstantBuffers(0, 1, &m_encodeParams);
      
        -		D3D::context->OMSetRenderTargets(1, &m_outRTV, NULL);
      
        +		D3D::context->OMSetRenderTargets(1, &m_outRTV, nullptr);
      
         		ID3D11ShaderResourceView* pEFB = (srcFormat == PIXELFMT_Z24) ?
      
         			FramebufferManager::GetEFBDepthTexture()->GetSRV() :
      
    @@ -1144,13 +1144,13 @@ size_t PSTextureEncoder::Encode(u8* dst, unsigned int dstFormat,
  
         		// Clean up state
      
        -		IUnknown* nullDummy = NULL;
      
        +		IUnknown* nullDummy = nullptr;
      
         		D3D::context->PSSetSamplers(0, 1, (ID3D11SamplerState**)&nullDummy);
      
         		D3D::context->PSSetShaderResources(0, 1, (ID3D11ShaderResourceView**)&nullDummy);
      
         		D3D::context->PSSetConstantBuffers(0, 1, (ID3D11Buffer**)&nullDummy);
      
        -		D3D::context->OMSetRenderTargets(0, NULL, NULL);
      
        +		D3D::context->OMSetRenderTargets(0, nullptr, nullptr);
      
         		D3D::context->VSSetConstantBuffers(0, 1, (ID3D11Buffer**)&nullDummy);
      
    @@ -1158,8 +1158,8 @@ size_t PSTextureEncoder::Encode(u8* dst, unsigned int dstFormat,
  
         		D3D::stateman->PopDepthState();
      
         		D3D::stateman->PopBlendState();
      
        -		D3D::context->PSSetShader(NULL, NULL, 0);
      
        -		D3D::context->VSSetShader(NULL, NULL, 0);
      
        +		D3D::context->PSSetShader(nullptr, nullptr, 0);
      
        +		D3D::context->VSSetShader(nullptr, nullptr, 0);
      
         		// Transfer staging buffer to GameCube/Wii RAM
      
    @@ -1221,7 +1221,7 @@ bool PSTextureEncoder::SetStaticShader(unsigned int dstFormat, unsigned int srcF
  
         	ComboMap::iterator it = m_staticShaders.find(key);
      
         	if (it == m_staticShaders.end())
      
         	{
      
        -		const char* generatorFuncName = NULL;
      
        +		const char* generatorFuncName = nullptr;
      
         		switch (generatorNum)
      
         		{
      
         		case 0x0: generatorFuncName = "Generate_0"; break;
      
    @@ -1239,7 +1239,7 @@ bool PSTextureEncoder::SetStaticShader(unsigned int dstFormat, unsigned int srcF
  
         		case 0xC: generatorFuncName = "Generate_C"; break;
      
         		default:
      
         			WARN_LOG(VIDEO, "No generator available for dst format 0x%X; aborting", generatorNum);
      
        -			m_staticShaders[key] = NULL;
      
        +			m_staticShaders[key] = nullptr;
      
         			return false;
      
         		}
      
    @@ -1247,13 +1247,13 @@ bool PSTextureEncoder::SetStaticShader(unsigned int dstFormat, unsigned int srcF
  
         			dstFormat, srcFormat, isIntensity ? 1 : 0, scaleByHalf ? 1 : 0);
      
         		// Shader permutation not found, so compile it
      
        -		D3DBlob* bytecode = NULL;
      
        +		D3DBlob* bytecode = nullptr;
      
         		D3D_SHADER_MACRO macros[] = {
      
         			{ "IMP_FETCH", FETCH_FUNC_NAMES[fetchNum] },
      
         			{ "IMP_SCALEDFETCH", SCALEDFETCH_FUNC_NAMES[scaledFetchNum] },
      
         			{ "IMP_INTENSITY", INTENSITY_FUNC_NAMES[intensityNum] },
      
         			{ "IMP_GENERATOR", generatorFuncName },
      
        -			{ NULL, NULL }
      
        +			{ nullptr, nullptr }
      
         		};
      
         		if (!D3D::CompilePixelShader(EFB_ENCODE_PS, sizeof(EFB_ENCODE_PS), &bytecode, macros))
      
         		{
      
    @@ -1261,12 +1261,12 @@ bool PSTextureEncoder::SetStaticShader(unsigned int dstFormat, unsigned int srcF
  
         				dstFormat, srcFormat, isIntensity ? 1 : 0, scaleByHalf ? 1 : 0);
      
         			// Add dummy shader to map to prevent trying to compile over and
      
         			// over again
      
        -			m_staticShaders[key] = NULL;
      
        +			m_staticShaders[key] = nullptr;
      
         			return false;
      
         		}
      
         		ID3D11PixelShader* newShader;
      
        -		HRESULT hr = D3D::device->CreatePixelShader(bytecode->Data(), bytecode->Size(), NULL, &newShader);
      
        +		HRESULT hr = D3D::device->CreatePixelShader(bytecode->Data(), bytecode->Size(), nullptr, &newShader);
      
         		CHECK(SUCCEEDED(hr), "create efb encoder pixel shader");
      
         		it = m_staticShaders.insert(std::make_pair(key, newShader)).first;
      
    @@ -1277,7 +1277,7 @@ bool PSTextureEncoder::SetStaticShader(unsigned int dstFormat, unsigned int srcF
  
         	{
      
         		if (it->second)
      
         		{
      
        -			D3D::context->PSSetShader(it->second, NULL, 0);
      
        +			D3D::context->PSSetShader(it->second, nullptr, 0);
      
         			return true;
      
         		}
      
         		else
      
    @@ -1292,11 +1292,11 @@ bool PSTextureEncoder::InitDynamicMode()
  
         	HRESULT hr;
      
         	D3D_SHADER_MACRO macros[] = {
      
        -		{ "DYNAMIC_MODE", NULL },
      
        -		{ NULL, NULL }
      
        +		{ "DYNAMIC_MODE", nullptr },
      
        +		{ nullptr, nullptr }
      
         	};
      
        -	D3DBlob* bytecode = NULL;
      
        +	D3DBlob* bytecode = nullptr;
      
         	if (!D3D::CompilePixelShader(EFB_ENCODE_PS, sizeof(EFB_ENCODE_PS), &bytecode, macros))
      
         	{
      
         		ERROR_LOG(VIDEO, "EFB encode pixel shader failed to compile");
      
    @@ -1313,14 +1313,14 @@ bool PSTextureEncoder::InitDynamicMode()
  
         	// Use D3DReflect
      
        -	ID3D11ShaderReflection* reflect = NULL;
      
        +	ID3D11ShaderReflection* reflect = nullptr;
      
         	hr = PD3DReflect(bytecode->Data(), bytecode->Size(), IID_ID3D11ShaderReflection, (void**)&reflect);
      
         	CHECK(SUCCEEDED(hr), "reflect on efb encoder shader");
      
         	// Get number of slots and create dynamic linkage array
      
         	UINT numSlots = reflect->GetNumInterfaceSlots();
      
        -	m_linkageArray.resize(numSlots, NULL);
      
        +	m_linkageArray.resize(numSlots, nullptr);
      
         	// Get interface slots
      
    @@ -1342,13 +1342,13 @@ bool PSTextureEncoder::InitDynamicMode()
  
         	// Class instances will be created at the time they are used
      
         	for (size_t i = 0; i < 4; ++i)
      
        -		m_fetchClass[i] = NULL;
      
        +		m_fetchClass[i] = nullptr;
      
         	for (size_t i = 0; i < 2; ++i)
      
        -		m_scaledFetchClass[i] = NULL;
      
        +		m_scaledFetchClass[i] = nullptr;
      
         	for (size_t i = 0; i < 2; ++i)
      
        -		m_intensityClass[i] = NULL;
      
        +		m_intensityClass[i] = nullptr;
      
         	for (size_t i = 0; i < 16; ++i)
      
        -		m_generatorClass[i] = NULL;
      
        +		m_generatorClass[i] = nullptr;
      
         	reflect->Release();
      
         	bytecode->Release();
      
    @@ -1378,7 +1378,7 @@ bool PSTextureEncoder::SetDynamicShader(unsigned int dstFormat,
  
         	// FIXME: Not all the possible generators are available as classes yet.
      
         	// When dynamic mode is usable, implement them.
      
        -	const char* generatorName = NULL;
      
        +	const char* generatorName = nullptr;
      
         	switch (generatorNum)
      
         	{
      
         	case 0x4: generatorName = "cGenerator_4"; break;
      
    @@ -1438,7 +1438,7 @@ bool PSTextureEncoder::SetDynamicShader(unsigned int dstFormat,
  
         		m_linkageArray[m_generatorSlot] = m_generatorClass[generatorNum];
      
         	D3D::context->PSSetShader(m_dynamicShader,
      
        -		m_linkageArray.empty() ? NULL : &m_linkageArray[0],
      
        +		m_linkageArray.empty() ? nullptr : &m_linkageArray[0],
      
         		(UINT)m_linkageArray.size());
      
         	return true;

42  Source/Core/VideoBackends/D3D/PixelShaderCache.cpp

show inline notes

View

              
    @@ -31,13 +31,13 @@
  
         LinearDiskCache<PixelShaderUid, u8> g_ps_disk_cache;
      
        -ID3D11PixelShader* s_ColorMatrixProgram[2] = {NULL};
      
        -ID3D11PixelShader* s_ColorCopyProgram[2] = {NULL};
      
        -ID3D11PixelShader* s_DepthMatrixProgram[2] = {NULL};
      
        -ID3D11PixelShader* s_ClearProgram = NULL;
      
        -ID3D11PixelShader* s_rgba6_to_rgb8[2] = {NULL};
      
        -ID3D11PixelShader* s_rgb8_to_rgba6[2] = {NULL};
      
        -ID3D11Buffer* pscbuf = NULL;
      
        +ID3D11PixelShader* s_ColorMatrixProgram[2] = {nullptr};
      
        +ID3D11PixelShader* s_ColorCopyProgram[2] = {nullptr};
      
        +ID3D11PixelShader* s_DepthMatrixProgram[2] = {nullptr};
      
        +ID3D11PixelShader* s_ClearProgram = nullptr;
      
        +ID3D11PixelShader* s_rgba6_to_rgb8[2] = {nullptr};
      
        +ID3D11PixelShader* s_rgb8_to_rgba6[2] = {nullptr};
      
        +ID3D11Buffer* pscbuf = nullptr;
      
         const char clear_program_code[] = {
      
         	"void main(\n"
      
    @@ -291,7 +291,7 @@ ID3D11PixelShader* PixelShaderCache::GetColorCopyProgram(bool multisampled)
  
         		char buf[1024];
      
         		int l = sprintf_s(buf, 1024, color_copy_program_code_msaa, D3D::GetAAMode(g_ActiveConfig.iMultisampleMode).Count);
      
         		s_ColorCopyProgram[1] = D3D::CompileAndCreatePixelShader(buf, l);
      
        -		CHECK(s_ColorCopyProgram[1]!=NULL, "Create color copy MSAA pixel shader");
      
        +		CHECK(s_ColorCopyProgram[1]!=nullptr, "Create color copy MSAA pixel shader");
      
         		D3D::SetDebugObjectName((ID3D11DeviceChild*)s_ColorCopyProgram[1], "color copy MSAA pixel shader");
      
         		return s_ColorCopyProgram[1];
      
         	}
      
    @@ -307,7 +307,7 @@ ID3D11PixelShader* PixelShaderCache::GetColorMatrixProgram(bool multisampled)
  
         		char buf[1024];
      
         		int l = sprintf_s(buf, 1024, color_matrix_program_code_msaa, D3D::GetAAMode(g_ActiveConfig.iMultisampleMode).Count);
      
         		s_ColorMatrixProgram[1] = D3D::CompileAndCreatePixelShader(buf, l);
      
        -		CHECK(s_ColorMatrixProgram[1]!=NULL, "Create color matrix MSAA pixel shader");
      
        +		CHECK(s_ColorMatrixProgram[1]!=nullptr, "Create color matrix MSAA pixel shader");
      
         		D3D::SetDebugObjectName((ID3D11DeviceChild*)s_ColorMatrixProgram[1], "color matrix MSAA pixel shader");
      
         		return s_ColorMatrixProgram[1];
      
         	}
      
    @@ -323,7 +323,7 @@ ID3D11PixelShader* PixelShaderCache::GetDepthMatrixProgram(bool multisampled)
  
         		char buf[1024];
      
         		int l = sprintf_s(buf, 1024, depth_matrix_program_msaa, D3D::GetAAMode(g_ActiveConfig.iMultisampleMode).Count);
      
         		s_DepthMatrixProgram[1] = D3D::CompileAndCreatePixelShader(buf, l);
      
        -		CHECK(s_DepthMatrixProgram[1]!=NULL, "Create depth matrix MSAA pixel shader");
      
        +		CHECK(s_DepthMatrixProgram[1]!=nullptr, "Create depth matrix MSAA pixel shader");
      
         		D3D::SetDebugObjectName((ID3D11DeviceChild*)s_DepthMatrixProgram[1], "depth matrix MSAA pixel shader");
      
         		return s_DepthMatrixProgram[1];
      
         	}
      
    @@ -364,28 +364,28 @@ void PixelShaderCache::Init()
  
         {
      
         	unsigned int cbsize = ((sizeof(PixelShaderConstants))&(~0xf))+0x10; // must be a multiple of 16
      
         	D3D11_BUFFER_DESC cbdesc = CD3D11_BUFFER_DESC(cbsize, D3D11_BIND_CONSTANT_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE);
      
        -	D3D::device->CreateBuffer(&cbdesc, NULL, &pscbuf);
      
        -	CHECK(pscbuf!=NULL, "Create pixel shader constant buffer");
      
        +	D3D::device->CreateBuffer(&cbdesc, nullptr, &pscbuf);
      
        +	CHECK(pscbuf!=nullptr, "Create pixel shader constant buffer");
      
         	D3D::SetDebugObjectName((ID3D11DeviceChild*)pscbuf, "pixel shader constant buffer used to emulate the GX pipeline");
      
         	// used when drawing clear quads
      
         	s_ClearProgram = D3D::CompileAndCreatePixelShader(clear_program_code, sizeof(clear_program_code));
      
        -	CHECK(s_ClearProgram!=NULL, "Create clear pixel shader");
      
        +	CHECK(s_ClearProgram!=nullptr, "Create clear pixel shader");
      
         	D3D::SetDebugObjectName((ID3D11DeviceChild*)s_ClearProgram, "clear pixel shader");
      
         	// used when copying/resolving the color buffer
      
         	s_ColorCopyProgram[0] = D3D::CompileAndCreatePixelShader(color_copy_program_code, sizeof(color_copy_program_code));
      
        -	CHECK(s_ColorCopyProgram[0]!=NULL, "Create color copy pixel shader");
      
        +	CHECK(s_ColorCopyProgram[0]!=nullptr, "Create color copy pixel shader");
      
         	D3D::SetDebugObjectName((ID3D11DeviceChild*)s_ColorCopyProgram[0], "color copy pixel shader");
      
         	// used for color conversion
      
         	s_ColorMatrixProgram[0] = D3D::CompileAndCreatePixelShader(color_matrix_program_code, sizeof(color_matrix_program_code));
      
        -	CHECK(s_ColorMatrixProgram[0]!=NULL, "Create color matrix pixel shader");
      
        +	CHECK(s_ColorMatrixProgram[0]!=nullptr, "Create color matrix pixel shader");
      
         	D3D::SetDebugObjectName((ID3D11DeviceChild*)s_ColorMatrixProgram[0], "color matrix pixel shader");
      
         	// used for depth copy
      
         	s_DepthMatrixProgram[0] = D3D::CompileAndCreatePixelShader(depth_matrix_program, sizeof(depth_matrix_program));
      
        -	CHECK(s_DepthMatrixProgram[0]!=NULL, "Create depth matrix pixel shader");
      
        +	CHECK(s_DepthMatrixProgram[0]!=nullptr, "Create depth matrix pixel shader");
      
         	D3D::SetDebugObjectName((ID3D11DeviceChild*)s_DepthMatrixProgram[0], "depth matrix pixel shader");
      
         	Clear();
      
    @@ -405,7 +405,7 @@ void PixelShaderCache::Init()
  
         	if (g_Config.bEnableShaderDebugging)
      
         		Clear();
      
        -	last_entry = NULL;
      
        +	last_entry = nullptr;
      
         }
      
         // ONLY to be used during shutdown.
      
    @@ -416,7 +416,7 @@ void PixelShaderCache::Clear()
  
         	PixelShaders.clear();
      
         	pixel_uid_checker.Invalidate();
      
        -	last_entry = NULL;
      
        +	last_entry = nullptr;
      
         }
      
         // Used in Swap() when AA mode has changed
      
    @@ -465,7 +465,7 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components)
  
         		if (uid == last_uid)
      
         		{
      
         			GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE,true);
      
        -			return (last_entry->shader != NULL);
      
        +			return (last_entry->shader != nullptr);
      
         		}
      
         	}
      
    @@ -480,7 +480,7 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components)
  
         		last_entry = &entry;
      
         		GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE,true);
      
        -		return (entry.shader != NULL);
      
        +		return (entry.shader != nullptr);
      
         	}
      
         	// Need to compile a new shader
      
    @@ -512,7 +512,7 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components)
  
         bool PixelShaderCache::InsertByteCode(const PixelShaderUid &uid, const void* bytecode, unsigned int bytecodelen)
      
         {
      
         	ID3D11PixelShader* shader = D3D::CreatePixelShaderFromByteCode(bytecode, bytecodelen);
      
        -	if (shader == NULL)
      
        +	if (shader == nullptr)
      
         		return false;
      
         	// TODO: Somehow make the debug name a bit more specific

2  Source/Core/VideoBackends/D3D/PixelShaderCache.h

show inline notes

View

              
    @@ -42,7 +42,7 @@ class PixelShaderCache
  
         		std::string code;
      
        -		PSCacheEntry() : shader(NULL) {}
      
        +		PSCacheEntry() : shader(nullptr) {}
      
         		void Destroy() { SAFE_RELEASE(shader); }
      
         	};

10  Source/Core/VideoBackends/D3D/PointGeometryShader.cpp

show inline notes

View

              
    @@ -119,7 +119,7 @@ struct PointGSParams
  
         ;
      
         PointGeometryShader::PointGeometryShader()
      
        -	: m_ready(false), m_paramsBuffer(NULL)
      
        +	: m_ready(false), m_paramsBuffer(nullptr)
      
         { }
      
         void PointGeometryShader::Init()
      
    @@ -132,7 +132,7 @@ void PointGeometryShader::Init()
  
         	D3D11_BUFFER_DESC bd = CD3D11_BUFFER_DESC(sizeof(PointGSParams_Padded),
      
         		D3D11_BIND_CONSTANT_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE);
      
        -	hr = D3D::device->CreateBuffer(&bd, NULL, &m_paramsBuffer);
      
        +	hr = D3D::device->CreateBuffer(&bd, nullptr, &m_paramsBuffer);
      
         	CHECK(SUCCEEDED(hr), "create point geometry shader params buffer");
      
         	D3D::SetDebugObjectName(m_paramsBuffer, "point geometry shader params buffer");
      
    @@ -178,14 +178,14 @@ bool PointGeometryShader::SetShader(u32 components, float pointSize,
  
         		const std::string& numTexCoordsStr = numTexCoordsStream.str();
      
         		D3D_SHADER_MACRO macros[] = {
      
         			{ "NUM_TEXCOORDS", numTexCoordsStr.c_str() },
      
        -			{ NULL, NULL }
      
        +			{ nullptr, nullptr }
      
         		};
      
         		ID3D11GeometryShader* newShader = D3D::CompileAndCreateGeometryShader(code.GetBuffer(), unsigned int(strlen(code.GetBuffer())), macros);
      
         		if (!newShader)
      
         		{
      
         			WARN_LOG(VIDEO, "Point geometry shader for components 0x%.08X failed to compile", components);
      
         			// Add dummy shader to prevent trying to compile again
      
        -			m_shaders[components] = NULL;
      
        +			m_shaders[components] = nullptr;
      
         			return false;
      
         		}
      
    @@ -217,7 +217,7 @@ bool PointGeometryShader::SetShader(u32 components, float pointSize,
  
         			DEBUG_LOG(VIDEO, "Point params: size %f, texOffset %f, vpWidth %f, vpHeight %f",
      
         				pointSize, texOffset, vpWidth, vpHeight);
      
        -			D3D::context->GSSetShader(shaderIt->second, NULL, 0);
      
        +			D3D::context->GSSetShader(shaderIt->second, nullptr, 0);
      
         			D3D::context->GSSetConstantBuffers(0, 1, &m_paramsBuffer);
      
         			return true;

36  Source/Core/VideoBackends/D3D/Render.cpp

show inline notes

View

              
    @@ -44,14 +44,14 @@
  
         static Television s_television;
      
        -ID3D11Buffer* access_efb_cbuf = NULL;
      
        -ID3D11BlendState* clearblendstates[4] = {NULL};
      
        -ID3D11DepthStencilState* cleardepthstates[3] = {NULL};
      
        -ID3D11BlendState* resetblendstate = NULL;
      
        -ID3D11DepthStencilState* resetdepthstate = NULL;
      
        -ID3D11RasterizerState* resetraststate = NULL;
      
        +ID3D11Buffer* access_efb_cbuf = nullptr;
      
        +ID3D11BlendState* clearblendstates[4] = {nullptr};
      
        +ID3D11DepthStencilState* cleardepthstates[3] = {nullptr};
      
        +ID3D11BlendState* resetblendstate = nullptr;
      
        +ID3D11DepthStencilState* resetdepthstate = nullptr;
      
        +ID3D11RasterizerState* resetraststate = nullptr;
      
        -static ID3D11Texture2D* s_screenshot_texture = NULL;
      
        +static ID3D11Texture2D* s_screenshot_texture = nullptr;
      
         // GX pipeline state
      
    @@ -145,7 +145,7 @@ void SetupDeviceObjects()
  
         	CHECK(hr==S_OK, "Create rasterizer state for Renderer::ResetAPIState");
      
         	D3D::SetDebugObjectName((ID3D11DeviceChild*)resetraststate, "rasterizer state for Renderer::ResetAPIState");
      
        -	s_screenshot_texture = NULL;
      
        +	s_screenshot_texture = nullptr;
      
         }
      
         // Kill off all device objects
      
    @@ -172,7 +172,7 @@ void TeardownDeviceObjects()
  
         void CreateScreenshotTexture(const TargetRectangle& rc)
      
         {
      
         	D3D11_TEXTURE2D_DESC scrtex_desc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, rc.GetWidth(), rc.GetHeight(), 1, 1, 0, D3D11_USAGE_STAGING, D3D11_CPU_ACCESS_READ|D3D11_CPU_ACCESS_WRITE);
      
        -	HRESULT hr = D3D::device->CreateTexture2D(&scrtex_desc, NULL, &s_screenshot_texture);
      
        +	HRESULT hr = D3D::device->CreateTexture2D(&scrtex_desc, nullptr, &s_screenshot_texture);
      
         	CHECK(hr==S_OK, "Create screenshot staging texture");
      
         	D3D::SetDebugObjectName((ID3D11DeviceChild*)s_screenshot_texture, "staging screenshot texture");
      
         }
      
    @@ -385,7 +385,7 @@ u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data)
  
         		D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.f, 0.f, 1.f, 1.f);
      
         		D3D::context->RSSetViewports(1, &vp);
      
         		D3D::context->PSSetConstantBuffers(0, 1, &access_efb_cbuf);
      
        -		D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBDepthReadTexture()->GetRTV(), NULL);
      
        +		D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBDepthReadTexture()->GetRTV(), nullptr);
      
         		D3D::SetPointCopySampler();
      
         		D3D::drawShadedTexQuad(FramebufferManager::GetEFBDepthTexture()->GetSRV(),
      
         								&RectToLock,
      
    @@ -464,7 +464,7 @@ u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data)
  
         		// TODO: The first five PE registers may change behavior of EFB pokes, this isn't implemented, yet.
      
         		ResetAPIState();
      
        -		D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBColorTexture()->GetRTV(), NULL);
      
        +		D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBColorTexture()->GetRTV(), nullptr);
      
         		D3D::drawColorQuad(rgbaColor, (float)RectToLock.left   * 2.f / (float)Renderer::GetTargetWidth()  - 1.f,
      
         		                            - (float)RectToLock.top    * 2.f / (float)Renderer::GetTargetHeight() + 1.f,
      
         		                              (float)RectToLock.right  * 2.f / (float)Renderer::GetTargetWidth()  - 1.f,
      
    @@ -570,7 +570,7 @@ void Renderer::ReinterpretPixelData(unsigned int convtype)
  
         	D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.f, 0.f, (float)g_renderer->GetTargetWidth(), (float)g_renderer->GetTargetHeight());
      
         	D3D::context->RSSetViewports(1, &vp);
      
        -	D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBColorTempTexture()->GetRTV(), NULL);
      
        +	D3D::context->OMSetRenderTargets(1, &FramebufferManager::GetEFBColorTempTexture()->GetRTV(), nullptr);
      
         	D3D::SetPointCopySampler();
      
         	D3D::drawShadedTexQuad(FramebufferManager::GetEFBColorTexture()->GetSRV(), &source, g_renderer->GetTargetWidth(), g_renderer->GetTargetHeight(), pixel_shader, VertexShaderCache::GetSimpleVertexShader(), VertexShaderCache::GetSimpleInputLayout());
      
    @@ -770,7 +770,7 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbHeight,const EFBRectangl
  
         	if (Height > (s_backbuffer_height - Y)) Height = s_backbuffer_height - Y;
      
         	D3D11_VIEWPORT vp = CD3D11_VIEWPORT((float)X, (float)Y, (float)Width, (float)Height);
      
         	D3D::context->RSSetViewports(1, &vp);
      
        -	D3D::context->OMSetRenderTargets(1, &D3D::GetBackBuffer()->GetRTV(), NULL);
      
        +	D3D::context->OMSetRenderTargets(1, &D3D::GetBackBuffer()->GetRTV(), nullptr);
      
         	float ClearColor[4] = { 0.f, 0.f, 0.f, 1.f };
      
         	D3D::context->ClearRenderTargetView(D3D::GetBackBuffer()->GetRTV(), ClearColor);
      
    @@ -999,7 +999,7 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbHeight,const EFBRectangl
  
         		s_LastEFBScale = g_ActiveConfig.iEFBScale;
      
         		CalculateTargetSize(s_backbuffer_width, s_backbuffer_height);
      
        -		D3D::context->OMSetRenderTargets(1, &D3D::GetBackBuffer()->GetRTV(), NULL);
      
        +		D3D::context->OMSetRenderTargets(1, &D3D::GetBackBuffer()->GetRTV(), nullptr);
      
         		delete g_framebuffer_manager;
      
         		g_framebuffer_manager = new FramebufferManager;
      
    @@ -1089,7 +1089,7 @@ void Renderer::ApplyState(bool bUseDstAlpha)
  
         			if (FAILED(hr)) PanicAlert("Fail %s %d, stage=%d\n", __FILE__, __LINE__, stage);
      
         			else D3D::SetDebugObjectName((ID3D11DeviceChild*)samplerstate[stage], "sampler state used to emulate the GX pipeline");
      
         		}
      
        -		// else samplerstate[stage] = NULL;
      
        +		// else samplerstate[stage] = nullptr;
      
         	}
      
         	D3D::context->PSSetSamplers(0, 8, samplerstate);
      
         	for (unsigned int stage = 0; stage < 8; stage++)
      
    @@ -1107,13 +1107,13 @@ void Renderer::ApplyState(bool bUseDstAlpha)
  
         	D3D::context->PSSetConstantBuffers(0, 1, &PixelShaderCache::GetConstantBuffer());
      
         	D3D::context->VSSetConstantBuffers(0, 1, &VertexShaderCache::GetConstantBuffer());
      
        -	D3D::context->PSSetShader(PixelShaderCache::GetActiveShader(), NULL, 0);
      
        -	D3D::context->VSSetShader(VertexShaderCache::GetActiveShader(), NULL, 0);
      
        +	D3D::context->PSSetShader(PixelShaderCache::GetActiveShader(), nullptr, 0);
      
        +	D3D::context->VSSetShader(VertexShaderCache::GetActiveShader(), nullptr, 0);
      
         }
      
         void Renderer::RestoreState()
      
         {
      
        -	ID3D11ShaderResourceView* shader_resources[8] = { NULL };
      
        +	ID3D11ShaderResourceView* shader_resources[8] = { nullptr };
      
         	D3D::context->PSSetShaderResources(0, 8, shader_resources);
      
         	D3D::stateman->PopBlendState();

4  Source/Core/VideoBackends/D3D/Television.cpp

show inline notes

View

              
    @@ -59,7 +59,7 @@
  
         ;
      
         Television::Television()
      
        -	: m_yuyvTexture(NULL), m_yuyvTextureSRV(NULL), m_pShader(NULL)
      
        +	: m_yuyvTexture(nullptr), m_yuyvTextureSRV(nullptr), m_pShader(nullptr)
      
         { }
      
         void Television::Init()
      
    @@ -99,7 +99,7 @@ void Television::Init()
  
         	// Create YUYV-decoding pixel shader
      
         	m_pShader = D3D::CompileAndCreatePixelShader(YUYV_DECODER_PS, sizeof(YUYV_DECODER_PS));
      
        -	CHECK(m_pShader != NULL, "compile and create yuyv decoder pixel shader");
      
        +	CHECK(m_pShader != nullptr, "compile and create yuyv decoder pixel shader");
      
         	D3D::SetDebugObjectName(m_pShader, "yuyv decoder pixel shader");
      
         	// Create sampler state and set border color

14  Source/Core/VideoBackends/D3D/TextureCache.cpp

show inline notes

View

              
    @@ -18,7 +18,7 @@
  
         namespace DX11
      
         {
      
        -static TextureEncoder* g_encoder = NULL;
      
        +static TextureEncoder* g_encoder = nullptr;
      
         const size_t MAX_COPY_BUFFERS = 32;
      
         ID3D11Buffer* efbcopycbuf[MAX_COPY_BUFFERS] = { 0 };
      
    @@ -43,7 +43,7 @@ bool TextureCache::TCacheEntry::Save(const std::string& filename, unsigned int l
  
         		return false;
      
         	}
      
        -	ID3D11Texture2D* pNewTexture = NULL;
      
        +	ID3D11Texture2D* pNewTexture = nullptr;
      
         	ID3D11Texture2D* pSurface = texture->GetTex();
      
         	D3D11_TEXTURE2D_DESC desc;
      
         	pSurface->GetDesc(&desc);
      
    @@ -52,7 +52,7 @@ bool TextureCache::TCacheEntry::Save(const std::string& filename, unsigned int l
  
         	desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ | D3D11_CPU_ACCESS_WRITE;
      
         	desc.Usage = D3D11_USAGE_STAGING;
      
        -	HRESULT hr = D3D::device->CreateTexture2D(&desc, NULL, &pNewTexture);
      
        +	HRESULT hr = D3D::device->CreateTexture2D(&desc, nullptr, &pNewTexture);
      
         	bool saved_png = false;
      
    @@ -85,7 +85,7 @@ void TextureCache::TCacheEntry::Load(unsigned int width, unsigned int height,
  
         {
      
         	D3D11_USAGE usage = D3D11_USAGE_DEFAULT;
      
         	D3D11_CPU_ACCESS_FLAG cpu_access = (D3D11_CPU_ACCESS_FLAG)0;
      
        -	D3D11_SUBRESOURCE_DATA srdata, *data = NULL;
      
        +	D3D11_SUBRESOURCE_DATA srdata, *data = nullptr;
      
         	if (tex_levels == 1)
      
         	{
      
    @@ -134,7 +134,7 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo
  
         		D3D::context->RSSetViewports(1, &vp);
      
         		// set transformation
      
        -		if (NULL == efbcopycbuf[cbufid])
      
        +		if (nullptr == efbcopycbuf[cbufid])
      
         		{
      
         			const D3D11_BUFFER_DESC cbdesc = CD3D11_BUFFER_DESC(28 * sizeof(float), D3D11_BIND_CONSTANT_BUFFER, D3D11_USAGE_DEFAULT);
      
         			D3D11_SUBRESOURCE_DATA data;
      
    @@ -155,7 +155,7 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo
  
         		else
      
         			D3D::SetPointCopySampler();
      
        -		D3D::context->OMSetRenderTargets(1, &texture->GetRTV(), NULL);
      
        +		D3D::context->OMSetRenderTargets(1, &texture->GetRTV(), nullptr);
      
         		// Create texture copy
      
         		D3D::drawShadedTexQuad(
      
    @@ -208,7 +208,7 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo
  
         	g_encoder->Shutdown();
      
         	delete g_encoder;
      
        -	g_encoder = NULL;
      
        +	g_encoder = nullptr;
      
         }
      
         }

12  Source/Core/VideoBackends/D3D/VertexManager.cpp

show inline notes

View

              
    @@ -41,8 +41,8 @@ void VertexManager::CreateDeviceObjects()
  
         	m_vertex_buffers = new PID3D11Buffer[MAX_VBUFFER_COUNT];
      
         	for (m_current_index_buffer = 0; m_current_index_buffer < MAX_VBUFFER_COUNT; m_current_index_buffer++)
      
         	{
      
        -		m_index_buffers[m_current_index_buffer] = NULL;
      
        -		CHECK(SUCCEEDED(D3D::device->CreateBuffer(&bufdesc, NULL, &m_index_buffers[m_current_index_buffer])),
      
        +		m_index_buffers[m_current_index_buffer] = nullptr;
      
        +		CHECK(SUCCEEDED(D3D::device->CreateBuffer(&bufdesc, nullptr, &m_index_buffers[m_current_index_buffer])),
      
         		"Failed to create index buffer.");
      
         		D3D::SetDebugObjectName((ID3D11DeviceChild*)m_index_buffers[m_current_index_buffer], "index buffer of VertexManager");
      
         	}
      
    @@ -50,8 +50,8 @@ void VertexManager::CreateDeviceObjects()
  
         	bufdesc.ByteWidth = VBUFFER_SIZE;
      
         	for (m_current_vertex_buffer = 0; m_current_vertex_buffer < MAX_VBUFFER_COUNT; m_current_vertex_buffer++)
      
         	{
      
        -		m_vertex_buffers[m_current_vertex_buffer] = NULL;
      
        -		CHECK(SUCCEEDED(D3D::device->CreateBuffer(&bufdesc, NULL, &m_vertex_buffers[m_current_vertex_buffer])),
      
        +		m_vertex_buffers[m_current_vertex_buffer] = nullptr;
      
        +		CHECK(SUCCEEDED(D3D::device->CreateBuffer(&bufdesc, nullptr, &m_vertex_buffers[m_current_vertex_buffer])),
      
         		"Failed to create vertex buffer.");
      
         		D3D::SetDebugObjectName((ID3D11DeviceChild*)m_vertex_buffers[m_current_vertex_buffer], "Vertex buffer of VertexManager");
      
         	}
      
    @@ -167,7 +167,7 @@ void VertexManager::Draw(UINT stride)
  
         			D3D::context->DrawIndexed(IndexGenerator::GetIndexLen(), m_index_draw_offset, 0);
      
         			INCSTAT(stats.thisFrame.numIndexedDrawCalls);
      
        -			D3D::context->GSSetShader(NULL, NULL, 0);
      
        +			D3D::context->GSSetShader(nullptr, nullptr, 0);
      
         			((DX11::Renderer*)g_renderer)->RestoreCull();
      
         		}
      
         	}
      
    @@ -191,7 +191,7 @@ void VertexManager::Draw(UINT stride)
  
         			D3D::context->DrawIndexed(IndexGenerator::GetIndexLen(), m_index_draw_offset, 0);
      
         			INCSTAT(stats.thisFrame.numIndexedDrawCalls);
      
        -			D3D::context->GSSetShader(NULL, NULL, 0);
      
        +			D3D::context->GSSetShader(nullptr, nullptr, 0);
      
         			((DX11::Renderer*)g_renderer)->RestoreCull();
      
         		}
      
         	}

30  Source/Core/VideoBackends/D3D/VertexShaderCache.cpp

show inline notes

View

              
    @@ -23,10 +23,10 @@
  
         VertexShaderUid VertexShaderCache::last_uid;
      
         UidChecker<VertexShaderUid,VertexShaderCode> VertexShaderCache::vertex_uid_checker;
      
        -static ID3D11VertexShader* SimpleVertexShader = NULL;
      
        -static ID3D11VertexShader* ClearVertexShader = NULL;
      
        -static ID3D11InputLayout* SimpleLayout = NULL;
      
        -static ID3D11InputLayout* ClearLayout = NULL;
      
        +static ID3D11VertexShader* SimpleVertexShader = nullptr;
      
        +static ID3D11VertexShader* ClearVertexShader = nullptr;
      
        +static ID3D11InputLayout* SimpleLayout = nullptr;
      
        +static ID3D11InputLayout* ClearLayout = nullptr;
      
         LinearDiskCache<VertexShaderUid, u8> g_vs_disk_cache;
      
    @@ -35,7 +35,7 @@
  
         ID3D11InputLayout* VertexShaderCache::GetSimpleInputLayout() { return SimpleLayout; }
      
         ID3D11InputLayout* VertexShaderCache::GetClearInputLayout() { return ClearLayout; }
      
        -ID3D11Buffer* vscbuf = NULL;
      
        +ID3D11Buffer* vscbuf = nullptr;
      
         ID3D11Buffer* &VertexShaderCache::GetConstantBuffer()
      
         {
      
    @@ -114,7 +114,7 @@ void VertexShaderCache::Init()
  
         	unsigned int cbsize = ((sizeof(VertexShaderConstants))&(~0xf))+0x10; // must be a multiple of 16
      
         	D3D11_BUFFER_DESC cbdesc = CD3D11_BUFFER_DESC(cbsize, D3D11_BIND_CONSTANT_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE);
      
        -	HRESULT hr = D3D::device->CreateBuffer(&cbdesc, NULL, &vscbuf);
      
        +	HRESULT hr = D3D::device->CreateBuffer(&cbdesc, nullptr, &vscbuf);
      
         	CHECK(hr==S_OK, "Create vertex shader constant buffer (size=%u)", cbsize);
      
         	D3D::SetDebugObjectName((ID3D11DeviceChild*)vscbuf, "vertex shader constant buffer used to emulate the GX pipeline");
      
    @@ -122,7 +122,7 @@ void VertexShaderCache::Init()
  
         	D3D::CompileVertexShader(simple_shader_code, sizeof(simple_shader_code), &blob);
      
         	D3D::device->CreateInputLayout(simpleelems, 2, blob->Data(), blob->Size(), &SimpleLayout);
      
         	SimpleVertexShader = D3D::CreateVertexShaderFromByteCode(blob);
      
        -	if (SimpleLayout == NULL || SimpleVertexShader == NULL) PanicAlert("Failed to create simple vertex shader or input layout at %s %d\n", __FILE__, __LINE__);
      
        +	if (SimpleLayout == nullptr || SimpleVertexShader == nullptr) PanicAlert("Failed to create simple vertex shader or input layout at %s %d\n", __FILE__, __LINE__);
      
         	blob->Release();
      
         	D3D::SetDebugObjectName((ID3D11DeviceChild*)SimpleVertexShader, "simple vertex shader");
      
         	D3D::SetDebugObjectName((ID3D11DeviceChild*)SimpleLayout, "simple input layout");
      
    @@ -130,7 +130,7 @@ void VertexShaderCache::Init()
  
         	D3D::CompileVertexShader(clear_shader_code, sizeof(clear_shader_code), &blob);
      
         	D3D::device->CreateInputLayout(clearelems, 2, blob->Data(), blob->Size(), &ClearLayout);
      
         	ClearVertexShader = D3D::CreateVertexShaderFromByteCode(blob);
      
        -	if (ClearLayout == NULL || ClearVertexShader == NULL) PanicAlert("Failed to create clear vertex shader or input layout at %s %d\n", __FILE__, __LINE__);
      
        +	if (ClearLayout == nullptr || ClearVertexShader == nullptr) PanicAlert("Failed to create clear vertex shader or input layout at %s %d\n", __FILE__, __LINE__);
      
         	blob->Release();
      
         	D3D::SetDebugObjectName((ID3D11DeviceChild*)ClearVertexShader, "clear vertex shader");
      
         	D3D::SetDebugObjectName((ID3D11DeviceChild*)ClearLayout, "clear input layout");
      
    @@ -152,7 +152,7 @@ void VertexShaderCache::Init()
  
         	if (g_Config.bEnableShaderDebugging)
      
         		Clear();
      
        -	last_entry = NULL;
      
        +	last_entry = nullptr;
      
         }
      
         void VertexShaderCache::Clear()
      
    @@ -162,7 +162,7 @@ void VertexShaderCache::Clear()
  
         	vshaders.clear();
      
         	vertex_uid_checker.Invalidate();
      
        -	last_entry = NULL;
      
        +	last_entry = nullptr;
      
         }
      
         void VertexShaderCache::Shutdown()
      
    @@ -196,7 +196,7 @@ bool VertexShaderCache::SetShader(u32 components)
  
         		if (uid == last_uid)
      
         		{
      
         			GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true);
      
        -			return (last_entry->shader != NULL);
      
        +			return (last_entry->shader != nullptr);
      
         		}
      
         	}
      
    @@ -209,16 +209,16 @@ bool VertexShaderCache::SetShader(u32 components)
  
         		last_entry = &entry;
      
         		GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true);
      
        -		return (entry.shader != NULL);
      
        +		return (entry.shader != nullptr);
      
         	}
      
         	VertexShaderCode code;
      
         	GenerateVertexShaderCode(code, components, API_D3D);
      
        -	D3DBlob* pbytecode = NULL;
      
        +	D3DBlob* pbytecode = nullptr;
      
         	D3D::CompileVertexShader(code.GetBuffer(), (int)strlen(code.GetBuffer()), &pbytecode);
      
        -	if (pbytecode == NULL)
      
        +	if (pbytecode == nullptr)
      
         	{
      
         		GFX_DEBUGGER_PAUSE_AT(NEXT_ERROR, true);
      
         		return false;
      
    @@ -240,7 +240,7 @@ bool VertexShaderCache::SetShader(u32 components)
  
         bool VertexShaderCache::InsertByteCode(const VertexShaderUid &uid, D3DBlob* bcodeblob)
      
         {
      
         	ID3D11VertexShader* shader = D3D::CreateVertexShaderFromByteCode(bcodeblob);
      
        -	if (shader == NULL)
      
        +	if (shader == nullptr)
      
         		return false;
      
         	// TODO: Somehow make the debug name a bit more specific

2  Source/Core/VideoBackends/D3D/VertexShaderCache.h

show inline notes

View

              
    @@ -40,7 +40,7 @@ class VertexShaderCache
  
         		std::string code;
      
        -		VSCacheEntry() : shader(NULL), bytecode(NULL) {}
      
        +		VSCacheEntry() : shader(nullptr), bytecode(nullptr) {}
      
         		void SetByteCode(D3DBlob* blob)
      
         		{
      
         			SAFE_RELEASE(bytecode);

34  Source/Core/VideoBackends/D3D/XFBEncoder.cpp

show inline notes

View

              
    @@ -130,10 +130,10 @@
  
         } QUAD_VERTS[4] = { { 0, 0 }, { 1, 0 }, { 0, 1 }, { 1, 1 } };
      
         XFBEncoder::XFBEncoder()
      
        -	: m_out(NULL), m_outRTV(NULL), m_outStage(NULL), m_encodeParams(NULL),
      
        -	m_quad(NULL), m_vShader(NULL), m_quadLayout(NULL), m_pShader(NULL),
      
        -	m_xfbEncodeBlendState(NULL), m_xfbEncodeDepthState(NULL),
      
        -	m_xfbEncodeRastState(NULL), m_efbSampler(NULL)
      
        +	: m_out(nullptr), m_outRTV(nullptr), m_outStage(nullptr), m_encodeParams(nullptr),
      
        +	m_quad(nullptr), m_vShader(nullptr), m_quadLayout(nullptr), m_pShader(nullptr),
      
        +	m_xfbEncodeBlendState(nullptr), m_xfbEncodeDepthState(nullptr),
      
        +	m_xfbEncodeRastState(nullptr), m_efbSampler(nullptr)
      
         { }
      
         void XFBEncoder::Init()
      
    @@ -147,7 +147,7 @@ void XFBEncoder::Init()
  
         	D3D11_TEXTURE2D_DESC t2dd = CD3D11_TEXTURE2D_DESC(
      
         		DXGI_FORMAT_R8G8B8A8_UNORM, MAX_XFB_WIDTH/2, MAX_XFB_HEIGHT, 1, 1,
      
         		D3D11_BIND_RENDER_TARGET);
      
        -	hr = D3D::device->CreateTexture2D(&t2dd, NULL, &m_out);
      
        +	hr = D3D::device->CreateTexture2D(&t2dd, nullptr, &m_out);
      
         	CHECK(SUCCEEDED(hr), "create xfb encoder output texture");
      
         	D3D::SetDebugObjectName(m_out, "xfb encoder output texture");
      
    @@ -164,7 +164,7 @@ void XFBEncoder::Init()
  
         	t2dd.Usage = D3D11_USAGE_STAGING;
      
         	t2dd.BindFlags = 0;
      
         	t2dd.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
      
        -	hr = D3D::device->CreateTexture2D(&t2dd, NULL, &m_outStage);
      
        +	hr = D3D::device->CreateTexture2D(&t2dd, nullptr, &m_outStage);
      
         	CHECK(SUCCEEDED(hr), "create xfb encoder output staging buffer");
      
         	D3D::SetDebugObjectName(m_outStage, "xfb encoder output staging buffer");
      
    @@ -172,7 +172,7 @@ void XFBEncoder::Init()
  
         	D3D11_BUFFER_DESC bd = CD3D11_BUFFER_DESC(sizeof(XFBEncodeParams),
      
         		D3D11_BIND_CONSTANT_BUFFER);
      
        -	hr = D3D::device->CreateBuffer(&bd, NULL, &m_encodeParams);
      
        +	hr = D3D::device->CreateBuffer(&bd, nullptr, &m_encodeParams);
      
         	CHECK(SUCCEEDED(hr), "create xfb encode params buffer");
      
         	D3D::SetDebugObjectName(m_encodeParams, "xfb encoder params buffer");
      
    @@ -188,14 +188,14 @@ void XFBEncoder::Init()
  
         	// Create vertex shader
      
        -	D3DBlob* bytecode = NULL;
      
        +	D3DBlob* bytecode = nullptr;
      
         	if (!D3D::CompileVertexShader(XFB_ENCODE_VS, sizeof(XFB_ENCODE_VS), &bytecode))
      
         	{
      
         		ERROR_LOG(VIDEO, "XFB encode vertex shader failed to compile");
      
         		return;
      
         	}
      
        -	hr = D3D::device->CreateVertexShader(bytecode->Data(), bytecode->Size(), NULL, &m_vShader);
      
        +	hr = D3D::device->CreateVertexShader(bytecode->Data(), bytecode->Size(), nullptr, &m_vShader);
      
         	CHECK(SUCCEEDED(hr), "create xfb encode vertex shader");
      
         	D3D::SetDebugObjectName(m_vShader, "xfb encoder vertex shader");
      
    @@ -279,8 +279,8 @@ void XFBEncoder::Encode(u8* dst, u32 width, u32 height, const EFBRectangle& srcR
  
         	// Set up all the state for XFB encoding
      
        -	D3D::context->PSSetShader(m_pShader, NULL, 0);
      
        -	D3D::context->VSSetShader(m_vShader, NULL, 0);
      
        +	D3D::context->PSSetShader(m_pShader, nullptr, 0);
      
        +	D3D::context->VSSetShader(m_vShader, nullptr, 0);
      
         	D3D::stateman->PushBlendState(m_xfbEncodeBlendState);
      
         	D3D::stateman->PushDepthState(m_xfbEncodeDepthState);
      
    @@ -306,11 +306,11 @@ void XFBEncoder::Encode(u8* dst, u32 width, u32 height, const EFBRectangle& srcR
  
         	params.TexRight = FLOAT(targetRect.right) / g_renderer->GetTargetWidth();
      
         	params.TexBottom = FLOAT(targetRect.bottom) / g_renderer->GetTargetHeight();
      
         	params.Gamma = gamma;
      
        -	D3D::context->UpdateSubresource(m_encodeParams, 0, NULL, &params, 0, 0);
      
        +	D3D::context->UpdateSubresource(m_encodeParams, 0, nullptr, &params, 0, 0);
      
         	D3D::context->VSSetConstantBuffers(0, 1, &m_encodeParams);
      
        -	D3D::context->OMSetRenderTargets(1, &m_outRTV, NULL);
      
        +	D3D::context->OMSetRenderTargets(1, &m_outRTV, nullptr);
      
         	ID3D11ShaderResourceView* pEFB = FramebufferManager::GetEFBColorTexture()->GetSRV();
      
    @@ -329,13 +329,13 @@ void XFBEncoder::Encode(u8* dst, u32 width, u32 height, const EFBRectangle& srcR
  
         	// Clean up state
      
        -	IUnknown* nullDummy = NULL;
      
        +	IUnknown* nullDummy = nullptr;
      
         	D3D::context->PSSetSamplers(0, 1, (ID3D11SamplerState**)&nullDummy);
      
         	D3D::context->PSSetShaderResources(0, 1, (ID3D11ShaderResourceView**)&nullDummy);
      
         	D3D::context->PSSetConstantBuffers(0, 1, (ID3D11Buffer**)&nullDummy);
      
        -	D3D::context->OMSetRenderTargets(0, NULL, NULL);
      
        +	D3D::context->OMSetRenderTargets(0, nullptr, nullptr);
      
         	D3D::context->VSSetConstantBuffers(0, 1, (ID3D11Buffer**)&nullDummy);
      
    @@ -343,8 +343,8 @@ void XFBEncoder::Encode(u8* dst, u32 width, u32 height, const EFBRectangle& srcR
  
         	D3D::stateman->PopDepthState();
      
         	D3D::stateman->PopBlendState();
      
        -	D3D::context->PSSetShader(NULL, NULL, 0);
      
        -	D3D::context->VSSetShader(NULL, NULL, 0);
      
        +	D3D::context->PSSetShader(nullptr, nullptr, 0);
      
        +	D3D::context->VSSetShader(nullptr, nullptr, 0);
      
         	// Transfer staging buffer to GameCube/Wii RAM

6  Source/Core/VideoBackends/D3D/main.cpp

show inline notes

View

              
    @@ -161,7 +161,7 @@ bool VideoBackend::Initialize(void *&window_handle)
  
         	UpdateActiveConfig();
      
         	window_handle = (void*)EmuWindow::Create((HWND)window_handle, GetModuleHandle(0), _T("Loading - Please wait."));
      
        -	if (window_handle == NULL)
      
        +	if (window_handle == nullptr)
      
         	{
      
         		ERROR_LOG(VIDEO, "An error has occurred while trying to create the window.");
      
         		return false;
      
    @@ -230,8 +230,8 @@ void VideoBackend::Shutdown()
  
         		delete g_vertex_manager;
      
         		delete g_texture_cache;
      
         		delete g_renderer;
      
        -		g_renderer = NULL;
      
        -		g_texture_cache = NULL;
      
        +		g_renderer = nullptr;
      
        +		g_texture_cache = nullptr;
      
         	}
      
         }

12  Source/Core/VideoBackends/OGL/FramebufferManager.cpp

show inline notes

View

              6 additions,
              6 deletions
              not shown
            

14  Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp

show inline notes

View

              7 additions,
              7 deletions
              not shown
            

4  Source/Core/VideoBackends/OGL/GLUtil.cpp

show inline notes

View

              2 additions,
              2 deletions
              not shown
            

4  Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp

show inline notes

View

              2 additions,
              2 deletions
              not shown
            

2  Source/Core/VideoBackends/OGL/PerfQuery.h

show inline notes

View

              1 additions,
              1 deletions
              not shown
            

4  Source/Core/VideoBackends/OGL/PostProcessing.cpp

show inline notes

View

              2 additions,
              2 deletions
              not shown
            

34  Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp

show inline notes

View

              20 additions,
              14 deletions
              not shown
            

4  Source/Core/VideoBackends/OGL/RasterFont.cpp

show inline notes

View

              2 additions,
              2 deletions
              not shown
            

20  Source/Core/VideoBackends/OGL/Render.cpp

show inline notes

View

              10 additions,
              10 deletions
              not shown
            

2  Source/Core/VideoBackends/OGL/Render.h

show inline notes

View

              1 additions,
              1 deletions
              not shown
            

36  Source/Core/VideoBackends/OGL/StreamBuffer.cpp

show inline notes

View

              18 additions,
              18 deletions
              not shown
            

2  Source/Core/VideoBackends/OGL/TextureCache.cpp

show inline notes

View

              1 additions,
              1 deletions
              not shown
            

2  Source/Core/VideoBackends/OGL/TextureCache.h

show inline notes

View

              1 additions,
              1 deletions
              not shown
            

6  Source/Core/VideoBackends/OGL/TextureConverter.cpp

show inline notes

View

              3 additions,
              3 deletions
              not shown
            

6  Source/Core/VideoBackends/OGL/VertexManager.cpp

show inline notes

View

              3 additions,
              3 deletions
              not shown
            

2  Source/Core/VideoBackends/OGL/VertexManager.h

show inline notes

View

              1 additions,
              1 deletions
              not shown
            

10  Source/Core/VideoBackends/OGL/main.cpp

show inline notes

View

              5 additions,
              5 deletions
              not shown
            

2  Source/Core/VideoBackends/Software/BPMemLoader.cpp

show inline notes

View

              1 additions,
              1 deletions
              not shown
            

2  Source/Core/VideoBackends/Software/DebugUtil.cpp

show inline notes

View

              1 additions,
              1 deletions
              not shown
            

2  Source/Core/VideoBackends/Software/OpcodeDecoder.cpp

show inline notes

View

              1 additions,
              1 deletions
              not shown
            

12  Source/Core/VideoBackends/Software/Rasterizer.cpp

show inline notes

View

              6 additions,
              6 deletions
              not shown
            

2  Source/Core/VideoBackends/Software/SWCommandProcessor.cpp

show inline notes

View

              1 additions,
              1 deletions
              not shown
            

4  Source/Core/VideoBackends/Software/SWRenderer.cpp

show inline notes

View

              2 additions,
              2 deletions
              not shown
            

10  Source/Core/VideoBackends/Software/SWVertexLoader.cpp

show inline notes

View

              5 additions,
              5 deletions
              not shown
            

2  Source/Core/VideoBackends/Software/SWmain.cpp

show inline notes

View

              1 additions,
              1 deletions
              not shown
            

24  Source/Core/VideoBackends/Software/Tev.cpp

show inline notes

View

              16 additions,
              8 deletions
              not shown
            

2  Source/Core/VideoBackends/Software/TextureSampler.cpp

show inline notes

View

              1 additions,
              1 deletions
              not shown
            

46  Source/Core/VideoCommon/AVIDump.cpp

show inline notes

View

              23 additions,
              23 deletions
              not shown
            

2  Source/Core/VideoCommon/BPStructs.cpp

show inline notes

View

              1 additions,
              1 deletions
              not shown
            

12  Source/Core/VideoCommon/Debugger.cpp

show inline notes

View

              6 additions,
              6 deletions
              not shown
            

18  Source/Core/VideoCommon/EmuWindow.cpp

show inline notes

View

              9 additions,
              9 deletions
              not shown
            

2  Source/Core/VideoCommon/Fifo.cpp

show inline notes

View

              1 additions,
              1 deletions
              not shown
            

18  Source/Core/VideoCommon/FramebufferManagerBase.cpp

show inline notes

View

              8 additions,
              10 deletions
              not shown
            

2  Source/Core/VideoCommon/FramebufferManagerBase.h

show inline notes

View

              1 additions,
              1 deletions
              not shown
            

4  Source/Core/VideoCommon/HiresTextures.cpp

show inline notes

View

              2 additions,
              2 deletions
              not shown
            

16  Source/Core/VideoCommon/ImageWrite.cpp

show inline notes

View

              8 additions,
              8 deletions
              not shown
            

2  Source/Core/VideoCommon/IndexGenerator.cpp

show inline notes

View

              1 additions,
              1 deletions
              not shown
            

4  Source/Core/VideoCommon/OpcodeDecoding.cpp

show inline notes

View

              2 additions,
              2 deletions
              not shown
            

2  Source/Core/VideoCommon/PerfQueryBase.cpp

show inline notes

View

              1 additions,
              1 deletions
              not shown
            

8  Source/Core/VideoCommon/PixelShaderGen.cpp

show inline notes

View

              4 additions,
              4 deletions
              not shown
            

2  Source/Core/VideoCommon/RenderBase.cpp

show inline notes

View

              1 additions,
              1 deletions
              not shown
            

8  Source/Core/VideoCommon/ShaderGenCommon.h

show inline notes

View

              4 additions,
              4 deletions
              not shown
            

30  Source/Core/VideoCommon/TextureCacheBase.cpp

show inline notes

View

              14 additions,
              16 deletions
              not shown
            

2  Source/Core/VideoCommon/TextureConversionShader.cpp

show inline notes

View

              1 additions,
              1 deletions
              not shown
            

8  Source/Core/VideoCommon/VertexLoader.cpp

show inline notes

View

              4 additions,
              4 deletions
              not shown
            

2  Source/Core/VideoCommon/VertexLoaderManager.cpp

show inline notes

View

              1 additions,
              1 deletions
              not shown
            

10  Source/Core/VideoCommon/VertexLoader_Position.cpp

show inline notes

View

              5 additions,
              5 deletions
              not shown
            

10  Source/Core/VideoCommon/VertexLoader_TextCoord.cpp

show inline notes

View

              5 additions,
              5 deletions
              not shown
            

6  Source/Core/VideoCommon/VertexShaderGen.cpp

show inline notes

View

              3 additions,
              3 deletions
              not shown
            

8  Source/Core/VideoCommon/VideoBackendBase.cpp

show inline notes

View

              4 additions,
              4 deletions
              not shown
            

40  Source/Core/VideoCommon/VideoBackendBase.h

show inline notes

View

              20 additions,
              20 deletions
              not shown
            

4  Source/DSPSpy/main_spy.cpp

show inline notes

View

              2 additions,
              2 deletions
              not shown
            

2  Source/DSPSpy/real_dsp.cpp

show inline notes

View

              1 additions,
              1 deletions
              not shown
            

4  Source/UnitTests/Core/MMIOTest.cpp

show inline notes

View

              2 additions,
              2 deletions
              not shown
            

2  docs/DSP/DSP_InterC/DSP_InterC/DSP_InterC.cpp

show inline notes

View

              1 additions,
              1 deletions
              not shown
            

0 notes on commit `633dc75`

Please sign in to comment.

Something went wrong with that request. Please try again.

public dolphin-emu / dolphin

HTTPS clone URL

Subversion checkout URL

0 notes on commit 633dc75

0 notes on commit `633dc75`