wine-commits January 2018

wine-commits@winehq.org

2 participants
638 discussions

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

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

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

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

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

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

Fabian Maurer : winecfg: Remove processorArchitecture from manifest.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: c4a470ef338daab8a5af6ec6ac31a727a344e8a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4a470ef338daab8a5af6ec6… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Sep 2 01:19:39 2017 +0200 winecfg: Remove processorArchitecture from manifest. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 685bdb2614503f7df7658000c46a5acaff11eb6e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winecfg/winecfg.manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winecfg/winecfg.manifest b/programs/winecfg/winecfg.manifest index a7e4d88..9008877 100644 --- a/programs/winecfg/winecfg.manifest +++ b/programs/winecfg/winecfg.manifest @@ -1,6 +1,6 @@ <?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.Winecfg" version="0.0.0.0" processorArchitecture=""/> +<assemblyIdentity type="win32" name="Wine.Winecfg" version="0.0.0.0"/> <dependency> <dependentAssembly> <assemblyIdentity

1 0

André Hentschel : ntdll: Bump Win 10 version to 15063.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 05e53259456c1672ef1d2bbdb3c9ee119183a8d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05e53259456c1672ef1d2bbd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 8 16:15:43 2017 +0200 ntdll: Bump Win 10 version to 15063. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 72aecacf94d93fa640de761d2866490276fe07d5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/version.c | 2 +- programs/winecfg/appdefaults.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 06f9827..c06aef6 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -185,7 +185,7 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = }, /* WIN10 */ { - sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x3839, VER_PLATFORM_WIN32_NT, + sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x3AD7, VER_PLATFORM_WIN32_NT, {0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index f674824..402ec16 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -48,7 +48,7 @@ static const struct const char *szProductType; } win_versions[] = { - { "win10", "Windows 10", 10, 0, 0x3839,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, + { "win10", "Windows 10", 10, 0, 0x3AD7,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, { "win81", "Windows 8.1", 6, 3, 0x2580,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, { "win8", "Windows 8", 6, 2, 0x23F0,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, { "win2008r2", "Windows 2008 R2", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"},

1 0

Huw Davies : winefile: Initialize length before calling GetWindowPlacement ().
by Alexandre Julliard 02 Jan '18

02 Jan '18

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

Alexandre Julliard : wineconsole: Remove duplicate line feeds.
by Alexandre Julliard 02 Jan '18

02 Jan '18

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

← Newer
1
...
48
49
50
51
52
53
54
...
64
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 January 2018