upd project sdk & fix FLLTGTHROUGH

Author: henrypp

src/controls.c

@@ -557,11 +557,9 @@ INT _app_getstateicon (
 
 		default:
 		{
-			FALLTHROUGH;
+			return IDI_INACTIVE;
 		}
 	}
-
-	return IDI_INACTIVE;
 }
 
 LPCWSTR _app_getstatelocale (
@@ -720,7 +718,7 @@ VOID _app_imagelist_init (
 		IDP_LOGUI,
 	};
 
-	UINT rules_ids[] = {
+	ULONG rules_ids[] = {
 		IDP_ALLOW,
 		IDP_BLOCK
 	};

src/db.c

@@ -48,7 +48,7 @@ NTSTATUS _app_db_encrypt (
 	if (!NT_SUCCESS (status))
 		goto CleanupExit;
 
-	status = _r_crypt_encryptbuffer (&crypt_context, bytes->buffer, (ULONG)bytes->length, out_buffer);
+	status = _r_crypt_encryptbuffer (&crypt_context, (PUCHAR)bytes->buffer, (ULONG)bytes->length, out_buffer);
 
 CleanupExit:
 

src/global.h

@@ -67,34 +67,34 @@ DECLSPEC_SELECTANY R_FREE_LIST listview_free_list = {0};
 // timers array
 DECLSPEC_SELECTANY const LONG64 timer_array[] =
 {
-	2 * 60LL, // 2 min
-	5 * 60LL, // 5 min
-	10 * 60LL, // 10 min
-	30 * 60LL, // 30 min
-	1 * 3600LL, // 1 hour
-	2 * 3600LL, // 2 hour
-	4 * 3600LL, // 4 hour
-	6 * 3600LL, // 6 hour
-	12 * 3600LL, // 12 hour
-	24 * 3600LL // 24 hour
+	2LL * 60LL, // 2 min
+	5LL * 60LL, // 5 min
+	10LL * 60LL, // 10 min
+	30LL * 60LL, // 30 min
+	1LL * 3600LL, // 1 hour
+	2LL * 3600LL, // 2 hour
+	4LL * 3600LL, // 4 hour
+	6LL * 3600LL, // 6 hour
+	12LL * 3600LL, // 12 hour
+	24LL * 3600LL // 24 hour
 };
 
 // dropped events callback subscription (win7+)
-#ifndef FWP_DIRECTION_IN
+#if !defined(FWP_DIRECTION_IN)
 #define FWP_DIRECTION_IN 0x00003900L
-#endif
+#endif // !FWP_DIRECTION_IN
 
-#ifndef FWP_DIRECTION_OUT
+#if !defined(FWP_DIRECTION_OUT)
 #define FWP_DIRECTION_OUT 0x00003901L
-#endif
+#endif // !FWP_DIRECTION_OUT
 
-#ifndef FWP_DIRECTION_FORWARD
+#if !defined(FWP_DIRECTION_FORWARD)
 #define FWP_DIRECTION_FORWARD 0x00003902L
-#endif
+#endif // !FWP_DIRECTION_FORWARD
 
-#ifndef FWP_DIRECTION_FORWARD2
+#if !defined(FWP_DIRECTION_FORWARD2)
 #define FWP_DIRECTION_FORWARD2 0x00003903L
-#endif
+#endif // !FWP_DIRECTION_FORWARD2
 
 #define WM_NOTIFICATION (WM_APP + 21)
 

src/listview.c

@@ -63,11 +63,9 @@ INT _app_listview_getbytype (
 
 		default:
 		{
-			FALLTHROUGH;
+			return 0;
 		}
 	}
-
-	return 0;
 }
 
 VOID _app_listview_additems (

src/notifications.c

@@ -848,7 +848,7 @@ VOID _app_notify_drawgradient (
 	GRADIENT_RECT gradient_rect = {0};
 	TRIVERTEX trivertx[2] = {0};
 
-	C_ASSERT (RTL_NUMBER_OF (gradient_arr) == RTL_NUMBER_OF (trivertx));
+	static_assert (RTL_NUMBER_OF (gradient_arr) == RTL_NUMBER_OF (trivertx), "Invalid array size!");
 
 	gradient_rect.LowerRight = 1;
 	//gradient_rect.UpperLeft = 0;

src/profile.c

@@ -158,7 +158,7 @@ BOOLEAN _app_getappinfo (
 
 		default:
 		{
-			FALLTHROUGH;
+			break;
 		}
 	}
 
@@ -303,7 +303,7 @@ VOID _app_setappinfo (
 
 		default:
 		{
-			FALLTHROUGH;
+			break;
 		}
 	}
 }
@@ -368,11 +368,9 @@ BOOLEAN _app_getruleinfo (
 
 		default:
 		{
-			FALLTHROUGH;
+			return FALSE;
 		}
 	}
-
-	return FALSE;
 }
 
 _Success_ (return)
@@ -1454,11 +1452,9 @@ BOOLEAN _app_isappexists (
 
 		default:
 		{
-			FALLTHROUGH;
+			return FALSE;
 		}
 	}
-
-	return FALSE;
 }
 
 BOOLEAN _app_isappfound (
@@ -1548,16 +1544,16 @@ VOID _app_profile_initialize ()
 	R_STRINGREF separator_sr = PR_STRINGREF_INIT (L"\\");
 	PR_STRING path;
 
-	path = _r_app_getprofiledirectory (TRUE);
+	path = _r_app_getprofiledirectory ();
 
 	_r_obj_movereference ((PVOID_PTR)&profile_info.profile_path, _r_obj_concatstringrefs (3, &path->sr, &separator_sr, &profile_sr));
 	_r_obj_movereference ((PVOID_PTR)&profile_info.profile_path_backup, _r_obj_concatstringrefs (3, &path->sr, &separator_sr, &profile_bak_sr));
 	_r_obj_movereference ((PVOID_PTR)&profile_info.profile_path_internal, _r_obj_concatstringrefs (3, &path->sr, &separator_sr, &profile_internal_sr));
 }
 
 NTSTATUS _app_profile_load_fromresource (
-	_In_ LPCWSTR resource_name,
-	_Out_ PDB_INFORMATION out_buffer
+	_Out_ PDB_INFORMATION out_buffer,
+	_In_ LPCWSTR resource_name
 )
 {
 	PDB_INFORMATION db_info;
@@ -1635,7 +1631,7 @@ VOID _app_profile_load_internal (
 		status_file = STATUS_OBJECT_PATH_NOT_FOUND;
 	}
 
-	status_res = _app_profile_load_fromresource (resource_name, &db_info_buffer);
+	status_res = _app_profile_load_fromresource (&db_info_buffer, resource_name);
 
 	// NOTE: prefer new profile version for 3.4+
 	if (!NT_SUCCESS (status_file))

src/profile.h

@@ -256,8 +256,8 @@ BOOLEAN _app_isrulesupportedbyos (
 VOID _app_profile_initialize ();
 
 NTSTATUS _app_profile_load_fromresource (
-	_In_ LPCWSTR resource_name,
-	_Out_ PDB_INFORMATION out_buffer
+	_Out_ PDB_INFORMATION out_buffer,
+	_In_ LPCWSTR resource_name
 );
 
 VOID _app_profile_load_fallback ();

src/wfp.c

@@ -729,11 +729,9 @@ FORCEINLINE LPCWSTR _wfp_filtertypetostring (
 
 		default:
 		{
-			FALLTHROUGH;
+			return NULL;
 		}
 	}
-
-	return NULL;
 }
 
 ULONG _wfp_createcallout (
@@ -1762,7 +1760,7 @@ BOOLEAN _wfp_create2filters (
 		PR_STRINGREF_INIT (L"[ff00::]/8")
 	};
 
-	FWPM_FILTER_CONDITION0 fwfc[3] = {0};
+	FWPM_FILTER_CONDITION0 fwfc[4] = {0};
 	ITEM_ADDRESS address;
 	LPGUID guid;
 	FWP_ACTION_TYPE action;