On Wed, May 9, 2012 at 8:11 PM, Ozkan Sezer <[email protected]> wrote:
> On 5/9/12, Kai Tietz <[email protected]> wrote:
> > 2012/5/9 Joshua Boyce <[email protected]>:
> >> In the MinGW-w64 trunk (and in the pre-built MinGW-w64 based toolchains
> >> that
> >> I tested), the map types for MapVirtualKeyEx are incorrectly wrapped by
> a
> >> preprocessor directive specifying a minimum target of Windows 7.
> >>
> >> The defines seem to have been incorrectly grouped with the Windows 7
> >> touch
> >> related APIs.
> >>
> >> Tentative patch (all I did was hoist the defines out of the #if, which
> >> seemed to work on my end):
> >>
> http://dl.dropbox.com/u/74751/cpp/mingw-w64/patches/mingw-w64-mapvirtualkeyex-fix-20120509-1826.patch
> >>
> >> Index: mingw-w64-headers/include/winuser.h
> >> ===================================================================
> >> --- mingw-w64-headers/include/winuser.h (revision 4984)
> >> +++ mingw-w64-headers/include/winuser.h (working copy)
> >> @@ -5335,6 +5335,12 @@
> >> #define RIDEV_EXMODEMASK 0x000000F0
> >> #define RIDEV_EXMODE(mode) ((mode) & RIDEV_EXMODEMASK)
> >>
> >> +#define MAPVK_VK_TO_VSC 0
> >> +#define MAPVK_VSC_TO_VK 1
> >> +#define MAPVK_VK_TO_CHAR 2
> >> +#define MAPVK_VSC_TO_VK_EX 3
> >> +#define MAPVK_VK_TO_VSC_EX 4
> >> +
> >> #if (_WIN32_WINNT >= 0x0601)
> >> #define WM_TOUCHMOVE 576
> >> #define WM_TOUCHDOWN 577
> >> @@ -5353,12 +5359,6 @@
> >> #define TOUCHINPUTMASKF_EXTRAINFO 0x0002
> >> #define TOUCHINPUTMASKF_CONTACTAREA 0x0004
> >>
> >> -#define MAPVK_VK_TO_VSC 0
> >> -#define MAPVK_VSC_TO_VK 1
> >> -#define MAPVK_VK_TO_CHAR 2
> >> -#define MAPVK_VSC_TO_VK_EX 3
> >> -#define MAPVK_VK_TO_VSC_EX 4
> >> -
> >> DECLARE_HANDLE(HTOUCHINPUT);
> >>
> >> typedef struct _TOUCHINPUT {
> >>
> >
> > Patch looks ok to me. Any objections Ozkan, JonY?
> >
>
> I applied the change to the trunk and to v2.x with a modification
> (MAPVK_VK_TO_VSC_EX needs vista+ only among others.)
>
> Revs. 4985, 4986.
>
> > Regards,
> > Kai
> >
>
> --
> O.S.
>
>
> ------------------------------------------------------------------------------
> Live Security Virtual Conference
> Exclusive live event will cover all the ways today's security and
> threat landscape has changed and how IT managers can respond. Discussions
> will include endpoint security, mobile security and the latest in malware
> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
> _______________________________________________
> Mingw-w64-public mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
>
Nice catch. It seems MSDN has omitted that particular detail:
http://msdn.microsoft.com/en-us/library/windows/desktop/ms646307.aspx
I see no mention of that flag being Vista+. I've confirmed in the Windows
SDK headers that you are correct though.
Thanks.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
