Switch diablo.cpp to upstream

CMakeLists.txt

@@ -43,7 +43,7 @@ set(SOURCES
     Source/cursor.cpp
     Source/dead.cpp
     Source/debug.cpp
-#   Source/diablo.cpp
+    Source/diablo.cpp
     Source/doom.cpp
     Source/drlg_l1.cpp
     Source/drlg_l2.cpp
@@ -112,7 +112,6 @@ set(ORIGINAL_SOURCES
     Source/nthread.cpp
     Source/restrict.cpp
     Source/sound.cpp
-    Source/diablo.cpp
 )
 
 set(STUB_SOURCES
@@ -135,7 +134,6 @@ set(STUB_SOURCES
     Stub/storm_net.cpp
     Stub/validate.cpp
     Stub/sdlrender.cpp
-    Stub/diablo.cpp
     Stub/gamemenu.cpp
 
     3rdParty/StormLib/src/FileStream.cpp

Source/diablo.cpp

@@ -64,6 +64,8 @@ char *spszMsgTbl[4] = {
 };                                                      // weak
 char *spszMsgKeyTbl[4] = { "F9", "F10", "F11", "F12" }; // weak
 
+bool CUSTOM_SDL_KEY_LSHIFT;
+
 void __cdecl FreeGameMem()
 {
 	void *p;

Stub/miniwin.cpp

@@ -108,7 +108,7 @@ HFILE WINAPI OpenFile(LPCSTR lpFileName, LPOFSTRUCT lpReOpenBuff, UINT uStyle)
 
 VOID WINAPI InitializeCriticalSection(LPCRITICAL_SECTION lpCriticalSection)
 {
-	UNIMPLEMENTED();
+	DUMMY();
 }
 
 VOID WINAPI EnterCriticalSection(LPCRITICAL_SECTION lpCriticalSection)
@@ -123,7 +123,7 @@ VOID WINAPI LeaveCriticalSection(LPCRITICAL_SECTION lpCriticalSection)
 
 VOID WINAPI DeleteCriticalSection(LPCRITICAL_SECTION lpCriticalSection)
 {
-	UNIMPLEMENTED();
+	DUMMY();
 }
 
 DWORD WINAPI WaitForSingleObject(HANDLE hHandle, DWORD dwMilliseconds)

Stub/miniwin.h

@@ -556,6 +556,9 @@ HFILE WINAPI OpenFile(LPCSTR lpFileName, LPOFSTRUCT lpReOpenBuff, UINT uStyle);
 //#define VK_OEM_8 0xDF
 //#define VK_OEM_102 0xE2
 
+#define MK_SHIFT 0x0004
+#define MK_LBUTTON 0x0001
+
 //
 // Total fakes
 //

Stub/storm.cpp

@@ -367,3 +367,8 @@ int __stdcall SNetGetProviderCaps(struct _SNETCAPS *)
 {
 	UNIMPLEMENTED();
 }
+
+BOOL __stdcall SFileEnableDirectAccess(BOOL enable)
+{
+	DUMMY();
+}