mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-02 16:08:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

os_resolve_shortcut: Report conversion error.

Browse Source
This commit is contained in:
Justin M. Keyes
2016-07-30 14:09:35 -04:00
parent f2d5ba65b5
commit 02346f9bc7
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/nvim/os/fs.c
View File

@@ -946,6 +946,7 @@ char_u * os_resolve_shortcut(char_u *fname)
OLECHAR wsz[MAX_PATH]; OLECHAR wsz[MAX_PATH];
char_u *rfname = NULL; char_u *rfname = NULL;
int len; int len;
int conversion_result;
IShellLinkW *pslw = NULL; IShellLinkW *pslw = NULL;
WIN32_FIND_DATAW ffdw; WIN32_FIND_DATAW ffdw;
@@ -966,8 +967,10 @@ char_u * os_resolve_shortcut(char_u *fname)
&IID_IShellLinkW, (void **)&pslw); &IID_IShellLinkW, (void **)&pslw);
if (hr == S_OK) { if (hr == S_OK) {
WCHAR *p; WCHAR *p;
//TODO(jkeyes): if this returns non-zero, report the error int conversion_result = utf8_to_utf16((char *)fname, &p);
(void)utf8_to_utf16((char *)fname, &p); if (conversion_result != 0) {
EMSG2("utf8_to_utf16 failed: %s", uv_strerror(conversion_result));
}
if (p != NULL) { if (p != NULL) {
// Get a pointer to the IPersistFile interface. // Get a pointer to the IPersistFile interface.
@@ -994,8 +997,10 @@ char_u * os_resolve_shortcut(char_u *fname)
ZeroMemory(wsz, MAX_PATH * sizeof(WCHAR)); ZeroMemory(wsz, MAX_PATH * sizeof(WCHAR));
hr = pslw->lpVtbl->GetPath(pslw, wsz, MAX_PATH, &ffdw, 0); hr = pslw->lpVtbl->GetPath(pslw, wsz, MAX_PATH, &ffdw, 0);
if (hr == S_OK && wsz[0] != NUL) { if (hr == S_OK && wsz[0] != NUL) {
//TODO(jkeyes): if this returns non-zero, report the error int conversion_result = utf16_to_utf8(wsz, &rfname);
(void)utf16_to_utf8(wsz, &rfname); if (conversion_result != 0) {
EMSG2("utf16_to_utf8 failed: %s", uv_strerror(conversion_result));
}
} }
shortcut_errorw: shortcut_errorw: