vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Workaround windows bug when querying EFI system partition parameters.

Browse source
This commit is contained in:
Vladimir Serbinenko 2013-12-14 23:23:11 +01:00
parent 6a5fe1328b
commit 4bad23a15f
4 changed files with 87 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-12-14 Vladimir Serbinenko <phcoder@gmail.com>
Workaround windows bug when querying EFI system partition parameters.
2013-12-14 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/i386/qemu/init.c (resource): Decrease struct size

82
grub-core/osdep/windows/getroot.c
View file

@ -55,6 +55,58 @@
#define tcsnicmp wcsnicmp
#endif
TCHAR *
grub_get_mount_point (const TCHAR *path)
{
const TCHAR *ptr;
TCHAR *out;
TCHAR letter = 0;
size_t allocsize;
for (ptr = path; *ptr; ptr++);
allocsize = (ptr - path + 10) * 2;
out = xmalloc (allocsize * sizeof (out[0]));
/* When pointing to EFI system partition GetVolumePathName fails
for ESP root and returns abberant information for everything
else. Since GetVolumePathName shouldn't fail for any valid
//?/X: we use it as indicator. */
if ((path[0] == '/' || path[0] == '\\')
&& (path[1] == '/' || path[1] == '\\')
&& (path[2] == '?' || path[2] == '.')
&& (path[3] == '/' || path[3] == '\\')
&& path[4]
&& (path[5] == ':'))
letter = path[4];
if (path[0] && path[1] == ':')
letter = path[0];
if (letter)
{
TCHAR letterpath[10] = TEXT("\\\\?\\#:");
letterpath[4] = letter;
if (!GetVolumePathName (letterpath, out, allocsize))
{
if (path[1] == ':')
{
out[0] = path[0];
out[1] = ':';
out[2] = '\0';
return out;
}
memcpy (out, path, sizeof (out[0]) * 6);
out[6] = '\0';
return out;
}
}
if (!GetVolumePathName (path, out, allocsize))
{
free (out);
return NULL;
}
return out;
}
char **
grub_guess_root_devices (const char *dir)
{
@ -62,21 +114,17 @@ grub_guess_root_devices (const char *dir)
TCHAR *dirwindows, *mntpointwindows;
TCHAR *ptr;
TCHAR volumename[100];
size_t mntpointwindows_sz;
dirwindows = grub_util_get_windows_path (dir);
if (!dirwindows)
return 0;
mntpointwindows_sz = strlen (dir) * 2 + 1;
mntpointwindows = xmalloc ((mntpointwindows_sz + 1) * sizeof (mntpointwindows[0]));
mntpointwindows = grub_get_mount_point (dirwindows);
if (!GetVolumePathName (dirwindows,
mntpointwindows,
mntpointwindows_sz))
if (!mntpointwindows)
{
free (dirwindows);
free (mntpointwindows);
grub_util_info ("can't get volume path name: %d", (int) GetLastError ());
return 0;
}
@ -97,11 +145,31 @@ grub_guess_root_devices (const char *dir)
if (!GetVolumeNameForVolumeMountPoint (mntpointwindows,
volumename,
ARRAY_SIZE (volumename)))
{
TCHAR letter = 0;
if ((mntpointwindows[0] == '/' || mntpointwindows[0] == '\\')
&& (mntpointwindows[1] == '/' || mntpointwindows[1] == '\\')
&& (mntpointwindows[2] == '?' || mntpointwindows[2] == '.')
&& (mntpointwindows[3] == '/' || mntpointwindows[3] == '\\')
&& mntpointwindows[4]
&& (mntpointwindows[5] == ':'))
letter = mntpointwindows[4];
if (mntpointwindows[0] && mntpointwindows[1] == ':')
letter = mntpointwindows[0];
if (!letter)
{
free (dirwindows);
free (mntpointwindows);
return 0;
}
volumename[0] = '\\';
volumename[1] = '\\';
volumename[2] = '?';
volumename[3] = '\\';
volumename[4] = letter;
volumename[5] = ':';
volumename[6] = '\0';
}
os_dev = xmalloc (2 * sizeof (os_dev[0]));
for (ptr = volumename; *ptr; ptr++);

9
grub-core/osdep/windows/relpath.c
View file

@ -44,8 +44,6 @@ grub_make_system_path_relative_to_its_root (const char *path)
{
TCHAR *dirwindows, *mntpointwindows;
TCHAR *ptr;
TCHAR volumename[100];
size_t mntpointwindows_sz;
size_t offset, flen;
TCHAR *ret;
char *cret;
@ -54,12 +52,9 @@ grub_make_system_path_relative_to_its_root (const char *path)
if (!dirwindows)
return xstrdup (path);
mntpointwindows_sz = strlen (path) * 2 + 1;
mntpointwindows = xmalloc ((mntpointwindows_sz + 1) * sizeof (mntpointwindows[0]));
mntpointwindows = grub_get_mount_point (dirwindows);
if (!GetVolumePathName (dirwindows,
mntpointwindows,
mntpointwindows_sz))
if (!mntpointwindows)
{
offset = 0;
if (dirwindows[0] && dirwindows[1] == ':')

3
include/grub/util/windows.h
View file

@ -27,4 +27,7 @@ grub_util_get_windows_path (const char *unix_path);
char *
grub_util_tchar_to_utf8 (LPCTSTR in);
TCHAR *
grub_get_mount_point (const TCHAR *path);
#endif