From 2e49823a06c2955fdd2ca1b1903327730c2b32ef Mon Sep 17 00:00:00 2001 From: Brad Hughes Date: Fri, 11 Nov 2016 11:43:49 -0500 Subject: Add basic keyboard input to UWP (nw) --- src/osd/modules/lib/osdlib_uwp.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/osd/modules/lib/osdlib_uwp.cpp') diff --git a/src/osd/modules/lib/osdlib_uwp.cpp b/src/osd/modules/lib/osdlib_uwp.cpp index 379829012dc..27c0ac4abe1 100644 --- a/src/osd/modules/lib/osdlib_uwp.cpp +++ b/src/osd/modules/lib/osdlib_uwp.cpp @@ -270,17 +270,17 @@ void *PeGetProcAddressA(void *Base, LPCSTR Name) { for (DWORD i = 0; iNumberOfNames && Ret == 0; i++) { - char *Func = (char*)(Names[i] + (DWORD_PTR)Base); + char *Func = (char*)(Names[i] + std::uintptr_t(Base)); if (Func && strcmp(Func, Name) == 0) - Ret = (FARPROC)(Functions[Ordinals[i]] + (DWORD_PTR)Base); + Ret = (FARPROC)(Functions[Ordinals[i]] + std::uintptr_t(Base)); } } if (Ret) { - DWORD ExpStart = NT->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress + (DWORD)Base; - DWORD ExpSize = NT->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].Size; - if ((DWORD)Ret >= ExpStart && (DWORD)Ret <= ExpStart + ExpSize) + std::uintptr_t ExpStart = NT->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress + std::uintptr_t(Base); + std::uintptr_t ExpSize = NT->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].Size; + if (std::uintptr_t(Ret) >= ExpStart && std::uintptr_t(Ret) <= ExpStart + ExpSize) { // Forwarder return 0; -- cgit v1.2.3-70-g09d2