[Bf-committers] SVN commit: [38164] merwin-spacenav: various fixes to enable MSVC build, removed crusty old Win32 ndof code

[Nathan Letwory]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

(forwarded from other email address, as first reply doesn't seem to show
up on ML).

Hi Mike,

Parts you removed here as unnecessary due to WinXP requirement were
there for MingW to compile successfully during the attempts to fix
Shift+Numpad trouble. More specifically, these were added in patch
#26364 from AlexKu, applied in r35437 in trunk. It would probably be
good to restore these parts.

/Nathan

On 6.7.2011 21:50, Mike Erwin wrote:
> Revision: 38164
>           http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38164
> Author:   merwin
> Date:     2011-07-06 18:50:59 +0000 (Wed, 06 Jul 2011)
> Log Message:
> -----------
> various fixes to enable MSVC build, removed crusty old Win32 ndof code
> 

> -
> -#ifndef WM_INPUT
> -#define WM_INPUT 0x00FF
> -#endif 
> -#ifndef RID_INPUT
> -#define RID_INPUT 0x10000003
> -#endif
> -#ifndef RIM_INPUTSINK
> -#define RIM_INPUTSINK 0x1
> -#endif
> -#ifndef RI_KEY_BREAK
> -#define RI_KEY_BREAK 0x1
> -#endif
> -#ifndef RI_KEY_E0
> -#define RI_KEY_E0 0x2
> -#endif
> -#ifndef RI_KEY_E1
> -#define RI_KEY_E1 0x4
> -#endif
> -#ifndef RIM_TYPEMOUSE
> -#define RIM_TYPEMOUSE		0x0
> -#define RIM_TYPEKEYBOARD	0x1
> -#define RIM_TYPEHID			0x2
> -
> -typedef struct tagRAWINPUTDEVICE {
> -	USHORT usUsagePage;
> -	USHORT usUsage;
> -	DWORD dwFlags;
> -	HWND hwndTarget;
> -} RAWINPUTDEVICE;
> -
> -typedef struct tagRAWINPUTHEADER {
> -	DWORD dwType;
> -	DWORD dwSize;
> -	HANDLE hDevice;
> -	WPARAM wParam;
> -} RAWINPUTHEADER;
> -
> -typedef struct tagRAWMOUSE {
> -	USHORT usFlags;
> -	union {
> -		ULONG ulButtons;
> -		struct	{
> -			USHORT	usButtonFlags;
> -			USHORT	usButtonData;
> -		};
> -	};
> -	ULONG	ulRawButtons;
> -	LONG	lLastX;
> -	LONG	lLastY;
> -	ULONG	ulExtraInformation;
> -} RAWMOUSE;
> -
> -typedef struct tagRAWKEYBOARD {
> -	USHORT	MakeCode;
> -	USHORT	Flags;
> -	USHORT	Reserved;
> -	USHORT	VKey;
> -	UINT	Message;
> -	ULONG	ExtraInformation;
> -} RAWKEYBOARD;
> -
> -typedef struct tagRAWHID {
> -	DWORD	dwSizeHid;
> -	DWORD	dwCount;
> -	BYTE	bRawData[1];
> -} RAWHID;
> -
> -typedef struct tagRAWINPUT {
> -	RAWINPUTHEADER header;
> -	union {
> -		RAWMOUSE	mouse;
> -		RAWKEYBOARD keyboard;
> -		RAWHID      hid;
> -	} data;
> -} RAWINPUT;
> -
> -DECLARE_HANDLE(HRAWINPUT);
> -#endif
> -
> -#ifdef FREE_WINDOWS
> -#define NEED_RAW_PROC
> -typedef BOOL (WINAPI * LPFNDLLRRID)(RAWINPUTDEVICE*,UINT, UINT);
> -
> -typedef UINT (WINAPI * LPFNDLLGRID)(HRAWINPUT, UINT, LPVOID, PUINT, UINT);
> -#define GetRawInputData(hRawInput, uiCommand, pData, pcbSize, cbSizeHeader) ((pGetRawInputData)?pGetRawInputData(hRawInput, uiCommand, pData, pcbSize, cbSizeHeader):(UINT)-1)
> -#endif
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJOFLtbAAoJEKtfN7KsE0Tt2vEIAKgYtcmmcQ2TEd4c8fdWiLFa
PdwUrBnDk1r3uGs4Ch5HPtmhMHg8fn9OBidATwxihPAogKc8VGPRnvx22ln6Trau
Hxfz4YKdm8yo3w/K6/qGb4Et8QAevjXzU2iTbc8RA97WeVnW3J+/8OrbPGwOHmXo
1rgq9KvK67aJwKZbIVCj/7aAKpMSUWzC+Sbzc1Kc+RkWzkS3rDqIUUxKpgM6hOpa
ifoqLcHAjIndbqRJlivhAFmwAhl5LKVwxzepQy7FugFHzc/Q8e5uyzoa8y7iSr5c
0KfcgceQGS/5l3IsZ7bVBi1hmZhE7lYXjmwJLSYNECKh17Vr4Zr/oCm7z7+BnmI=
=hWye
-----END PGP SIGNATURE-----