August 2016 - Wine-commits - list.winehq.org

Grazvydas Ignotas : wined3d: Use Intel data returned by Windows driver.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: 58291b78c8ffaf0e0281ff0ef780d24faefb3ce5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58291b78c8ffaf0e0281ff0ef… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Sat Jun 4 23:07:00 2016 +0300 wined3d: Use Intel data returned by Windows driver. 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(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 898e477e6a103ec5aa533758a44b944a0de57e7d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index cb4f58f..b48fedd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -49,6 +49,7 @@ enum wined3d_display_driver DRIVER_INTEL_GMA900, DRIVER_INTEL_GMA950, DRIVER_INTEL_GMA3000, + DRIVER_INTEL_HD4000, DRIVER_NVIDIA_TNT, DRIVER_NVIDIA_GEFORCE2MX, DRIVER_NVIDIA_GEFORCEFX, @@ -1156,6 +1157,7 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_INTEL_GMA3000, DRIVER_MODEL_NT5X, "igxprd32.dll", 14, 10, 5218}, {DRIVER_INTEL_GMA950, DRIVER_MODEL_NT6X, "igdumd32.dll", 14, 10, 1504}, {DRIVER_INTEL_GMA3000, DRIVER_MODEL_NT6X, "igdumd32.dll", 15, 10, 1666}, + {DRIVER_INTEL_HD4000, DRIVER_MODEL_NT6X, "igdumdim32.dll", 19, 15, 4352}, /* Nvidia * - Geforce8 and newer is supported by the current 340.52 driver on XP-Win8 @@ -1372,15 +1374,15 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_Q45, "Intel(R) Q45/Q43", DRIVER_INTEL_GMA3000, 512}, {HW_VENDOR_INTEL, CARD_INTEL_G41, "Intel(R) G41", DRIVER_INTEL_GMA3000, 512}, {HW_VENDOR_INTEL, CARD_INTEL_B43, "Intel(R) B43", DRIVER_INTEL_GMA3000, 512}, - {HW_VENDOR_INTEL, CARD_INTEL_ILKD, "Intel(R) Ironlake Desktop", DRIVER_INTEL_GMA3000, 1024}, - {HW_VENDOR_INTEL, CARD_INTEL_ILKM, "Intel(R) Ironlake Mobile", DRIVER_INTEL_GMA3000, 1024}, - {HW_VENDOR_INTEL, CARD_INTEL_SNBD, "Intel(R) Sandybridge Desktop", DRIVER_INTEL_GMA3000, 1024}, - {HW_VENDOR_INTEL, CARD_INTEL_SNBM, "Intel(R) Sandybridge Mobile", DRIVER_INTEL_GMA3000, 1024}, - {HW_VENDOR_INTEL, CARD_INTEL_SNBS, "Intel(R) Sandybridge Server", DRIVER_INTEL_GMA3000, 1024}, - {HW_VENDOR_INTEL, CARD_INTEL_IVBD, "Intel(R) Ivybridge Desktop", DRIVER_INTEL_GMA3000, 1024}, - {HW_VENDOR_INTEL, CARD_INTEL_IVBM, "Intel(R) Ivybridge Mobile", DRIVER_INTEL_GMA3000, 1024}, - {HW_VENDOR_INTEL, CARD_INTEL_IVBS, "Intel(R) Ivybridge Server", DRIVER_INTEL_GMA3000, 1024}, - {HW_VENDOR_INTEL, CARD_INTEL_HWM, "Intel(R) Haswell Mobile", DRIVER_INTEL_GMA3000, 1024}, + {HW_VENDOR_INTEL, CARD_INTEL_ILKD, "Intel(R) HD Graphics", DRIVER_INTEL_GMA3000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_ILKM, "Intel(R) HD Graphics", DRIVER_INTEL_GMA3000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_SNBD, "Intel(R) HD Graphics 3000", DRIVER_INTEL_GMA3000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_SNBM, "Intel(R) HD Graphics 3000", DRIVER_INTEL_GMA3000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_SNBS, "Intel(R) HD Graphics Family", DRIVER_INTEL_GMA3000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_IVBD, "Intel(R) HD Graphics 4000", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_IVBM, "Intel(R) HD Graphics 4000", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_IVBS, "Intel(R) HD Graphics Family", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_HWM, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver,

1 0

Grazvydas Ignotas : wined3d: Add some more Intel GPUs.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: 157948ea6c57e39c3f31caaa3fa6e4372658268d URL: http://source.winehq.org/git/wine.git/?a=commit;h=157948ea6c57e39c3f31caaa3… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Sat Jun 4 23:07:01 2016 +0300 wined3d: Add some more Intel GPUs. 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(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ed59d4a9d9b565e253cf75f2dd7129fa43f25ee4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 5 +++++ dlls/wined3d/wined3d_private.h | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b48fedd..c60bb8d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1382,7 +1382,12 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IVBD, "Intel(R) HD Graphics 4000", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_IVBM, "Intel(R) HD Graphics 4000", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_IVBS, "Intel(R) HD Graphics Family", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_HWD, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_HWM, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_HD520, "Intel(R) HD Graphics 520", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD530_1, "Intel(R) HD Graphics 530", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD530_2, "Intel(R) HD Graphics 530", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD540, "Intel(R) Iris(TM) Graphics 540", DRIVER_INTEL_HD4000, 2048}, }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 76a0559..2d8b76a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1681,7 +1681,12 @@ enum wined3d_pci_device CARD_INTEL_IVBD = 0x0162, CARD_INTEL_IVBM = 0x0166, CARD_INTEL_IVBS = 0x015a, + CARD_INTEL_HWD = 0x0412, CARD_INTEL_HWM = 0x0416, + CARD_INTEL_HD520 = 0x1916, + CARD_INTEL_HD530_1 = 0x1912, + CARD_INTEL_HD530_2 = 0x191b, + CARD_INTEL_HD540 = 0x1926, }; struct wined3d_fbo_ops

1 0

Grazvydas Ignotas : wined3d: Add a fallback for Skylake.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: 97b7ee17b939859c1857ced58f67988108198106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97b7ee17b939859c1857ced58… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Wed Jun 8 00:27:55 2016 +0300 wined3d: Add a fallback for Skylake. Signed-off-by: Grazvydas Ignotas <notasas(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6be3a8fb75085dcaa1f0ffa268c98f127cbd2103) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c60bb8d..0315efd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1985,6 +1985,8 @@ cards_amd_binary[] = }, cards_intel[] = { + /* Skylake */ + {"Skylake", CARD_INTEL_HD520}, /* Haswell */ {"Haswell Mobile", CARD_INTEL_HWM}, /* Ivybridge */

1 0

Béla Gyebrószki : wined3d: Add Nvidia GeForce GTS 250.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: eb814b8cae913ab9b75eae2c08bf38656d3ea7d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb814b8cae913ab9b75eae2c0… Author: Béla Gyebrószki <gyebro69(a)gmail.com> Date: Wed Jun 8 18:30:23 2016 +0200 wined3d: Add Nvidia GeForce GTS 250. Signed-off-by: Béla Gyebrószki <gyebro69(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a6d7a1c6e4f027b29092fa504d5fba1b7833cc24) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0315efd..19ab0b8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1230,6 +1230,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_210, "NVIDIA GeForce 210", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT220, "NVIDIA GeForce GT 220", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT240, "NVIDIA GeForce GT 240", DRIVER_NVIDIA_GEFORCE8, 512 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS250, "NVIDIA GeForce GTS 250", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX260, "NVIDIA GeForce GTX 260", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, "NVIDIA GeForce GTX 275", DRIVER_NVIDIA_GEFORCE8, 896 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", DRIVER_NVIDIA_GEFORCE8, 1024}, @@ -1819,13 +1820,13 @@ cards_nvidia_binary[] = {"GTX 280", CARD_NVIDIA_GEFORCE_GTX280}, /* Geforce 200 - highend */ {"GTX 275", CARD_NVIDIA_GEFORCE_GTX275}, /* Geforce 200 - midend high */ {"GTX 260", CARD_NVIDIA_GEFORCE_GTX260}, /* Geforce 200 - midend */ + {"GTS 250", CARD_NVIDIA_GEFORCE_GTS250}, /* Geforce 200 - midend */ {"GT 240", CARD_NVIDIA_GEFORCE_GT240}, /* Geforce 200 - midend */ {"GT 220", CARD_NVIDIA_GEFORCE_GT220}, /* Geforce 200 - lowend */ {"GeForce 310", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ {"GeForce 305", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ {"GeForce 210", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ {"G 210", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ - {"GTS 250", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ {"GTS 150", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ {"9800", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ {"9700M GT", CARD_NVIDIA_GEFORCE_9700MGT}, /* Geforce 9 - midend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2d8b76a..e061b84 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1574,6 +1574,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_210 = 0x0a23, CARD_NVIDIA_GEFORCE_GT220 = 0x0a20, CARD_NVIDIA_GEFORCE_GT240 = 0x0ca3, + CARD_NVIDIA_GEFORCE_GTS250 = 0x0615, CARD_NVIDIA_GEFORCE_GTX260 = 0x05e2, CARD_NVIDIA_GEFORCE_GTX275 = 0x05e6, CARD_NVIDIA_GEFORCE_GTX280 = 0x05e1,

1 0

Béla Gyebrószki : wined3d: Add Nvidia GeForce GT 730 (GK208).
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: 3ddca5bffea3fc4915a0dd3935e3449cb361be93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ddca5bffea3fc4915a0dd393… Author: Béla Gyebrószki <gyebro69(a)gmail.com> Date: Fri Jun 10 20:15:11 2016 +0200 wined3d: Add Nvidia GeForce GT 730 (GK208). Signed-off-by: Béla Gyebrószki <gyebro69(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 72cdfff3e5b8dafbe71ad353f442bc8c67be568d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 19ab0b8..39eff73 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1272,6 +1272,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670MX, "NVIDIA GeForce GTX 670MX", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730, "NVIDIA GeForce GT 730", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730M, "NVIDIA GeForce GT 730M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT750M, "NVIDIA GeForce GT 750M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX750, "NVIDIA GeForce GTX 750", DRIVER_NVIDIA_GEFORCE8, 1024}, @@ -1774,6 +1775,7 @@ cards_nvidia_binary[] = {"GTX 750", CARD_NVIDIA_GEFORCE_GTX750}, /* Geforce 700 - midend */ {"GT 750M", CARD_NVIDIA_GEFORCE_GT750M}, /* Geforce 700 - midend mobile */ {"GT 730M", CARD_NVIDIA_GEFORCE_GT730M}, /* Geforce 700 - midend mobile */ + {"GT 730", CARD_NVIDIA_GEFORCE_GT730}, /* Geforce 700 - lowend */ {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ {"GTX 670MX", CARD_NVIDIA_GEFORCE_GTX670MX}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e061b84..a148a20 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1616,6 +1616,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_NVIDIA_GEFORCE_GTX670MX = 0x11a1, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, + CARD_NVIDIA_GEFORCE_GT730 = 0x1287, CARD_NVIDIA_GEFORCE_GT730M = 0x0fe1, CARD_NVIDIA_GEFORCE_GT750M = 0x0fe9, CARD_NVIDIA_GEFORCE_GTX750 = 0x1381,

1 0

Alistair Leslie-Hughes : wined3d: Correct memory size for Geforce 9600 GT.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: 6aa0569fe3b129bfde4c309c2ad15706047de840 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aa0569fe3b129bfde4c309c2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 15 07:48:30 2016 +0000 wined3d: Correct memory size for Geforce 9600 GT. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1da27c10b8edfa41e1308b8b67c80d236c4fed9e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 39eff73..29ca713 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1224,7 +1224,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400M, "NVIDIA GeForce 9400M", DRIVER_NVIDIA_GEFORCE8, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400GT, "NVIDIA GeForce 9400 GT", DRIVER_NVIDIA_GEFORCE8, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9500GT, "NVIDIA GeForce 9500 GT", DRIVER_NVIDIA_GEFORCE8, 256 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, "NVIDIA GeForce 9600 GT", DRIVER_NVIDIA_GEFORCE8, 384 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, "NVIDIA GeForce 9600 GT", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9700MGT, "NVIDIA GeForce 9700M GT", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9800GT, "NVIDIA GeForce 9800 GT", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_210, "NVIDIA GeForce 210", DRIVER_NVIDIA_GEFORCE8, 512 },

1 0

Austin English : winsta: Add a stub for WinStationEnumerateW.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: 0fa6f6f95a11d64fd1d34c6736f4447a508ab780 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fa6f6f95a11d64fd1d34c673… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 26 23:36:47 2016 -0500 winsta: Add a stub for WinStationEnumerateW. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0a31f489a65230cb72ae9953c184571101b059d2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winsta/main.c | 7 +++++++ dlls/winsta/winsta.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/winsta/main.c b/dlls/winsta/main.c index a95782f..59efef2 100644 --- a/dlls/winsta/main.c +++ b/dlls/winsta/main.c @@ -91,3 +91,10 @@ BOOL WINAPI WinStationVirtualOpen( PVOID a, PVOID b, PVOID c ) SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } + +BOOLEAN WINAPI WinStationEnumerateW( HANDLE server, PSESSIONIDW *sessionids, ULONG *count ) +{ + FIXME( "%p %p %p\n", server, sessionids, count ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} diff --git a/dlls/winsta/winsta.spec b/dlls/winsta/winsta.spec index 30aa6b5..20db0ca 100644 --- a/dlls/winsta/winsta.spec +++ b/dlls/winsta/winsta.spec @@ -29,7 +29,7 @@ @ stub WinStationEnumerateA @ stub WinStationEnumerateLicenses @ stub WinStationEnumerateProcesses -@ stub WinStationEnumerateW +@ stdcall WinStationEnumerateW(ptr ptr ptr) @ stub WinStationEnumerate_IndexedA @ stub WinStationEnumerate_IndexedW @ stub WinStationFreeGAPMemory

1 0

Austin English : dwmapi: Add DwmSetPresentParameters stub.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: 1d72cc8f4da527dfa6aeb40c56de72c5e3c07388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d72cc8f4da527dfa6aeb40c5… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jan 28 17:45:17 2016 -0600 dwmapi: Add DwmSetPresentParameters stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a717598b75b81f776e3fe51372651046cd24f955) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 9 +++++++++ include/dwmapi.h | 18 ++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 531f279..6adbcb9 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -39,7 +39,7 @@ @ stub DwmQueryThumbnailSourceSize @ stdcall DwmRegisterThumbnail(long long ptr) @ stub DwmSetDxFrameDuration -@ stub DwmSetPresentParameters +@ stdcall DwmSetPresentParameters(ptr ptr) @ stdcall DwmSetWindowAttribute(long long ptr long) @ stdcall DwmUnregisterThumbnail(long) @ stdcall DwmUpdateThumbnailProperties(ptr ptr) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index a776cfe..155d7d3 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -259,3 +259,12 @@ HRESULT WINAPI DwmUpdateThumbnailProperties(HTHUMBNAIL thumbnail, const DWM_THUM FIXME("(%p, %p) stub\n", thumbnail, props); return E_NOTIMPL; } + +/********************************************************************** + * DwmSetPresentParameters (DWMAPI.@) + */ +HRESULT WINAPI DwmSetPresentParameters(HWND hwnd, DWM_PRESENT_PARAMETERS *params) +{ + FIXME("(%p %p) stub\n", hwnd, params); + return S_OK; +}; diff --git a/include/dwmapi.h b/include/dwmapi.h index 035c831..f5191e1 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -37,6 +37,12 @@ typedef HTHUMBNAIL *PHTHUMBNAIL; typedef ULONGLONG DWM_FRAME_COUNT; typedef ULONGLONG QPC_TIME; +typedef enum _DWM_SOURCE_FRAME_SAMPLING { + DWM_SOURCE_FRAME_SAMPLING_POINT, + DWM_SOURCE_FRAME_SAMPLING_COVERAGE, + DWM_SOURCE_FRAME_SAMPLING_LAST +} DWM_SOURCE_FRAME_SAMPLING; + typedef struct _UNSIGNED_RATIO { UINT32 uiNumerator; UINT32 uiDenominator; @@ -117,6 +123,17 @@ typedef struct _DWM_THUMBNAIL_PROPERTIES BOOL fSourceClientAreaOnly; } DWM_THUMBNAIL_PROPERTIES, *PDWM_THUMBNAIL_PROPERTIES; +typedef struct _DWM_PRESENT_PARAMETERS { + UINT32 cbSize; + BOOL fQueue; + DWM_FRAME_COUNT cRefreshStart; + UINT cBuffer; + BOOL fUseSourceRate; + UNSIGNED_RATIO rateSource; + UINT cRefreshesPerFrame; + DWM_SOURCE_FRAME_SAMPLING eSampling; +} DWM_PRESENT_PARAMETERS; + #include <poppack.h> DWMAPI DwmDefWindowProc(HWND, UINT, WPARAM, LPARAM, LRESULT*); @@ -129,6 +146,7 @@ DWMAPI DwmGetCompositionTimingInfo(HWND,DWM_TIMING_INFO*); DWMAPI DwmInvalidateIconicBitmaps(HWND); DWMAPI DwmIsCompositionEnabled(BOOL*); DWMAPI DwmRegisterThumbnail(HWND, HWND, PHTHUMBNAIL); +DWMAPI DwmSetPresentParameters(HWND, DWM_PRESENT_PARAMETERS *); DWMAPI DwmSetWindowAttribute(HWND, DWORD, LPCVOID, DWORD); DWMAPI DwmUnregisterThumbnail(HTHUMBNAIL); DWMAPI DwmUpdateThumbnailProperties(HTHUMBNAIL, const DWM_THUMBNAIL_PROPERTIES *);

1 0

Austin English : kernel32: Add GetConsoleAliasExesLengthA/W stubs.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: 47d5193e1079ce4cba538a288c9cc7e35dbff1c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47d5193e1079ce4cba538a288… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Mar 31 21:38:36 2016 -0500 kernel32: Add GetConsoleAliasExesLengthA/W stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 43637ce9f7b8654934b8bea65cf5de68c182d4f9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/console.c | 14 ++++++++++++++ dlls/kernel32/kernel32.spec | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 179e14e..874d19c 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3203,6 +3203,20 @@ DWORD WINAPI GetConsoleAliasesLengthW(LPWSTR unknown) return 0; } +DWORD WINAPI GetConsoleAliasExesLengthA(void) +{ + FIXME(": stub!\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +DWORD WINAPI GetConsoleAliasExesLengthW(void) +{ + FIXME(": stub!\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + VOID WINAPI ExpungeConsoleCommandHistoryA(LPCSTR unknown) { FIXME(": (%s) stub!\n", debugstr_a(unknown)); diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index bcbc50ed..bc147c5 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -582,8 +582,8 @@ @ stdcall GetComputerNameW(ptr ptr) @ stub GetConsoleAliasA @ stub GetConsoleAliasExesA -@ stub GetConsoleAliasExesLengthA -@ stub GetConsoleAliasExesLengthW +@ stdcall GetConsoleAliasExesLengthA() +@ stdcall GetConsoleAliasExesLengthW() @ stub GetConsoleAliasExesW @ stdcall GetConsoleAliasW(wstr ptr long wstr) @ stub GetConsoleAliasesA

1 0

Alistair Leslie-Hughes : wininet: Free socket when connection is freed.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: bbacc9a40593cd33b36ad42b4400a39e1e5d5397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbacc9a40593cd33b36ad42b4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 11 18:41:25 2016 +1000 wininet: Free socket when connection is freed. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5ee82583f7716c140a02c4eb043e80d64cd33c04) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wininet/netconnection.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 7305860..63b84aa 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -396,6 +396,7 @@ void free_netconn(netconn_t *netconn) DeleteSecurityContext(&netconn->ssl_ctx); } + close_netconn(netconn); heap_free(netconn); }

1 0