diff --git a/src/printer/prt_escp.c b/src/printer/prt_escp.c
index 110839282..9e5e1c628 100644
--- a/src/printer/prt_escp.c
+++ b/src/printer/prt_escp.c
@@ -2006,7 +2006,7 @@ read_ctrl(void *priv)
 {
     escp_t *dev = (escp_t *)priv;
 
-    return 0xe0 | dev->autofeed ? 0x02 : 0x00 | (dev->ctrl & 0xfd);
+    return 0xe0 | (dev->autofeed ? 0x02 : 0x00) | (dev->ctrl & 0xfd);
 }
 
 
diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw
index 52ddb8a49..008a0510c 100644
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -196,7 +196,7 @@ ifndef RDP
 RDP		:= n
 endif
 ifndef DINPUT
- DINPUT		:= n
+ DINPUT		:= y
 endif
 ifndef OPENAL
 OPENAL		:= y
@@ -448,10 +448,6 @@ RDPLIB		+= -lrdp
 RDPOBJ		:= rdp.o
 endif
 
-ifeq ($(DINPUT), y)
-OPTS		+= -DUSE_DINPUT
-endif
-
 ifeq ($(DISCORD), y)
 OPTS		+= -DUSE_DISCORD
 RFLAGS		+= -DUSE_DISCORD
@@ -554,7 +550,7 @@ CFLAGS		:= $(WX_FLAGS) $(OPTS) $(DFLAGS) $(COPTIM) $(AOPTIM) \
 # -funroll-loops
 
 # Add freetyp2 references through pkgconfig
-CFLAGS          := $(CFLAGS)  `pkg-config.exe --cflags freetype2`
+CFLAGS          := $(CFLAGS)  `pkg-config --cflags freetype2`
 
 CXXFLAGS	:= $(CFLAGS)
 
@@ -722,7 +718,13 @@ PLATOBJ		:= win.o \
 		    win_dynld.o win_thread.o \
 		    win_cdrom.o win_keyboard.o \
 		    win_midi.o \
-		    win_mouse.o win_joystick.o
+		    win_mouse.o
+
+ifeq ($(DINPUT), y)
+ PLATOBJ	+= win_joystick.o
+else
+ PLATOBJ	+= win_joystick_rawinput.o
+endif
 
 OBJ		:= $(MAINOBJ) $(INTELOBJ) $(CPUOBJ) $(CHIPSETOBJ) $(MCHOBJ) \
 		   $(DEVOBJ) $(FDDOBJ) $(CDROMOBJ) $(ZIPOBJ) $(HDDOBJ) \
@@ -748,12 +750,12 @@ endif
 ifneq ($(WX), n)
 LIBS		+= $(WX_LIBS) -lm
 endif
-LIBS		+= -lpng -lz -lwsock32 -liphlpapi -ldinput8 -lSDL2 -limm32 -lhid -lsetupapi -loleaut32 -lversion -lwinmm -static -lstdc++ 
+LIBS		+= -lpng -lz -lwsock32 -lshell32 -liphlpapi -lSDL2 -limm32 -lhid -lsetupapi -loleaut32 -lversion -lwinmm -static -lstdc++
 ifneq ($(X64), y)
 LIBS		+= -Wl,--large-address-aware
 endif
-ifneq ($(DINPUT), y)
- LIBS    += -lxinput
+ifeq ($(DINPUT), y)
+ LIBS    += -ldinput8
 endif
 
 LIBS    += -static
@@ -807,7 +809,7 @@ all:		$(PROG).exe pcap_if.exe
 
 $(PROG).exe:	$(OBJ) 86Box.res
 		@echo Linking $(PROG).exe ..
-		@$(CC) -o $(PROG).exe $(OBJ) 86Box.res $(LIBS) -pipe
+		@$(CC) $(LDFLAGS) -o $(PROG).exe $(OBJ) 86Box.res $(LIBS) -pipe
 ifneq ($(DEBUG), y)
 		@$(STRIP) $(PROG).exe
 endif
@@ -818,7 +820,7 @@ pcap_if.res:	pcap_if.rc
 
 pcap_if.exe:	pcap_if.o win_dynld.o pcap_if.res
 		@echo Linking pcap_if.exe ..
-		@$(CC) -o pcap_if.exe pcap_if.o win_dynld.o pcap_if.res
+		@$(CC) $(LDFLAGS) -o pcap_if.exe pcap_if.o win_dynld.o pcap_if.res
 ifneq ($(DEBUG), y)
 		@$(STRIP) pcap_if.exe
 endif
diff --git a/src/win/Makefile_ndr.mingw b/src/win/Makefile_ndr.mingw
index daaf9af48..c26eed470 100644
--- a/src/win/Makefile_ndr.mingw
+++ b/src/win/Makefile_ndr.mingw
@@ -196,7 +196,7 @@ ifndef RDP
 RDP		:= n
 endif
 ifndef DINPUT
- DINPUT		:= n
+ DINPUT		:= y
 endif
 ifndef OPENAL
 OPENAL		:= y
@@ -454,10 +454,6 @@ RDPLIB		+= -lrdp
 RDPOBJ		:= rdp.o
 endif
 
-ifeq ($(DINPUT), y)
-OPTS		+= -DUSE_DINPUT
-endif
-
 ifeq ($(DISCORD), y)
 OPTS		+= -DUSE_DISCORD
 RFLAGS		+= -DUSE_DISCORD
@@ -559,7 +555,7 @@ CFLAGS		:= $(WX_FLAGS) $(OPTS) $(DFLAGS) $(COPTIM) $(AOPTIM) \
 		   -fno-strict-aliasing
 
 # Add freetyp2 references through pkgconfig
-CFLAGS          := $(CFLAGS)  `pkg-config.exe --cflags freetype2`
+CFLAGS          := $(CFLAGS)  `pkg-config --cflags freetype2`
 
 CXXFLAGS	:= $(CFLAGS)
 
@@ -727,7 +723,13 @@ PLATOBJ		:= win.o \
 		    win_dynld.o win_thread.o \
 		    win_cdrom.o win_keyboard.o \
 		    win_midi.o \
-		    win_mouse.o win_joystick.o
+		    win_mouse.o
+
+ifeq ($(DINPUT), y)
+ PLATOBJ	+= win_joystick.o
+else
+ PLATOBJ	+= win_joystick_rawinput.o
+endif
 
 OBJ		:= $(MAINOBJ) $(INTELOBJ) $(CPUOBJ) $(CHIPSETOBJ) $(MCHOBJ) \
 		   $(DEVOBJ) $(FDDOBJ) $(CDROMOBJ) $(ZIPOBJ) $(HDDOBJ) \
@@ -753,12 +755,12 @@ endif
 ifneq ($(WX), n)
 LIBS		+= $(WX_LIBS) -lm
 endif
-LIBS		+= -lpng -lz -lwsock32 -liphlpapi -ldinput8 -lSDL2 -limm32 -lhid -lsetupapi -loleaut32 -lversion -lwinmm -static -lstdc++ 
+LIBS		+= -lpng -lz -lwsock32 -lshell32 -liphlpapi -lSDL2 -limm32 -lhid -lsetupapi -loleaut32 -lversion -lwinmm -static -lstdc++
 ifneq ($(X64), y)
 LIBS		+= -Wl,--large-address-aware
 endif
-ifneq ($(DINPUT), y)
- LIBS    += -lxinput
+ifeq ($(DINPUT), y)
+ LIBS    += -ldinput8
 endif
 
 LIBS    += -static
@@ -812,7 +814,7 @@ all:		$(PROG).exe pcap_if.exe
 
 $(PROG).exe:	$(OBJ) 86Box.res
 		@echo Linking $(PROG).exe ..
-		@$(CC) -o $(PROG).exe $(OBJ) 86Box.res $(LIBS)
+		@$(CC) $(LDFLAGS) -o $(PROG).exe $(OBJ) 86Box.res $(LIBS)
 ifneq ($(DEBUG), y)
 		@$(STRIP) $(PROG).exe
 endif
@@ -823,7 +825,7 @@ pcap_if.res:	pcap_if.rc
 
 pcap_if.exe:	pcap_if.o win_dynld.o pcap_if.res
 		@echo Linking pcap_if.exe ..
-		@$(CC) -o pcap_if.exe pcap_if.o win_dynld.o pcap_if.res
+		@$(CC) $(LDFLAGS) -o pcap_if.exe pcap_if.o win_dynld.o pcap_if.res
 ifneq ($(DEBUG), y)
 		@$(STRIP) pcap_if.exe
 endif
diff --git a/src/win/win.c b/src/win/win.c
index 6fadcc591..c570101f2 100644
--- a/src/win/win.c
+++ b/src/win/win.c
@@ -19,8 +19,10 @@
  *		Copyright 2017-2019 Fred N. van Kempen.
  */
 #define UNICODE
+#define NTDDI_VERSION 0x06010000
 #include <windows.h>
 #include <shlobj.h>
+#include <shobjidl.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdint.h>
diff --git a/src/win/win.h b/src/win/win.h
index 62f0062e6..1734b71de 100644
--- a/src/win/win.h
+++ b/src/win/win.h
@@ -114,13 +114,13 @@ extern int	get_vidpause(void);
 extern void	show_cursor(int);
 
 extern void	keyboard_getkeymap(void);
-extern void	keyboard_handle(LPARAM lParam, int infocus);
+extern void	keyboard_handle(PRAWINPUT raw);
 
 extern void     win_mouse_init(void);
 extern void     win_mouse_close(void);
-#ifndef USE_DINPUT
-extern void     win_mouse_handle(LPARAM lParam, int infocus);
-#endif
+extern void     win_mouse_handle(PRAWINPUT raw);
+
+extern void     win_joystick_handle(PRAWINPUT raw);
 
 extern void     win_notify_dlg_open(void);
 extern void     win_notify_dlg_closed(void);
diff --git a/src/win/win_joystick.cpp b/src/win/win_joystick.cpp
index d2e569cb4..970c04b5d 100644
--- a/src/win/win_joystick.cpp
+++ b/src/win/win_joystick.cpp
@@ -336,3 +336,4 @@ void joystick_process(void)
         }
 }
 
+void win_joystick_handle(PRAWINPUT raw) {}
diff --git a/src/win/win_joystick_rawinput.c b/src/win/win_joystick_rawinput.c
new file mode 100644
index 000000000..85e8f31df
--- /dev/null
+++ b/src/win/win_joystick_rawinput.c
@@ -0,0 +1,472 @@
+/*
+ * 86Box	A hypervisor and IBM PC system emulator that specializes in
+ *		running old operating systems and software designed for IBM
+ *		PC systems and compatibles from 1981 through fairly recent
+ *		system designs based on the PCI bus.
+ *
+ *		This file is part of the 86Box distribution.
+ *
+ *		RawInput joystick interface.
+ *
+ * Version:	@(#)win_joystick_rawinput.c	1.0.0	2020/1/19
+ *
+ * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
+ *		Miran Grca, <mgrca8@gmail.com>
+ *              GH Cao, <driver1998.ms@outlook.com>
+ *
+ *		Copyright 2008-2018 Sarah Walker.
+ *		Copyright 2016-2018 Miran Grca.
+ *		Copyright 2020 GH Cao.
+ */
+#include <windows.h>
+#include <windowsx.h>
+#include <hidclass.h>
+#include <hidusage.h>
+#include <hidsdi.h>
+#include <math.h>
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#define HAVE_STDARG_H
+#include "../86box.h"
+#include "../device.h"
+#include "../plat.h"
+#include "../game/gameport.h"
+#include "win.h"
+
+#ifdef ENABLE_JOYSTICK_LOG
+int joystick_do_log = ENABLE_JOYSTICK_LOG;
+
+
+static void
+joystick_log(const char *fmt, ...)
+{
+	va_list ap;
+
+	if (joystick_do_log) {
+	va_start(ap, fmt);
+	pclog_ex(fmt, ap);
+	va_end(ap);
+	}
+}
+#else
+#define joystick_log(fmt, ...)
+#endif
+
+typedef struct {
+	HANDLE hdevice;
+	PHIDP_PREPARSED_DATA data;
+	
+	USAGE usage_button[128];
+
+	struct raw_axis_t {
+		USAGE  usage;
+		USHORT link;
+		USHORT bitsize;
+		LONG   max;
+		LONG   min;
+	} axis[8];
+
+	struct raw_pov_t {
+		USAGE  usage;
+		USHORT link;
+		LONG   max;
+		LONG   min;
+	} pov[4];
+} raw_joystick_t;
+
+plat_joystick_t plat_joystick_state[MAX_PLAT_JOYSTICKS];
+joystick_t joystick_state[MAX_JOYSTICKS];
+int joysticks_present = 0;
+
+raw_joystick_t raw_joystick_state[MAX_PLAT_JOYSTICKS];
+
+/* We only use the first 32 buttons reported, from Usage ID 1-128 */
+void joystick_add_button(raw_joystick_t* rawjoy, plat_joystick_t* joy, USAGE usage) {
+	if (joy->nr_buttons >= 32) return;
+	if (usage < 1 || usage > 128) return;
+
+	rawjoy->usage_button[usage] = joy->nr_buttons;
+	sprintf(joy->button[joy->nr_buttons].name, "Button %d", usage);
+	joy->nr_buttons++;
+}
+
+void joystick_add_axis(raw_joystick_t* rawjoy, plat_joystick_t* joy, PHIDP_VALUE_CAPS prop) {
+	if (joy->nr_axes >= 8) return;
+
+	switch (prop->Range.UsageMin) {
+	case HID_USAGE_GENERIC_X:
+		sprintf(joy->axis[joy->nr_axes].name, "X");
+		break;
+	case HID_USAGE_GENERIC_Y:
+		sprintf(joy->axis[joy->nr_axes].name, "Y");
+		break;
+	case HID_USAGE_GENERIC_Z:
+		sprintf(joy->axis[joy->nr_axes].name, "Z");
+		break;
+	case HID_USAGE_GENERIC_RX:
+		sprintf(joy->axis[joy->nr_axes].name, "RX");
+		break;
+	case HID_USAGE_GENERIC_RY:
+		sprintf(joy->axis[joy->nr_axes].name, "RY");
+		break;
+	case HID_USAGE_GENERIC_RZ:
+		sprintf(joy->axis[joy->nr_axes].name, "RZ");
+		break;
+	default:
+		return;
+	}
+
+	joy->axis[joy->nr_axes].id         = joy->nr_axes;
+	rawjoy->axis[joy->nr_axes].usage   = prop->Range.UsageMin;
+	rawjoy->axis[joy->nr_axes].link    = prop->LinkCollection;
+	rawjoy->axis[joy->nr_axes].bitsize = prop->BitSize;
+
+	/* Assume unsigned when min >= 0 */
+	if (prop->LogicalMin < 0) {
+		rawjoy->axis[joy->nr_axes].max = prop->LogicalMax;
+	} else {
+		/*
+		 * Some joysticks will send -1 in LogicalMax, like Xbox Controllers
+		 * so we need to mask that to appropriate value (instead of 0xFFFFFFFF) 
+		 */
+		rawjoy->axis[joy->nr_axes].max = prop->LogicalMax & ((1 << prop->BitSize) - 1);
+	}
+	rawjoy->axis[joy->nr_axes].min     = prop->LogicalMin;
+
+	joy->nr_axes++;
+}
+
+void joystick_add_pov(raw_joystick_t* rawjoy, plat_joystick_t* joy, PHIDP_VALUE_CAPS prop) {
+	if (joy->nr_povs >= 4) return;
+
+	sprintf(joy->pov[joy->nr_povs].name, "POV %d", joy->nr_povs+1);
+	rawjoy->pov[joy->nr_povs].usage = prop->Range.UsageMin;
+	rawjoy->pov[joy->nr_povs].link  = prop->LinkCollection;
+	rawjoy->pov[joy->nr_povs].min   = prop->LogicalMin;
+	rawjoy->pov[joy->nr_povs].max   = prop->LogicalMax;
+
+	joy->nr_povs++;
+}
+
+void joystick_get_capabilities(raw_joystick_t* rawjoy, plat_joystick_t* joy) {
+	UINT size = 0;
+	PHIDP_BUTTON_CAPS btn_caps = NULL;
+	PHIDP_VALUE_CAPS  val_caps = NULL;
+
+	/* Get preparsed data (HID data format) */
+	GetRawInputDeviceInfoW(rawjoy->hdevice, RIDI_PREPARSEDDATA, NULL, &size);
+	rawjoy->data = malloc(size);
+	if (GetRawInputDeviceInfoW(rawjoy->hdevice, RIDI_PREPARSEDDATA, rawjoy->data, &size) <= 0)
+		fatal("joystick_get_capabilities: Failed to get preparsed data.\n");
+	
+	HIDP_CAPS caps;
+	HidP_GetCaps(rawjoy->data, &caps);
+
+	/* Buttons */
+	if (caps.NumberInputButtonCaps > 0) {
+		btn_caps = calloc(caps.NumberInputButtonCaps, sizeof(HIDP_BUTTON_CAPS));
+		if (HidP_GetButtonCaps(HidP_Input, btn_caps, &caps.NumberInputButtonCaps, rawjoy->data) != HIDP_STATUS_SUCCESS) {
+			joystick_log("joystick_get_capabilities: Failed to query input buttons.\n");
+			goto end;
+		}
+		/* We only detect generic stuff */
+		for (int c=0; c<caps.NumberInputButtonCaps; c++) {
+			if (btn_caps[c].UsagePage != HID_USAGE_PAGE_BUTTON) continue;
+
+			int button_count = btn_caps[c].Range.UsageMax - btn_caps[c].Range.UsageMin + 1;
+			for (int b=0; b<button_count; b++) {
+				joystick_add_button(rawjoy, joy, b + btn_caps[c].Range.UsageMin);
+			}
+		}
+	}
+
+	/* Values (axes and povs) */
+	if (caps.NumberInputValueCaps > 0) {
+		val_caps = calloc(caps.NumberInputValueCaps, sizeof(HIDP_VALUE_CAPS));
+		if (HidP_GetValueCaps(HidP_Input, val_caps, &caps.NumberInputValueCaps, rawjoy->data) != HIDP_STATUS_SUCCESS) {
+			joystick_log("joystick_get_capabilities: Failed to query axes and povs.\n");
+			goto end;
+		}
+		/* We only detect generic stuff */
+		for (int c=0; c<caps.NumberInputValueCaps; c++) {
+			if (val_caps[c].UsagePage != HID_USAGE_PAGE_GENERIC) continue;
+
+			if (val_caps[c].Range.UsageMin == HID_USAGE_GENERIC_HATSWITCH)
+				joystick_add_pov(rawjoy, joy, &val_caps[c]);
+			else
+				joystick_add_axis(rawjoy, joy, &val_caps[c]);
+		}
+	}
+
+	end:
+	free(btn_caps);
+	free(val_caps);
+}
+
+void joystick_get_device_name(raw_joystick_t* rawjoy, plat_joystick_t* joy, PRID_DEVICE_INFO info) {
+	UINT size = 0;
+	char *device_name = NULL;
+	WCHAR device_desc_wide[200] = {0};
+
+	GetRawInputDeviceInfoA(rawjoy->hdevice, RIDI_DEVICENAME, device_name, &size);
+	device_name = calloc(size, sizeof(char));
+	if (GetRawInputDeviceInfoA(rawjoy->hdevice, RIDI_DEVICENAME, device_name, &size) <= 0)
+		fatal("joystick_get_capabilities: Failed to get device name.\n");
+
+	HANDLE hDevObj = CreateFile(device_name, GENERIC_READ | GENERIC_WRITE, 
+		FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
+	if (hDevObj) {
+		HidD_GetProductString(hDevObj, device_desc_wide, sizeof(WCHAR) * 200);
+		CloseHandle(hDevObj);
+	}
+	free(device_name);
+
+	int result = WideCharToMultiByte(CP_ACP, 0, device_desc_wide, 200, joy->name, 260, NULL, NULL);
+	if (result == 0 || strlen(joy->name) == 0)
+		sprintf(joy->name, 
+			"RawInput %s, VID:%04lX PID:%04lX",  
+			info->hid.usUsage == HID_USAGE_GENERIC_JOYSTICK ? "Joystick" : "Gamepad",
+			info->hid.dwVendorId,
+			info->hid.dwProductId);
+}
+
+void joystick_init()
+{
+	UINT size = 0;
+	atexit(joystick_close);
+
+	joysticks_present = 0;
+	memset(raw_joystick_state, 0, sizeof(raw_joystick_t) * MAX_PLAT_JOYSTICKS);
+
+	/* Get a list of raw input devices from Windows */
+	UINT raw_devices = 0;
+	GetRawInputDeviceList(NULL, &raw_devices, sizeof(RAWINPUTDEVICELIST));
+	PRAWINPUTDEVICELIST deviceList = calloc(raw_devices, sizeof(RAWINPUTDEVICELIST));
+	GetRawInputDeviceList(deviceList, &raw_devices, sizeof(RAWINPUTDEVICELIST));
+
+	for (int i=0; i<raw_devices; i++) {
+		PRID_DEVICE_INFO info = NULL;
+
+		if (joysticks_present >= MAX_PLAT_JOYSTICKS) break;
+		if (deviceList[i].dwType != RIM_TYPEHID) continue; 
+		
+		/* Get device info: hardware IDs and usage IDs */
+		GetRawInputDeviceInfoA(deviceList[i].hDevice, RIDI_DEVICEINFO, NULL, &size);
+		info = malloc(size);
+		info->cbSize = sizeof(RID_DEVICE_INFO);
+		if (GetRawInputDeviceInfoA(deviceList[i].hDevice, RIDI_DEVICEINFO, info, &size) <= 0)
+			goto end_loop;
+
+		/* If this is not a joystick/gamepad, skip */
+		if (info->hid.usUsagePage != HID_USAGE_PAGE_GENERIC) goto end_loop;
+		if (info->hid.usUsage != HID_USAGE_GENERIC_JOYSTICK && 
+			info->hid.usUsage != HID_USAGE_GENERIC_GAMEPAD) goto end_loop;
+		
+		plat_joystick_t *joy    = &plat_joystick_state[joysticks_present];
+		raw_joystick_t  *rawjoy = &raw_joystick_state[joysticks_present];
+		rawjoy->hdevice = deviceList[i].hDevice;
+
+		joystick_get_capabilities(rawjoy, joy);
+		joystick_get_device_name(rawjoy, joy, info);
+
+		joystick_log("joystick_init: %s - %d buttons, %d axes, %d POVs\n", 
+			joy->name, joy->nr_buttons, joy->nr_axes, joy->nr_povs);
+
+		joysticks_present++;
+
+		end_loop:
+		free(info);
+	}
+	
+	joystick_log("joystick_init: joysticks_present=%i\n", joysticks_present);
+
+	/* Initialize the RawInput (joystick and gamepad) module. */
+	RAWINPUTDEVICE ridev[2];
+	ridev[0].dwFlags     = 0;
+	ridev[0].hwndTarget  = NULL;
+	ridev[0].usUsagePage = HID_USAGE_PAGE_GENERIC;
+	ridev[0].usUsage     = HID_USAGE_GENERIC_JOYSTICK;
+
+	ridev[1].dwFlags     = 0;
+	ridev[1].hwndTarget  = NULL;
+	ridev[1].usUsagePage = HID_USAGE_PAGE_GENERIC;
+	ridev[1].usUsage     = HID_USAGE_GENERIC_GAMEPAD;
+
+	if (!RegisterRawInputDevices(ridev, 2, sizeof(RAWINPUTDEVICE)))
+		fatal("plat_joystick_init: RegisterRawInputDevices failed\n"); 
+}
+
+void joystick_close()
+{
+	RAWINPUTDEVICE ridev[2];
+	ridev[0].dwFlags     = RIDEV_REMOVE;
+	ridev[0].hwndTarget  = NULL;
+	ridev[0].usUsagePage = HID_USAGE_PAGE_GENERIC;
+	ridev[0].usUsage     = HID_USAGE_GENERIC_JOYSTICK;
+
+	ridev[1].dwFlags     = RIDEV_REMOVE;
+	ridev[1].hwndTarget  = NULL;
+	ridev[1].usUsagePage = HID_USAGE_PAGE_GENERIC;
+	ridev[1].usUsage     = HID_USAGE_GENERIC_GAMEPAD;
+
+	RegisterRawInputDevices(ridev, 2, sizeof(RAWINPUTDEVICE));
+}
+
+
+void win_joystick_handle(PRAWINPUT raw)
+{
+	HRESULT r;
+	int j = -1; /* current joystick index, -1 when not found */
+
+	/* If the input is not from a known device, we ignore it */
+	for (int i=0; i<joysticks_present; i++) {
+		if (raw_joystick_state[i].hdevice == raw->header.hDevice) {
+			j = i;
+			break;
+		}
+	}
+	if (j == -1) return;
+	
+	/* Read buttons */
+	USAGE usage_list[128] = {0};
+	ULONG usage_length    = plat_joystick_state[j].nr_buttons;
+	memset(plat_joystick_state[j].b, 0, 32 * sizeof(int));
+
+	r = HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, usage_list, &usage_length,
+		raw_joystick_state[j].data, (PCHAR)raw->data.hid.bRawData, raw->data.hid.dwSizeHid);
+	
+	if (r == HIDP_STATUS_SUCCESS) {
+		for (int i=0; i<usage_length; i++) {
+			int button = raw_joystick_state[j].usage_button[usage_list[i]];
+			plat_joystick_state[j].b[button] = 128;
+		}
+	}
+
+	/* Read axes */
+	for (int a=0; a<plat_joystick_state[j].nr_axes; a++) {
+		struct raw_axis_t* axis = &raw_joystick_state[j].axis[a];
+		ULONG  uvalue = 0;
+		LONG   value  = 0;
+		LONG   center = (axis->max - axis->min + 1) / 2;
+
+		r = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, axis->link, axis->usage, &uvalue, 
+			raw_joystick_state[j].data, (PCHAR)raw->data.hid.bRawData, raw->data.hid.dwSizeHid);
+			
+		if (r == HIDP_STATUS_SUCCESS) {
+			if (axis->min < 0) {
+				/* extend signed uvalue to LONG */
+				if (uvalue & (1 << (axis->bitsize-1))) {
+					ULONG mask = (1 << axis->bitsize) - 1;
+					value = -1U ^ mask;
+					value |= uvalue;
+				} else {
+					value = uvalue;
+				}
+			} else {
+				/* Assume unsigned when min >= 0, convert to a signed value */
+				value = (LONG)uvalue - center;
+			}
+			if (abs(value) == 1) value = 0;
+			value = value * 32768 / center;
+		}
+
+		plat_joystick_state[j].a[a] = value;
+		//joystick_log("%s %-06d ", plat_joystick_state[j].axis[a].name, plat_joystick_state[j].a[a]);	
+	}
+
+	/* read povs */
+	for (int p=0; p<plat_joystick_state[j].nr_povs; p++) {
+		struct raw_pov_t* pov = &raw_joystick_state[j].pov[p];
+		ULONG  uvalue = 0;
+		LONG   value = -1;
+		
+		r = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, pov->link, pov->usage, &uvalue, 
+			raw_joystick_state[j].data, (PCHAR)raw->data.hid.bRawData, raw->data.hid.dwSizeHid);
+		
+		if (r == HIDP_STATUS_SUCCESS && (uvalue >= pov->min && uvalue <= pov->max)) {
+			value  = (uvalue - pov->min) * 36000;
+			value /= (pov->max - pov->min + 1);
+			value %= 36000;
+		}
+
+		plat_joystick_state[j].p[p] = value;
+
+		//joystick_log("%s %-3d ", plat_joystick_state[j].pov[p].name, plat_joystick_state[j].p[p]);
+			
+	}
+	//joystick_log("\n");
+}
+
+
+static int joystick_get_axis(int joystick_nr, int mapping)
+{
+	if (mapping & POV_X)
+	{
+		int pov = plat_joystick_state[joystick_nr].p[mapping & 3];
+		if (LOWORD(pov) == 0xFFFF)
+			return 0;
+		else 
+			return sin((2*M_PI * (double)pov) / 36000.0) * 32767;
+	}
+	else if (mapping & POV_Y)
+	{
+		int pov = plat_joystick_state[joystick_nr].p[mapping & 3];
+			
+		if (LOWORD(pov) == 0xFFFF)
+			return 0;
+		else
+			return -cos((2*M_PI * (double)pov) / 36000.0) * 32767;
+	}
+	else
+		return plat_joystick_state[joystick_nr].a[plat_joystick_state[joystick_nr].axis[mapping].id];
+	
+}
+
+
+void joystick_process(void)
+{
+	int c, d;
+
+	if (joystick_type == 7) return;
+
+		for (c = 0; c < joystick_get_max_joysticks(joystick_type); c++)
+		{
+				if (joystick_state[c].plat_joystick_nr)
+				{
+					int joystick_nr = joystick_state[c].plat_joystick_nr - 1;
+					
+					for (d = 0; d < joystick_get_axis_count(joystick_type); d++)
+						joystick_state[c].axis[d] = joystick_get_axis(joystick_nr, joystick_state[c].axis_mapping[d]);
+					for (d = 0; d < joystick_get_button_count(joystick_type); d++)
+						joystick_state[c].button[d] = plat_joystick_state[joystick_nr].b[joystick_state[c].button_mapping[d]];
+
+					for (d = 0; d < joystick_get_pov_count(joystick_type); d++)
+					{
+						int x, y;
+						double angle, magnitude;
+
+						x = joystick_get_axis(joystick_nr, joystick_state[c].pov_mapping[d][0]);
+						y = joystick_get_axis(joystick_nr, joystick_state[c].pov_mapping[d][1]);
+						
+						angle = (atan2((double)y, (double)x) * 360.0) / (2*M_PI);
+						magnitude = sqrt((double)x*(double)x + (double)y*(double)y);
+						
+						if (magnitude < 16384)
+							joystick_state[c].pov[d] = -1;
+						else
+							joystick_state[c].pov[d] = ((int)angle + 90 + 360) % 360;
+					}
+				}
+				else
+				{
+					for (d = 0; d < joystick_get_axis_count(joystick_type); d++)
+						joystick_state[c].axis[d] = 0;
+					for (d = 0; d < joystick_get_button_count(joystick_type); d++)
+						joystick_state[c].button[d] = 0;
+					for (d = 0; d < joystick_get_pov_count(joystick_type); d++)
+						joystick_state[c].pov[d] = -1;
+				}
+		}
+}
+
diff --git a/src/win/win_joystick_xinput.cpp b/src/win/win_joystick_xinput.c
similarity index 99%
rename from src/win/win_joystick_xinput.cpp
rename to src/win/win_joystick_xinput.c
index 5fc636580..76526d350 100644
--- a/src/win/win_joystick_xinput.cpp
+++ b/src/win/win_joystick_xinput.c
@@ -18,7 +18,7 @@
  *		Copyright 2016-2018 Miran Grca.
  *		Copyright 2019 GH Cao.
  */
-#include <Xinput.h>
+#include <xinput.h>
 #include <math.h>
 #include <stdarg.h>
 #include <stdint.h>
@@ -260,3 +260,4 @@ void joystick_process(void)
         }
 }
 
+void win_joystick_handle(PRAWINPUT raw) {}
diff --git a/src/win/win_keyboard.c b/src/win/win_keyboard.c
index 36897c9be..d4769d9e5 100644
--- a/src/win/win_keyboard.c
+++ b/src/win/win_keyboard.c
@@ -108,30 +108,12 @@ keyboard_getkeymap(void)
 
 
 void
-keyboard_handle(LPARAM lParam, int infocus)
+keyboard_handle(PRAWINPUT raw)
 {
-    uint32_t ri_size = 0;
-    UINT size;
-    RAWINPUT *raw;
     USHORT scancode;
     static int recv_lalt = 0, recv_ralt = 0, recv_tab = 0;
 
-    if (! infocus) return;
-
-    GetRawInputData((HRAWINPUT)lParam, RID_INPUT, NULL,
-		    &size, sizeof(RAWINPUTHEADER));
-
-    raw = malloc(size);
-    if (raw == NULL) return;
-
-    /* Here we read the raw input data for the keyboard */
-    ri_size = GetRawInputData((HRAWINPUT)(lParam), RID_INPUT,
-			      raw, &size, sizeof(RAWINPUTHEADER));
-    if (ri_size != size) return;
-
-    /* If the input is keyboard, we process it */
-    if (raw->header.dwType == RIM_TYPEKEYBOARD) {
-	RAWKEYBOARD rawKB = raw->data.keyboard;
+    RAWKEYBOARD rawKB = raw->data.keyboard;
 	scancode = rawKB.MakeCode;
 
 	/* If it's not a scan code that starts with 0xE1 */
@@ -217,7 +199,4 @@ keyboard_handle(LPARAM lParam, int infocus)
 		if (scancode != 0xFFFF)
 			keyboard_input(!(rawKB.Flags & RI_KEY_BREAK), scancode);
 	}
-    }
-
-    free(raw);
 }
diff --git a/src/win/win_mouse.c b/src/win/win_mouse.c
index f58f4be82..080ef0be0 100644
--- a/src/win/win_mouse.c
+++ b/src/win/win_mouse.c
@@ -58,32 +58,11 @@ win_mouse_init(void)
 }
 
 void
-win_mouse_handle(LPARAM lParam, int infocus)
+win_mouse_handle(PRAWINPUT raw)
 {
-    uint32_t ri_size = 0;
-    UINT size;
-    RAWINPUT *raw;
-    RAWMOUSE state;
+    RAWMOUSE state = raw->data.mouse;
     static int x, y;
 
-    if (! infocus) return;
-
-    GetRawInputData((HRAWINPUT)lParam, RID_INPUT, NULL,
-		    &size, sizeof(RAWINPUTHEADER));
-
-    raw = (RAWINPUT*)malloc(size);
-    if (raw == NULL) return;
-
-    /* Here we read the raw input data for the mouse */
-    ri_size = GetRawInputData((HRAWINPUT)(lParam), RID_INPUT,
-			      raw, &size, sizeof(RAWINPUTHEADER));
-    if (ri_size != size) goto err;
-
-	/* If the input is not a mouse, we ignore it */	
-	if (raw->header.dwType != RIM_TYPEMOUSE) goto err;
-
-	state = raw->data.mouse;
-
 	/* read mouse buttons and wheel */
 	if (state.usButtonFlags & RI_MOUSE_LEFT_BUTTON_DOWN)
 		mousestate.buttons |= 1;
@@ -120,9 +99,6 @@ win_mouse_handle(LPARAM lParam, int infocus)
 		mousestate.dx += state.lLastX;
 		mousestate.dy += state.lLastY;
 	}
-
-	err:
-	free(raw);
 }
 
 void
diff --git a/src/win/win_settings.c b/src/win/win_settings.c
index 97c1e60e3..39a330eb8 100644
--- a/src/win/win_settings.c
+++ b/src/win/win_settings.c
@@ -2797,7 +2797,7 @@ win_settings_hard_disks_add_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM
 					if (r) {
 						for (i = 0; i < r; i++) {
 							fwrite(big_buf, 1, 1048576, f);
-							SendMessage(h, PBM_SETPOS, (WPARAM) (size + 1), (LPARAM) 0);
+							SendMessage(h, PBM_SETPOS, (WPARAM) (i + 1), (LPARAM) 0);
 
 							while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE | PM_NOYIELD)) {
 								TranslateMessage(&msg); 
diff --git a/src/win/win_ui.c b/src/win/win_ui.c
index a2216e3c8..244eb134d 100644
--- a/src/win/win_ui.c
+++ b/src/win/win_ui.c
@@ -1238,12 +1238,30 @@ input_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
     switch (message) {
 	case WM_INPUT:
-		keyboard_handle(lParam, infocus);
-#ifndef USE_DINPUT
-		win_mouse_handle(lParam, infocus);
-#endif
-		break;
+		if (infocus) {
+			UINT size = 0;
+			PRAWINPUT raw = NULL;
 
+			/* Here we read the raw input data */
+			GetRawInputData((HRAWINPUT)lParam, RID_INPUT, NULL, &size, sizeof(RAWINPUTHEADER));
+			raw = (PRAWINPUT)malloc(size);
+			if (GetRawInputData((HRAWINPUT)lParam, RID_INPUT, raw, &size, sizeof(RAWINPUTHEADER)) == size) {
+				switch(raw->header.dwType)
+				{
+					case RIM_TYPEKEYBOARD:
+						keyboard_handle(raw);
+						break;
+					case RIM_TYPEMOUSE:
+						win_mouse_handle(raw);
+						break;
+					case RIM_TYPEHID:
+						win_joystick_handle(raw);
+						break;
+				}
+			}
+			free(raw);
+		}
+		break;
 	case WM_SETFOCUS:
 		infocus = 1;
 		if (! hook_enabled) {