diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index 26ff7e830e8..6de629f9975 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -40,10 +40,88 @@ RETERR16 WINAPI DiGetClassDevs16(LPLPDEVICE_INFO16 lplpdi,
           lplpdi, lpszClassName, hwndParent, iFlags);
     lpdi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DEVICE_INFO16));
     lpdi->cbSize = sizeof(DEVICE_INFO16);
-    *lplpdi = lpdi;
+    *lplpdi = (LPDEVICE_INFO16)MapLS(lpdi);
     return OK;
 }
 
+/***********************************************************************
+ *		DiBuildCompatDrvList (SETUPX.300)
+ */
+RETERR16 WINAPI DiBuildCompatDrvList16(LPDEVICE_INFO16 lpdi)
+{
+    FIXME("(%p): stub\n", lpdi);
+    lpdi->lpCompatDrvList = NULL;
+    return FALSE;
+}
+
+/***********************************************************************
+ *		DiCallClassInstaller (SETUPX.308)
+ */
+RETERR16 WINAPI DiCallClassInstaller16(/*DI_FUNCTIONS*/WORD diFctn, LPDEVICE_INFO16 lpdi)
+{
+    FIXME("(%x, %p): stub\n", diFctn, lpdi);
+    return FALSE;
+}
+
+/***********************************************************************
+ *		DiCreateDevRegKey (SETUPX.318)
+ */
+RETERR16 WINAPI DiCreateDevRegKey16(LPDEVICE_INFO16 lpdi,
+                                    VOID* p2, WORD w3,
+                                    LPCSTR s4, WORD w5)
+{
+    FIXME("(%p, %p, %x, %s, %x): stub\n", lpdi, p2, w3, debugstr_a(s4), w5);
+    return FALSE;
+}
+
+/***********************************************************************
+ *		DiDeleteDevRegKey (SETUPX.344)
+ */
+RETERR16 WINAPI DiDeleteDevRegKey16(LPDEVICE_INFO16 lpdi, INT16 iFlags)
+{
+    FIXME("(%p, %x): stub\n", lpdi, iFlags);
+    return FALSE;
+}
+
+/***********************************************************************
+ *		DiCreateDeviceInfo (SETUPX.303)
+ */
+RETERR16 WINAPI DiCreateDeviceInfo16(LPLPDEVICE_INFO16 lplpdi,
+                                     LPCSTR lpszDescription, DWORD dnDevnode,
+                                     HKEY16 hkey, LPCSTR lpszRegsubkey,
+                                     LPCSTR lpszClassName, HWND16 hwndParent)
+{
+    LPDEVICE_INFO16 lpdi;
+    FIXME("(%p %s %08lx %x %s %s %x): stub\n", lplpdi,
+          debugstr_a(lpszDescription), dnDevnode, hkey,
+          debugstr_a(lpszRegsubkey), debugstr_a(lpszClassName), hwndParent);
+    lpdi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DEVICE_INFO16));
+    lpdi->cbSize = sizeof(DEVICE_INFO16);
+    strcpy(lpdi->szClassName, lpszClassName);
+    lpdi->hwndParent = hwndParent;
+    *lplpdi = (LPDEVICE_INFO16)MapLS(lpdi);
+    return OK;
+}
+
+/***********************************************************************
+ *		DiDestroyDeviceInfoList (SETUPX.305)
+ */
+RETERR16 WINAPI DiDestroyDeviceInfoList16(LPDEVICE_INFO16 lpdi)
+{
+    FIXME("(%p): stub\n", lpdi);
+    return FALSE;
+}
+
+/***********************************************************************
+ *		DiOpenDevRegKey (SETUPX.319)
+ */
+RETERR16 WINAPI DiOpenDevRegKey16(LPDEVICE_INFO16 lpdi,
+                                  LPHKEY16 lphk,INT16 iFlags)
+{
+    FIXME("(%p %p %d): stub\n", lpdi, lphk, iFlags);
+    return FALSE;
+}
+
 /***********************************************************************
  *		SetupDiGetDeviceInterfaceDetailA (SETUPAPI.@)
  */
diff --git a/dlls/setupapi/setupx.spec b/dlls/setupapi/setupx.spec
index 02ba5d5e8e8..8c625e33de8 100644
--- a/dlls/setupapi/setupx.spec
+++ b/dlls/setupapi/setupx.spec
@@ -134,14 +134,14 @@
 212  stub     IpOpenAppendEx #(str word word)
 213  pascal16 vcpUICallbackProc(ptr word word long long) vcpUICallbackProc16
 214  stub     VcpAddMRUPath #(str)
-300  stub     DiBuildCompatDrvList #(ptr)
+300  pascal16 DiBuildCompatDrvList (ptr) DiBuildCompatDrvList16
 301  stub     DiBuildClassDrvList #(ptr)
 302  stub     DiDestroyDriverNodeList #(ptr)
-303  stub     DiCreateDeviceInfo #(ptr str long str str word)
+303  pascal16 DiCreateDeviceInfo (ptr str long long str str word) DiCreateDeviceInfo16
 304  pascal16 DiGetClassDevs(ptr str word word) DiGetClassDevs16
-305  stub     DiDestroyDeviceInfoList #(ptr)
+305  pascal16 DiDestroyDeviceInfoList (ptr) DiDestroyDeviceInfoList16
 306  stub     DiRemoveDevice #(ptr)
-308  stub     DiCallClassInstaller #(word ptr)
+308  pascal16 DiCallClassInstaller (word ptr) DiCallClassInstaller16
 309  stub     DiCreateDriverNode #(ptr word word word str str str str str str long)
 310  stub     DiDrawMiniIcon
 311  stub     DiGetClassBitmapIndex #(str ptr)
@@ -151,8 +151,8 @@
 315  stub     DiAskForOEMDisk #(ptr)
 316  stub     Display_SetMode #(ptr word word word)
 317  stub     Display_ClassInstaller #(word ptr)
-318  stub     DiCreateDevRegKey #(ptr ptr word str word)
-319  stub     DiOpenDevRegKey #(ptr ptr word)
+318  pascal16 DiCreateDevRegKey (ptr ptr word str word) DiCreateDevRegKey16
+319  pascal16 DiOpenDevRegKey (ptr ptr word) DiOpenDevRegKey16
 320  stub     DiInstallDrvSection #(str str str str long)
 321  stub     DiInstallClass #(str long)
 322  stub     DiOpenClassRegKey #(ptr str)
@@ -166,7 +166,7 @@
 341  stub     DiBuildClassInfoList #(ptr)
 342  stub     DiDestroyClassInfoList #(ptr)
 343  stub     DiGetDeviceClassInfo #(ptr ptr)
-344  stub     DiDeleteDevRegKey #(ptr word)
+344  pascal16 DiDeleteDevRegKey (ptr word) DiDeleteDevRegKey16
 350  stub     DiSelectOEMDrv #(word ptr)
 351  stub     DiGetINFClass #(str word str long)
 353  stub     DIPICKBESTDRIVER