Signed-off-by: Justas Lavišius <bucaneer@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit dccb57df)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 42c27995)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 49078e00)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: André Hentschel <nerv@dawncrow.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 113f4325)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Austin English <austinenglish@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit c9516970)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Austin English <austinenglish@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 2bb17745)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 25b0a498)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Apple added the same enum declaration to their headers, causing a build failure.
Signed-off-by: Ken Thomases <ken@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit cac22620)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Michael Müller <michael@fds-team.de>
Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit c88f4b85)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 04c3a9ba)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit c90845cf)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Stefan Leichter <Stefan.Leichter@camLine.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 9cd67d2a)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Stefan Leichter <Stefan.Leichter@camLine.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit cfaca5ea)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Stefan Leichter <Stefan.Leichter@camLine.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 1c3c9f06)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 75059e9e)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit e60b2766)
Conflicts:
	dlls/riched20/tests/editor.c
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 6b8fb1c2)
Conflicts:
	dlls/wined3d/swapchain.c
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Add the newer and high-end Intel Iris GPU chips to the current
identification list.
Signed-off-by: Benjamin Hodgetts <ben@xnode.org>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit a14e5fb1)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 1da27c10)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Béla Gyebrószki <gyebro69@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 72cdfff3)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Béla Gyebrószki <gyebro69@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit a6d7a1c6)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 6be3a8fb)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

For HD Graphics 520 or newer, the whole system RAM seems to be reported
as VRAM. For now I've chosen 2048MB based on assumption that systems as
new as this will have at least 2GB of RAM.
Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit ed59d4a9)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

The returned VRAM size seems to vary between 1600-1800 MB, probably
depends on the system, I chose 1536 (1024+512) just to be safe.
Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 898e477e)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Austin English <austinenglish@gmail.com>
Signed-off-by: Marcus Meissner <marcus@jet.franken.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 4d313e64)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Bruno Jesus <00cpxxx@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 134bf22b)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Jarkko Korpi <jarkko_korpi@hotmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit bb9b2f33)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 7300f1b7)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Vincent Povirk <vincent@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 7fbf0dee)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit e4b8bc0e)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 5325b8c9)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit fdc57d49)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit c044cf41)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Jean-Christophe Cardot <wine@cardot.net>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 706145c5)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

HLPFILE_HalfPointsToTwips was performing a useless transformation of the
RTF measures, using a hardcoded 72 DPI. As winhlp32 makes use of the
richedit component, it is counter productive to transform the measures,
as this is taken care of by richedit himself.
Signed-off-by: Jean-Christophe Cardot <wine@cardot.net>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit a01c0030)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Jean-Christophe Cardot <wine@cardot.net>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 5200dc9b)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Jean-Christophe Cardot <wine@cardot.net>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit d55cb801)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Jean-Christophe Cardot <wine@cardot.net>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit ae56f3d0)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Jean-Christophe Cardot <wine@cardot.net>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 58f16273)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 88dd3b4f)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>