Compiling fixes

audiorouterdev · Jul 2, 2017 · 50e3638 · 50e3638
1 parent aba8c6c
commit 50e3638
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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));