Move OS detection to common and PowerToysInterop (#5120)

* Remove os-detection project * Removed os-detection project from sln * Added os-detection to PowerToysInterop * Removed references to os-detection and added PowerToysInterop.dll to the ImageResizer folder
2026-04-05 10:46:33 +02:00 · 2020-07-21 12:01:59 -07:00
parent b31d9761fa
commit d01b93ae5f
23 changed files with 37 additions and 274 deletions
--- a/src/common/common-md-flag/common-md-flag.vcxproj
+++ b/src/common/common-md-flag/common-md-flag.vcxproj
@@ -93,6 +93,7 @@
    <ClInclude Include="..\common.h" />
    <ClInclude Include="..\keyboard_layout.h" />
    <ClInclude Include="..\keyboard_layout_impl.h" />
+    <ClInclude Include="..\os-detect.h" />
    <ClInclude Include="..\pch.h" />
    <ClInclude Include="..\two_way_pipe_message_ipc.h" />
    <ClInclude Include="..\two_way_pipe_message_ipc_impl.h" />
@@ -100,6 +101,7 @@
  <ItemGroup>
    <ClCompile Include="..\common.cpp" />
    <ClCompile Include="..\keyboard_layout.cpp" />
+    <ClCompile Include="..\os-detect.cpp" />
    <ClCompile Include="..\pch.cpp">
      <PrecompiledHeader Condition="'$(CIBuild)'!='true'">Create</PrecompiledHeader>
    </ClCompile>
--- a/src/common/common-md-flag/common-md-flag.vcxproj.filters
+++ b/src/common/common-md-flag/common-md-flag.vcxproj.filters
@@ -33,6 +33,9 @@
    <ClInclude Include="..\pch.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="..\os-detect.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\keyboard_layout.cpp">
@@ -47,6 +50,9 @@
    <ClCompile Include="..\pch.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="..\os-detect.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <None Include="packages.config" />
--- a/src/common/common.vcxproj
+++ b/src/common/common.vcxproj
@@ -126,7 +126,7 @@
    <ClInclude Include="keyboard_layout.h" />
    <ClInclude Include="keyboard_layout_impl.h" />
    <ClInclude Include="notifications.h" />
-    <ClInclude Include="os-detection\os-detect.h" />
+    <ClInclude Include="os-detect.h" />
    <ClInclude Include="RestartManagement.h" />
    <ClInclude Include="shared_constants.h" />
    <ClInclude Include="timeutil.h" />
@@ -161,7 +161,7 @@
    <ClCompile Include="monitors.cpp" />
    <ClCompile Include="notifications.cpp" />
    <ClCompile Include="on_thread_executor.cpp" />
-    <ClCompile Include="os-detection\os-detect.cpp" />
+    <ClCompile Include="os-detect.cpp" />
    <ClCompile Include="pch.cpp">
      <PrecompiledHeader Condition="'$(CIBuild)'!='true'">Create</PrecompiledHeader>
    </ClCompile>
--- a/src/common/common.vcxproj.filters
+++ b/src/common/common.vcxproj.filters
@@ -111,7 +111,7 @@
    <ClInclude Include="two_way_pipe_message_ipc.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="os-detection\os-detect.h">
+    <ClInclude Include="os-detect.h">
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="RestartManagement.h">
@@ -189,7 +189,7 @@
    <ClCompile Include="two_way_pipe_message_ipc.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="os-detection\os-detect.cpp">
+    <ClCompile Include="os-detect.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="RestartManagement.cpp">
--- a/src/common/interop/interop.h
+++ b/src/common/interop/interop.h
@@ -7,6 +7,7 @@
 #include "..\two_way_pipe_message_ipc.h"
 #include "..\common.h"
 #include "..\shared_constants.h"
+#include "..\os-detect.h"

 using namespace System;
 using namespace System::Runtime::InteropServices;
@@ -113,7 +114,12 @@ public
        static String^ GetProductVersion() 
        {
            return gcnew String(get_product_version().c_str());
-        } 
+        }
+
+        static bool ShouldNewSettingsBeUsed()
+        {
+            return UseNewSettings();
+        }
    };

    public
--- a/src/common/os-detection/os-detect.cpp
+++ b/src/common/os-detection/os-detect.cpp
--- a/src/common/os-detect.h
+++ b/src/common/os-detect.h
@@ -0,0 +1,3 @@
+#pragma once
+
+bool UseNewSettings();
--- a/src/common/os-detection/dllmain.cpp
+++ b/src/common/os-detection/dllmain.cpp
@@ -1,19 +0,0 @@
-// dllmain.cpp : Defines the entry point for the DLL application.
-#include "pch.h"
-
-BOOL APIENTRY DllMain( HMODULE hModule,
-                       DWORD  ul_reason_for_call,
-                       LPVOID lpReserved
-                     )
-{
-    switch (ul_reason_for_call)
-    {
-    case DLL_PROCESS_ATTACH:
-    case DLL_THREAD_ATTACH:
-    case DLL_THREAD_DETACH:
-    case DLL_PROCESS_DETACH:
-        break;
-    }
-    return TRUE;
-}
-
--- a/src/common/os-detection/framework.h
+++ b/src/common/os-detection/framework.h
@@ -1,5 +0,0 @@
-#pragma once
-
-#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
-// Windows Header Files
-#include <windows.h>
--- a/src/common/os-detection/os-detect.h
+++ b/src/common/os-detection/os-detect.h
@@ -1,3 +0,0 @@
-#pragma once
-
-extern "C" __declspec(dllexport) bool UseNewSettings();
--- a/src/common/os-detection/os-detection.rc
+++ b/src/common/os-detection/os-detection.rc
@@ -1,36 +0,0 @@
-#include <windows.h>
-#include "resource.h"
-#include "../version.h"
-
-1 VERSIONINFO
-FILEVERSION FILE_VERSION
-PRODUCTVERSION PRODUCT_VERSION
-FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
-FILEFLAGS VS_FF_DEBUG
-#else
-FILEFLAGS 0x0L
-#endif
-FILEOS VOS_NT_WINDOWS32
-FILETYPE VFT_DLL
-FILESUBTYPE VFT2_UNKNOWN 
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset
-        BEGIN
-            VALUE "CompanyName", COMPANY_NAME
-            VALUE "FileDescription", FILE_DESCRIPTION
-            VALUE "FileVersion", FILE_VERSION_STRING
-            VALUE "InternalName", INTERNAL_NAME
-            VALUE "LegalCopyright", COPYRIGHT_NOTE
-            VALUE "OriginalFilename", ORIGINAL_FILENAME
-            VALUE "ProductName", PRODUCT_NAME
-            VALUE "ProductVersion", PRODUCT_VERSION_STRING
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset
-    END
-END
--- a/src/common/os-detection/os-detection.vcxproj
+++ b/src/common/os-detection/os-detection.vcxproj
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <ProjectGuid>{E6410BFC-B341-498C-8C67-312C20CDD8D5}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>osdetection</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <SpectreMitigation>Spectre</SpectreMitigation>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <SpectreMitigation>Spectre</SpectreMitigation>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;OSDETECTION_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>false</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableUAC>false</EnableUAC>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;OSDETECTION_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>false</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableUAC>false</EnableUAC>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(CIBuild)'!='true'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="framework.h" />
-    <ClInclude Include="os-detect.h" />
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="resource.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="dllmain.cpp" />
-    <ClCompile Include="os-detect.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(CIBuild)'!='true'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="os-detection.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
--- a/src/common/os-detection/os-detection.vcxproj.filters
+++ b/src/common/os-detection/os-detection.vcxproj.filters
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;c++;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="framework.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="pch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="os-detect.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="dllmain.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="os-detect.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="os-detection.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
--- a/src/common/os-detection/pch.cpp
+++ b/src/common/os-detection/pch.cpp
@@ -1,6 +0,0 @@
-// pch.cpp: source file corresponding to the pre-compiled header
-
-#include "pch.h"
-#pragma comment(lib, "windowsapp")
-
-// When you are using pre-compiled headers, this source file is necessary for compilation to succeed.
--- a/src/common/os-detection/pch.h
+++ b/src/common/os-detection/pch.h
@@ -1,13 +0,0 @@
-// pch.h: This is a precompiled header file.
-// Files listed below are compiled only once, improving build performance for future builds.
-// This also affects IntelliSense performance, including code completion and many code browsing features.
-// However, files listed here are ALL re-compiled if any one of them is updated between builds.
-// Do not add files here that you will be updating frequently as this negates the performance advantage.
-
-#ifndef PCH_H
-#define PCH_H
-
-// add headers that you want to pre-compile here
-#include "framework.h"
-
-#endif //PCH_H
--- a/src/common/os-detection/resource.h
+++ b/src/common/os-detection/resource.h
@@ -1,13 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by os-detection.rc
-
-//////////////////////////////
-// Non-localizable
-
-#define FILE_DESCRIPTION "PowerToys OS Detection"
-#define INTERNAL_NAME "os-detection"
-#define ORIGINAL_FILENAME "os-detection.dll"
-
-// Non-localizable
-//////////////////////////////