[PULL] hw/xwin fixes

[Jon TURNEY]

Hi Keith,

Please consider pulling into master.

Thanks.

The following changes since commit e01a3f65d3e6d92f92ef2992b338cc9625bde082:

  ephyr: Fix warning about XID vs unsigned long * by changing function args
(2013-08-21 09:10:49 -0700)

are available in the git repository at:

  git://people.freedesktop.org/~jturney/xserver master

for you to fetch changes up to 3752a815800626ae93f64a856f5889aa6636344e:

  hw/xwin: Remove unnecessary and incorrect HWND casts (2013-08-30 14:22:22 +0100)

----------------------------------------------------------------
Colin Harrison (1):
      hw/xwin: Correct winprefs.c function signatures for x64.

Jon TURNEY (12):
      hw/xwin: Fix inclusion of shlobj.h in MinGW64 build
      hw/xwin: Fix winglobals.h for MinGW64 build
      Move pseudoramiX code where it can be shared between Xwin and Xquartz
      hw/xwin: Fix -Warray-bounds warning in winXCursorToHCURSOR()
      hw/xwin: Fix an issue in winSetSpansNativeGDI() identifed by -Warray-bounds
      hw/xwin: Fix ARGB cursor conversion on x86_64
      hw/xwin: Remove unused winProcQueryTreeOrig variable
      hw/xwin: Remove unused externs from winclipboardwrappers.c
      hw/xwin: Remove prototype for non-existent winDeinitClipboard()
      hw/xwin: Remove unneeded forward declaration of winProcessXEventsTimeout()
      hw/xwin: Remove unused extern g_fUseUnicode from winclipboardwndproc.c
      hw/xwin: Fix compilation of winauth.c with
-Werror=implicit-function-declaration

Marc Haesen (2):
      hw/xwin: Correct size of _WINDOWSWM_NATIVE_HWND property on x86_64
      hw/xwin: Remove unnecessary and incorrect HWND casts

 Makefile.am                               |  2 ++
 configure.ac                              |  1 +
 hw/xquartz/Makefile.am                    |  4 ++--
 hw/xwin/InitInput.c                       |  1 -
 hw/xwin/InitOutput.c                      |  4 ++++
 hw/xwin/Makefile.am                       |  1 +
 hw/xwin/winauth.c                         |  7 +++----
 hw/xwin/winclipboard.h                    |  3 ---
 hw/xwin/winclipboardwndproc.c             | 11 -----------
 hw/xwin/winclipboardwrappers.c            |  2 --
 hw/xwin/wincursor.c                       | 43
+++++++++++++++++++++++--------------------
 hw/xwin/winglobals.c                      |  1 -
 hw/xwin/winglobals.h                      |  3 ++-
 hw/xwin/winmultiwindowwm.c                | 20 +++++++++-----------
 hw/xwin/winmultiwindowwndproc.c           |  8 ++++----
 hw/xwin/winprefs.c                        | 22 +++++-----------------
 hw/xwin/winprefs.h                        |  8 ++++----
 hw/xwin/winsetsp.c                        | 52
+++++++++++++++++++++++++++++-----------------------
 hw/xwin/wintrayicon.c                     |  2 +-
 pseudoramiX/Makefile.am                   |  7 +++++++
 {hw/xquartz => pseudoramiX}/pseudoramiX.c |  0
 {hw/xquartz => pseudoramiX}/pseudoramiX.h |  0
 22 files changed, 97 insertions(+), 105 deletions(-)
 create mode 100644 pseudoramiX/Makefile.am
 rename {hw/xquartz => pseudoramiX}/pseudoramiX.c (100%)
 rename {hw/xquartz => pseudoramiX}/pseudoramiX.h (100%)