diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index 5eaffd6aa02..33dea82e7c6 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -2887,7 +2887,7 @@ BOOL WINAPI SetupDiDestroyDeviceInfoList(HDEVINFO devinfo)
         }
     }
 
-    if (ret == FALSE)
+    if (!ret)
         SetLastError(ERROR_INVALID_HANDLE);
 
     return ret;
diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c
index 5f341ccfe70..22e55d9d5f4 100644
--- a/dlls/setupapi/misc.c
+++ b/dlls/setupapi/misc.c
@@ -1458,7 +1458,7 @@ static DWORD decompress_file_lz( LPCWSTR source, LPCWSTR target )
 
 struct callback_context
 {
-    int has_extracted;
+    BOOL has_extracted;
     LPCWSTR target;
 };
 
@@ -1477,7 +1477,7 @@ static UINT CALLBACK decompress_or_copy_callback( PVOID context, UINT notificati
         TRACE("Requesting extraction of cabinet file %s\n",
               wine_dbgstr_w(info->NameInCabinet));
         strcpyW( info->FullTargetName, context_info->target );
-        context_info->has_extracted = 1;
+        context_info->has_extracted = TRUE;
         return FILEOP_DOIT;
     }
     default: return NO_ERROR;
diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c
index cd101b71860..e8c8fd31198 100644
--- a/dlls/setupapi/parser.c
+++ b/dlls/setupapi/parser.c
@@ -370,7 +370,7 @@ static unsigned int PARSER_string_substW( const struct inf_file *file, const WCH
 {
     const WCHAR *start, *subst, *p;
     unsigned int len, total = 0;
-    int inside = 0;
+    BOOL inside = FALSE;
 
     if (!buffer) size = MAX_STRING_LEN + 1;
     for (p = start = text; *p; p++)