Changeset 11115

Timestamp:

Feb 14, 2016, 6:08:13 PM (9 years ago)

Author:

landauf

Message:

fixed code to compile in 64bit mode

Location:

code/trunk/src

Files:

• external/bullet/LinearMath/btAlignedAllocator.cpp (modified) (1 diff)
• external/bullet/LinearMath/btSerializer.h (modified) (2 diffs)
• libraries/core/Core.cc (modified) (1 diff)
• libraries/core/GraphicsManager.cc (modified) (1 diff)
• libraries/util/SignalHandler.cc (modified) (2 diffs)
• libraries/util/SignalHandler.h (modified) (1 diff)
• modules/overlays/GUIOverlay.cc (modified) (1 diff)

code/trunk/src/external/bullet/LinearMath/btAlignedAllocator.cpp

@@ -67 +67 @@
   real = (char *)sAllocFunc(size + sizeof(void *) + (alignment-1));
   if (real) {
-    offset = (alignment - (unsigned long)(real + sizeof(void *))) & (alignment-1);
+    offset = (alignment - (unsigned long long)(real + sizeof(void *))) & (alignment-1);
     ret = (void *)((real + sizeof(void *)) + offset);
     *((void **)(ret)-1) = (void *)(real);

code/trunk/src/external/bullet/LinearMath/btSerializer.h

@@ -248 +248 @@
                         }
                         {
-                                nr= (long)cp;
+                                nr= (long long)cp;
                         //      long mask=3;
                                 nr= ((nr+3)&~3)-nr;
@@ -283 +283 @@
 
                 {
-                                nr= (long)cp;
+                                nr= (long long)cp;
                         //      long mask=3;
                                 nr= ((nr+3)&~3)-nr;

code/trunk/src/libraries/core/Core.cc

@@ -433 +433 @@
         unsigned int coreNr = limitToCPU - 1;
         // Get the current process core mask
-        DWORD procMask;
-        DWORD sysMask;
+        ULONG_PTR procMask;
+        ULONG_PTR sysMask;
 #  if _MSC_VER >= 1400 && defined (_M_X64)
         GetProcessAffinityMask(GetCurrentProcess(), (PDWORD_PTR)&procMask, (PDWORD_PTR)&sysMask);

code/trunk/src/libraries/core/GraphicsManager.cc

@@ -320 +320 @@
         HWND hwnd;
         this->renderWindow_->getCustomAttribute("WINDOW", (void*)&hwnd);
-        LONG iconID = (LONG)LoadIcon(GetModuleHandle(nullptr), MAKEINTRESOURCE(101));
-        SetClassLong(hwnd, GCL_HICON, iconID);
+        LONG_PTR iconID = (LONG_PTR)LoadIcon(GetModuleHandle(nullptr), MAKEINTRESOURCE(101));
+        SetClassLongPtr(hwnd, GCLP_HICON, iconID);
 #endif
 

code/trunk/src/libraries/util/SignalHandler.cc

@@ -722 +722 @@
         // Now print information about where the fault occured
         output += " at location " + SignalHandler::pointerToString(pExceptionRecord->ExceptionAddress);
-        if ((hModule = (HMODULE) SignalHandler::getModuleBase((DWORD) pExceptionRecord->ExceptionAddress)) && GetModuleFileName(hModule, szModule, MAX_PATH))
+        if ((hModule = (HMODULE) SignalHandler::getModuleBase(pExceptionRecord->ExceptionAddress)) && GetModuleFileName(hModule, szModule, MAX_PATH))
         {
             output += " in module ";
@@ -748 +748 @@
     /// Retrieves the base address of the module that contains the specified address.
     // Code from Dr. Mingw by Jos\E9 Fonseca
-    /* static */ DWORD SignalHandler::getModuleBase(DWORD dwAddress)
+    /* static */ PVOID SignalHandler::getModuleBase(LPCVOID dwAddress)
     {
         MEMORY_BASIC_INFORMATION Buffer;
 
-        return VirtualQuery((LPCVOID) dwAddress, &Buffer, sizeof(Buffer)) ? (DWORD) Buffer.AllocationBase : 0;
+        return VirtualQuery(dwAddress, &Buffer, sizeof(Buffer)) ? Buffer.AllocationBase : 0;
     }
 

code/trunk/src/libraries/util/SignalHandler.h

@@ -120 +120 @@
 
             static std::string getModuleName(const std::string& path);
-            static DWORD getModuleBase(DWORD dwAddress);
+            static PVOID getModuleBase(LPCVOID dwAddress);
 
             template <typename T>

code/trunk/src/modules/overlays/GUIOverlay.cc

@@ -73 +73 @@
         if (this->isVisible())
         {
-            const std::string& str = multi_cast<std::string>(reinterpret_cast<long>(this));
+            const std::string& str = multi_cast<std::string>(reinterpret_cast<long long>(this));
             GUIManager::getInstance().showGUIExtra(this->guiName_, str);