From 654c258bedc11f2e136b9e789b0462a885d4a26b Mon Sep 17 00:00:00 2001
From: Rin <ry00001@protonmail.com>
Date: Sat, 9 Jul 2022 11:07:07 +0100
Subject: [PATCH] Wrap it in an extern C

---
 OpenBanapass/OpenBanapass.vcxproj |  5 ++--
 OpenBanapass/banapass.cpp         |  5 ++++
 OpenBanapass/banapass.h           | 49 +++++++++++++++++--------------
 3 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/OpenBanapass/OpenBanapass.vcxproj b/OpenBanapass/OpenBanapass.vcxproj
index 1af8058..4ff8a73 100644
--- a/OpenBanapass/OpenBanapass.vcxproj
+++ b/OpenBanapass/OpenBanapass.vcxproj
@@ -80,7 +80,7 @@
     <TargetName>OpenBanapass</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetName>OpenBanapass</TargetName>
+    <TargetName>bngrw</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -139,8 +139,9 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;OPENBANAPASS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <CallingConvention>FastCall</CallingConvention>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/OpenBanapass/banapass.cpp b/OpenBanapass/banapass.cpp
index d60686f..4ca7538 100644
--- a/OpenBanapass/banapass.cpp
+++ b/OpenBanapass/banapass.cpp
@@ -3,6 +3,9 @@
 
 #define BANA_API_VERSION "Ver 1.6.0"
 
+extern "C"
+{
+
 ULONGLONG BngRwAttach(UINT a1, char* a2, int a3, int a4, void* callback, long a6)
 {
 	log("BngRwAttach()\n");
@@ -161,4 +164,6 @@ int BngRwReqWaitTouch(UINT a, int b, UINT c, ULONGLONG d, ULONGLONG e)
 {
 	log("BngRwReqWaitTouch()\n");
 	return GetAsyncKeyState(VK_RETURN) ? 0 : -1;
+}
+
 }
\ No newline at end of file
diff --git a/OpenBanapass/banapass.h b/OpenBanapass/banapass.h
index 9763b3d..6bdebb7 100644
--- a/OpenBanapass/banapass.h
+++ b/OpenBanapass/banapass.h
@@ -4,25 +4,30 @@
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 
-BANA_API ULONGLONG BngRwAttach(UINT, char*, int, int, void*, long);
-BANA_API int BngRwDevReset(UINT, ULONGLONG, ULONGLONG);
-BANA_API ULONGLONG BngRwExReadMifareAllBlock();
-BANA_API void BngRwFin();
-BANA_API UINT BngRwGetFwVersion(UINT);
-BANA_API UINT BngRwGetStationID(UINT);
-BANA_API UINT BngRwGetTotalRetryCount(UINT);
-BANA_API const char* BngRwGetVersion();
-BANA_API long BngRwInit();
-BANA_API ULONGLONG BngRwIsCmdExec(UINT);
-BANA_API int BngRwReqAction(UINT, UINT, ULONGLONG, ULONGLONG);
-BANA_API int BngRwReqAiccAuth(UINT, int, UINT, int*, ULONGLONG, ULONGLONG, ULONGLONG*);
-BANA_API int BngRwReqBeep(UINT, UINT, ULONGLONG, ULONGLONG);
-BANA_API int BngRwReqCancel(UINT);
-BANA_API int BngRwReqFwCleanup(UINT, ULONGLONG, ULONGLONG);
-BANA_API int BngRwReqFwVersionup(UINT, ULONGLONG, ULONGLONG, ULONGLONG);
-BANA_API int BngRwReqLatchID(UINT, ULONGLONG, ULONGLONG);
-BANA_API int BngRwReqLed(UINT, UINT, ULONGLONG, ULONGLONG);
-BANA_API int BngRwReqSendMailTo(UINT, int, UINT, int*, char*, char*, char*, char*, ULONGLONG, ULONGLONG);
-BANA_API int BngRwReqSendUrlTo(UINT, int, UINT, int*, char*, char*, ULONGLONG, ULONGLONG);
-BANA_API int BngRwReqWaitTouch(UINT, int, UINT, ULONGLONG, ULONGLONG);
-BANA_API ULONGLONG BngRwReqSetLedPower();
\ No newline at end of file
+extern "C"
+{
+
+	BANA_API ULONGLONG BngRwAttach(UINT, char*, int, int, void*, long);
+	BANA_API int BngRwDevReset(UINT, ULONGLONG, ULONGLONG);
+	BANA_API ULONGLONG BngRwExReadMifareAllBlock();
+	BANA_API void BngRwFin();
+	BANA_API UINT BngRwGetFwVersion(UINT);
+	BANA_API UINT BngRwGetStationID(UINT);
+	BANA_API UINT BngRwGetTotalRetryCount(UINT);
+	BANA_API const char* BngRwGetVersion();
+	BANA_API long BngRwInit();
+	BANA_API ULONGLONG BngRwIsCmdExec(UINT);
+	BANA_API int BngRwReqAction(UINT, UINT, ULONGLONG, ULONGLONG);
+	BANA_API int BngRwReqAiccAuth(UINT, int, UINT, int*, ULONGLONG, ULONGLONG, ULONGLONG*);
+	BANA_API int BngRwReqBeep(UINT, UINT, ULONGLONG, ULONGLONG);
+	BANA_API int BngRwReqCancel(UINT);
+	BANA_API int BngRwReqFwCleanup(UINT, ULONGLONG, ULONGLONG);
+	BANA_API int BngRwReqFwVersionup(UINT, ULONGLONG, ULONGLONG, ULONGLONG);
+	BANA_API int BngRwReqLatchID(UINT, ULONGLONG, ULONGLONG);
+	BANA_API int BngRwReqLed(UINT, UINT, ULONGLONG, ULONGLONG);
+	BANA_API int BngRwReqSendMailTo(UINT, int, UINT, int*, char*, char*, char*, char*, ULONGLONG, ULONGLONG);
+	BANA_API int BngRwReqSendUrlTo(UINT, int, UINT, int*, char*, char*, ULONGLONG, ULONGLONG);
+	BANA_API int BngRwReqWaitTouch(UINT, int, UINT, ULONGLONG, ULONGLONG);
+	BANA_API ULONGLONG BngRwReqSetLedPower();
+
+}
\ No newline at end of file