[ros-diffs] 10/16: [APPHELP] Fix 64 bit issues

[Timo Kreuzer]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e59d7a5687bb3a20bef88…

commit e59d7a5687bb3a20bef88e51409aa087c2376dc5
Author:     Timo Kreuzer <timo.kreuzer(a)reactos.org>
AuthorDate: Sun Mar 4 16:04:17 2018 +0100
Commit:     Timo Kreuzer <timo.kreuzer(a)reactos.org>
CommitDate: Sat Aug 4 19:19:34 2018 +0200

    [APPHELP] Fix 64 bit issues
---
 dll/appcompat/apphelp/sdbfileattr.c | 2 +-
 dll/appcompat/apphelp/shimeng.c     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dll/appcompat/apphelp/sdbfileattr.c b/dll/appcompat/apphelp/sdbfileattr.c
index 61177b0239..4be994a4d9 100644
--- a/dll/appcompat/apphelp/sdbfileattr.c
+++ b/dll/appcompat/apphelp/sdbfileattr.c
@@ -286,7 +286,7 @@ BOOL WINAPI SdbGetFileAttributes(LPCWSTR path, PATTRINFO
*attr_info_ret, LPDWORD
     if (headers && module_type == MODTYPE_PE && ((PBYTE)(headers+1) <=
mapping_end))
     {
         DWORD info_size;
-        SIZE_T export_dir_size;
+        ULONG export_dir_size;
         PIMAGE_EXPORT_DIRECTORY export_dir;
 
         info_size = GetFileVersionInfoSizeW(path, NULL);
diff --git a/dll/appcompat/apphelp/shimeng.c b/dll/appcompat/apphelp/shimeng.c
index 3b0e7d0866..8f3fe2bab0 100644
--- a/dll/appcompat/apphelp/shimeng.c
+++ b/dll/appcompat/apphelp/shimeng.c
@@ -597,9 +597,9 @@ FARPROC WINAPI StubGetProcAddress(HINSTANCE hModule, LPCSTR
lpProcName)
     PHOOKMODULEINFO HookModuleInfo;
     FARPROC proc = ((GETPROCADDRESSPROC)g_IntHookEx[0].OriginalFunction)(hModule,
lpProcName);
 
-    if (!HIWORD(lpProcName))
+    if ((DWORD_PTR)lpProcName <= MAXUSHORT)
     {
-        sprintf(szOrdProcName, "#%lu", (DWORD)lpProcName);
+        sprintf(szOrdProcName, "#%Iu", (DWORD_PTR)lpProcName);
         lpPrintName = szOrdProcName;
     }
 
@@ -676,7 +676,7 @@ VOID SeiPatchNewImport(PIMAGE_THUNK_DATA FirstThunk, PHOOKAPIEX
HookApi, PLDR_DA
 {
     ULONG OldProtection = 0;
     PVOID Ptr;
-    ULONG Size;
+    SIZE_T Size;
     NTSTATUS Status;
 
     SHIMENG_INFO("Hooking API \"%s!%s\" for DLL \"%wZ\"\n",
HookApi->LibraryName, HookApi->FunctionName, &LdrEntry->BaseDllName);