diff options
| -rw-r--r-- | README.Windows | 2 | ||||
| -rw-r--r-- | lib/filter.c | 5 | ||||
| -rw-r--r-- | lib/init.c | 159 | ||||
| -rw-r--r-- | lib/internal.h | 4 | ||||
| -rw-r--r-- | lib/mmio-ports.c | 8 | ||||
| -rw-r--r-- | lib/win32-kldbg.c | 4 | ||||
| -rwxr-xr-x | update-pciids.sh | 10 |
7 files changed, 174 insertions, 18 deletions
diff --git a/README.Windows b/README.Windows index 2bef240..7a5ccab 100644 --- a/README.Windows +++ b/README.Windows @@ -21,7 +21,7 @@ users to access config space even with SeTcbPrivilege. To compile this port, run following command: - make CROSS_COMPILE=i586-mingw32msvc- HOST=i386-windows ZLIB=no IDSDIR="" + make CROSS_COMPILE=i586-mingw32msvc- HOST=i586-windows ZLIB=no IDSDIR="" To build 64-bit version, run: diff --git a/lib/filter.c b/lib/filter.c index 7038451..86486d3 100644 --- a/lib/filter.c +++ b/lib/filter.c @@ -76,6 +76,11 @@ parse_hex_field(char *str, int *outp, unsigned int *maskp, unsigned int max) if (!field_defined(str)) return 1; // and keep the defaults + // Historically, filters allowed writing hexadecimal numbers with leading "0x". + // This was never intentional nor documented, but some people relied on it. + if (!maskp && str[0] == '0' && (str[1] == 'x' || str[1] == 'X')) + str += 2; + while (*str) { int c = *str++; @@ -13,8 +13,61 @@ #include "internal.h" +#ifdef PCI_OS_DJGPP +#include <crt0.h> /* for __dos_argv0 */ +#endif + #ifdef PCI_OS_WINDOWS + #include <windows.h> + +/* Force usage of ANSI (char*) variant of GetModuleFileName() function */ +#ifdef _WIN32 +#ifdef GetModuleFileName +#undef GetModuleFileName +#endif +#define GetModuleFileName GetModuleFileNameA +#endif + +/* Define __ImageBase for all linkers */ +#ifdef _WIN32 +/* GNU LD provides __ImageBase symbol since 2.19, in previous versions it is + * under name _image_base__, so add weak alias for compatibility. */ +#ifdef __GNUC__ +asm(".weak\t" PCI_STRINGIFY(__MINGW_USYMBOL(__ImageBase)) "\n\t" + ".set\t" PCI_STRINGIFY(__MINGW_USYMBOL(__ImageBase)) "," PCI_STRINGIFY(__MINGW_USYMBOL(_image_base__))); +#endif +/* + * MSVC link.exe provides __ImageBase symbol since 12.00 (MSVC 6.0), for + * previous versions resolve it at runtime via GetModuleHandleA() which + * returns base for main executable or via VirtualQuery() for DLL builds. + */ +#if defined(_MSC_VER) && _MSC_VER < 1200 +static HMODULE +get_current_module_handle(void) +{ +#ifdef PCI_SHARED_LIB + MEMORY_BASIC_INFORMATION info; + size_t len = VirtualQuery(&get_current_module_handle, &info, sizeof(info)); + if (len != sizeof(info)) + return NULL; + return (HMODULE)info.AllocationBase; +#else + return GetModuleHandleA(NULL); +#endif +} +#define __ImageBase (*(IMAGE_DOS_HEADER *)get_current_module_handle()) +#else +extern IMAGE_DOS_HEADER __ImageBase; +#endif +#endif + +#if defined(_WINDLL) +extern HINSTANCE _hModule; +#elif defined(_WINDOWS) +extern HINSTANCE _hInstance; +#endif + #endif static struct pci_methods *pci_methods[PCI_ACCESS_MAX] = { @@ -213,7 +266,7 @@ pci_get_method_name(int index) return pci_methods[index]->name; } -#ifdef PCI_OS_WINDOWS +#if defined(PCI_OS_WINDOWS) || defined(PCI_OS_DJGPP) static void pci_init_name_list_path(struct pci_access *a) @@ -223,13 +276,107 @@ pci_init_name_list_path(struct pci_access *a) else { char *path, *sep; - DWORD len; + size_t len; + +#if defined(PCI_OS_WINDOWS) && (defined(_WIN32) || defined(_WINDLL) || defined(_WINDOWS)) + + HMODULE module; + size_t size; + +#if defined(_WIN32) + module = (HINSTANCE)&__ImageBase; +#elif defined(_WINDLL) + module = _hModule; +#elif defined(_WINDOWS) + module = _hInstance; +#endif + + /* + * Module file name can have arbitrary length despite all MS examples say + * about MAX_PATH upper limit. This limit does not apply for example when + * executable is running from network disk with very long UNC paths or + * when using "\\??\\" prefix for specifying executable binary path. + * Function GetModuleFileName() returns passed size argument when passed + * buffer is too small and does not signal any error. In this case retry + * again with larger buffer. + */ + size = 256; /* initial buffer size (more than sizeof(PCI_IDS)-4) */ +retry: + path = pci_malloc(a, size); + len = GetModuleFileName(module, path, size-sizeof(PCI_IDS)-4); /* 4 for "\\\\?\\" */ + if (len >= size-sizeof(PCI_IDS)-4) + { + free(path); + size *= 2; + goto retry; + } + else if (len == 0) + path[0] = '\0'; + + /* + * GetModuleFileName() has bugs. On Windows 10 it prepends current drive + * letter if path is just pure NT namespace (with "\\??\\" prefix). Such + * extra drive letter makes path fully invalid and unusable. So remove + * extra drive letter to make path valid again. + * Reproduce: CreateProcessW("\\??\\C:\\lspci.exe", ...) + */ + if (((path[0] >= 'a' && path[0] <= 'z') || + (path[0] >= 'A' && path[0] <= 'Z')) && + strncmp(path+1, ":\\??\\", 5) == 0) + { + memmove(path, path+2, len-2); + len -= 2; + path[len] = '\0'; + } + + /* + * GetModuleFileName() has bugs. On Windows 10 it does not add "\\\\?\\" + * prefix when path is in native NT UNC namespace. Such path is treated by + * WinAPI/DOS functions as standard DOS path relative to the current + * directory, hence something completely different. So prepend missing + * "\\\\?\\" prefix to make path valid again. + * Reproduce: CreateProcessW("\\??\\UNC\\10.0.2.4\\qemu\\lspci.exe", ...) + * + * If path starts with DOS drive letter and with appended PCI_IDS is + * longer than 260 bytes and is without "\\\\?\\" prefix then append it. + * This prefix is required for paths and file names with DOS drive letter + * longer than 260 bytes. + */ + if (strncmp(path, "\\UNC\\", 5) == 0 || + strncmp(path, "UNC\\", 4) == 0 || + (((path[0] >= 'a' && path[0] <= 'z') || (path[0] >= 'A' && path[0] <= 'Z')) && + len + sizeof(PCI_IDS) >= 260)) + { + memmove(path+4, path, len); + memcpy(path, "\\\\?\\", 4); + len += 4; + path[len] = '\0'; + } + +#elif defined(PCI_OS_DJGPP) || defined(PCI_OS_WINDOWS) + + const char *exe_path; + +#ifdef PCI_OS_DJGPP + exe_path = __dos_argv0; +#else + exe_path = _pgmptr; +#endif + + len = strlen(exe_path); + path = pci_malloc(a, len+sizeof(PCI_IDS)); + memcpy(path, exe_path, len+1); + +#endif - path = pci_malloc(a, MAX_PATH+1); - len = GetModuleFileNameA(NULL, path, MAX_PATH+1); - sep = (len > 0) ? strrchr(path, '\\') : NULL; - if (len == 0 || len == MAX_PATH+1 || !sep || MAX_PATH-(size_t)(sep+1-path) < sizeof(PCI_IDS)) + sep = strrchr(path, '\\'); + if (!sep) { + /* + * If current module path (current executable for static builds or + * current DLL library for shared build) cannot be determined then + * fallback to the current directory. + */ free(path); pci_set_name_list_path(a, PCI_IDS, 0); } diff --git a/lib/internal.h b/lib/internal.h index b07b1a9..7f19db4 100644 --- a/lib/internal.h +++ b/lib/internal.h @@ -15,12 +15,12 @@ // optimizations is happy to optimize them away, leading to linker failures. #define VERSIONED_ABI __attribute__((used)) PCI_ABI #ifdef __APPLE__ -#define STATIC_ALIAS(_decl, _for) _decl PCI_ABI { return _for; } +#define STATIC_ALIAS(_decl, _for) _decl VERSIONED_ABI { return _for; } #define DEFINE_ALIAS(_decl, _for) #define SYMBOL_VERSION(_int, _ext) #else #define STATIC_ALIAS(_decl, _for) -#define DEFINE_ALIAS(_decl, _for) extern _decl __attribute__((alias(#_for))) +#define DEFINE_ALIAS(_decl, _for) extern _decl __attribute__((alias(#_for))) VERSIONED_ABI #ifdef _WIN32 /* GCC does not support asm .symver directive for Windows targets, so define new external global function symbol as alias to internal symbol */ #define SYMBOL_VERSION(_int, _ext) asm(".globl\t" PCI_STRINGIFY(__MINGW_USYMBOL(_ext)) "\n\t" \ diff --git a/lib/mmio-ports.c b/lib/mmio-ports.c index c8e5f8c..a9e23c3 100644 --- a/lib/mmio-ports.c +++ b/lib/mmio-ports.c @@ -124,9 +124,9 @@ writew(unsigned short value, volatile void *addr) } static void -writel(unsigned long value, volatile void *addr) +writel(u32 value, volatile void *addr) { - *(volatile unsigned long *)addr = value; + *(volatile u32 *)addr = value; } static unsigned char @@ -141,10 +141,10 @@ readw(volatile void *addr) return *(volatile unsigned short *)addr; } -static unsigned long +static u32 readl(volatile void *addr) { - return *(volatile unsigned long *)addr; + return *(volatile u32 *)addr; } static int diff --git a/lib/win32-kldbg.c b/lib/win32-kldbg.c index 3890b6b..4c8ee54 100644 --- a/lib/win32-kldbg.c +++ b/lib/win32-kldbg.c @@ -15,6 +15,10 @@ #include "internal.h" #include "i386-io-windows.h" +#ifndef ERROR_NOT_FOUND +#define ERROR_NOT_FOUND 1168 +#endif + #ifndef LOAD_LIBRARY_AS_IMAGE_RESOURCE #define LOAD_LIBRARY_AS_IMAGE_RESOURCE 0x20 #endif diff --git a/update-pciids.sh b/update-pciids.sh index 3ea4690..929f6af 100755 --- a/update-pciids.sh +++ b/update-pciids.sh @@ -20,23 +20,23 @@ if [ "$PCI_COMPRESSED_IDS" = 1 ] ; then DECOMP="cat" SRC="$SRC.gz" GREP=zgrep -elif which bzip2 >/dev/null 2>&1 ; then +elif command -v bzip2 >/dev/null 2>&1 ; then DECOMP="bzip2 -d" SRC="$SRC.bz2" -elif which gzip >/dev/null 2>&1 ; then +elif command -v gzip >/dev/null 2>&1 ; then DECOMP="gzip -d" SRC="$SRC.gz" else DECOMP="cat" fi -if which curl >/dev/null 2>&1 ; then +if command -v curl >/dev/null 2>&1 ; then DL="curl -o $DEST.new $SRC" ${quiet} && DL="$DL -s -S" -elif which wget >/dev/null 2>&1 ; then +elif command -v wget >/dev/null 2>&1 ; then DL="wget --no-timestamping -O $DEST.new $SRC" ${quiet} && DL="$DL -q" -elif which lynx >/dev/null 2>&1 ; then +elif command -v lynx >/dev/null 2>&1 ; then DL="eval lynx -source $SRC >$DEST.new" else echo >&2 "update-pciids: cannot find curl, wget or lynx" |