January 2018 - Wine-Commits

Henri Verbeet : wordpad: Fall back to the default position if the saved position is off-screen.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

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

Akihiro Sagawa : regsvr32: Use neutral language for the version resource.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

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 Jan. 2, 2018

Jan. 2, 2018

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

Austin English : loader/wine.pl.UTF-8.man.in: Move WineHQ URL to https.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: adf14b2009cd90723739bbf50f6c73c04f8ec5e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adf14b2009cd90723739bbf5… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 6 17:35:49 2017 -0600 loader/wine.pl.UTF-8.man.in: Move WineHQ URL to https. Missed in 3bc68c24b972643aba2b96dcdcf97ea2f9fb82bd. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f1512cf25f0c8ef3df192bc1980d047cfa650059) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.pl.UTF-8.man.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.pl.UTF-8.man.in b/loader/wine.pl.UTF-8.man.in index 9f1f2cf..c487d0a 100644 --- a/loader/wine.pl.UTF-8.man.in +++ b/loader/wine.pl.UTF-8.man.in @@ -305,7 +305,7 @@ można pobrać ze strony Najaktualnieszy zrzut kodu można pobrać przez GIT. Aby dowiedzieć się jak to zrobić, odwiedź stronę .I -http://www.winehq.org/git +https://www.winehq.org/git .PP WineHQ, siedziba rozwoju .B wine

1 0

Lauri Kenttä : readme: Use UTF-8 consistently in all translations.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 839e43253404b4476e9632a245609a68598b27e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=839e43253404b4476e9632a2… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Dec 5 22:40:46 2017 +0200 readme: Use UTF-8 consistently in all translations. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a0ad190b9b0eb3eb0261d08520dffbd36b840fcd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- documentation/README.hu | 274 ++++++++++++++++++++++----------------------- documentation/README.ko | 242 +++++++++++++++++++-------------------- documentation/README.pt | 210 +++++++++++++++++----------------- documentation/README.pt_br | 166 +++++++++++++-------------- 4 files changed, 446 insertions(+), 446 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=839e43253404b4476e96…

1 0

Huw Davies : winedbg: Return after raising an exception.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

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

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

Jan. 2, 2018

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

Alexandre Julliard : wineconsole: Remove duplicate line feeds.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: cd0991d35453aefbf694e2dac4e59f0ad4bddf90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd0991d35453aefbf694e2da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 17 22:20:51 2017 +0200 wineconsole: Remove duplicate line feeds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 03e438dbf5e8f1ac9da5bf31ff3a356ff9acf899) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/wineconsole/user.c | 2 +- programs/wineconsole/wineconsole.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index fe1cf46..03d0ea1 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -559,7 +559,7 @@ static void WCUSER_SetFontPmt(struct inner_data* data, const WCHAR* font, EnumFontFamiliesW(PRIVATE(data)->hMemDC, NULL, get_first_font_enum, (LPARAM)&fc); if (fc.done) return; } - WINECON_Fatal("Couldn't find a decent font, aborting\n"); + WINECON_Fatal("Couldn't find a decent font, aborting"); } /****************************************************************** diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index d1d38be..9e3afb1 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -340,7 +340,7 @@ void WINECON_GrabChanges(struct inner_data* data) data->cells = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, data->cells, data->curcfg.sb_width * data->curcfg.sb_height * sizeof(CHAR_INFO)); - if (!data->cells) WINECON_Fatal("OOM\n"); + if (!data->cells) WINECON_Fatal("OOM"); data->fnResizeScreenBuffer(data); data->fnComputePositions(data); }

1 0

Huw Davies : winefile: Initialize length before calling GetWindowPlacement ().
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 1435d76506a07789fc049615c8770792a8e1e4f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1435d76506a07789fc049615… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 30 10:29:15 2017 +0000 winefile: Initialize length before calling GetWindowPlacement(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2b8a38169bf719225012e66a2409ffba8966f546) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winefile/winefile.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 27079bb..044a399 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -1923,6 +1923,7 @@ static void frame_get_clientspace(HWND hwnd, PRECT prect) else { WINDOWPLACEMENT wp; + wp.length = sizeof(wp); GetWindowPlacement(hwnd, &wp); prect->left = prect->top = 0;

1 0

Austin English : appwiz.cpl: Move WineHQ URLs to https.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

1 0