October 2016 - Wine-Commits

Sebastian Lackner : ntoskrnl.exe: Defer deallocation of in_buff in dispatch_ioctl.
by Alexandre Julliard Oct. 18, 2016

Oct. 18, 2016

Module: wine Branch: master Commit: 5789b94f197894c314604b6dc31ce153d1526b73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5789b94f197894c314604b6dc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Oct 16 08:48:55 2016 +0200 ntoskrnl.exe: Defer deallocation of in_buff in dispatch_ioctl. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 428e700..3c18ee6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -417,6 +417,7 @@ static NTSTATUS dispatch_ioctl( const irp_params_t *params, void *in_buff, ULONG { IRP *irp; void *out_buff = NULL; + void *to_free = NULL; DEVICE_OBJECT *device; FILE_OBJECT *file = wine_server_get_ptr( params->ioctl.file ); @@ -435,7 +436,7 @@ static NTSTATUS dispatch_ioctl( const irp_params_t *params, void *in_buff, ULONG if ((params->ioctl.code & 3) == METHOD_BUFFERED) { memcpy( out_buff, in_buff, in_size ); - HeapFree( GetProcessHeap(), 0, in_buff ); + to_free = in_buff; in_buff = out_buff; } } @@ -455,6 +456,7 @@ static NTSTATUS dispatch_ioctl( const irp_params_t *params, void *in_buff, ULONG irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate in_buff */ dispatch_irp( device, irp, irp_handle ); + HeapFree( GetProcessHeap(), 0, to_free ); return STATUS_SUCCESS; }

1 0

Jacek Caban : advapi32: Pass options argument to NtOpenFileEx.
by Alexandre Julliard Oct. 18, 2016

Oct. 18, 2016

Module: wine Branch: master Commit: 41c7d1e227b06ec5bb0a2a3af1963bb4830e6f3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=41c7d1e227b06ec5bb0a2a3af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 17 21:22:36 2016 +0200 advapi32: Pass options argument to NtOpenFileEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 11be690..2d8e1bb 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -126,7 +126,7 @@ static HANDLE open_wow6432node( HANDLE key ) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; RtlInitUnicodeString( &nameW, wow6432nodeW ); - if (NtOpenKey( &ret, MAXIMUM_ALLOWED, &attr )) ret = 0; + if (NtOpenKeyEx( &ret, MAXIMUM_ALLOWED, &attr, 0 )) ret = 0; return ret; } @@ -202,21 +202,24 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES return status; } -/* wrapper for NtOpenKey to handle Wow6432 nodes */ -static NTSTATUS open_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr ) +/* wrapper for NtOpenKeyEx to handle Wow6432 nodes */ +static NTSTATUS open_key( HKEY *retkey, DWORD options, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr ) { NTSTATUS status; BOOL force_wow32 = is_win64 && (access & KEY_WOW64_32KEY); HANDLE subkey, root = attr->RootDirectory; WCHAR *buffer = attr->ObjectName->Buffer; - DWORD attrs, pos = 0, i = 0, len = attr->ObjectName->Length / sizeof(WCHAR); + DWORD pos = 0, i = 0, len = attr->ObjectName->Length / sizeof(WCHAR); UNICODE_STRING str; - if (!force_wow32) return NtOpenKey( (HANDLE *)retkey, access, attr ); + if (!force_wow32) + { + if (options & REG_OPTION_OPEN_LINK) attr->Attributes |= OBJ_OPENLINK; + return NtOpenKeyEx( (HANDLE *)retkey, access, attr, options ); + } if (len && buffer[0] == '\\') return STATUS_OBJECT_PATH_INVALID; while (i < len && buffer[i] != '\\') i++; - attrs = attr->Attributes; attr->ObjectName = &str; for (;;) @@ -235,13 +238,13 @@ static NTSTATUS open_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *a } if (i == len) { - attr->Attributes = attrs; - status = NtOpenKey( &subkey, access, attr ); + if (options & REG_OPTION_OPEN_LINK) attr->Attributes |= OBJ_OPENLINK; + status = NtOpenKeyEx( &subkey, access, attr, options ); } else { - attr->Attributes = attrs & ~OBJ_OPENLINK; - status = NtOpenKey( &subkey, access, attr ); + if (!(options & REG_OPTION_OPEN_LINK)) attr->Attributes &= ~OBJ_OPENLINK; + status = NtOpenKeyEx( &subkey, access, attr, options & ~REG_OPTION_OPEN_LINK ); } if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); if (status) return status; @@ -536,9 +539,8 @@ LSTATUS WINAPI RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD options, REGSAM acc attr.Attributes = 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (options & REG_OPTION_OPEN_LINK) attr.Attributes |= OBJ_OPENLINK; RtlInitUnicodeString( &nameW, name ); - return RtlNtStatusToDosError( open_key( retkey, access, &attr ) ); + return RtlNtStatusToDosError( open_key( retkey, options, access, &attr ) ); } @@ -591,13 +593,12 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegOpenKeyExA( HKEY hkey, LPCSTR name, DWORD op attr.Attributes = 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (options & REG_OPTION_OPEN_LINK) attr.Attributes |= OBJ_OPENLINK; RtlInitAnsiString( &nameA, name ); if (!(status = RtlAnsiStringToUnicodeString( &NtCurrentTeb()->StaticUnicodeString, &nameA, FALSE ))) { - status = open_key( retkey, access, &attr ); + status = open_key( retkey, options, access, &attr ); } return RtlNtStatusToDosError( status ); }

1 0

Carlo Bramini : comdlg32: Uses SetDlgItemInt() to simplify the code.
by Alexandre Julliard Oct. 18, 2016

Oct. 18, 2016

Module: wine Branch: master Commit: a1b0d925874942881b8ad15b967530beba65aa33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1b0d925874942881b8ad15b9… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Sat Oct 15 13:39:31 2016 +0200 comdlg32: Uses SetDlgItemInt() to simplify the code. Signed-off-by: Carlo Bramini <carlo_bramini(a)users.sourceforge.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/colordlg.c | 21 ++++++--------------- dlls/comdlg32/fontdlg.c | 4 +--- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index 6bf54c3..5e67499 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -673,15 +673,11 @@ static void CC_EditSetRGB( CCPRIV *infoPtr ) int r = GetRValue(cr); int g = GetGValue(cr); int b = GetBValue(cr); - char buffer[10]; infoPtr->updating = TRUE; - sprintf(buffer, "%d", r); - SetWindowTextA( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_EDIT_R), buffer); - sprintf(buffer, "%d", g); - SetWindowTextA( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_EDIT_G), buffer); - sprintf( buffer, "%d", b ); - SetWindowTextA( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_EDIT_B), buffer); + SetDlgItemInt(infoPtr->hwndSelf, IDC_COLOR_EDIT_R, r, TRUE); + SetDlgItemInt(infoPtr->hwndSelf, IDC_COLOR_EDIT_G, g, TRUE); + SetDlgItemInt(infoPtr->hwndSelf, IDC_COLOR_EDIT_B, b, TRUE); infoPtr->updating = FALSE; } } @@ -693,15 +689,10 @@ static void CC_EditSetHSL( CCPRIV *infoPtr ) { if (IsWindowVisible( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_GRAPH) )) /* if full size */ { - char buffer[10]; - infoPtr->updating = TRUE; - sprintf(buffer, "%d", infoPtr->h); - SetWindowTextA( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_EDIT_H), buffer); - sprintf(buffer, "%d", infoPtr->s); - SetWindowTextA( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_EDIT_S), buffer); - sprintf(buffer, "%d", infoPtr->l); - SetWindowTextA( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_EDIT_L), buffer); + SetDlgItemInt(infoPtr->hwndSelf, IDC_COLOR_EDIT_H, infoPtr->h, TRUE); + SetDlgItemInt(infoPtr->hwndSelf, IDC_COLOR_EDIT_S, infoPtr->s, TRUE); + SetDlgItemInt(infoPtr->hwndSelf, IDC_COLOR_EDIT_L, infoPtr->l, TRUE); infoPtr->updating = FALSE; } CC_PaintLumBar(infoPtr); diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index ed2615d..c08b246 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -534,7 +534,6 @@ static INT AddFontStyle( const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW * static void CFn_FitFontSize( HWND hDlg, int points) { - WCHAR buffW[16]; int i,n; /* look for fitting font size in combobox3 */ @@ -553,8 +552,7 @@ static void CFn_FitFontSize( HWND hDlg, int points) } /* no default matching size, set text manually */ - sprintfW(buffW, fontsizefmtW, points); - SetDlgItemTextW(hDlg, cmb3, buffW); + SetDlgItemInt(hDlg, cmb3, points, TRUE); } static BOOL CFn_FitFontStyle( HWND hDlg, LONG packedstyle )

1 0

Jacek Caban : ntdll: Return NULL key on NtCreateKey failure.
by Alexandre Julliard Oct. 18, 2016

Oct. 18, 2016

Module: wine Branch: master Commit: e891be17b23f9f8007aad75209776edb7cb065b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e891be17b23f9f8007aad7520… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 17 21:22:28 2016 +0200 ntdll: Return NULL key on NtCreateKey failure. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/reg.c | 8 +++----- dlls/ntdll/tests/reg.c | 12 +++++++++++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index cb522ca..e151e91 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -71,11 +71,9 @@ NTSTATUS WINAPI NtCreateKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_AT req->options = options; wine_server_add_data( req, objattr, len ); if (class) wine_server_add_data( req, class->Buffer, class->Length ); - if (!(ret = wine_server_call( req ))) - { - *retkey = wine_server_ptr_handle( reply->hkey ); - if (dispos) *dispos = reply->created ? REG_CREATED_NEW_KEY : REG_OPENED_EXISTING_KEY; - } + ret = wine_server_call( req ); + *retkey = wine_server_ptr_handle( reply->hkey ); + if (dispos && !ret) *dispos = reply->created ? REG_CREATED_NEW_KEY : REG_OPENED_EXISTING_KEY; } SERVER_END_REQ; diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index c15d6a8..7d2e566 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -364,16 +364,22 @@ static void test_NtOpenKey(void) /* Zero accessmask */ attr.Length = sizeof(attr); + key = (HANDLE)0xdeadbeef; status = pNtOpenKey(&key, 0, &attr); todo_wine ok(status == STATUS_ACCESS_DENIED, "Expected STATUS_ACCESS_DENIED, got: 0x%08x\n", status); +todo_wine + ok(!key, "key = %p\n", key); if (status == STATUS_SUCCESS) NtClose(key); /* Calling without parent key requres full registry path. */ pRtlCreateUnicodeStringFromAsciiz( &str, "Machine" ); InitializeObjectAttributes(&attr, &str, 0, 0, 0); + key = (HANDLE)0xdeadbeef; status = pNtOpenKey(&key, KEY_READ, &attr); todo_wine ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenKey Failed: 0x%08x\n", status); +todo_wine + ok(!key, "key = %p\n", key); pRtlFreeUnicodeString( &str ); /* Open is case sensitive unless OBJ_CASE_INSENSITIVE is specified. */ @@ -1070,8 +1076,10 @@ static void test_symlinks(void) /* try opening the target through the link */ attr.ObjectName = &link_str; + key = (HANDLE)0xdeadbeef; status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtOpenKey wrong status 0x%08x\n", status ); + ok( !key, "key = %p\n", key ); attr.ObjectName = &target_str; status = pNtCreateKey( &key, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); @@ -1271,8 +1279,10 @@ static void test_symlinks(void) ok( status == STATUS_SUCCESS || status == STATUS_OBJECT_NAME_NOT_FOUND, "NtOpenKey wrong status 0x%08x\n", status ); - status = pNtCreateKey( &key, KEY_ALL_ACCESS, &attr, 0, 0, REG_OPTION_CREATE_LINK, 0 ); + key = (HKEY)0xdeadbeef; + status = pNtCreateKey( &key, KEY_ALL_ACCESS, &attr, 0, 0, REG_OPTION_CREATE_LINK, NULL ); ok( status == STATUS_OBJECT_NAME_COLLISION, "NtCreateKey failed: 0x%08x\n", status ); + ok( !key, "key = %p\n", key ); status = pNtDeleteKey( link ); ok( status == STATUS_SUCCESS, "NtDeleteKey failed: 0x%08x\n", status );

1 0

Jacek Caban : ntdll/tests: Added more registry symlink tests.
by Alexandre Julliard Oct. 18, 2016

Oct. 18, 2016

Module: wine Branch: master Commit: eeb4ed4c7066ec877cc746bcf608059535c325f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeb4ed4c7066ec877cc746bcf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 17 21:22:16 2016 +0200 ntdll/tests: Added more registry symlink tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/reg.c | 2 +- dlls/ntdll/tests/reg.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 6dc5d61..cb522ca 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -129,7 +129,7 @@ static NTSTATUS open_key( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRI TRACE( "(%p,%s,%x,%p)\n", attr->RootDirectory, debugstr_us(attr->ObjectName), access, retkey ); - if (options) + if (options & ~REG_OPTION_OPEN_LINK) FIXME("options %x not implemented\n", options); SERVER_START_REQ( open_key ) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 0160869..c15d6a8 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1135,6 +1135,40 @@ static void test_symlinks(void) "wrong len %u\n", len ); pNtClose( key ); + if (pNtOpenKeyEx) + { + /* REG_OPTION_OPEN_LINK flag doesn't matter */ + status = pNtOpenKeyEx( &key, KEY_ALL_ACCESS, &attr, REG_OPTION_OPEN_LINK ); + ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08x\n", status ); + + len = sizeof(buffer); + status = pNtQueryValueKey( key, &symlink_str, KeyValuePartialInformation, info, len, &len ); + ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08x\n", status ); + ok( len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION,Data) + target_len - sizeof(WCHAR), + "wrong len %u\n", len ); + pNtClose( key ); + + status = pNtOpenKeyEx( &key, KEY_ALL_ACCESS, &attr, 0 ); + ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08x\n", status ); + + len = sizeof(buffer); + status = pNtQueryValueKey( key, &symlink_str, KeyValuePartialInformation, info, len, &len ); + ok( status == STATUS_SUCCESS, "NtQueryValueKey failed: 0x%08x\n", status ); + ok( len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION,Data) + target_len - sizeof(WCHAR), + "wrong len %u\n", len ); + pNtClose( key ); + + attr.Attributes = 0; + status = pNtOpenKeyEx( &key, KEY_ALL_ACCESS, &attr, REG_OPTION_OPEN_LINK ); + ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08x\n", status ); + + len = sizeof(buffer); + status = pNtQueryValueKey( key, &symlink_str, KeyValuePartialInformation, info, len, &len ); + ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryValueKey failed: 0x%08x\n", status ); + pNtClose( key ); + } + + attr.Attributes = OBJ_OPENLINK; status = pNtCreateKey( &key, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); len = sizeof(buffer); @@ -1144,6 +1178,36 @@ static void test_symlinks(void) "wrong len %u\n", len ); pNtClose( key ); + /* delete target and create by NtCreateKey on link */ + attr.ObjectName = &target_str; + status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); + ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08x\n", status ); + status = pNtDeleteKey( key ); + ok( status == STATUS_SUCCESS, "NtDeleteKey failed: 0x%08x\n", status ); + pNtClose( key ); + + attr.ObjectName = &link_str; + attr.Attributes = 0; + status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); + ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtOpenKey wrong status 0x%08x\n", status ); + + status = pNtCreateKey( &key, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); + todo_wine ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); + pNtClose( key ); + if (status) /* can be removed once todo_wine above is fixed */ + { + attr.ObjectName = &target_str; + attr.Attributes = OBJ_OPENLINK; + status = pNtCreateKey( &key, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); + pNtClose( key ); + } + + attr.ObjectName = &target_str; + attr.Attributes = OBJ_OPENLINK; + status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); + ok( status == STATUS_SUCCESS, "NtOpenKey wrong status 0x%08x\n", status ); + if (0) /* crashes the Windows kernel on some Vista systems */ { /* reopen the link from itself */

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Oct. 18, 2016

Oct. 18, 2016

Module: wine Branch: master Commit: e6ace0aa08adea946cabdeafdb635e4646fba50b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6ace0aa08adea946cabdeafd… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Oct 14 22:22:51 2016 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index a826605..86c1bec 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-10-13 22:35+0300\n" +"PO-Revision-Date: 2016-10-14 22:22+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -14513,10 +14513,8 @@ msgid "Error: Invalid query\n" msgstr "Klaida: Netinkama užklausa\n" #: wmic.rc:31 -#, fuzzy -#| msgid "reg: Invalid syntax. " msgid "Error: Invalid syntax for PATH\n" -msgstr "reg: Netinkama sintaksė. " +msgstr "Klaida: Netinkama PATH sintaksė\n" #: wordpad.rc:31 msgid "&New...\tCtrl+N"

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard Oct. 18, 2016

Oct. 18, 2016

Module: wine Branch: master Commit: cf7c47d3d2610c7b03c1c006a5f431614d7049ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf7c47d3d2610c7b03c1c006a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 16 21:05:33 2016 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/po/ru.po b/po/ru.po index 62cf1f6..a834c13 100644 --- a/po/ru.po +++ b/po/ru.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: 2016-07-15 23:49+0300\n" +"PO-Revision-Date: 2016-10-14 22:09+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -14584,36 +14584,32 @@ msgid "F&ormat" msgstr "Фор&мат" #: wordpad.rc:85 -#, fuzzy -#| msgid "&List" msgid "&Lists" -msgstr "&Список" +msgstr "&Списки" #: wordpad.rc:87 wordpad.rc:116 msgid "&Bullet points" msgstr "&Маркер" #: wordpad.rc:88 -#, fuzzy -#| msgid "CRL Number" msgid "Numbers" -msgstr "Номер CRL" +msgstr "Числа" #: wordpad.rc:89 msgid "Letters - lower case" -msgstr "" +msgstr "Буквы - строчные" #: wordpad.rc:90 msgid "Letters - upper case" -msgstr "" +msgstr "Буквы - прописные" #: wordpad.rc:91 msgid "Roman numerals - lower case" -msgstr "" +msgstr "Римские числа - строчные" #: wordpad.rc:92 msgid "Roman numerals - upper case" -msgstr "" +msgstr "Римские числа - прописные" #: wordpad.rc:94 wordpad.rc:117 msgid "&Paragraph..."

1 0

Jacek Caban : wintrust: Don't close key if RegOpenKeyExW failed.
by Alexandre Julliard Oct. 18, 2016

Oct. 18, 2016

Module: wine Branch: master Commit: fb518192bb6f8d5f9ae07bbaf0b84678ca933f89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb518192bb6f8d5f9ae07bbaf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 17 19:32:07 2016 +0200 wintrust: Don't close key if RegOpenKeyExW failed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/register.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index b9a7559..effe9d1 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -811,7 +811,7 @@ static FARPROC WINTRUST_ReadProviderFromReg(WCHAR *GuidString, const WCHAR *Func lstrcatW(ProvKey, GuidString); Res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, ProvKey, 0, KEY_READ, &Key); - if (Res != ERROR_SUCCESS) goto error_close_key; + if (Res != ERROR_SUCCESS) return NULL; /* Read the $DLL entry */ Size = sizeof(DllName);

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Oct. 18, 2016

Oct. 18, 2016

Module: wine Branch: master Commit: a45eb80790317940f5f32264abfe255f28d10d89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a45eb80790317940f5f32264a… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Mon Oct 17 20:01:57 2016 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/po/fi.po b/po/fi.po index 7621cd7..c03f0a8 100644 --- a/po/fi.po +++ b/po/fi.po @@ -10487,10 +10487,8 @@ msgid "IPv6 address" msgstr "IPv6-osoite" #: msinfo32.rc:28 -#, fuzzy -#| msgid "System Configuration" msgid "System Information" -msgstr "Järjestelmän kokoonpano" +msgstr "Järjestelmätiedot" #: net.rc:30 msgid "" @@ -14471,10 +14469,8 @@ msgid "Error: Invalid query\n" msgstr "Virhe: Virheellinen kysely\n" #: wmic.rc:31 -#, fuzzy -#| msgid "reg: Invalid syntax. " msgid "Error: Invalid syntax for PATH\n" -msgstr "reg: Syntaksi ei kelpaa. " +msgstr "Virhe: Virheellinen syntaksi komennolle PATH\n" #: wordpad.rc:31 msgid "&New...\tCtrl+N" @@ -14549,36 +14545,32 @@ msgid "F&ormat" msgstr "&Muotoile" #: wordpad.rc:85 -#, fuzzy -#| msgid "&List" msgid "&Lists" -msgstr "&Lista" +msgstr "&Listat" #: wordpad.rc:87 wordpad.rc:116 msgid "&Bullet points" msgstr "&Listan kohdat" #: wordpad.rc:88 -#, fuzzy -#| msgid "CRL Number" msgid "Numbers" -msgstr "Sulkulistan numero" +msgstr "Luvut" #: wordpad.rc:89 msgid "Letters - lower case" -msgstr "" +msgstr "Kirjaimet - pienaakkoset" #: wordpad.rc:90 msgid "Letters - upper case" -msgstr "" +msgstr "Kirjaimet - suuraakkoset" #: wordpad.rc:91 msgid "Roman numerals - lower case" -msgstr "" +msgstr "Roomalaiset numerot - pienaakkoset" #: wordpad.rc:92 msgid "Roman numerals - upper case" -msgstr "" +msgstr "Roomalaiset numerot - suuraakkoset" #: wordpad.rc:94 wordpad.rc:117 msgid "&Paragraph..."

1 0

Alexandre Julliard : Wine release 1.9.21
by Alexandre Julliard Oct. 14, 2016

Oct. 14, 2016

Module: website Branch: master Commit: 2357aae912c9f7fce832531f335a2f4f42c96bf4 URL: http://source.winehq.org/git/website.git/?a=commit;h=2357aae912c9f7fce83253… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 14 20:47:06 2016 +0200 Wine release 1.9.21 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016101401.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2016101401.xml b/news/en/2016101401.xml new file mode 100644 index 0000000..894b2e1 --- /dev/null +++ b/news/en/2016101401.xml @@ -0,0 +1,15 @@ +<news> +<date>October 14, 2016</date> +<title>Wine 1.9.21 Released</title> +<body> + The Wine development release 1.9.21 is now available. + <a href="{$root}/announce/1.9.21">What's new</a> in this release: +<ul> + <li>Initial version of the HID minidriver.</li> + <li>Support for lists in the RichEdit control.</li> + <li>System tray improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.21.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0