June 2021 - Wine-commits - list.winehq.org

Zebediah Figura : server: Do not bother clearing events in IOCTL_AFD_WINE_CONNECT.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: 139e95df619f8bb1069ae206c40539f930bc3718 URL: https://source.winehq.org/git/wine.git/?a=commit;h=139e95df619f8bb1069ae206… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 10 19:36:27 2021 -0500 server: Do not bother clearing events in IOCTL_AFD_WINE_CONNECT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/server/sock.c b/server/sock.c index aa2c6842efc..827eba52117 100644 --- a/server/sock.c +++ b/server/sock.c @@ -610,8 +610,6 @@ static void complete_async_connect( struct sock *sock ) if (debug_level) fprintf( stderr, "completing connect request for socket %p\n", sock ); - sock->pending_events &= ~(FD_CONNECT | FD_READ | FD_WRITE); - sock->reported_events &= ~(FD_CONNECT | FD_READ | FD_WRITE); sock->state = SOCK_CONNECTED; if (!req->send_len) @@ -1846,9 +1844,6 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) /* a connected or connecting socket can no longer be accepted into */ allow_fd_caching( sock->fd ); - sock->pending_events &= ~(FD_CONNECT | FD_READ | FD_WRITE); - sock->reported_events &= ~(FD_CONNECT | FD_READ | FD_WRITE); - if (!ret) { sock->state = SOCK_CONNECTED;

1 0

Francois Gouget : gdi32/tests: Use a winetest context for test_font_metrics().
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: ed98e3b51b5f6022c1b698002113abe491b78f81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed98e3b51b5f6022c1b69800… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 10 14:12:06 2021 +0200 gdi32/tests: Use a winetest context for test_font_metrics(). test_font_metrics() is called from many places and it is important to know where it was called from to diagnose failures. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ed98e3b51b5f6022c1b6…

1 0

Zhiyi Zhang : notepad: Enable visual styles.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: 026a6ff2be47427db319881cfca52993874c4223 URL: https://source.winehq.org/git/wine.git/?a=commit;h=026a6ff2be47427db319881c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 10 11:03:35 2021 +0800 notepad: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/notepad/Makefile.in | 2 +- programs/notepad/main.c | 3 +++ programs/notepad/notepad.manifest | 16 ++++++++++++++++ programs/notepad/notepad.rc | 3 +++ 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in index 06c5ff04c1e..ba32100c40f 100644 --- a/programs/notepad/Makefile.in +++ b/programs/notepad/Makefile.in @@ -1,5 +1,5 @@ MODULE = notepad.exe -IMPORTS = comdlg32 shell32 shlwapi user32 gdi32 advapi32 +IMPORTS = comdlg32 shell32 shlwapi user32 gdi32 advapi32 comctl32 EXTRADLLFLAGS = -mwindows -mno-cygwin diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 3f046f19d19..210ecd2bfc8 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -24,6 +24,7 @@ #include <stdio.h> #include <windows.h> +#include <commctrl.h> #include <commdlg.h> #include <shellapi.h> #include <shlwapi.h> @@ -750,6 +751,8 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) static const WCHAR className[] = {'N','o','t','e','p','a','d',0}; static const WCHAR winName[] = {'N','o','t','e','p','a','d',0}; + InitCommonControls(); + aFINDMSGSTRING = RegisterWindowMessageW(FINDMSGSTRINGW); ZeroMemory(&Globals, sizeof(Globals)); diff --git a/programs/notepad/notepad.manifest b/programs/notepad/notepad.manifest new file mode 100644 index 00000000000..30aa0f3853b --- /dev/null +++ b/programs/notepad/notepad.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Notepad" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/notepad/notepad.rc b/programs/notepad/notepad.rc index 63b8c7d91b8..6fc12dcf5cd 100644 --- a/programs/notepad/notepad.rc +++ b/programs/notepad/notepad.rc @@ -149,5 +149,8 @@ ID_ACCEL ACCELERATORS LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +/* @makedep: notepad.manifest */ +1 RT_MANIFEST notepad.manifest + /* @makedep: notepad.ico */ IDI_NOTEPAD ICON "notepad.ico"

1 0

Zhiyi Zhang : oleview: Enable visual styles.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: e1033e925302f779543bfc8cc5b43d74d2e495ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1033e925302f779543bfc8c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 10 11:03:42 2021 +0800 oleview: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/oleview/oleview.c | 3 +++ programs/oleview/oleview.manifest | 16 ++++++++++++++++ programs/oleview/oleview.rc | 3 +++ 3 files changed, 22 insertions(+) diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 410cb053dd8..0d1838bfa69 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -19,6 +19,7 @@ */ #include "main.h" +#include "commctrl.h" #include "commdlg.h" #include "shellapi.h" @@ -554,6 +555,8 @@ int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int MSG msg; HANDLE hAccelTable; + InitCommonControls(); + if(!InitApplication(hInst)) return FALSE; diff --git a/programs/oleview/oleview.manifest b/programs/oleview/oleview.manifest new file mode 100644 index 00000000000..da8d81cffec --- /dev/null +++ b/programs/oleview/oleview.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Oleview" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/oleview/oleview.rc b/programs/oleview/oleview.rc index bb252a67e6f..d225f533bbf 100644 --- a/programs/oleview/oleview.rc +++ b/programs/oleview/oleview.rc @@ -222,5 +222,8 @@ IDA_OLEVIEW ACCELERATORS VK_F5, IDM_REFRESH, VIRTKEY } +/* @makedep: oleview.manifest */ +1 RT_MANIFEST oleview.manifest + /* @makedep: toolbar.bmp */ IDB_TOOLBAR BITMAP toolbar.bmp

1 0

Zhiyi Zhang : regedit: Enable visual styles.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: f623608f9f4cd5d44eb3dece660fc25a695231ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=f623608f9f4cd5d44eb3dece… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 10 11:04:14 2021 +0800 regedit: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/main.c | 2 ++ programs/regedit/regedit.manifest | 16 ++++++++++++++++ programs/regedit/regedit.rc | 3 +++ 3 files changed, 21 insertions(+) diff --git a/programs/regedit/main.c b/programs/regedit/main.c index df92a13ab69..d9f81218acb 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -142,6 +142,8 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi HACCEL hAccel; BOOL is_wow64; + InitCommonControls(); + if (ProcessCmdLine(GetCommandLineW())) { return 0; } diff --git a/programs/regedit/regedit.manifest b/programs/regedit/regedit.manifest new file mode 100644 index 00000000000..a2c1a437027 --- /dev/null +++ b/programs/regedit/regedit.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Regedit" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/regedit/regedit.rc b/programs/regedit/regedit.rc index 4e629b7d878..d7dd7c4b49e 100644 --- a/programs/regedit/regedit.rc +++ b/programs/regedit/regedit.rc @@ -434,6 +434,9 @@ STRINGTABLE LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +/* @makedep: regedit.manifest */ +1 RT_MANIFEST regedit.manifest + /* @makedep: folderopen.ico */ IDI_OPEN_FILE ICON folderopen.ico

1 0

Zhiyi Zhang : taskmgr: Enable visual styles.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: 3058bac5e9506a888a1ddf2e137b9c44cefc1ce4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3058bac5e9506a888a1ddf2e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 10 11:04:22 2021 +0800 taskmgr: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/taskmgr.c | 2 ++ programs/taskmgr/taskmgr.manifest | 16 ++++++++++++++++ programs/taskmgr/taskmgr.rc | 3 +++ 3 files changed, 21 insertions(+) diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index e71d4c9ee9d..d779e5d893a 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -999,6 +999,8 @@ int APIENTRY WinMain(HINSTANCE hInstance, HANDLE hToken; TOKEN_PRIVILEGES tkp; + InitCommonControls(); + /* Initialize global variables */ hInst = hInstance; diff --git a/programs/taskmgr/taskmgr.manifest b/programs/taskmgr/taskmgr.manifest new file mode 100644 index 00000000000..b93212bc931 --- /dev/null +++ b/programs/taskmgr/taskmgr.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Taskmgr" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/taskmgr/taskmgr.rc b/programs/taskmgr/taskmgr.rc index ffd0699f80d..ccabf34477e 100644 --- a/programs/taskmgr/taskmgr.rc +++ b/programs/taskmgr/taskmgr.rc @@ -571,6 +571,9 @@ END LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +/* @makedep: taskmgr.manifest */ +1 RT_MANIFEST taskmgr.manifest + /* Icon */

1 0

Zhiyi Zhang : view: Enable visual styles.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: d271efe01295e2c5113d87fab1faf91b4e313df7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d271efe01295e2c5113d87fa… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 10 11:04:39 2021 +0800 view: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/view/Makefile.in | 2 +- programs/view/resource.h | 1 + programs/view/view.c | 3 +++ programs/view/view.manifest | 16 ++++++++++++++++ programs/view/view.rc | 3 +++ 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/programs/view/Makefile.in b/programs/view/Makefile.in index 7e9ff33e2d1..ce55999c1a9 100644 --- a/programs/view/Makefile.in +++ b/programs/view/Makefile.in @@ -1,5 +1,5 @@ MODULE = view.exe -IMPORTS = comdlg32 user32 gdi32 +IMPORTS = comdlg32 user32 gdi32 comctl32 EXTRADLLFLAGS = -mwindows -municode -mno-cygwin diff --git a/programs/view/resource.h b/programs/view/resource.h index 1cfaf5fca11..76f940d1fad 100644 --- a/programs/view/resource.h +++ b/programs/view/resource.h @@ -17,6 +17,7 @@ */ #include <windef.h> +#include <winuser.h> #define IDS_DESCRIPTION 2 #define IDS_OPEN_META_STRING 3 diff --git a/programs/view/view.c b/programs/view/view.c index ad29734828b..1e5c7daa8cf 100644 --- a/programs/view/view.c +++ b/programs/view/view.c @@ -17,6 +17,7 @@ */ #include <windows.h> +#include <commctrl.h> #include <commdlg.h> #include <stdio.h> @@ -403,6 +404,8 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmd { MSG msg; + InitCommonControls(); + /* Other instances of app running? */ if (!hPrevInstance) { diff --git a/programs/view/view.manifest b/programs/view/view.manifest new file mode 100644 index 00000000000..198ffbfc055 --- /dev/null +++ b/programs/view/view.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.View" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/view/view.rc b/programs/view/view.rc index 39971dd555f..19a778c8036 100644 --- a/programs/view/view.rc +++ b/programs/view/view.rc @@ -48,3 +48,6 @@ BEGIN IDS_DESCRIPTION "Regular Metafile Viewer" IDS_OPEN_META_STRING "Metafiles (*.wmf, *.emf)" END + +/* @makedep: view.manifest */ +1 RT_MANIFEST view.manifest

1 0

Zhiyi Zhang : wineboot: Enable visual styles.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: b99da49a7510ce42e583a31ed4dc3e55a9388902 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b99da49a7510ce42e583a31e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 10 11:04:49 2021 +0800 wineboot: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.manifest | 16 ++++++++++++++++ programs/wineboot/wineboot.rc | 3 +++ 2 files changed, 19 insertions(+) diff --git a/programs/wineboot/wineboot.manifest b/programs/wineboot/wineboot.manifest new file mode 100644 index 00000000000..6e5892ae6ac --- /dev/null +++ b/programs/wineboot/wineboot.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Wineboot" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/wineboot/wineboot.rc b/programs/wineboot/wineboot.rc index 93083c32b36..898926203db 100644 --- a/programs/wineboot/wineboot.rc +++ b/programs/wineboot/wineboot.rc @@ -45,3 +45,6 @@ BEGIN LTEXT "The Wine configuration in %s is being updated, please wait...", IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX END + +/* @makedep: wineboot.manifest */ +1 RT_MANIFEST wineboot.manifest

1 0

Rémi Bernon : hid: Check preparsed data magic in HidP_GetLinkCollectionNodes.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: dec362a766fbf5d6774dd699b6044841e042f8a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dec362a766fbf5d6774dd699… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 10 10:06:24 2021 +0200 hid: Check preparsed data magic in HidP_GetLinkCollectionNodes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index a7003717a21..2933c2ff7ef 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -1001,6 +1001,9 @@ NTSTATUS WINAPI HidP_GetLinkCollectionNodes(HIDP_LINK_COLLECTION_NODE *LinkColle TRACE("(%p, %p, %p)\n", LinkCollectionNode, LinkCollectionNodeLength, PreparsedData); + if (data->magic != HID_MAGIC) + return HIDP_STATUS_INVALID_PREPARSED_DATA; + if (*LinkCollectionNodeLength < data->caps.NumberLinkCollectionNodes) return HIDP_STATUS_BUFFER_TOO_SMALL;

1 0

Rémi Bernon : ntoskrnl.exe/tests: Add some HidP_Get(Specific)ButtonCaps tests.
by Alexandre Julliard 10 Jun '21

10 Jun '21

Module: wine Branch: master Commit: 3b96cb8baed323dbd54c44370512b5cc4e7e5bf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b96cb8baed323dbd54c4437… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 10 10:06:25 2021 +0200 ntoskrnl.exe/tests: Add some HidP_Get(Specific)ButtonCaps tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/Makefile.in | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 218 ++++++++++++++++++++++++++++++++++++ 2 files changed, 219 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3b96cb8baed323dbd54c…

1 0