TSA: TH_UNLIKELY macro makes no sense here

32th-System · 32th-System · commit f2726837f00b · 2025-05-12T00:21:33.000+02:00
diff --git a/thcrap_tsa/src/layout.cpp b/thcrap_tsa/src/layout.cpp
@@ -608,7 +608,7 @@ void ruby_shift_debug_impl(HDC hdc, int orig_x) {
 
 
 void debug_colorfill_impl(HDC hdc) {
-	if TH_UNLIKELY(debug_fill_brush) {
+	if unexpected(debug_fill_brush) {
 		RECT drawRect = { 0, 0, GetDeviceCaps(hdc, HORZRES), GetDeviceCaps(hdc, VERTRES) };
 		FillRect(hdc, &drawRect, debug_fill_brush);
 	}
@@ -812,7 +812,7 @@ int layout_mod_init(HMODULE hMod)
 	json_object_get_eval_bool(runcfg, "ruby_shift_debug", &ruby_shift_debug, JEVAL_DEFAULT);
 
 	size_t col;
-	if TH_UNLIKELY(!json_object_get_eval_int(runcfg, "hdc_debug_color", &col, JEVAL_DEFAULT)) {
+	if unexpected(!json_object_get_eval_int(runcfg, "hdc_debug_color", &col, JEVAL_DEFAULT)) {
 		// Truncation to the lower 32 bits in 64 bit mode
 		debug_fill_brush = CreateSolidBrush((COLORREF)col);
 	}

Original file line number	Diff line number	Diff line change
`@@ -608,7 +608,7 @@ void ruby_shift_debug_impl(HDC hdc, int orig_x) {`
`608`	`608`
`609`	`609`
`610`	`610`	`void debug_colorfill_impl(HDC hdc) {`
`611`		`- if TH_UNLIKELY(debug_fill_brush) {`
	`611`	`+ if unexpected(debug_fill_brush) {`
`612`	`612`	`RECT drawRect = { 0, 0, GetDeviceCaps(hdc, HORZRES), GetDeviceCaps(hdc, VERTRES) };`
`613`	`613`	`FillRect(hdc, &drawRect, debug_fill_brush);`
`614`	`614`	`}`
`@@ -812,7 +812,7 @@ int layout_mod_init(HMODULE hMod)`
`812`	`812`	`json_object_get_eval_bool(runcfg, "ruby_shift_debug", &ruby_shift_debug, JEVAL_DEFAULT);`
`813`	`813`
`814`	`814`	`size_t col;`
`815`		`- if TH_UNLIKELY(!json_object_get_eval_int(runcfg, "hdc_debug_color", &col, JEVAL_DEFAULT)) {`
	`815`	`+ if unexpected(!json_object_get_eval_int(runcfg, "hdc_debug_color", &col, JEVAL_DEFAULT)) {`
`816`	`816`	`// Truncation to the lower 32 bits in 64 bit mode`
`817`	`817`	`debug_fill_brush = CreateSolidBrush((COLORREF)col);`
`818`	`818`	`}`