January 2018 - Wine-commits

Henri Verbeet : wordpad: Fall back to the default position if the saved position is off-screen.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 49d0150154218f875283aa963aaae512fb933946 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49d0150154218f875283aa96… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 21 22:59:13 2017 +0100 wordpad: Fall back to the default position if the saved position is off-screen. This condition is particularly easy to trigger when switching from a multi-head setup to a virtual desktop. Inspired by some fairly similar code in notepad. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ff0a34e9c95b6c7fee8453ee30d36bda21c01713) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/wordpad/wordpad.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 89bcac1..f787191 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2731,6 +2731,9 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar HWND hRulerWnd; POINTL EditPoint; DWORD bMaximized; + MONITORINFO info; + HMONITOR monitor; + int x, y; static const WCHAR wszAccelTable[] = {'M','A','I','N','A','C','C','E','L', 'T','A','B','L','E','\0'}; @@ -2767,8 +2770,18 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar RegisterClassExW(&wc); registry_read_winrect(&rc); + monitor = MonitorFromRect(&rc, MONITOR_DEFAULTTOPRIMARY); + info.cbSize = sizeof(info); + GetMonitorInfoW(monitor, &info); + + x = rc.left; + y = rc.top; + IntersectRect(&info.rcWork, &info.rcWork, &rc); + if (IsRectEmpty(&info.rcWork)) + x = y = CW_USEDEFAULT; + hMainWnd = CreateWindowExW(0, wszMainWndClass, wszAppTitle, WS_CLIPCHILDREN|WS_OVERLAPPEDWINDOW, - rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, NULL, NULL, hInstance, NULL); + x, y, rc.right - rc.left, rc.bottom - rc.top, NULL, NULL, hInstance, NULL); registry_read_maximized(&bMaximized); if ((nCmdShow == SW_SHOWNORMAL || nCmdShow == SW_SHOWDEFAULT) && bMaximized)

1 0

Alexandre Julliard : wordpad: New high resolution cursor generated from SVG.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: f5e341b4845a87b1b4f991b227be3ee2a3acbf1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5e341b4845a87b1b4f991b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 14 13:12:27 2017 +0200 wordpad: New high resolution cursor generated from SVG. Based on a cursor set published by Ludvig Hummel under the X11 license. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 756fdd029c6587a0be99042485d674ca0850de14) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/wordpad/Makefile.in | 3 +- programs/wordpad/zoom.cur | Bin 766 -> 33134 bytes programs/wordpad/zoom.svg | 246 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 248 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f5e341b4845a87b1b4f9…

1 0

Dmitry Timoshkov : cmd: '$E' in the prompt should be interpreted as an escape code (0x1b).
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 71565a1147e6bbb2abd3337fed12b16706d3206f URL: https://source.winehq.org/git/wine.git/?a=commit;h=71565a1147e6bbb2abd3337f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 21 16:24:11 2017 +0800 cmd: '$E' in the prompt should be interpreted as an escape code (0x1b). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 586e171d6fc81db670d290ebcc84fc467db7c49d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/wcmdmain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 87f5387..dc1943f 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -379,7 +379,7 @@ static void WCMD_show_prompt (void) { while (*q) q++; break; case 'E': - *q++ = '\E'; + *q++ = '\x1b'; break; case 'F': *q++ = ')';

1 0

Akihiro Sagawa : explorer: Use neutral language for the version resource.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: fffc9b41815bdd3efa6e761d97798067ce32c4aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=fffc9b41815bdd3efa6e761d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 20 21:44:04 2017 +0900 explorer: Use neutral language for the version resource. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ecd34e5896ba8c9900fdc5e0ef40a4f6737da57f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/explorer/explorer.rc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/explorer/explorer.rc b/programs/explorer/explorer.rc index 53224a8..b9ca5d8 100644 --- a/programs/explorer/explorer.rc +++ b/programs/explorer/explorer.rc @@ -33,6 +33,8 @@ STRINGTABLE IDS_RUN "&Run..." } +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define WINE_FILEDESCRIPTION_STR "Wine Explorer" #define WINE_FILENAME_STR "explorer.exe" #define WINE_FILEVERSION 6,1,7601,17567

1 0

Alexandre Julliard : explorer: Don' t forward the system tray to the display driver in desktop mode.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: d20d9b7fa9881cfc340f4adb6f42efbaf51d0c57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d20d9b7fa9881cfc340f4adb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 2 17:20:33 2017 +0200 explorer: Don't forward the system tray to the display driver in desktop mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 082e4981631189c5903f838a0bc23e137c1cce17) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/explorer/systray.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index ddfd67d..9e58ad4 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -565,7 +565,7 @@ static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) buffer, buffer + cbMaskBits); } - /* try forward to x11drv first */ + /* try forwarding to the display driver first */ if (cds->dwData == NIM_ADD || !(icon = get_icon( nid.hWnd, nid.uID ))) { if (wine_notify_icon && ((ret = wine_notify_icon( cds->dwData, &nid )) != -1)) @@ -901,7 +901,7 @@ void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enab WNDCLASSEXW class; static const WCHAR classname[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; - wine_notify_icon = (void *)GetProcAddress( graphics_driver, "wine_notify_icon" ); + if (using_root) wine_notify_icon = (void *)GetProcAddress( graphics_driver, "wine_notify_icon" ); icon_cx = GetSystemMetrics( SM_CXSMICON ) + 2*ICON_BORDER; icon_cy = GetSystemMetrics( SM_CYSMICON ) + 2*ICON_BORDER;

1 0

Huw Davies : winedbg: Return after raising an exception.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: d746db81b8b1ef6fc53605d46671d6c78faf192b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d746db81b8b1ef6fc53605d4… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 17 21:40:31 2017 +0000 winedbg: Return after raising an exception. Fixes a compiler warning. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit eba6bf44b3577ff98591a57e525a1da8dd736291) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winedbg/types.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 5b24715..2df7572 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -80,11 +80,13 @@ LONGLONG types_extract_as_longlong(const struct dbg_lvalue* lvalue, { WINE_ERR("Couldn't get information\n"); RaiseException(DEBUG_STATUS_INTERNAL_ERROR, 0, 0, NULL); + return rtn; } if (size > sizeof(rtn)) { WINE_ERR("Size too large (%s)\n", wine_dbgstr_longlong(size)); RaiseException(DEBUG_STATUS_NOT_AN_INTEGER, 0, 0, NULL); + return rtn; } switch (bt) {

1 0

Akihiro Sagawa : regsvr32: Use neutral language for the version resource.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: e09c12b29b4acae287701abe724532474ed0292c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e09c12b29b4acae287701abe… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 20 21:44:03 2017 +0900 regsvr32: Use neutral language for the version resource. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cd37c6e13b3632af2f0a5f4b11f94e492369d967) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/regsvr32/regsvr32.rc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/regsvr32/regsvr32.rc b/programs/regsvr32/regsvr32.rc index 3169b71..c7fc2c3 100644 --- a/programs/regsvr32/regsvr32.rc +++ b/programs/regsvr32/regsvr32.rc @@ -50,6 +50,8 @@ Options:\n\ STRING_UNINSTALL_SUCCESSFUL, "regsvr32: Successfully uninstalled DLL '%1'\n" } +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define WINE_FILEDESCRIPTION_STR "Wine Register Server" #define WINE_FILENAME_STR "REGSVR32.EXE" #define WINE_FILETYPE VFT_APP

1 0

Bas Weelinck : start: Ignore multiple quoted arguments as title.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 43b7c3d73d9e7b8995d99a4901de76844c68773a URL: https://source.winehq.org/git/wine.git/?a=commit;h=43b7c3d73d9e7b8995d99a49… Author: Bas Weelinck <bas.weelinck(a)gmail.com> Date: Mon Mar 20 18:14:19 2017 +0100 start: Ignore multiple quoted arguments as title. Signed-off-by: Bas Weelinck <bas.weelinck(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5b4f8a385b46a8a8a8b09b8ca6578aa7b7995a1e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/start/start.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/start/start.c b/programs/start/start.c index 9f2c3f7..4010bef 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -224,7 +224,8 @@ int wmain (int argc, WCHAR *argv[]) * flags start with / and are case insensitive. */ for (i=1; i<argc; i++) { - if (argv[i][0] == '"') { + /* parse first quoted argument as console title */ + if (!title && argv[i][0] == '"') { title = argv[i]; continue; }

1 0

Jacek Caban : services: Call RpcMgmtWaitServerListen in RPC_Stop.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 9fb6f376c7c670c01b3dfc4aa8f44b5ac4a88500 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fb6f376c7c670c01b3dfc4a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 10 14:27:58 2017 +0200 services: Call RpcMgmtWaitServerListen in RPC_Stop. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 69608af0a960658fcb3b0958c395614f286bcaa1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/services/rpc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 08b5776a..8c95b7e 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1958,6 +1958,7 @@ void RPC_Stop(void) { RpcMgmtStopServerListening(NULL); RpcServerUnregisterIf(svcctl_v2_0_s_ifspec, NULL, TRUE); + RpcMgmtWaitServerListen(); CloseThreadpoolCleanupGroupMembers(cleanup_group, TRUE, NULL); CloseThreadpoolCleanupGroup(cleanup_group);

1 0

Austin English : maintainers: Move WineHQ URLs to https.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 212d9fc70aadecb90bc5cf6f47dda2f9c0cbf7bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=212d9fc70aadecb90bc5cf6f… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 6 13:51:09 2017 -0600 maintainers: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 83bbeab9b2d0ceac2548d2a9d8e5aefb0d9f5606) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index cec6cdb..d5815fd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3,7 +3,7 @@ List of Wine subsection maintainers When submitting patches to Wine, the guidelines at -<http://wiki.winehq.org/SubmittingPatches> should be followed. This file +<https://wiki.winehq.org/SubmittingPatches> should be followed. This file contains a list of maintainers for subsections of Wine. When submitting patches, you may want to CC relevant people from this list. If you have questions about your work in an area of Wine, you may find a list of @@ -279,7 +279,7 @@ F: */ Stable Branch M: Michael Stefaniuc <mstefani(a)winehq.org> -W: http://wiki.winehq.org/StableRules +W: https://wiki.winehq.org/StableRules Staging Branch M: Sebastian Lackner <sebastian(a)fds-team.de>

1 0