Statically link undocumented shell32 functions (but better this time)

Author: aubymori

src/OpenWithEx.vcxproj

@@ -18,6 +18,24 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <ItemGroup Condition="'$(Platform)'=='Win32'">
+    <_DefToLib Include="defs\Win32\*.def" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(Platform)'!='Win32'">
+    <_DefToLib Include="defs\Win64\*.def" />
+  </ItemGroup>
+  <Target Name="_GenerateDefLib" BeforeTargets="Link" Inputs="@(_DefToLib)" Outputs="@(_DefToLib->'$(IntDir)%(Filename).lib')">
+    <Exec Command="lib /nologo /def:&quot;%(_DefToLib.Identity)&quot; /machine:$(PlatformTargetAsMSBuildArchitecture) /out:&quot;$(IntDir)%(Filename).lib&quot;" />
+  </Target>
+  <PropertyGroup>
+    <_GeneratedLibs>@(_DefToLib->'%(Filename).lib')</_GeneratedLibs>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <Link>
+      <AdditionalLibraryDirectories>$(IntDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>$(_GeneratedLibs);%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>17.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
@@ -396,6 +414,10 @@ del "$(IntermediateOutputPath)temp.res"</Command>
   <ItemGroup>
     <Xml Include="muiconfig.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="defs\Win32\shell32p.def" />
+    <None Include="defs\Win64\shell32p.def" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

src/OpenWithEx.vcxproj.filters

@@ -236,4 +236,12 @@
   <ItemGroup>
     <Xml Include="muiconfig.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="defs\Win32\shell32p.def">
+      <Filter>Source Files</Filter>
+    </None>
+    <None Include="defs\Win64\shell32p.def">
+      <Filter>Source Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>

src/defs/Win32/shell32p.def

@@ -0,0 +1,4 @@
+LIBRARY SHELL32
+EXPORTS
+	SHCreateAssocHandler@16        @765 NONAME
+	IsBlockedFromOpenWithBrowse@4  @779 NONAME

src/defs/Win64/shell32p.def

@@ -0,0 +1,4 @@
+LIBRARY SHELL32
+EXPORTS
+	SHCreateAssocHandler         @765 NONAME
+	IsBlockedFromOpenWithBrowse  @779 NONAME

src/openwithex.cpp

@@ -17,9 +17,6 @@ HMODULE         g_hInst     = nullptr;
 HMODULE         g_hShell32  = nullptr;
 OPENWITHEXSTYLE g_style     = OWXS_VISTA;
 
-SHCreateAssocHandler_t SHCreateAssocHandler = nullptr;
-IsBlockedFromOpenWithBrowse_t IsBlockedFromOpenWithBrowse = nullptr;
-
 WCHAR szPath[MAX_PATH] = { 0 };
 
 void OpenDownloadURL(LPCWSTR pszExtension)
@@ -141,25 +138,7 @@ int WINAPI wWinMain(
 			g_style = (OPENWITHEXSTYLE)dwValue;
 	}
 
-	/* Load undocumented functions */
 	g_hShell32 = GetModuleHandleW(L"shell32.dll");
-	SHCreateAssocHandler = (SHCreateAssocHandler_t)GetProcAddress(
-		g_hShell32,
-		(LPCSTR)765 // Ordinal number
-	);
-	IsBlockedFromOpenWithBrowse = (IsBlockedFromOpenWithBrowse_t)GetProcAddress(
-		g_hShell32,
-		(LPCSTR)779
-	);
-	if (!SHCreateAssocHandler || !IsBlockedFromOpenWithBrowse)
-	{
-		LocalizedMessageBox(
-			NULL,
-			IDS_ERR_UNDOC,
-			MB_ICONERROR
-		);
-		return -1;
-	}
 
 	/**
 	  * HACKHACK: Windows loves to pass the full executable path as the first

src/openwithex.h

@@ -40,11 +40,8 @@ enum IMMERSIVE_OPENWITH_FLAGS
 void OpenDownloadURL(LPCWSTR pszExtension);
 void ShowOpenWithDialog(HWND hWndParent, LPCWSTR lpszPath, IMMERSIVE_OPENWITH_FLAGS flags);
 
-typedef HRESULT (WINAPI *SHCreateAssocHandler_t)(UINT uFlags, LPCWSTR pszExt, LPCWSTR pszApp, IAssocHandler **ppah);
-extern SHCreateAssocHandler_t SHCreateAssocHandler;
-
-typedef bool (WINAPI *IsBlockedFromOpenWithBrowse_t)(LPCWSTR lpszPath);
-extern IsBlockedFromOpenWithBrowse_t IsBlockedFromOpenWithBrowse;
+EXTERN_C WINUSERAPI HRESULT WINAPI SHCreateAssocHandler(UINT uFlags, LPCWSTR pszExt, LPCWSTR pszApp, IAssocHandler **ppah);
+EXTERN_C WINUSERAPI bool WINAPI IsBlockedFromOpenWithBrowse(LPCWSTR lpszPath);
 
 DEFINE_GUID(CLSID_ExecuteUnknown, 0xE44E9428, 0xBDBC, 0x4987, 0xA0,0x99, 0x40,0xDC,0x8F,0xD2,0x55,0xE7);