From 143bb2a5dbf2d4f726865996ffff376549af310e Mon Sep 17 00:00:00 2001
From: Connor Rigby <connorr@hey.com>
Date: Sat, 5 Nov 2022 14:33:10 -0700
Subject: [PATCH] build: windows: set exe file details

Signed-off-by: Connor Rigby <connorr@hey.com>
---
 conescan.db              | Bin 16384 -> 16384 bytes
 conescan.vcxproj         |   3 +-
 conescan.vcxproj.filters |   9 ++--
 src/conescan.cpp         |   6 +++
 windows/conescan.aps     | Bin 0 -> 2276 bytes
 windows/conescan.rc      | 100 +++++++++++++++++++++++++++++++++++++++
 windows/resource.h       |  14 ++++++
 7 files changed, 128 insertions(+), 4 deletions(-)
 create mode 100644 windows/conescan.aps
 create mode 100644 windows/conescan.rc
 create mode 100644 windows/resource.h

diff --git a/conescan.db b/conescan.db
index 2c0c6c357fd91c00fee6dec902792b086940a085..ce58e72aee5a4aac97013c3f277254671e83d2fd 100644
GIT binary patch
delta 44
zcmZo@U~Fh$+`wkQBFexhy0MX)k$r9kBMZas(9Lp&S9#bC4UKdRO-(lcu;pL^00Vvt
AtpET3

delta 42
ycmZo@U~Fh$+`wkQBF?}lzOj*)k$r9&BMZasz|As-S9w^CO?1r7Hvh2YU;+T{lnYM)

diff --git a/conescan.vcxproj b/conescan.vcxproj
index 9e4774d..171e2b2 100644
--- a/conescan.vcxproj
+++ b/conescan.vcxproj
@@ -186,9 +186,10 @@ xcopy /y "$(ProjectDir)conescan.db" "$(OutDir)"</Command>
     <ClInclude Include="lib\rx8-ecu-dump\src\OBD2.h" />
     <ClInclude Include="lib\rx8-ecu-dump\src\UDS.h" />
     <ClInclude Include="lib\rx8-ecu-dump\src\util.h" />
+    <ClInclude Include="windows\resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include=".gitignore" />
+    <ResourceCompile Include="windows\conescan.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/conescan.vcxproj.filters b/conescan.vcxproj.filters
index 3365a3d..e123a4f 100644
--- a/conescan.vcxproj.filters
+++ b/conescan.vcxproj.filters
@@ -158,10 +158,13 @@
     <ClInclude Include="lib\rx8-ecu-dump\lib\getopt\getopt.h">
       <Filter>Header Files\optarg</Filter>
     </ClInclude>
+    <ClInclude Include="windows\resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include=".gitignore">
-      <Filter>Source Files</Filter>
-    </None>
+    <ResourceCompile Include="windows\conescan.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/conescan.cpp b/src/conescan.cpp
index 5c2304c..3b155fc 100644
--- a/src/conescan.cpp
+++ b/src/conescan.cpp
@@ -855,12 +855,18 @@ void ConeScan::Cleanup()
   conescan_db_save_layout(&db, layoutID, iniData);
 
   conescan_db_close(&db);
+  if (j2534.valid()) {
+      j2534.PassThruClose(devID);
+      j2534.PassThruDisconnect(chanID);
+  }
 }
 
 size_t j2534Initialize()
 {
     console.AddLog("initializing J2534\n");
+#ifdef DEBUG
     j2534.debug(true);
+#endif
     if (!j2534.init()) {
         console.AddLog("failed to connect to J2534 DLL.");
         return 1;
diff --git a/windows/conescan.aps b/windows/conescan.aps
new file mode 100644
index 0000000000000000000000000000000000000000..62197551e89fbc775513fbe1d43a82f77e7016d8
GIT binary patch
literal 2276
zcmbtV%TCl#82&2b1(n3OaN(+47O-G4gCjv=BG?Xb;xHw16O$%&C>03MlIcvqcW~*}
zcW~*(y}I@Vh!5b_mG%2ir_&Ay#(0`@>3{zF?Erwz8Ab8rab&FUZ-(<3Uf?PBDAKsf
z7|+E!(7O&8%XTaDx}m)v_<mrUUbx>2j_mHqlI^*D+YNj#bUVI%yytHR$Keo=@4C1}
zMkUTB%Gl&uK@A3~Xu%{Tm08Hh?0R9)@48-o7r6IV`YXf$vh>q?zI)K$_Vg)gL}vNj
zsfnA!8RNWM7r_|il@RKLN70?3kFxSGCS2QSz~Nd(ou>*cTIwi!*LarkDfi<SkoY*=
zpQu|P$1i~nKzK#-H1g}Ai#_<*!5a4ic;xKkH3A|&RyYOPR=^|961KPki}b!mZwENU
z5jw<wL!CPO^AvlRH$KmK$Z4CWP{DmnlP-~CD!8lUA5o7zMJ0$9xq9TFlP*A?7%u;H
zdca_Ob?j1>i~WJ#I_37Mxp0{08t^+%@(Q?-k=G`VE;*)h3e-?$QSHDoCWtTg_Y|&A
zIR_cb61zf57pwEcI^mSDO}#YcpGQv$m3Zffei85PP~#qP&ck%f5;{lP1!}UuPghtz
zxd)`x8FQiEA}6qxL_cf5Q=%r45`W5H9D&R9T);SaY><aUrcX<H84F__C3cO0jbd9#
z`EiuytT)g4(j=Y6tnE-zqG6g@(jTN1G<hqY3~5J)nxwHA&wa?95@WQFd?qBWqqsVO
zNd=iirnWV}S>0$jwen`ush1m8t8SE?_G-0NMzK(&12Xr9wZ6VuGY8kDLV*aZ>6C$C
z)tYsyI;7`4drx}bc)4Cq$c6juRHvj%&=Fd@;k3*3M#ZW*mD-xcoVyFHVj51Px!SB4
zn4K@qF?}^<kF4L>TnFPmEgJR17j+}OBJo2s7~?sEd2F*zLPk;Y-DagoJxWH|?2b~6
z`}DQsr%j9#EOGZ3?>_glxntv)QSq580Z+oMt2m@}nP+xO4~s`4KhBmN72iYX!yE{C
zo>ejznfEqdh%9#<&-vd|a*C`7TUDdW?C7gLV$*MFro}xeu3noMhs2MyjdhGQ1Kv}=
zQU85C=f5VCrBXAhEt5&2Zf9sy7P|09=z}4&xJbgYVg8>d?je<qBAJv?J(mM<<g+=j
zLOhf6vUgYB&5xY_@@~po`SVhmR2QPDAupauoiCPi{!NsJbeA+2y@#jd`8JoeFYO1h
aR6uIw-PJ5kS}O^T<iodXS)4Q<5}e<*8I6Ac

literal 0
HcmV?d00001

diff --git a/windows/conescan.rc b/windows/conescan.rc
new file mode 100644
index 0000000..04ed39a
--- /dev/null
+++ b/windows/conescan.rc
@@ -0,0 +1,100 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United States) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""winres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 0,0,1,0
+ PRODUCTVERSION 0,0,1,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "cone.codes"
+            VALUE "FileDescription", "Open source ECU hacking multi-tool"
+            VALUE "FileVersion", "0.0.1.0"
+            VALUE "InternalName", "conescan.exe"
+            VALUE "LegalCopyright", "Copyright (C) 2022 Connor Rigby"
+            VALUE "OriginalFilename", "conescan.exe"
+            VALUE "ProductName", "ConeScan"
+            VALUE "ProductVersion", "0.0.1.0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // English (United States) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/windows/resource.h b/windows/resource.h
new file mode 100644
index 0000000..d0cbfcb
--- /dev/null
+++ b/windows/resource.h
@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by conescan.rc
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif