June 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : mspatcha: Build with msvcrt.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: a8732ce6383b61f1608d9385e45bd0e4c9468f7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8732ce6383b61f1608d9385… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 08:45:28 2019 +0200 mspatcha: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mspatcha/Makefile.in | 2 ++ dlls/mspatcha/lzxd_dec.c | 2 -- dlls/mspatcha/mspatcha_main.c | 2 -- dlls/mspatcha/pa19.c | 8 +++----- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/mspatcha/Makefile.in b/dlls/mspatcha/Makefile.in index 935e645..a380f3f 100644 --- a/dlls/mspatcha/Makefile.in +++ b/dlls/mspatcha/Makefile.in @@ -1,6 +1,8 @@ MODULE = mspatcha.dll IMPORTLIB = mspatcha +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ lzxd_dec.c \ mspatcha_main.c \ diff --git a/dlls/mspatcha/lzxd_dec.c b/dlls/mspatcha/lzxd_dec.c index 0be5553..f21e1ed 100644 --- a/dlls/mspatcha/lzxd_dec.c +++ b/dlls/mspatcha/lzxd_dec.c @@ -21,8 +21,6 @@ * - Implememnt interleaved decoding */ -#include "config.h" - #include <stdarg.h> #include <assert.h> diff --git a/dlls/mspatcha/mspatcha_main.c b/dlls/mspatcha/mspatcha_main.c index 9695a7a..167c3fd 100644 --- a/dlls/mspatcha/mspatcha_main.c +++ b/dlls/mspatcha/mspatcha_main.c @@ -29,8 +29,6 @@ * solution to the above 32-bit exe problem. */ -#include "config.h" - #include <stdarg.h> #include "windef.h" diff --git a/dlls/mspatcha/pa19.c b/dlls/mspatcha/pa19.c index 3a0fd55..633915e 100644 --- a/dlls/mspatcha/pa19.c +++ b/dlls/mspatcha/pa19.c @@ -32,8 +32,6 @@ * but not all, of the positions listed in the PE .reloc table. */ -#include "config.h" - #include <stdarg.h> #include <stdlib.h> @@ -297,7 +295,7 @@ static INT64 read_svli(struct patch_file_header *ph) return n; } -static int compare_ignored_range(const void *a, const void *b) +static int __cdecl compare_ignored_range(const void *a, const void *b) { LONG delta = ((PATCH_IGNORE_RANGE*)a)->OffsetInOldFile - ((PATCH_IGNORE_RANGE*)b)->OffsetInOldFile; if (delta > 0) @@ -307,7 +305,7 @@ static int compare_ignored_range(const void *a, const void *b) return 0; } -static int compare_retained_range_old(const void *a, const void *b) +static int __cdecl compare_retained_range_old(const void *a, const void *b) { LONG delta = ((PATCH_RETAIN_RANGE*)a)->OffsetInOldFile - ((PATCH_RETAIN_RANGE*)b)->OffsetInOldFile; if (delta > 0) @@ -317,7 +315,7 @@ static int compare_retained_range_old(const void *a, const void *b) return 0; } -static int compare_retained_range_new(const void *a, const void *b) +static int __cdecl compare_retained_range_new(const void *a, const void *b) { LONG delta = ((PATCH_RETAIN_RANGE*)a)->OffsetInNewFile - ((PATCH_RETAIN_RANGE*)b)->OffsetInNewFile; if (delta > 0)

1 0

Alexandre Julliard : msnet32: Build with msvcrt.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: 8997127c11f3a1d12c220773aafa9c4d253f7370 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8997127c11f3a1d12c220773… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 08:45:07 2019 +0200 msnet32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msnet32/Makefile.in | 2 ++ dlls/msnet32/msnet_main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msnet32/Makefile.in b/dlls/msnet32/Makefile.in index 8cbb8c6..4ec8226 100644 --- a/dlls/msnet32/Makefile.in +++ b/dlls/msnet32/Makefile.in @@ -1,3 +1,5 @@ MODULE = msnet32.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = msnet_main.c diff --git a/dlls/msnet32/msnet_main.c b/dlls/msnet32/msnet_main.c index 1ffef50..8303b8f 100644 --- a/dlls/msnet32/msnet_main.c +++ b/dlls/msnet32/msnet_main.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : msimtf: Build with msvcrt.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: 62e610ad324774684f6d1d2738ce2c08b8ed91bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=62e610ad324774684f6d1d27… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 08:44:06 2019 +0200 msimtf: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msimtf/Makefile.in | 2 ++ dlls/msimtf/activeimmapp.c | 4 ---- dlls/msimtf/main.c | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/msimtf/Makefile.in b/dlls/msimtf/Makefile.in index f7f6bfc..800969c 100644 --- a/dlls/msimtf/Makefile.in +++ b/dlls/msimtf/Makefile.in @@ -1,6 +1,8 @@ MODULE = msimtf.dll IMPORTS = uuid imm32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ activeimmapp.c \ main.c diff --git a/dlls/msimtf/activeimmapp.c b/dlls/msimtf/activeimmapp.c index 313cd8c..5dec79e 100644 --- a/dlls/msimtf/activeimmapp.c +++ b/dlls/msimtf/activeimmapp.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #define COBJMACROS @@ -34,8 +32,6 @@ #include "dimm.h" #include "imm.h" -#include "wine/unicode.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msimtf); diff --git a/dlls/msimtf/main.c b/dlls/msimtf/main.c index 78c26cb..76ad654 100644 --- a/dlls/msimtf/main.c +++ b/dlls/msimtf/main.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include <stdio.h>

1 0

Alexandre Julliard : msi: Build with msvcrt.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: 7cd3c9f0734d217e1d08319e72a9df91fe2ef882 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cd3c9f0734d217e1d08319e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 08:42:35 2019 +0200 msi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/Makefile.in | 2 + dlls/msi/action.c | 306 +++++++++++++++++++++++++------------------------- dlls/msi/appsearch.c | 67 ++++++----- dlls/msi/assembly.c | 19 ++-- dlls/msi/automation.c | 3 +- dlls/msi/classes.c | 92 +++++++-------- dlls/msi/cond.y | 81 +++++++------ dlls/msi/create.c | 3 +- dlls/msi/custom.c | 47 ++++---- dlls/msi/database.c | 51 +++++---- dlls/msi/dialog.c | 151 +++++++++++++------------ dlls/msi/files.c | 45 ++++---- dlls/msi/font.c | 27 +++-- dlls/msi/format.c | 13 +-- dlls/msi/insert.c | 5 +- dlls/msi/install.c | 29 +++-- dlls/msi/media.c | 47 ++++---- dlls/msi/msi.c | 183 +++++++++++++++--------------- dlls/msi/msipriv.h | 4 +- dlls/msi/msiquery.c | 27 +++-- dlls/msi/package.c | 168 ++++++++++++++------------- dlls/msi/patch.c | 33 +++--- dlls/msi/record.c | 3 +- dlls/msi/registry.c | 145 ++++++++++++------------ dlls/msi/script.c | 3 +- dlls/msi/source.c | 57 +++++----- dlls/msi/sql.y | 14 +-- dlls/msi/streams.c | 3 +- dlls/msi/string.c | 5 +- dlls/msi/suminfo.c | 21 ++-- dlls/msi/table.c | 43 ++++--- dlls/msi/tokenize.c | 5 +- dlls/msi/upgrade.c | 17 ++- dlls/msi/where.c | 11 +- 34 files changed, 846 insertions(+), 884 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7cd3c9f0734d217e1d08…

1 0

Zhiyi Zhang : winex11.drv: Initialize GPU registry data.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: bada31698fec7125329cae6e62b2cf70205d5ece URL: https://source.winehq.org/git/wine.git/?a=commit;h=bada31698fec7125329cae6e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 10 22:07:14 2019 +0800 winex11.drv: Initialize GPU registry data. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/Makefile.in | 2 +- dlls/winex11.drv/display.c | 154 +++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 22 +++++++ dlls/winex11.drv/xinerama.c | 25 +++++++ 4 files changed, 202 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bada31698fec7125329c…

1 0

Zhiyi Zhang : user32: Improve EnumDisplayDevicesW stub.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: 8f5fbfeb42f1d18c93d0bc98f63822936057306d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f5fbfeb42f1d18c93d0bc98… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 10 22:08:40 2019 +0800 user32: Improve EnumDisplayDevicesW stub. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/misc.c | 74 ++++++++++++++++++++++++++++++++++++--------- dlls/user32/tests/monitor.c | 18 +++++------ 2 files changed, 68 insertions(+), 24 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 1a03d70..3554570 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -39,6 +39,33 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); +static const WCHAR default_adapter_name[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; +static const WCHAR default_monitor_name[] = + {'\\','\\','.','\\', + 'D','I','S','P','L','A','Y','1','\\', + 'M','o','n','i','t','o','r','0',0}; +static const WCHAR default_adapter_string[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; +static const WCHAR default_monitor_string[] = + {'G','e','n','e','r','i','c',' ','N','o','n','-','P','n','P',' ','M','o','n','i','t','o','r',0}; +static const WCHAR default_adapter_id[] = + {'P','C','I','\\', + 'V','E','N','_','0','0','0','0','&', + 'D','E','V','_','0','0','0','0','&', + 'S','U','B','S','Y','S','_','0','0','0','0','0','0','0','0','&', + 'R','E','V','_','0','0',0}; +static const WCHAR default_monitor_id[] = + {'M','O','N','I','T','O','R','\\', + 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r','\\', + '{','4','d','3','6','e','9','6','e','-','e','3','2','5','-','1','1','c','e','-', + 'b','f','c','1','-','0','8','0','0','2','b','e','1','0','3','1','8','}', + '\\','0','0','0','0',0}; +static const WCHAR default_monitor_interface_id[] = + {'\\','\\','\?','\\', + 'D','I','S','P','L','A','Y','#','D','e','f','a','u','l','t','_','M','o','n','i','t','o','r','#', + '4','&','1','7','f','0','f','f','5','4','&','0','&','U','I','D','0','#', + '{','e','6','f','0','7','b','5','f','-','e','e','9','7','-','4','a','9','0','-', + 'b','0','7','6','-','3','3','f','5','7','b','f','4','e','a','a','7','}',0}; + #define IMM_INIT_MAGIC 0x19650412 static HWND (WINAPI *imm_get_ui_window)(HKL); BOOL (WINAPI *imm_register_window)(HWND) = NULL; @@ -243,12 +270,6 @@ DWORD WINAPI SetLogonNotifyWindow(HWINSTA hwinsta,HWND hwnd) return 1; } -static const WCHAR primary_device_name[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; -static const WCHAR primary_device_string[] = {'X','1','1',' ','W','i','n','d','o','w','i','n','g',' ', - 'S','y','s','t','e','m',0}; -static const WCHAR primary_device_deviceid[] = {'P','C','I','\\','V','E','N','_','0','0','0','0','&', - 'D','E','V','_','0','0','0','0',0}; - /*********************************************************************** * EnumDisplayDevicesA (USER32.@) */ @@ -293,16 +314,39 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lp if (i) return FALSE; - memcpy(lpDisplayDevice->DeviceName, primary_device_name, sizeof(primary_device_name)); - memcpy(lpDisplayDevice->DeviceString, primary_device_string, sizeof(primary_device_string)); - - lpDisplayDevice->StateFlags = - DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | - DISPLAY_DEVICE_PRIMARY_DEVICE | - DISPLAY_DEVICE_VGA_COMPATIBLE; + /* Adapter */ + if (!lpDevice) + { + memcpy(lpDisplayDevice->DeviceName, default_adapter_name, sizeof(default_adapter_name)); + memcpy(lpDisplayDevice->DeviceString, default_adapter_string, sizeof(default_adapter_string)); + lpDisplayDevice->StateFlags = + DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_VGA_COMPATIBLE; + if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + { + if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) + lpDisplayDevice->DeviceID[0] = 0; + else + memcpy(lpDisplayDevice->DeviceID, default_adapter_id, sizeof(default_adapter_id)); + } + } + /* Monitor */ + else + { + if (lstrcmpiW(default_adapter_name, lpDevice)) + return FALSE; + + memcpy(lpDisplayDevice->DeviceName, default_monitor_name, sizeof(default_monitor_name)); + memcpy(lpDisplayDevice->DeviceString, default_monitor_string, sizeof(default_monitor_string)); + lpDisplayDevice->StateFlags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED; + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + { + if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) + memcpy(lpDisplayDevice->DeviceID, default_monitor_interface_id, sizeof(default_monitor_interface_id)); + else + memcpy(lpDisplayDevice->DeviceID, default_monitor_id, sizeof(default_monitor_id)); + } + } - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - memcpy(lpDisplayDevice->DeviceID, primary_device_deviceid, sizeof(primary_device_deviceid)); if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) lpDisplayDevice->DeviceKey[0] = 0; diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index bee1085..e3e1f38 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -146,13 +146,13 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de * by changing the data and rerun EnumDisplayDevices. But it's difficult to find corresponding PCI device on * userland. So here we check the expected format instead. */ if (flags & EDD_GET_DEVICE_INTERFACE_NAME) - todo_wine ok(strlen(device->DeviceID) == 0 || /* vista+ */ + ok(strlen(device->DeviceID) == 0 || /* vista+ */ sscanf(device->DeviceID, "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X", &vendor_id, &device_id, &subsys_id, &revision_id) == 4, /* XP/2003 ignores EDD_GET_DEVICE_INTERFACE_NAME */ "#%d: got %s\n", index, device->DeviceID); else { - todo_wine ok(broken(strlen(device->DeviceID) == 0) || /* XP on Testbot returns an empty string, whereas real machine doesn't */ + ok(broken(strlen(device->DeviceID) == 0) || /* XP on Testbot returns an empty string, whereas real machine doesn't */ sscanf(device->DeviceID, "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X", &vendor_id, &device_id, &subsys_id, &revision_id) == 4, "#%d: wrong DeviceID %s\n", index, device->DeviceID); } @@ -173,14 +173,14 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index /* DeviceName */ lstrcpyA(monitor_name, adapter_name); sprintf(monitor_name + strlen(monitor_name), "\\Monitor%d", monitor_index); - todo_wine ok(!strcmp(monitor_name, device->DeviceName), "#%d: expect %s, got %s\n", monitor_index, monitor_name, device->DeviceName); + ok(!strcmp(monitor_name, device->DeviceName), "#%d: expect %s, got %s\n", monitor_index, monitor_name, device->DeviceName); /* DeviceString */ ok(strlen(device->DeviceString) > 0, "#%d: expect DeviceString not empty\n", monitor_index); /* StateFlags */ if (adapter_index == 0 && monitor_index == 0) - todo_wine ok(device->StateFlags & DISPLAY_DEVICE_ATTACHED, "#%d expect to have a primary monitor attached\n", monitor_index); + ok(device->StateFlags & DISPLAY_DEVICE_ATTACHED, "#%d expect to have a primary monitor attached\n", monitor_index); else ok(device->StateFlags <= (DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE), "#%d wrong state %#x\n", monitor_index, device->StateFlags); @@ -191,7 +191,7 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index { /* HKLM\SYSTEM\CurrentControlSet\Enum\DISPLAY\Default_Monitor\4&2abfaa30&0&UID0 GUID_DEVINTERFACE_MONITOR * ^ ^ ^ * Expect format \\?\DISPLAY#Default_Monitor#4&2abfaa30&0&UID0#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7} */ - todo_wine ok(strlen(device->DeviceID) == 0 || /* vista ~ win7 */ + ok(strlen(device->DeviceID) == 0 || /* vista ~ win7 */ sscanf(device->DeviceID, "\\\\?\\DISPLAY#Default_Monitor#%[^#]#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7}", buffer) == 1 || /* win8+ */ (!lstrcmpiA(buffer, device_id_prefix) && sscanf(device->DeviceID + sizeof(device_id_prefix) - 1, "%04d", &number) == 1), /* XP/2003 ignores EDD_GET_DEVICE_INTERFACE_NAME */ @@ -201,9 +201,9 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index { /* Expect HarewareID value data + Driver value data in HKLM\SYSTEM\CurrentControlSet\Enum\DISPLAY\Default_Monitor\{Instance} */ /* But we don't know which monitor instance this belongs to, so check format instead */ - todo_wine ok(!lstrcmpiA(buffer, device_id_prefix), "#%d wrong DeviceID : %s\n", monitor_index, device->DeviceID); - todo_wine ok(sscanf(device->DeviceID + sizeof(device_id_prefix) - 1, "%04d", &number) == 1, - "#%d wrong DeviceID : %s\n", monitor_index, device->DeviceID); + ok(!lstrcmpiA(buffer, device_id_prefix), "#%d wrong DeviceID : %s\n", monitor_index, device->DeviceID); + ok(sscanf(device->DeviceID + sizeof(device_id_prefix) - 1, "%04d", &number) == 1, + "#%d wrong DeviceID : %s\n", monitor_index, device->DeviceID); } /* DeviceKey */ @@ -235,7 +235,7 @@ static void test_enumdisplaydevices(void) /* Doesn't accept \\.\DISPLAY */ dd.cb = sizeof(dd); ret = pEnumDisplayDevicesA("\\\\.\\DISPLAY", 0, &dd, 0); - todo_wine ok(!ret, "Expect failure\n"); + ok(!ret, "Expect failure\n"); /* Enumeration */ for (flag_index = 0; flag_index < ARRAY_SIZE(flags); flag_index++)

1 0

Zhiyi Zhang : winex11.drv: Initialize monitor registry data.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: 31445c3264f01d2cf35c0e00ca6b6dc4d42fb1d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31445c3264f01d2cf35c0e00… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 10 22:07:34 2019 +0800 winex11.drv: Initialize monitor registry data. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 95 ++++++++++++++++++++++++++++++++++++++++++--- dlls/winex11.drv/x11drv.h | 18 +++++++++ dlls/winex11.drv/xinerama.c | 51 ++++++++++++++++++++++++ 3 files changed, 159 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=31445c3264f01d2cf35c…

1 0

Zhiyi Zhang : winex11.drv: Initialize adapter registry data.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: eada6178816aebc6cb071d45473c5cd161087610 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eada6178816aebc6cb071d45… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 10 22:07:23 2019 +0800 winex11.drv: Initialize adapter registry data. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 4 +- dlls/winex11.drv/display.c | 128 +++++++++++++++++++++++++++++++++++++++++--- dlls/winex11.drv/x11drv.h | 18 +++++++ dlls/winex11.drv/xinerama.c | 69 ++++++++++++++++++++++++ 4 files changed, 210 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eada6178816aebc6cb07…

1 0

Zhiyi Zhang : winex11.drv: Add Xinerama display device handler.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: 52a3d5db48982825fc951381ae675bc16113b05f URL: https://source.winehq.org/git/wine.git/?a=commit;h=52a3d5db48982825fc951381… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 10 22:07:02 2019 +0800 winex11.drv: Add Xinerama display device handler. Display device handlers are used to initialize the display device registry data. Different handlers can be implemented according to the defined interface, for example, via Xinerama or XRandR. With those registry data, EnumDisplayDevices, EnumDisplayMonitors and GetMonitorInfo can be built on top of it. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 6 ++-- dlls/winex11.drv/Makefile.in | 1 + dlls/winex11.drv/display.c | 77 ++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 15 ++++++++ dlls/winex11.drv/x11drv_main.c | 1 + dlls/winex11.drv/xinerama.c | 7 ++++ 6 files changed, 104 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index c5e6745..0a097cc 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -81,7 +81,7 @@ static int monitor_count = 0; static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *device, DWORD flags) { - char video_name[16]; + char video_name[32]; char video_value[128]; char buffer[128]; int number; @@ -107,13 +107,13 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de { sprintf(video_name, "\\Device\\Video%d", index); ls = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "HARDWARE\\DEVICEMAP\\VIDEO", 0, KEY_READ, &hkey); - todo_wine ok(!ls, "#%d: failed to open registry, error: %#x\n", index, ls); + ok(!ls, "#%d: failed to open registry, error: %#x\n", index, ls); if (!ls) { memset(video_value, 0, sizeof(video_value)); size = sizeof(video_value); ls = RegQueryValueExA(hkey, video_name, NULL, NULL, (unsigned char *)video_value, &size); - ok(!ls, "#%d: failed to get registry value, error: %#x\n", index, ls); + todo_wine ok(!ls, "#%d: failed to get registry value, error: %#x\n", index, ls); RegCloseKey(hkey); ok(!strcmp(video_value, device->DeviceKey), "#%d: wrong DeviceKey: %s\n", index, device->DeviceKey); } diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 747f509..9ca2fc6 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ brush.c \ clipboard.c \ desktop.c \ + display.c \ event.c \ graphics.c \ ime.c \ diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c new file mode 100644 index 0000000..e3e4dce --- /dev/null +++ b/dlls/winex11.drv/display.c @@ -0,0 +1,77 @@ +/* + * X11DRV display device functions + * + * Copyright 2019 Zhiyi Zhang for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "wine/debug.h" +#include "x11drv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(x11drv); + +static const WCHAR video_keyW[] = { + 'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O',0}; + +static struct x11drv_display_device_handler handler; + +void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *new_handler) +{ + if (new_handler->priority > handler.priority) + { + handler = *new_handler; + TRACE("Display device functions are now handled by: %s\n", handler.name); + } +} + +void X11DRV_DisplayDevices_Init(void) +{ + static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; + HANDLE mutex; + HKEY video_hkey = NULL; + DWORD disposition = 0; + + mutex = CreateMutexW(NULL, FALSE, init_mutexW); + WaitForSingleObject(mutex, INFINITE); + + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &video_hkey, + &disposition)) + { + ERR("Failed to create video device key\n"); + goto done; + } + + /* Avoid unnecessary reinit */ + if (disposition != REG_CREATED_NEW_KEY) + goto done; + + TRACE("via %s\n", wine_dbgstr_a(handler.name)); + +done: + RegCloseKey(video_hkey); + ReleaseMutex(mutex); + CloseHandle(mutex); +} diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index c633102..7dd2d10 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -665,6 +665,21 @@ struct x11drv_mode_info *X11DRV_Settings_SetHandlers(const char *name, void X11DRV_XF86VM_Init(void) DECLSPEC_HIDDEN; void X11DRV_XRandR_Init(void) DECLSPEC_HIDDEN; +/* X11 display device handler. Used to initialize display device registry data */ + +/* Required functions for display device registry initialization */ +struct x11drv_display_device_handler +{ + /* A name to tell what host driver is used */ + const char *name; + + /* Higher priority can override handlers with lower proprity */ + INT priority; +}; + +extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; +extern void X11DRV_DisplayDevices_Init(void) DECLSPEC_HIDDEN; + /* XIM support */ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; extern XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index e67a3c0..6947874 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -597,6 +597,7 @@ static BOOL process_attach(void) X11DRV_InitKeyboard( gdi_display ); if (use_xim) use_xim = X11DRV_InitXIM( input_style ); + X11DRV_DisplayDevices_Init(); return TRUE; } diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 739b139..7a99573 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -30,6 +30,8 @@ #include "wine/library.h" #include "x11drv.h" #include "wine/debug.h" +#include "wine/heap.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); @@ -201,6 +203,7 @@ RECT get_primary_monitor_rect(void) void xinerama_init( unsigned int width, unsigned int height ) { + struct x11drv_display_device_handler handler; MONITORINFOEXW *primary; int i; RECT rect; @@ -234,6 +237,10 @@ void xinerama_init( unsigned int width, unsigned int height ) (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); } + handler.name = "Xinerama"; + handler.priority = 100; + X11DRV_DisplayDevices_SetHandler( &handler ); + TRACE( "virtual size: %s primary: %s\n", wine_dbgstr_rect(&virtual_screen_rect), wine_dbgstr_rect(&primary->rcMonitor) ); }

1 0

Alexandre Julliard : mshtml: Build with msvcrt.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: 5182813ae00b69d4870e9a85f6bf39285afccdc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5182813ae00b69d4870e9a85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 08:34:29 2019 +0200 mshtml: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 2 ++ dlls/mshtml/dispex.c | 16 ++++----- dlls/mshtml/editor.c | 36 +++++++++---------- dlls/mshtml/htmlanchor.c | 6 ++-- dlls/mshtml/htmlbody.c | 22 ++++++------ dlls/mshtml/htmldoc.c | 14 ++++---- dlls/mshtml/htmlelem.c | 18 +++++----- dlls/mshtml/htmlelemcol.c | 8 ++--- dlls/mshtml/htmlevent.c | 10 +++--- dlls/mshtml/htmlform.c | 8 ++--- dlls/mshtml/htmlframe.c | 10 +++--- dlls/mshtml/htmlimg.c | 2 +- dlls/mshtml/htmlinput.c | 4 +-- dlls/mshtml/htmllocation.c | 4 +-- dlls/mshtml/htmlnode.c | 2 +- dlls/mshtml/htmlobject.c | 4 +-- dlls/mshtml/htmlselect.c | 2 +- dlls/mshtml/htmlstyle.c | 82 ++++++++++++++++++++++---------------------- dlls/mshtml/htmltable.c | 6 ++-- dlls/mshtml/htmlwindow.c | 6 ++-- dlls/mshtml/ifacewrap.c | 2 -- dlls/mshtml/loadopts.c | 2 -- dlls/mshtml/main.c | 6 ++-- dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/mutation.c | 30 ++++++++-------- dlls/mshtml/navigate.c | 34 +++++++++--------- dlls/mshtml/npplugin.c | 2 -- dlls/mshtml/nsembed.c | 28 +++++++-------- dlls/mshtml/nsevents.c | 2 -- dlls/mshtml/nsio.c | 24 ++++++------- dlls/mshtml/nsservice.c | 4 +-- dlls/mshtml/olecmd.c | 2 +- dlls/mshtml/oleobj.c | 2 -- dlls/mshtml/persist.c | 2 -- dlls/mshtml/pluginhost.c | 8 ++--- dlls/mshtml/protocol.c | 36 +++++++++---------- dlls/mshtml/script.c | 20 +++++------ dlls/mshtml/secmgr.c | 2 -- dlls/mshtml/service.c | 2 -- dlls/mshtml/svg.c | 6 ++-- dlls/mshtml/task.c | 2 -- dlls/mshtml/txtrange.c | 52 ++++++++++++++-------------- dlls/mshtml/view.c | 2 -- dlls/mshtml/xmlhttprequest.c | 2 +- 44 files changed, 250 insertions(+), 287 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5182813ae00b69d4870e…

1 0