Merge commit '9a92ae2f200749dae1da1e4967ed0623e8537bf4' into eterhack

diff --cc .gitignore
Simple merge

diff --cc configure
Simple merge

diff --cc configure.ac
Simple merge

diff --cc dlls/gdi32/enhmfdrv/graphics.c
Simple merge

diff --cc dlls/gdi32/font.c
Simple merge

diff --cc dlls/gdi32/freetype.c
Simple merge

diff --cc dlls/mountmgr.sys/device.c
index d4fe217d3bb1b2d8de3b036b3067ab7b7303c06f,7a50a45dbcf110750a96ab840e0a0acdddab8a16..692fe38ad96a85ab5420a553b34d875306f24e5f
--- 1/dlls/mountmgr.sys/device.c
--- 2/dlls/mountmgr.sys/device.c
+++ b/dlls/mountmgr.sys/device.c
@@@ -1120,11 -900,31 +1120,31 @@@ static NTSTATUS WINAPI harddisk_ioctl( 
          info.TracksPerCylinder = 255;
          info.SectorsPerTrack = 63;
          info.BytesPerSector = 512;
 -        memcpy( irp->MdlAddress->StartVa, &info, len );
 +        memcpy( irp->AssociatedIrp.SystemBuffer, &info, len );
          irp->IoStatus.Information = len;
 -        irp->IoStatus.u.Status = STATUS_SUCCESS;
 +        status = STATUS_SUCCESS;
          break;
      }
+     case IOCTL_DISK_GET_DRIVE_GEOMETRY_EX:
+     {
+         DISK_GEOMETRY_EX info;
+         DWORD len = min( sizeof(info), irpsp->Parameters.DeviceIoControl.OutputBufferLength );
+ 
+         FIXME("The DISK_PARTITION_INFO and DISK_DETECTION_INFO structures will not be filled\n");
+ 
+         info.Geometry.Cylinders.QuadPart = 10000;
+         info.Geometry.MediaType = (dev->devnum.DeviceType == FILE_DEVICE_DISK) ? FixedMedia : RemovableMedia;
+         info.Geometry.TracksPerCylinder = 255;
+         info.Geometry.SectorsPerTrack = 63;
+         info.Geometry.BytesPerSector = 512;
+         info.DiskSize.QuadPart = info.Geometry.Cylinders.QuadPart * info.Geometry.TracksPerCylinder *
+                                  info.Geometry.SectorsPerTrack * info.Geometry.BytesPerSector;
+         info.Data[0]  = 0;
+         memcpy( irp->MdlAddress->StartVa, &info, len );
+         irp->IoStatus.Information = len;
+         irp->IoStatus.u.Status = STATUS_SUCCESS;
+         break;
+     }
      case IOCTL_STORAGE_GET_DEVICE_NUMBER:
      {
          DWORD len = min( sizeof(dev->devnum), irpsp->Parameters.DeviceIoControl.OutputBufferLength );

diff --cc dlls/msi/files.c
Simple merge

diff --cc dlls/wineps.drv/pen.c
Simple merge

diff --cc dlls/wineps.drv/wineps.drv.spec
Simple merge

diff --cc dlls/winex11.drv/mouse.c
Simple merge

diff --cc include/Makefile.in
Simple merge

diff --cc include/config.h.in
Simple merge

diff --cc include/winioctl.h
Simple merge