Косметика кода.

Aleksoid1978 · Jul 30, 2024 · 0ba241f · 0ba241f
1 parent 1d49e08
commit 0ba241f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/Source/DX9Helper.cpp b/Source/DX9Helper.cpp
@@ -103,20 +103,27 @@ HRESULT DumpDX9Surface(IDirect3DSurface9* pSurface, const wchar_t* filename)
  HRESULT hr = S_OK;
 
  D3DSURFACE_DESC desc = {};
- if (FAILED(hr = pSurface->GetDesc(&desc))) {
+ hr = pSurface->GetDesc(&desc);
+ if (FAILED(hr)) {
  return hr;
  };
 
  CComPtr<IDirect3DDevice9> pDevice;
- if (FAILED(hr = pSurface->GetDevice(&pDevice))) {
+ hr = pSurface->GetDevice(&pDevice);
+ if (FAILED(hr)) {
  return hr;
  };
 
  CComPtr<IDirect3DSurface9> pTarget;
- if (FAILED(hr = pDevice->CreateRenderTarget(desc.Width, desc.Height, D3DFMT_X8R8G8B8, D3DMULTISAMPLE_NONE, 0, TRUE, &pTarget, nullptr))
-  || FAILED(hr = pDevice->StretchRect(pSurface, nullptr, pTarget, nullptr, D3DTEXF_NONE))) {
+ hr = pDevice->CreateRenderTarget(desc.Width, desc.Height, D3DFMT_X8R8G8B8, D3DMULTISAMPLE_NONE, 0, TRUE, &pTarget, nullptr);
+ if (FAILED(hr)) {
  return hr;
- }
+ };
+
+ hr = pDevice->StretchRect(pSurface, nullptr, pTarget, nullptr, D3DTEXF_NONE);
+ if (FAILED(hr)) {
+ return hr;
+ };
 
  unsigned len = desc.Width * desc.Height * 4;
  std::unique_ptr<BYTE[]> dib(new(std::nothrow) BYTE[sizeof(BITMAPINFOHEADER) + len]);
@@ -134,7 +141,8 @@ HRESULT DumpDX9Surface(IDirect3DSurface9* pSurface, const wchar_t* filename)
  bih->biSizeImage = DIBSIZE(*bih);
 
  D3DLOCKED_RECT r;
- if (FAILED(hr = pTarget->LockRect(&r, nullptr, D3DLOCK_READONLY))) {
+ hr = pTarget->LockRect(&r, nullptr, D3DLOCK_READONLY);
+ if (FAILED(hr)) {
  return hr;
  }
 

diff --git a/Source/DX9VideoProcessor.cpp b/Source/DX9VideoProcessor.cpp
@@ -452,7 +452,8 @@ HRESULT CDX9VideoProcessor::InitInternal(bool* pChangeDevice/* = nullptr*/)
  */
 
  if (bTryToReset) {
- bTryToReset = SUCCEEDED(hr = m_pD3DDevEx->ResetEx(&m_d3dpp, &m_DisplayMode));
+ hr = m_pD3DDevEx->ResetEx(&m_d3dpp, &m_DisplayMode);
+ bTryToReset = SUCCEEDED(hr);
  DLog(L" => ResetEx(fullscreen) : {}", HR2Str(hr));
  }
 
@@ -482,7 +483,8 @@ HRESULT CDX9VideoProcessor::InitInternal(bool* pChangeDevice/* = nullptr*/)
  }
 
  if (bTryToReset) {
- bTryToReset = SUCCEEDED(hr = m_pD3DDevEx->ResetEx(&m_d3dpp, nullptr));
+ hr = m_pD3DDevEx->ResetEx(&m_d3dpp, nullptr);
+ bTryToReset = SUCCEEDED(hr);
  DLog(L" => ResetEx() : {}", HR2Str(hr));
  }