@@ -30,51 +30,21 @@ void test_checkout_icase__cleanup(void)
3030 cl_git_sandbox_cleanup ();
3131}
3232
33- static char * p_realpath (const char * in )
33+ static char * test_realpath (const char * in )
3434{
3535#ifdef GIT_WIN32
36- /*
37-
38- HANDLE fh, mh;
39- HINSTANCE psapi;
40- BY_HANDLE_FILE_INFORMATION fi;
41- void *map;
42- char *filename;
43- size_t filename_len = 1024;
44-
45- typedef DWORD (__stdcall *getmappedfilename)(HANDLE, LPVOID, LPTSTR, DWORD);
46- getmappedfilename getfunc;
47-
48- cl_assert(filename = malloc(filename_len));
49-
50- cl_win32_pass(psapi = LoadLibrary("psapi.dll"));
51- cl_win32_pass(getfunc = (getmappedfilename)GetProcAddress(psapi, "GetMappedFileNameA"));
52-
53- cl_win32_pass(fh = CreateFileA(in, GENERIC_READ, FILE_SHARE_READ,
54- NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL));
55- cl_win32_pass(mh = CreateFileMapping(fh, NULL, PAGE_READONLY, 0, 1, NULL));
56-
57- cl_win32_pass(map = MapViewOfFile(mh, FILE_MAP_READ, 0, 0, 1));
58-
59- cl_win32_pass(getfunc(GetCurrentProcess(), map, filename, filename_len));
60-
61- UnmapViewOfFile(map);
62- CloseHandle(mh);
63- CloseHandle(fh);
64- */
65-
6636 HANDLE fh ;
67- HINSTANCE kerneldll ;
37+ HMODULE kerneldll ;
6838 char * filename ;
6939
7040 typedef DWORD (__stdcall * getfinalpathname )(HANDLE , LPSTR , DWORD , DWORD );
7141 getfinalpathname getfinalpathfn ;
7242
7343 cl_assert (filename = malloc (MAX_PATH ));
74- cl_win32_pass (kerneldll = LoadLibrary ("kernel32.dll" ));
75- cl_win32_pass (getfinalpathfn = (getfinalpathname )GetProcAddress (kerneldll , "GetFinalPathNameByHandleA" ));
44+ cl_assert (kerneldll = LoadLibrary ("kernel32.dll" ));
45+ cl_assert (getfinalpathfn = (getfinalpathname )GetProcAddress (kerneldll , "GetFinalPathNameByHandleA" ));
7646
77- cl_win32_pass (fh = CreateFileA (in , FILE_READ_ATTRIBUTES | STANDARD_RIGHTS_READ , FILE_SHARE_READ ,
47+ cl_assert (fh = CreateFileA (in , FILE_READ_ATTRIBUTES | STANDARD_RIGHTS_READ , FILE_SHARE_READ ,
7848 NULL , OPEN_EXISTING , FILE_FLAG_BACKUP_SEMANTICS , NULL ));
7949
8050 cl_win32_pass (getfinalpathfn (fh , filename , MAX_PATH , VOLUME_NAME_DOS ));
@@ -94,7 +64,7 @@ static void assert_name_is(const char *expected)
9464 char * actual ;
9565 size_t actual_len , expected_len , start ;
9666
97- cl_assert (actual = p_realpath (expected ));
67+ cl_assert (actual = test_realpath (expected ));
9868
9969 expected_len = strlen (expected );
10070 actual_len = strlen (actual );
0 commit comments