Mercurial > hg > icedtea8-forest > jdk
changeset 13978:a854158a2c94
8213583: Error while opening the JFileChooser when desktop contains shortcuts pointing to deleted files.
Summary: Use SLR_NO_UI flag to suppress any system dialogs during IShellLinkW::Resolve invocation.
Reviewed-by: kaddepalli, aivanov, serb
| author | phh |
|---|---|
| date | Wed, 20 Feb 2019 21:11:13 +0000 |
| parents | 3bb8137f36a8 |
| children | aa5e4bedfa82 |
| files | src/windows/native/sun/windows/ShellFolder2.cpp |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/windows/native/sun/windows/ShellFolder2.cpp Tue Dec 04 17:54:13 2018 +0100 +++ b/src/windows/native/sun/windows/ShellFolder2.cpp Wed Feb 20 21:11:13 2019 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -692,7 +692,7 @@ hres = ppf->Load(wstr, STGM_READ); if (SUCCEEDED(hres)) { if (resolve) { - hres = psl->Resolve(NULL, 0); + hres = psl->Resolve(NULL, SLR_NO_UI); // Ignore failure } pidl = (LPITEMIDLIST)NULL;