diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c
index 9e6077cd312..1afeced033f 100644
--- a/programs/winecfg/drive.c
+++ b/programs/winecfg/drive.c
@@ -72,9 +72,9 @@ static inline int letter_to_index(char letter)
  * so the edit dialog can display the currently used drive letter
  * alongside the available ones.
  */
-long drive_available_mask(char letter)
+ULONG drive_available_mask(char letter)
 {
-  long result = 0;
+  ULONG result = 0;
   int i;
 
   WINE_TRACE("\n");
@@ -89,7 +89,7 @@ long drive_available_mask(char letter)
   result = ~result;
   if (letter) result |= DRIVE_MASK_BIT(letter);
 
-  WINE_TRACE("finished drive letter loop with %lx\n", result);
+  WINE_TRACE("finished drive letter loop with %x\n", result);
   return result;
 }
 
diff --git a/programs/winecfg/drivedetect.c b/programs/winecfg/drivedetect.c
index 178520ba48f..8e55f562c49 100644
--- a/programs/winecfg/drivedetect.c
+++ b/programs/winecfg/drivedetect.c
@@ -43,7 +43,7 @@
 WINE_DEFAULT_DEBUG_CHANNEL(winecfg);
 
 BOOL gui_mode = TRUE;
-static long working_mask = 0;
+static ULONG working_mask = 0;
 
 typedef struct
 {
diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c
index acad07a8391..de54f2199ee 100644
--- a/programs/winecfg/driveui.c
+++ b/programs/winecfg/driveui.c
@@ -300,7 +300,7 @@ static void on_add_click(HWND dialog)
        then invoke the directory chooser dialog. */
 
     char new = 'C'; /* we skip A and B, they are historically floppy drives */
-    long mask = ~drive_available_mask(0); /* the mask is now which drives aren't available */
+    ULONG mask = ~drive_available_mask(0); /* the mask is now which drives aren't available */
     int i, c;
 
     while (mask & (1 << (new - 'A')))
diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h
index dcfb64da4c0..d730d8491b4 100644
--- a/programs/winecfg/winecfg.h
+++ b/programs/winecfg/winecfg.h
@@ -107,7 +107,7 @@ struct drive
 
 #define DRIVE_MASK_BIT(B) (1 << (toupper(B) - 'A'))
 
-long drive_available_mask(char letter);
+ULONG drive_available_mask(char letter);
 BOOL add_drive(char letter, const char *targetpath, const char *device,
                const WCHAR *label, DWORD serial, DWORD type);
 void delete_drive(struct drive *pDrive);