Fix issues introduced in 5135590

microsoft · Jun 2, 2022 · c95b1a4 · DHowett · Jun 2, 2022 · c95b1a4
1 parent b45ec69
commit c95b1a4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/inc/til/point.h b/src/inc/til/point.h
@@ -268,7 +268,7 @@ namespace til // Terminal Implementation Library. Also: "Today I Learned"
             out.Y = y;
             return S_OK;
         }
-        return HRESULT_FROM_WIN32(ERROR_UNHANDLED_EXCEPTION);
+        RETURN_WIN32(ERROR_UNHANDLED_EXCEPTION);
     }
 }
 

diff --git a/src/inc/til/rect.h b/src/inc/til/rect.h
@@ -84,7 +84,7 @@ namespace til // Terminal Implementation Library. Also: "Today I Learned"
             out.Bottom = b;
             return S_OK;
         }
-        return HRESULT_FROM_WIN32(ERROR_UNHANDLED_EXCEPTION);
+        RETURN_WIN32(ERROR_UNHANDLED_EXCEPTION);
     }
 
     namespace details
@@ -791,7 +791,7 @@ namespace til // Terminal Implementation Library. Also: "Today I Learned"
             out.Bottom = b;
             return S_OK;
         }
-        return HRESULT_FROM_WIN32(ERROR_UNHANDLED_EXCEPTION);
+        RETURN_WIN32(ERROR_UNHANDLED_EXCEPTION);
     }
 }
 

diff --git a/src/inc/til/size.h b/src/inc/til/size.h
@@ -215,7 +215,7 @@ namespace til // Terminal Implementation Library. Also: "Today I Learned"
             out.Y = y;
             return S_OK;
         }
-        return HRESULT_FROM_WIN32(ERROR_UNHANDLED_EXCEPTION);
+        RETURN_WIN32(ERROR_UNHANDLED_EXCEPTION);
     }
 };
 

diff --git a/src/server/ApiDispatchers.cpp b/src/server/ApiDispatchers.cpp
@@ -1188,7 +1188,7 @@
     RETURN_IF_FAILED(pObjectHandle->GetScreenBuffer(GENERIC_READ, &pObj));
 
     auto size = til::wrap_coord_size(a->FontSize);
-    const auto hr = m->_pApiRoutines->GetConsoleFontSizeImpl(*pObj, a->FontIndex, size);
+    RETURN_IF_FAILED(m->_pApiRoutines->GetConsoleFontSizeImpl(*pObj, a->FontIndex, size));
     return til::unwrap_coord_size_hr(size, a->FontSize);
 }
 
@@ -1231,7 +1231,7 @@
     RETURN_IF_FAILED(pObjectHandle->GetScreenBuffer(GENERIC_WRITE, &pObj));
 
     auto size = til::wrap_coord_size(a->ScreenBufferDimensions);
-    const auto hr = m->_pApiRoutines->SetConsoleDisplayModeImpl(*pObj, a->dwFlags, size);
+    RETURN_IF_FAILED(m->_pApiRoutines->SetConsoleDisplayModeImpl(*pObj, a->dwFlags, size));
     return til::unwrap_coord_size_hr(size, a->ScreenBufferDimensions);
 }