Controller mapping bug

This was mentioned in another thread but I'd like to bring it to Tom's attention as a potential bug.

I have a Microsoft XBox 360 controller running on Windows XP SP3. The controller works great in the system. It maps the buttons as 1-10 in the Control Panel.

GameEx reads the controller as 0-9. It is one-off what the system reads. I also have this issue with my Playstation USB adapter. The buttons are mapped in XP fine but GameEx sees them as a value one less than the system.

I have done the custominput.ini manually and through the setup wizard with the same results. Whether I manually set the values to what Windows sees or use the setup wizard it does not fix the issue.

XBOX 360 controller is a Wired USB controller with latest driver from Microsoft.

Control Panel sees:
A = 1
B = 2
X = 3
Y = 4
L = 5
R = 6
BACK = 7
START = 8
LEFT STICK = 9
RIGHT STICK = 10

Setup Wizard sees:
A = 0
B = 1
X = 2
Y = 3
L = 4
R = 5
BACK = 6
START = 7
LEFT STICK = 8
RIGHT STICK = 9

I haven't tested this on Windows 7 yet but I will in a few minutes.

EDIT: Windows 7 x64 does the exact same thing.