diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c
index ce6d020533a..7e596f0af73 100644
--- a/dlls/user32/tests/class.c
+++ b/dlls/user32/tests/class.c
@@ -39,7 +39,7 @@ static const WCHAR WC_EDITW[] = {'E','d','i','t',0};
 
 #define NUMCLASSWORDS 4
 
-#define IS_WNDPROC_HANDLE(x) (((ULONG_PTR)(x) >> 16) == (~((ULONG_PTR)0) >> 16))
+#define IS_WNDPROC_HANDLE(x) (((ULONG_PTR)(x) >> 16) == (~0u >> 16))
 
 static LRESULT WINAPI ClassTest_WndProc (HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c
index ac5ec416903..dda649bbfe7 100644
--- a/dlls/user32/winproc.c
+++ b/dlls/user32/winproc.c
@@ -50,7 +50,7 @@ typedef struct tagWINDOWPROC
     WNDPROC        procW;    /* Unicode window proc */
 } WINDOWPROC;
 
-#define WINPROC_HANDLE (~0UL >> 16)
+#define WINPROC_HANDLE (~0u >> 16)
 #define MAX_WINPROCS  8192
 #define BUILTIN_WINPROCS 9  /* first BUILTIN_WINPROCS entries are reserved for builtin procs */
 #define MAX_WINPROC_RECURSION  64