fix std.os.windows.PathFileExists specified in the wrong DLL (#1066)

andrewrk · web-flow · commit b11c5d8f8256 · 2018-06-06T15:36:47.000-04:00
closes #1054
diff --git a/std/os/file.zig b/std/os/file.zig
@@ -123,7 +123,8 @@ pub const File = struct {
             }
             return true;
         } else if (is_windows) {
-            if (os.windows.PathFileExists(path_with_null.ptr) == os.windows.TRUE) {
+            // TODO do not depend on shlwapi.dll
+            if (os.windows.PathFileExistsA(path_with_null.ptr) == os.windows.TRUE) {
                 return true;
             }
 
diff --git a/std/os/windows/index.zig b/std/os/windows/index.zig
@@ -123,8 +123,6 @@ pub extern "kernel32" stdcallcc fn QueryPerformanceCounter(lpPerformanceCount: *
 
 pub extern "kernel32" stdcallcc fn QueryPerformanceFrequency(lpFrequency: *LARGE_INTEGER) BOOL;
 
-pub extern "kernel32" stdcallcc fn PathFileExists(pszPath: ?LPCTSTR) BOOL;
-
 pub extern "kernel32" stdcallcc fn ReadFile(
     in_hFile: HANDLE,
     out_lpBuffer: *c_void,
@@ -163,6 +161,8 @@ pub extern "kernel32" stdcallcc fn FreeLibrary(hModule: HMODULE) BOOL;
 
 pub extern "user32" stdcallcc fn MessageBoxA(hWnd: ?HANDLE, lpText: ?LPCTSTR, lpCaption: ?LPCTSTR, uType: UINT) c_int;
 
+pub extern "shlwapi" stdcallcc fn PathFileExistsA(pszPath: ?LPCTSTR) BOOL;
+
 pub const PROV_RSA_FULL = 1;
 
 pub const BOOL = c_int;

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,8 @@ pub const File = struct {`
`123`	`123`	`}`
`124`	`124`	`return true;`
`125`	`125`	`} else if (is_windows) {`
`126`		`- if (os.windows.PathFileExists(path_with_null.ptr) == os.windows.TRUE) {`
	`126`	`+ // TODO do not depend on shlwapi.dll`
	`127`	`+ if (os.windows.PathFileExistsA(path_with_null.ptr) == os.windows.TRUE) {`
`127`	`128`	`return true;`
`128`	`129`	`}`
`129`	`130`