wtl10.patch 1.4 KB

12345678910111213141516171819202122232425262728293031323334353637
  1. From 23ef510bb7a3f38ecf2d05edd04ccc5bcf210c0d Mon Sep 17 00:00:00 2001
  2. From: Sorin Jianu <sorin@chromium.org>
  3. Date: Thu, 13 Jun 2019 15:45:01 -0700
  4. Subject: [PATCH] fix atlverify
  5. ---
  6. third_party/wtl/include/atlapp.h | 6 +++---
  7. 1 file changed, 3 insertions(+), 3 deletions(-)
  8. diff --git a/third_party/wtl/include/atlapp.h b/third_party/wtl/include/atlapp.h
  9. index c61be7e18faf..6c4d9b0f6e2a 100644
  10. --- a/third_party/wtl/include/atlapp.h
  11. +++ b/third_party/wtl/include/atlapp.h
  12. @@ -187,7 +187,7 @@ inline HFONT AtlGetDefaultGuiFont()
  13. inline HFONT AtlCreateControlFont()
  14. {
  15. LOGFONT lf = {};
  16. - ATLVERIFY(::SystemParametersInfo(SPI_GETICONTITLELOGFONT, sizeof(LOGFONT), &lf, 0) != FALSE);
  17. + ATLVERIFY(::SystemParametersInfo(SPI_GETICONTITLELOGFONT, sizeof(LOGFONT), &lf, 0));
  18. HFONT hFont = ::CreateFontIndirect(&lf);
  19. ATLASSERT(hFont != NULL);
  20. return hFont;
  21. @@ -199,9 +199,9 @@ inline HFONT AtlCreateBoldFont(HFONT hFont = NULL)
  22. {
  23. LOGFONT lf = {};
  24. if(hFont == NULL)
  25. - ATLVERIFY(::SystemParametersInfo(SPI_GETICONTITLELOGFONT, sizeof(LOGFONT), &lf, 0) != FALSE);
  26. + ATLVERIFY(::SystemParametersInfo(SPI_GETICONTITLELOGFONT, sizeof(LOGFONT), &lf, 0));
  27. else
  28. - ATLVERIFY(::GetObject(hFont, sizeof(LOGFONT), &lf) == sizeof(LOGFONT));
  29. + (void)(ATLVERIFY(::GetObject(hFont, sizeof(LOGFONT), &lf) == sizeof(LOGFONT)));
  30. lf.lfWeight = FW_BOLD;
  31. HFONT hFontBold = ::CreateFontIndirect(&lf);
  32. ATLASSERT(hFontBold != NULL);
  33. --
  34. 2.21.0.windows.1