October 2016 - Wine-commits

Sebastian Lackner : ntoskrnl.exe: Explicitly set MappedSystemVa for MDLs.
by Alexandre Julliard 18 Oct '16

18 Oct '16

Module: wine Branch: master Commit: b466e893116af5007a1302aef56030f150884b75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b466e893116af5007a1302aef… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Oct 16 08:57:21 2016 +0200 ntoskrnl.exe: Explicitly set MappedSystemVa for MDLs. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 26 ++++++++++++++++++++++++-- include/ddk/wdm.h | 9 +++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index eac81f7..854d68d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -820,6 +820,7 @@ PIRP WINAPI IoBuildDeviceIoControlRequest( ULONG code, PDEVICE_OBJECT device, { PIRP irp; PIO_STACK_LOCATION irpsp; + MDL *mdl; TRACE( "%x, %p, %p, %u, %p, %u, %u, %p, %p\n", code, device, in_buff, in_len, out_buff, out_len, internal, event, iosb ); @@ -847,7 +848,16 @@ PIRP WINAPI IoBuildDeviceIoControlRequest( ULONG code, PDEVICE_OBJECT device, case METHOD_IN_DIRECT: case METHOD_OUT_DIRECT: irp->AssociatedIrp.SystemBuffer = in_buff; - IoAllocateMdl( out_buff, out_len, FALSE, FALSE, irp ); + + mdl = IoAllocateMdl( out_buff, out_len, FALSE, FALSE, irp ); + if (!mdl) + { + IoFreeIrp( irp ); + return NULL; + } + + mdl->MdlFlags |= MDL_MAPPED_TO_SYSTEM_VA; + mdl->MappedSystemVa = out_buff; break; case METHOD_NEITHER: irpsp->Parameters.DeviceIoControl.Type3InputBuffer = in_buff; @@ -882,7 +892,19 @@ PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG majorfunc, PDEVICE_OBJECT device, irpsp->CompletionRoutine = NULL; irp->AssociatedIrp.SystemBuffer = buffer; - if (device->Flags & DO_DIRECT_IO) IoAllocateMdl( buffer, length, FALSE, FALSE, irp ); + + if (device->Flags & DO_DIRECT_IO) + { + MDL *mdl = IoAllocateMdl( buffer, length, FALSE, FALSE, irp ); + if (!mdl) + { + IoFreeIrp( irp ); + return NULL; + } + + mdl->MdlFlags |= MDL_MAPPED_TO_SYSTEM_VA; + mdl->MappedSystemVa = buffer; + } switch (majorfunc) { diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 3829e8b..95de8d0 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1306,8 +1306,17 @@ PVOID WINAPI MmAllocateContiguousMemory(SIZE_T,PHYSICAL_ADDRESS); PVOID WINAPI MmAllocateNonCachedMemory(SIZE_T); PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,SIZE_T); void WINAPI MmFreeNonCachedMemory(PVOID,SIZE_T); +PVOID WINAPI MmMapLockedPagesSpecifyCache(PMDL,KPROCESSOR_MODE,MEMORY_CACHING_TYPE,PVOID,ULONG,ULONG); MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void); +static inline void *MmGetSystemAddressForMdlSafe(MDL *mdl, ULONG priority) +{ + if (mdl->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA | MDL_SOURCE_IS_NONPAGED_POOL)) + return mdl->MappedSystemVa; + else + return MmMapLockedPagesSpecifyCache(mdl, KernelMode, MmCached, NULL, FALSE, priority); +} + void WINAPI ObDereferenceObject(void*); NTSTATUS WINAPI ObReferenceObjectByHandle(HANDLE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,PVOID*,POBJECT_HANDLE_INFORMATION); NTSTATUS WINAPI ObReferenceObjectByName(UNICODE_STRING*,ULONG,ACCESS_STATE*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,void*,void**);

1 0

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

18 Oct '16

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

Andrew Eikum : quartz: Clarify debug strings.
by Alexandre Julliard 18 Oct '16

18 Oct '16

Module: wine Branch: master Commit: 4fefafe5cd545d0ed78c90bb6b0335ff6edda81a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fefafe5cd545d0ed78c90bb6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 14 14:27:59 2016 -0500 quartz: Clarify debug strings. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 5488afb..88af2f6 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -690,14 +690,14 @@ static HRESULT WINAPI FilterGraph2_ConnectDirect(IFilterGraph2 *iface, IPin *ppi if (FAILED(hr)) return hr; - TRACE("Filter owning first pin => %p\n", PinInfo.pFilter); + TRACE("Filter owning ppinIn(%p) => %p\n", ppinIn, PinInfo.pFilter); IBaseFilter_Release(PinInfo.pFilter); hr = IPin_QueryPinInfo(ppinOut, &PinInfo); if (FAILED(hr)) return hr; - TRACE("Filter owning second pin => %p\n", PinInfo.pFilter); + TRACE("Filter owning ppinOut(%p) => %p\n", ppinOut, PinInfo.pFilter); IBaseFilter_Release(PinInfo.pFilter); } @@ -919,14 +919,14 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, if (FAILED(hr)) return hr; - TRACE("Filter owning first pin => %p\n", PinInfo.pFilter); + TRACE("Filter owning ppinIn(%p) => %p\n", ppinIn, PinInfo.pFilter); IBaseFilter_Release(PinInfo.pFilter); hr = IPin_QueryPinInfo(ppinOut, &PinInfo); if (FAILED(hr)) return hr; - TRACE("Filter owning second pin => %p\n", PinInfo.pFilter); + TRACE("Filter owning ppinOut(%p) => %p\n", ppinOut, PinInfo.pFilter); IBaseFilter_Release(PinInfo.pFilter); } @@ -947,6 +947,8 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, { IPin *temp; + TRACE("Directions seem backwards, swapping pins\n"); + temp = ppinIn; ppinIn = ppinOut; ppinOut = temp;

1 0

Roman Pisl : process: Make PROCESS_QUERY_LIMITED_INFORMATION sufficient for QueryFullProcessImageName ().
by Alexandre Julliard 18 Oct '16

18 Oct '16

Module: wine Branch: master Commit: ddfc5275af0081cba6e834bf9d9e35dcaa17d256 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddfc5275af0081cba6e834bf9… Author: Roman Pisl <rpisl(a)seznam.cz> Date: Fri Oct 14 21:02:48 2016 +0200 process: Make PROCESS_QUERY_LIMITED_INFORMATION sufficient for QueryFullProcessImageName(). Signed-off-by: Roman Pisl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 6 +----- server/process.c | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 8a135ef..5131126 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1953,7 +1953,7 @@ static void test_QueryFullProcessImageNameW(void) expect_eq_d(lstrlenW(buf), size); expect_eq_ws_i(buf, module_name); - hSelf = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, GetCurrentProcessId()); + hSelf = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, GetCurrentProcessId()); /* Real handle */ size = sizeof(buf) / sizeof(buf[0]); expect_eq_d(TRUE, pQueryFullProcessImageNameW(hSelf, 0, buf, &size)); @@ -3061,11 +3061,7 @@ static void test_process_info(void) case ProcessWow64Information: case ProcessDefaultHardErrorMode: case ProcessHandleCount: - ok(status == STATUS_SUCCESS, "for info %u expected STATUS_SUCCESS, got %08x (ret_len %u)\n", i, status, ret_len); - break; - case ProcessImageFileName: -todo_wine ok(status == STATUS_SUCCESS, "for info %u expected STATUS_SUCCESS, got %08x (ret_len %u)\n", i, status, ret_len); break; diff --git a/server/process.c b/server/process.c index 2f2d1ad..528ec74 100644 --- a/server/process.c +++ b/server/process.c @@ -1469,7 +1469,7 @@ DECL_HANDLER(get_dll_info) { struct process *process; - if ((process = get_process_from_handle( req->handle, PROCESS_QUERY_INFORMATION ))) + if ((process = get_process_from_handle( req->handle, PROCESS_QUERY_LIMITED_INFORMATION ))) { struct process_dll *dll;

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 18 Oct '16

18 Oct '16

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

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 18 Oct '16

18 Oct '16

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

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 18 Oct '16

18 Oct '16

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

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

18 Oct '16

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

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

18 Oct '16

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

Alexandre Julliard : Wine release 1.9.21
by Alexandre Julliard 14 Oct '16

14 Oct '16

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