diff --git a/dlls/ntdll/tests/generated.c b/dlls/ntdll/tests/generated.c
index 89b2e05b18a..b7bfa6dd14a 100644
--- a/dlls/ntdll/tests/generated.c
+++ b/dlls/ntdll/tests/generated.c
@@ -2856,7 +2856,6 @@ static void test_pack_HCURSOR(void)
     /* HCURSOR */
     TEST_TYPE_SIZE   (HCURSOR, 4)
     TEST_TYPE_ALIGN  (HCURSOR, 4)
-    TEST_TYPE_UNSIGNED(HCURSOR)
 }
 
 static void test_pack_HFILE(void)
@@ -2893,7 +2892,6 @@ static void test_pack_HMODULE(void)
     /* HMODULE */
     TEST_TYPE_SIZE   (HMODULE, 4)
     TEST_TYPE_ALIGN  (HMODULE, 4)
-    TEST_TYPE_UNSIGNED(HMODULE)
 }
 
 static void test_pack_INT(void)
diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test
index 7288a2ecdc1..99a72766412 100755
--- a/tools/winapi/winapi_test
+++ b/tools/winapi/winapi_test
@@ -220,9 +220,9 @@ sub _find_align_kind_size($) {
 	$align = 4;
 	$kind = "float";
 	$size = 12;
-    } elsif (/^H(?:DC|BITMAP|BRUSH|ICON|INSTANCE|KEY|MENU|METAFILE|RESULT|WND)$/) {
+    } elsif (/^H(?:DC|BITMAP|BRUSH|ICON|INSTANCE|KEY|MENU|METAFILE|WND)$/) {
 	$align = 4;
-	$kind = "unsigned";
+	$kind = "pointer";
 	$size = 4;
     } elsif (/^LP(?:BYTE|CSTR|CWSTR|DWORD|STR|VOID|WSTR)$/) {
 	$align = 4;