wine-commits October 2017

wine-commits@winehq.org

2 participants
478 discussions

Alex Henrie : mountmgr: Symlink WoW64 Wine ports key to regular Wine ports key.
by Alexandre Julliard 31 Oct '17

31 Oct '17

Module: wine Branch: master Commit: c296e7de4d6d7eab56ab3ee5d8f2dc2c913ae05f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c296e7de4d6d7eab56ab3ee5d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 29 21:58:52 2017 +0100 mountmgr: Symlink WoW64 Wine ports key to regular Wine ports key. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 3 ++- dlls/mountmgr.sys/mountmgr.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 5101f2b..20c96d0 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -1136,7 +1136,8 @@ static void create_port_devices( DRIVER_OBJECT *driver ) } p += 3; - RegOpenKeyExW( HKEY_LOCAL_MACHINE, ports_keyW, 0, KEY_QUERY_VALUE, &wine_ports_key ); + RegCreateKeyExW( HKEY_LOCAL_MACHINE, ports_keyW, 0, NULL, 0, + KEY_QUERY_VALUE, NULL, &wine_ports_key, NULL ); RegCreateKeyExW( HKEY_LOCAL_MACHINE, windows_ports_key_name, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &windows_ports_key, NULL ); diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 1eb0a78..b792be4 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -422,6 +422,17 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) static const WCHAR driver_serialW[] = {'\\','D','r','i','v','e','r','\\','S','e','r','i','a','l',0}; static const WCHAR driver_parallelW[] = {'\\','D','r','i','v','e','r','\\','P','a','r','a','l','l','e','l',0}; +#ifdef _WIN64 + static const WCHAR qualified_ports_keyW[] = {'\\','R','E','G','I','S','T','R','Y','\\', + 'M','A','C','H','I','N','E','\\','S','o','f','t','w','a','r','e','\\', + 'W','i','n','e','\\','P','o','r','t','s'}; /* no null terminator */ + static const WCHAR wow64_ports_keyW[] = {'S','o','f','t','w','a','r','e','\\', + 'W','o','w','6','4','3','2','N','o','d','e','\\','W','i','n','e','\\', + 'P','o','r','t','s',0}; + static const WCHAR symbolic_link_valueW[] = {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e',0}; + HKEY wow64_ports_key = NULL; +#endif + UNICODE_STRING nameW, linkW; DEVICE_OBJECT *device; NTSTATUS status; @@ -449,6 +460,15 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) initialize_dbus(); initialize_diskarbitration(); +#ifdef _WIN64 + /* create a symlink so that the Wine port overrides key can be edited with 32-bit reg or regedit */ + RegCreateKeyExW( HKEY_LOCAL_MACHINE, wow64_ports_keyW, 0, NULL, REG_OPTION_CREATE_LINK, + KEY_SET_VALUE, NULL, &wow64_ports_key, NULL ); + RegSetValueExW( wow64_ports_key, symbolic_link_valueW, 0, REG_LINK, + (BYTE *)qualified_ports_keyW, sizeof(qualified_ports_keyW) ); + RegCloseKey( wow64_ports_key ); +#endif + RtlInitUnicodeString( &nameW, driver_serialW ); IoCreateDriver( &nameW, serial_driver_entry );

1 0

Marcus Meissner : po: Update German translation.
by Alexandre Julliard 31 Oct '17

31 Oct '17

Module: wine Branch: master Commit: b3ee6101734d6d4337ce6a4ae93772fb6c9ebe06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3ee6101734d6d4337ce6a4ae… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Oct 30 18:07:14 2017 +0100 po: Update German translation. Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/po/de.po b/po/de.po index 15d0a75..89a132a 100644 --- a/po/de.po +++ b/po/de.po @@ -1,17 +1,20 @@ # German translations for Wine # +# Marcus Meissner <marcus(a)jet.franken.de>, 2017. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-08-08 16:25+0200\n" -"Last-Translator: Julian Rüger\n" -"Language-Team: German\n" +"PO-Revision-Date: 2017-10-28 15:22+0100\n" +"Last-Translator: Marcus Meissner <marcus(a)jet.franken.de>\n" +"Language-Team: German <kde-i18n-de(a)kde.org>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 2.0\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -12058,17 +12061,6 @@ msgid "Icons (*.ico)" msgstr "Symbole (*.ico)" #: reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -12084,7 +12076,7 @@ msgstr "" " REG [Operation] [Parameter]\n" "\n" "Unterstützte Operationen:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "Hilfe für eine spezifische Operation:\n" " REG [Operation] /?\n" @@ -12213,25 +12205,19 @@ msgstr "(Wert nicht gesetzt)" #: reg.rc:66 msgid "REG IMPORT file.reg\n" -msgstr "" +msgstr "REG IMPORT file.reg\n" #: reg.rc:67 -#, fuzzy -#| msgid "regedit: The file '%1' was not found.\n" msgid "reg: The file '%1' was not found.\n" -msgstr "regedit: Die Datei '%1' wurde nicht gefunden.\n" +msgstr "reg: Die Datei '%1' wurde nicht gefunden.\n" #: reg.rc:68 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "reg: Unable to open the registry key '%1'.\n" -msgstr "regedit: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" +msgstr "reg: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" #: reg.rc:69 -#, fuzzy -#| msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit: Unbekannte Escape-Sequenz [\\%1!c!]\n" +msgstr "reg: Unbekannte Escape-Sequenz [\\%1!c!]\n" #: regedit.rc:34 msgid "&Registry"

1 0

Mingcong Bai : po: Update Simplified Chinese translation.
by Alexandre Julliard 31 Oct '17

31 Oct '17

Module: wine Branch: master Commit: 37eb3066de199bbc2358010186db1b010e640a6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=37eb3066de199bbc235801018… Author: Mingcong Bai <jeffbai(a)aosc.xyz> Date: Sun Oct 29 23:45:20 2017 +0800 po: Update Simplified Chinese translation. Signed-off-by: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index fc09f30..84ed2b2 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-08-18 22:29+0800\n" +"PO-Revision-Date: 2017-10-27 00:02-0500\n" "Last-Translator: Mingcong Bai <jeffbai(a)aosc.xyz>\n" "Language-Team: Chinese (PRC)\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.2\n" +"X-Generator: Poedit 2.0.4\n" "Plural-Forms: nplurals=1; plural=0;\n" #: appwiz.rc:58 @@ -11774,17 +11774,6 @@ msgid "Icons (*.ico)" msgstr "图标 (*.ico)" #: reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -11923,25 +11912,19 @@ msgstr "(没有设值)" #: reg.rc:66 msgid "REG IMPORT file.reg\n" -msgstr "" +msgstr "REG IMPORT file.reg\n" #: reg.rc:67 -#, fuzzy -#| msgid "regedit: The file '%1' was not found.\n" msgid "reg: The file '%1' was not found.\n" -msgstr "regedit: 找不到文件 '%1'。\n" +msgstr "reg: 找不到文件 '%1'。\n" #: reg.rc:68 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "reg: Unable to open the registry key '%1'.\n" -msgstr "regedit: 无法打开注册表键 '%1'。\n" +msgstr "reg: 无法打开注册表键 '%1'。\n" #: reg.rc:69 -#, fuzzy -#| msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit: 无法识别的转义序列 [\\%1!c!]\n" +msgstr "reg: 无法识别的转义序列 [\\%1!c!]\n" #: regedit.rc:34 msgid "&Registry"

1 0

Lauri Kenttä : readme: Update Finnish translation.
by Alexandre Julliard 31 Oct '17

31 Oct '17

Module: wine Branch: master Commit: 40156f3d0b5c76c6404193cec5b27f55edf6198e URL: http://source.winehq.org/git/wine.git/?a=commit;h=40156f3d0b5c76c6404193cec… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sun Oct 29 12:48:22 2017 +0200 readme: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.fi | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/documentation/README.fi b/documentation/README.fi index b2dc9ed..2c1bd0d 100644 --- a/documentation/README.fi +++ b/documentation/README.fi @@ -18,6 +18,14 @@ Aja Winen lähdekoodin juurihakemistossa seuraavat komennot: ./configure make +Sitten joko asenna Wine: + +make install + +Tai aja se käännöshakemistosta: + +./wine notepad + Ohjelmat ajetaan komennolla "wine ohjelma". Lisätietoja sekä apua ongelmien ratkaisemiseen on jäljempänä tässä tiedostossa, Winen man-sivuilla sekä ennen kaikkea Internetissä osoitteessa http://www.winehq.org/.

1 0

Lauri Kenttä : readme: Fix word order.
by Alexandre Julliard 31 Oct '17

31 Oct '17

Module: wine Branch: master Commit: 258a1c783b9c39c892615cd7eb01678939557dea URL: http://source.winehq.org/git/wine.git/?a=commit;h=258a1c783b9c39c892615cd7e… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sun Oct 29 12:47:08 2017 +0200 readme: Fix word order. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 3d2e4cf..4b76546 100644 --- a/README +++ b/README @@ -23,7 +23,7 @@ Then either install wine: make install -Or run from it the build directory: +Or run it from the build directory: ./wine notepad

1 0

Huw Davies : user32: Initialize length before calling GetWindowPlacement() .
by Alexandre Julliard 31 Oct '17

31 Oct '17

Module: wine Branch: master Commit: 9933a0fc8601b6121251c9b046b7c24e0823f566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9933a0fc8601b6121251c9b04… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 30 10:29:16 2017 +0000 user32: Initialize length before calling GetWindowPlacement(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/misc.c | 1 + dlls/user32/winpos.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index fa0502e..895ccce 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -415,6 +415,7 @@ HMONITOR WINAPI MonitorFromWindow(HWND hWnd, DWORD dwFlags) TRACE("(%p, 0x%08x)\n", hWnd, dwFlags); + wp.length = sizeof(wp); if (IsIconic(hWnd) && GetWindowPlacement(hWnd, &wp)) return MonitorFromRect( &wp.rcNormalPosition, dwFlags ); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 6b6b26a..10f0fd0 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1255,6 +1255,8 @@ UINT WINAPI GetInternalWindowPos( HWND hwnd, LPRECT rectWnd, LPPOINT ptIcon ) { WINDOWPLACEMENT wndpl; + + wndpl.length = sizeof(wndpl); if (GetWindowPlacement( hwnd, &wndpl )) { if (rectWnd) *rectWnd = wndpl.rcNormalPosition;

1 0

Huw Davies : winefile: Initialize length before calling GetWindowPlacement ().
by Alexandre Julliard 31 Oct '17

31 Oct '17

Module: wine Branch: master Commit: 2b8a38169bf719225012e66a2409ffba8966f546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b8a38169bf719225012e66a2… 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> --- 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

Huw Davies : user32: Trace the full NCCALCSIZE_PARAMS info if present.
by Alexandre Julliard 31 Oct '17

31 Oct '17

Module: wine Branch: master Commit: 05e40aa67ddf4b570e0e549c0a000ea2dafd019f URL: http://source.winehq.org/git/wine.git/?a=commit;h=05e40aa67ddf4b570e0e549c0… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 30 10:29:14 2017 +0000 user32: Trace the full NCCALCSIZE_PARAMS info if present. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/spy.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index ff80051..9fb7307 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -2479,9 +2479,20 @@ static void SPY_DumpStructure(const SPY_INSTANCE *sp_e, BOOL enter) } break; case WM_NCCALCSIZE: + if (!sp_e->wParam) { RECT *rc = (RECT *)sp_e->lParam; - TRACE("Rect (%s)\n", wine_dbgstr_rect(rc)); + TRACE("Rect %s\n", wine_dbgstr_rect(rc)); + } + else + { + NCCALCSIZE_PARAMS *nc = (NCCALCSIZE_PARAMS *)sp_e->lParam; + TRACE("Rects %s %s %s\n", wine_dbgstr_rect(nc->rgrc), + wine_dbgstr_rect(nc->rgrc + 1), wine_dbgstr_rect(nc->rgrc + 2)); + if (nc->lppos) + TRACE("WINDOWPOS hwnd=%p, after=%p, at (%d,%d) w=%d h=%d, flags=0x%08x\n", + nc->lppos->hwnd, nc->lppos->hwndInsertAfter, nc->lppos->x, nc->lppos->y, + nc->lppos->cx, nc->lppos->cy, nc->lppos->flags); } break; case WM_NOTIFY:

1 0

Huw Davies : user32: Use WS_MINIMIZE instead of WS_ICONIC.
by Alexandre Julliard 31 Oct '17

31 Oct '17

Module: wine Branch: master Commit: 9c9c03046f58075faa9cd82f0496f27dfc718f88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c9c03046f58075faa9cd82f0… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 30 10:29:13 2017 +0000 user32: Use WS_MINIMIZE instead of WS_ICONIC. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/nonclient.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 55b19cf..2b38897 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -378,7 +378,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH AdjustWindowRect( LPRECT rect, DWORD style, BOOL m */ BOOL WINAPI DECLSPEC_HOTPATCH AdjustWindowRectEx( LPRECT rect, DWORD style, BOOL menu, DWORD exStyle ) { - if (style & WS_ICONIC) return TRUE; + if (style & WS_MINIMIZE) return TRUE; style &= ~(WS_HSCROLL | WS_VSCROLL); TRACE("(%s) %08x %d %08x\n", wine_dbgstr_rect(rect), style, menu, exStyle ); @@ -409,7 +409,7 @@ LRESULT NC_HandleNCCalcSize( HWND hwnd, WPARAM wparam, RECT *winRect ) if (cls_style & CS_VREDRAW) result |= WVR_VREDRAW; if (cls_style & CS_HREDRAW) result |= WVR_HREDRAW; - if (!(style & WS_ICONIC)) + if (!(style & WS_MINIMIZE)) { NC_AdjustRectOuter( &tmpRect, style, FALSE, exStyle ); @@ -472,7 +472,7 @@ static void NC_GetInsideRect( HWND hwnd, enum coords_relative relative, RECT *re { WIN_GetRectangles( hwnd, relative, rect, NULL ); - if (style & WS_ICONIC) return; + if (style & WS_MINIMIZE) return; /* Remove frame from rectangle */ if (HAS_THICKFRAME( style, ex_style ))

1 0

Huw Davies : strmbase: Remove unnecessary WS_ICONIC.
by Alexandre Julliard 31 Oct '17

31 Oct '17

Module: wine Branch: master Commit: 9ca53840789da6381d9a1ca178879209c5ff660b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ca53840789da6381d9a1ca17… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 30 10:29:12 2017 +0000 strmbase: Remove unnecessary WS_ICONIC. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index b4b5aab..b08608e 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -295,7 +295,7 @@ HRESULT WINAPI BaseControlWindowImpl_put_WindowStyle(IVideoWindow *iface, LONG W TRACE("(%p/%p)->(%x -> %x)\n", This, iface, old, WindowStyle); - if (WindowStyle & (WS_DISABLED|WS_HSCROLL|WS_ICONIC|WS_MAXIMIZE|WS_MINIMIZE|WS_VSCROLL)) + if (WindowStyle & (WS_DISABLED|WS_HSCROLL|WS_MAXIMIZE|WS_MINIMIZE|WS_VSCROLL)) return E_INVALIDARG; SetWindowLongW(This->baseWindow.hWnd, GWL_STYLE, WindowStyle);

1 0

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 October 2017