From 50e363895d08bea4479a09b2e791b7e09f6d55d6 Mon Sep 17 00:00:00 2001 From: wolfreak99 Date: Thu, 15 Jun 2017 05:38:11 -0400 Subject: [PATCH] Compiling fixes --- audio-router-gui/app_list.cpp | 4 ++-- bootstrapper/main.cpp | 2 +- third-party/WTL90_4140_Final/Include/atlframe.h | 2 +- third-party/WTL90_4140_Final/Include/atlgdi.h | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/audio-router-gui/app_list.cpp b/audio-router-gui/app_list.cpp index fe03bd1..2245fe8 100644 --- a/audio-router-gui/app_list.cpp +++ b/audio-router-gui/app_list.cpp @@ -26,10 +26,10 @@ bool app_list::populate_list() { bool app_list::populate_list(const filters_t & filters) { this->apps.clear(); - if ( ! this-> populate_list(true, filters)) + if (!this->populate_list(true, filters)) return false; #ifdef _WIN64 - return this - > populate_list(false, filters); + return this->populate_list(false, filters); #else return true; #endif diff --git a/bootstrapper/main.cpp b/bootstrapper/main.cpp index 98fb316..4bf89c6 100644 --- a/bootstrapper/main.cpp +++ b/bootstrapper/main.cpp @@ -241,7 +241,7 @@ NTSTATUS NTAPI ntcreateuserprocess_patch( DWORD mode = PIPE_READMODE_MESSAGE; SetNamedPipeHandleState(hpipe, &mode, NULL, NULL); // flag 2 indicates that bootstrapping is only injected - DWORD pid_tid_both[3] = {pid, tid, in_list ? 1 : 2}; + DWORD pid_tid_both[3] = {pid, tid, (DWORD)(in_list ? 1 : 2) }; DWORD exitcode, bytes_read; BOOL success = TransactNamedPipe( hpipe, pid_tid_both, sizeof(pid_tid_both), &exitcode, sizeof(exitcode), diff --git a/third-party/WTL90_4140_Final/Include/atlframe.h b/third-party/WTL90_4140_Final/Include/atlframe.h index 7d7acd5..18df933 100644 --- a/third-party/WTL90_4140_Final/Include/atlframe.h +++ b/third-party/WTL90_4140_Final/Include/atlframe.h @@ -987,7 +987,7 @@ class ATL_NO_VTABLE CFrameWindowImplBase : public ATL::CWindowImplBaseT< TBase, bool PrepareChevronMenu(_ChevronMenuInfo& cmi) { // get rebar and toolbar - REBARBANDINFO rbbi = { RunTimeHelper::SizeOf_REBARBANDINFO() }; + REBARBANDINFO rbbi = { (UINT)RunTimeHelper::SizeOf_REBARBANDINFO() }; rbbi.fMask = RBBIM_CHILD; BOOL bRet = (BOOL)::SendMessage(cmi.lpnm->hdr.hwndFrom, RB_GETBANDINFO, cmi.lpnm->uBand, (LPARAM)&rbbi); ATLASSERT(bRet); diff --git a/third-party/WTL90_4140_Final/Include/atlgdi.h b/third-party/WTL90_4140_Final/Include/atlgdi.h index 03aa076..eb7c9ed 100644 --- a/third-party/WTL90_4140_Final/Include/atlgdi.h +++ b/third-party/WTL90_4140_Final/Include/atlgdi.h @@ -467,28 +467,28 @@ class CLogFont : public LOGFONT #ifndef _WIN32_WCE void SetCaptionFont() { - NONCLIENTMETRICS ncm = { RunTimeHelper::SizeOf_NONCLIENTMETRICS() }; + NONCLIENTMETRICS ncm = { (UINT)RunTimeHelper::SizeOf_NONCLIENTMETRICS() }; ATLVERIFY(::SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0)); Copy(&ncm.lfCaptionFont); } void SetMenuFont() { - NONCLIENTMETRICS ncm = { RunTimeHelper::SizeOf_NONCLIENTMETRICS() }; + NONCLIENTMETRICS ncm = { (UINT)RunTimeHelper::SizeOf_NONCLIENTMETRICS() }; ATLVERIFY(::SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0)); Copy(&ncm.lfMenuFont); } void SetStatusFont() { - NONCLIENTMETRICS ncm = { RunTimeHelper::SizeOf_NONCLIENTMETRICS() }; + NONCLIENTMETRICS ncm = { (UINT)RunTimeHelper::SizeOf_NONCLIENTMETRICS() }; ATLVERIFY(::SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0)); Copy(&ncm.lfStatusFont); } void SetMessageBoxFont() { - NONCLIENTMETRICS ncm = { RunTimeHelper::SizeOf_NONCLIENTMETRICS() }; + NONCLIENTMETRICS ncm = { (UINT)RunTimeHelper::SizeOf_NONCLIENTMETRICS() }; ATLVERIFY(::SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0)); Copy(&ncm.lfMessageFont); } @@ -3680,8 +3680,8 @@ struct DIBINFO16 // a BITMAPINFO with 2 additional color bitfields DIBINFO16(SIZE size) { BITMAPINFOHEADER bmih = { sizeof(BITMAPINFOHEADER), size.cx, size.cy, - 1, 16, BI_BITFIELDS, 2 * size.cx * size.cy , 0, 0, 3 }; - DWORD dw[3] = DIBINFO16_BITFIELDS ; + 1, 16, (DWORD)BI_BITFIELDS, (DWORD)2 * size.cx * size.cy, 0, 0, 3 }; + DWORD dw[3] = DIBINFO16_BITFIELDS; bmiHeader = bmih; SecureHelper::memcpy_x(bmiColors, sizeof(bmiColors), dw, 3 * sizeof(DWORD));