wine-commits June 2019

wine-commits@winehq.org

1 participants
865 discussions

Alexandre Julliard : msimtf: Build with msvcrt.
by Alexandre Julliard 13 Jun '19

13 Jun '19

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 : msimg32: Build with msvcrt.
by Alexandre Julliard 13 Jun '19

13 Jun '19

Module: wine Branch: master Commit: 08a9a6f35b0c034faa59c9064f10d431c082a4a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08a9a6f35b0c034faa59c906… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 08:43:44 2019 +0200 msimg32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msimg32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msimg32/Makefile.in b/dlls/msimg32/Makefile.in index 5080d80..9f64e80 100644 --- a/dlls/msimg32/Makefile.in +++ b/dlls/msimg32/Makefile.in @@ -2,4 +2,6 @@ MODULE = msimg32.dll IMPORTLIB = msimg32 IMPORTS = gdi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = msimg32_main.c

1 0

Alexandre Julliard : msident: Build with msvcrt.
by Alexandre Julliard 13 Jun '19

13 Jun '19

Module: wine Branch: master Commit: a37791c95f13fb3432a31885bb24b562074b93b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a37791c95f13fb3432a31885… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 08:43:37 2019 +0200 msident: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msident/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msident/Makefile.in b/dlls/msident/Makefile.in index 913c114..433d454 100644 --- a/dlls/msident/Makefile.in +++ b/dlls/msident/Makefile.in @@ -1,5 +1,7 @@ MODULE = msident.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ msident.c

1 0

Alexandre Julliard : msi: Build with msvcrt.
by Alexandre Julliard 13 Jun '19

13 Jun '19

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

Alexandre Julliard : mshtml: Build with msvcrt.
by Alexandre Julliard 13 Jun '19

13 Jun '19

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

Zhiyi Zhang : user32: Implement EnumDisplayDevicesW().
by Alexandre Julliard 13 Jun '19

13 Jun '19

Module: wine Branch: master Commit: a985771f83b767a47c1b246b9cbe2151d2725e34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a985771f83b767a47c1b246b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 10 22:08:52 2019 +0800 user32: Implement EnumDisplayDevicesW(). 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 | 202 +++++++++++++++++++++++++++++++++++++++++++- dlls/user32/tests/monitor.c | 8 +- 2 files changed, 205 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a985771f83b767a47c1b…

1 0

Zhiyi Zhang : user32: Improve EnumDisplayDevicesW stub.
by Alexandre Julliard 13 Jun '19

13 Jun '19

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: Handle display device changes.
by Alexandre Julliard 13 Jun '19

13 Jun '19

Module: wine Branch: master Commit: 7f57cda707f882de8085367c46df40b81e58a70a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f57cda707f882de8085367c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 10 22:07:46 2019 +0800 winex11.drv: Handle display device changes. 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/desktop.c | 1 + dlls/winex11.drv/display.c | 4 ++-- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/x11drv_main.c | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index d478cbd..a0495c4 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -154,6 +154,7 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) max_width = primary_rect.right - primary_rect.left; max_height = primary_rect.bottom - primary_rect.top; xinerama_init( width, height ); + X11DRV_DisplayDevices_Init( TRUE ); /* initialize the available resolutions */ dd_modes = X11DRV_Settings_SetHandlers("desktop", diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 99a70be..ce2c568 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -339,7 +339,7 @@ static void cleanup_devices(void) SetupDiDestroyDeviceInfoList(devinfo); } -void X11DRV_DisplayDevices_Init(void) +void X11DRV_DisplayDevices_Init(BOOL force) { 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; @@ -366,7 +366,7 @@ void X11DRV_DisplayDevices_Init(void) } /* Avoid unnecessary reinit */ - if (disposition != REG_CREATED_NEW_KEY) + if (!force && disposition != REG_CREATED_NEW_KEY) goto done; TRACE("via %s\n", wine_dbgstr_a(handler.name)); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8031beb..ed5e268 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -736,7 +736,7 @@ struct x11drv_display_device_handler }; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; -extern void X11DRV_DisplayDevices_Init(void) DECLSPEC_HIDDEN; +extern void X11DRV_DisplayDevices_Init(BOOL force) DECLSPEC_HIDDEN; /* XIM support */ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 6947874..21807af 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -597,7 +597,7 @@ static BOOL process_attach(void) X11DRV_InitKeyboard( gdi_display ); if (use_xim) use_xim = X11DRV_InitXIM( input_style ); - X11DRV_DisplayDevices_Init(); + X11DRV_DisplayDevices_Init(FALSE); return TRUE; }

1 0

Zhiyi Zhang : winex11.drv: Initialize monitor registry data.
by Alexandre Julliard 13 Jun '19

13 Jun '19

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 13 Jun '19

13 Jun '19

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

← Newer
1
...
49
50
51
52
53
54
55
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2019