From 9a31255ff8ce2deff2ce0859bd364418f7f84bab Mon Sep 17 00:00:00 2001
From: Solomon Peachy <pizza@shaftnet.org>
Date: Sat, 4 Jul 2026 11:13:34 -0400
Subject: [PATCH] rbutil:  Fix some compile warnings under Windows

Change-Id: I8abfbd61066c17297962de1432144692604cf245
---
 utils/rbutilqt/base/system.cpp | 4 ++--
 utils/rbutilqt/base/utils.cpp  | 2 +-
 utils/rbutilqt/configure.cpp   | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/utils/rbutilqt/base/system.cpp b/utils/rbutilqt/base/system.cpp
index 0ab0d9823a..672e9464cb 100644
--- a/utils/rbutilqt/base/system.cpp
+++ b/utils/rbutilqt/base/system.cpp
@@ -28,8 +28,10 @@
 // Windows Includes
 #if defined(Q_OS_WIN32)
 #if defined(UNICODE)
+#ifndef _UNICODE
 #define _UNICODE
 #endif
+#endif
 #include <windows.h>
 #include <tchar.h>
 #include <lm.h>
@@ -489,5 +491,3 @@ QUrl System::systemProxy(void)
     return QUrl("");
 #endif
 }
-
-
diff --git a/utils/rbutilqt/base/utils.cpp b/utils/rbutilqt/base/utils.cpp
index ef0c11ca83..92e09de569 100644
--- a/utils/rbutilqt/base/utils.cpp
+++ b/utils/rbutilqt/base/utils.cpp
@@ -587,7 +587,7 @@ QStringList Utils::mountpoints(enum MountpointsFilter type)
     for(int i=0; i<list.size();i++)
     {
         wchar_t t[32];
-        memset(t, 0, 32);
+        memset(t, 0, sizeof(t));
         if(GetVolumeInformationW((LPCWSTR)list.at(i).absolutePath().utf16(),
                 NULL, 0, NULL, NULL, NULL, t, 32) == 0) {
             // on error empty retrieved type -- don't rely on
diff --git a/utils/rbutilqt/configure.cpp b/utils/rbutilqt/configure.cpp
index 25cea94acf..7b6d634c3f 100644
--- a/utils/rbutilqt/configure.cpp
+++ b/utils/rbutilqt/configure.cpp
@@ -39,8 +39,10 @@
 #include "comboboxviewdelegate.h"
 #if defined(Q_OS_WIN32)
 #if defined(UNICODE)
+#ifndef _UNICODE
 #define _UNICODE
 #endif
+#endif
 #include <tchar.h>
 #include <windows.h>
 #endif