Link tests directly with obj files of jN

sieukrem · Oct 13, 2024 · 4a6c296 · 4a6c296
1 parent 400289d
commit 4a6c296
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 47 deletions.
diff --git a/common/CallBack.cpp b/common/CallBack.cpp
@@ -20,13 +20,10 @@ size_t CallBack::Call(void* params){
 
 	SysFreeString(var[0].bstrVal);
 
-	VARTYPE type = VT_UI4;
+	VARTYPE type = (sizeof(size_t) > sizeof(DWORD))? VT_UI8 : VT_UI4;
 	HRESULT hr = VariantChangeType(&result, &result, 0, type);
 
-	DWORD dwResult = 0;
-	dwResult = result.uintVal;
-
-	return dwResult;
+	return (sizeof(size_t) > sizeof(DWORD)) ? result.llVal : result.lVal;
 }
 
 CallBack::~CallBack(){

diff --git a/common/CallBack.h b/common/CallBack.h
@@ -28,7 +28,7 @@ class CallBack :public CComDispatch<ICallBack>
 	CBP* Proc();
 
 	template<int NUM>
-	static size_t WINAPI CallBackProc(size_t r1, size_t r2,size_t r3,size_t r4,size_t stack1){
+	static size_t WINAPI CallBackProc(size_t r1, ...){
 #ifndef _M_X64
 		void* v_ebp = &r1;	// base pointer, points to actual parameters of called callback function
 
@@ -56,6 +56,9 @@ class CallBack :public CComDispatch<ICallBack>
 
 		return 0;
 #else
+		va_list vars;		// enforce the compiler to store
+		va_start(vars, r1); // integer registers on stack
+
 		void* v_ebp = &r1;	// base pointer, points to actual parameters of called callback function
 
 		CallBack* cb = *GetCallBack(NUM);

diff --git a/jN.sln b/jN.sln
@@ -6,6 +6,9 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jN", "jN.vcxproj", "{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "tests\tests.vcxproj", "{255FBEA7-0EEB-432C-A4DB-B88C9D0572F4}"
+	ProjectSection(ProjectDependencies) = postProject
+		{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D} = {1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -27,10 +30,10 @@ Global
 		{255FBEA7-0EEB-432C-A4DB-B88C9D0572F4}.Debug|Win32.Build.0 = Debug|Win32
 		{255FBEA7-0EEB-432C-A4DB-B88C9D0572F4}.Debug|x64.ActiveCfg = Debug|x64
 		{255FBEA7-0EEB-432C-A4DB-B88C9D0572F4}.Debug|x64.Build.0 = Debug|x64
-		{255FBEA7-0EEB-432C-A4DB-B88C9D0572F4}.Release|Win32.ActiveCfg = Debug|Win32
-		{255FBEA7-0EEB-432C-A4DB-B88C9D0572F4}.Release|Win32.Build.0 = Debug|Win32
-		{255FBEA7-0EEB-432C-A4DB-B88C9D0572F4}.Release|x64.ActiveCfg = Debug|x64
-		{255FBEA7-0EEB-432C-A4DB-B88C9D0572F4}.Release|x64.Build.0 = Debug|x64
+		{255FBEA7-0EEB-432C-A4DB-B88C9D0572F4}.Release|Win32.ActiveCfg = Release|Win32
+		{255FBEA7-0EEB-432C-A4DB-B88C9D0572F4}.Release|Win32.Build.0 = Release|Win32
+		{255FBEA7-0EEB-432C-A4DB-B88C9D0572F4}.Release|x64.ActiveCfg = Release|x64
+		{255FBEA7-0EEB-432C-A4DB-B88C9D0572F4}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/jN.vcxproj b/jN.vcxproj
@@ -74,7 +74,7 @@
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <AdditionalIncludeDirectories>.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;NPPPLUGINTEMPLATE_EXPORTS;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
       <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
@@ -112,7 +112,7 @@
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <AdditionalIncludeDirectories>.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;NPPPLUGINTEMPLATE_EXPORTS;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -149,9 +149,8 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NPPPLUGINTEMPLATE_EXPORTS;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader />
       <PrecompiledHeaderFile />
       <WarningLevel>Level3</WarningLevel>
@@ -185,9 +184,8 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NPPPLUGINTEMPLATE_EXPORTS;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <PrecompiledHeaderFile>

diff --git a/tests/CallBackTests.cpp b/tests/CallBackTests.cpp
@@ -54,8 +54,11 @@ class TestCfg : public IDispatchEx{
     virtual HRESULT __stdcall InvokeEx(DISPID id, LCID lcid, WORD wFlags, DISPPARAMS* pdp, VARIANT* pvarRes, EXCEPINFO* pei, IServiceProvider* pspCaller) override
     {
         Stack = pdp->rgvarg[1].bstrVal;
-        pvarRes->uintVal = Result;
 
+
+        pvarRes->vt = VT_UI4;
+        pvarRes->lVal = Result;
+
         return S_OK;
     }
     virtual HRESULT __stdcall DeleteMemberByName(BSTR bstrName, DWORD grfdex) override
@@ -106,7 +109,10 @@ TEST(CallBackTests, With_parameter_has_corresponding_stack_len_and_result) {
 
   EXPECT_EQ(SysStringByteLen(cfg.Stack), 2*(sizeof(size_t)));
   EXPECT_EQ(result, cfg.Result);
-  EXPECT_EQ((int)(((size_t*)cfg.Stack)[0]), 123);
-  EXPECT_EQ((int)(((size_t*)cfg.Stack)[1]), 456);
+
+  auto stack = (size_t*)cfg.Stack;
+
+  EXPECT_EQ(*(int*)stack, 123);
+  EXPECT_EQ(*(int*)(stack+1), 456);
 }
 }
diff --git a/tests/tests.vcxproj b/tests/tests.vcxproj
@@ -34,10 +34,6 @@
   <PropertyGroup Label="UserMacros" />
   <ItemGroup>
     <ClCompile Include="*Tests.cpp" />
-    <ClCompile Include="../common/**/*.cpp" />
-    <MASM Include="../common\x64Dispatcher.asm">
-      <ExcludedFromBuild Condition="'$(Platform)'=='Win32'">true</ExcludedFromBuild>
-    </MASM>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
@@ -56,15 +52,16 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <Optimization>Disabled</Optimization>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary Condition="'$(Configuration)'=='Debug'">MultiThreadedDebugDLL</RuntimeLibrary>
       <RuntimeLibrary Condition="'$(Configuration)'=='Release'">MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
-      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(Platform)'=='Win32'">$(MSBuildProjectDirectory)\..\$(Configuration)\*.obj;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(Platform)'=='x64'">$(MSBuildProjectDirectory)\..\x64\$(Configuration)\*.obj;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

diff --git a/tests/tests.vcxproj.filters b/tests/tests.vcxproj.filters