Moved the rest of direct draw into library

eric-914 · Feb 23, 2021 · 7832e17 · 7832e17
1 parent 8318ed6
commit 7832e17
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 57 deletions.
diff --git a/FullScreenToggle.c b/FullScreenToggle.c
diff --git a/FullScreenToggle.h b/FullScreenToggle.h
diff --git a/InitBasicWindowInstance.c b/InitBasicWindowInstance.c
diff --git a/InitBasicWindowInstance.h b/InitBasicWindowInstance.h
diff --git a/Vcc.vcxproj b/Vcc.vcxproj
@@ -168,8 +168,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="EmuLoop.c" />
-    <ClCompile Include="FullScreenToggle.c" />
-    <ClCompile Include="InitBasicWindowInstance.c" />
     <ClCompile Include="main.c" />
   </ItemGroup>
   <ItemGroup>
@@ -178,8 +176,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="EmuLoop.h" />
-    <ClInclude Include="FullScreenToggle.h" />
-    <ClInclude Include="InitBasicWindowInstance.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="fd502\fd502.vcxproj">

diff --git a/library/DirectDraw.c b/library/DirectDraw.c
@@ -8,6 +8,9 @@
 #include "DirectDraw.h"
 #include "Throttle.h"
 #include "Config.h"
+#include "PAKInterface.h"
+#include "VCC.h"
+#include "Graphics.h"
 
 #include "systemstate.h"
 
@@ -754,4 +757,42 @@ extern "C" {
 
     return TRUE;
   }
-}
+}
+
+extern "C" {
+  __declspec(dllexport) BOOL __cdecl InitInstance(HINSTANCE hInstance, HINSTANCE hResources, int nCmdShow)
+  {
+    DirectDrawState* ddState = GetDirectDrawState();
+
+    ddState->hInstance = hInstance;
+    ddState->CmdShow = nCmdShow;
+
+    LoadString(hResources, IDS_APP_TITLE, ddState->TitleBarText, MAX_LOADSTRING);
+    LoadString(hResources, IDS_APP_TITLE, ddState->AppNameText, MAX_LOADSTRING);
+
+    return TRUE;
+  }
+}
+
+extern "C" {
+  __declspec(dllexport) void __cdecl FullScreenToggle(WNDPROC WndProc)
+  {
+    VccState* vccState = GetVccState();
+
+    PauseAudio(true);
+
+    if (!CreateDirectDrawWindow(&(vccState->EmuState), WndProc))
+    {
+      MessageBox(0, "Can't rebuild primary Window", "Error", 0);
+
+      exit(0);
+    }
+
+    InvalidateBorder();
+    RefreshDynamicMenu(&(vccState->EmuState));
+
+    vccState->EmuState.ConfigDialog = NULL;
+
+    PauseAudio(false);
+  }
+}
diff --git a/library/DirectDraw.h b/library/DirectDraw.h
@@ -50,3 +50,5 @@ extern "C" __declspec(dllexport) void __cdecl DoCls(SystemState* systemState);
 extern "C" __declspec(dllexport) float __cdecl Static(SystemState* systemState);
 
 extern "C" __declspec(dllexport) bool __cdecl CreateDirectDrawWindow(SystemState* systemState, WNDPROC WndProc);
+extern "C" __declspec(dllexport) BOOL __cdecl InitInstance(HINSTANCE hInstance, HINSTANCE hResources, int nCmdShow);
+extern "C" __declspec(dllexport) void __cdecl FullScreenToggle(WNDPROC WndProc);
diff --git a/main.c b/main.c
@@ -20,8 +20,6 @@
 #include "library/Callbacks.h"
 
 #include "EmuLoop.h"
-#include "FullScreenToggle.h"
-#include "InitBasicWindowInstance.h"
 
 LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);