Cleanup Windows shell extensions

Signed-off-by: Michael Schuster <michael@schuster.ms>
2024-11-22 04:55:48 +03:00 · 2020-08-17 20:35:39 +02:00 · 2020-08-17 20:35:39 +02:00 · 34e9e2f288
commit 34e9e2f288
parent 6c9a31f6ee
29 changed files with 13 additions and 146 deletions
--- a/shell_integration/windows/OCContextMenu/CMakeLists.txt
+++ b/shell_integration/windows/OCContextMenu/CMakeLists.txt
@ -4,7 +4,6 @@ add_library(OCContextMenu MODULE
    OCContextMenu.cpp
    OCContextMenuFactory.cpp
    OCContextMenuRegHandler.cpp
-    stdafx.cpp
    OCContextMenu.rc
    OCContextMenu.def
 )
--- a/shell_integration/windows/OCContextMenu/OCClientInterface.cpp
+++ b/shell_integration/windows/OCContextMenu/OCClientInterface.cpp
@ -12,8 +12,6 @@
 * details.
 */

-#include "stdafx.h"
-
 #include "OCClientInterface.h"

 #include "CommunicationSocket.h"
--- a/shell_integration/windows/OCContextMenu/OCContextMenu.cpp
+++ b/shell_integration/windows/OCContextMenu/OCContextMenu.cpp
@ -12,8 +12,6 @@
 * details.
 */

-#include "stdafx.h"
-
 #include "OCContextMenu.h"
 #include "OCClientInterface.h"

@ -21,6 +19,7 @@
 #include <shlwapi.h>
 #include <shellapi.h>
 #include <StringUtil.h>
+#include <strsafe.h>

 extern long g_cDllRef;

--- a/shell_integration/windows/OCContextMenu/OCContextMenuFactory.cpp
+++ b/shell_integration/windows/OCContextMenu/OCContextMenuFactory.cpp
@ -12,8 +12,6 @@
 * details.
 */

-#include "stdafx.h"
-
 #include "OCContextMenuFactory.h"
 #include "OCContextMenu.h"
 #include <new>
--- a/shell_integration/windows/OCContextMenu/OCContextMenuRegHandler.cpp
+++ b/shell_integration/windows/OCContextMenu/OCContextMenuRegHandler.cpp
@ -12,8 +12,6 @@
 * details.
 */

-#include "stdafx.h"
-
 #include "OCContextMenuRegHandler.h"
 #include "RegDelnode.h"
 #include <strsafe.h>
--- a/shell_integration/windows/OCContextMenu/OCContextMenuRegHandler.h
+++ b/shell_integration/windows/OCContextMenu/OCContextMenuRegHandler.h
@ -18,7 +18,7 @@

 #pragma once

-#include "stdafx.h"
+#include <windows.h>

 class __declspec(dllexport) OCContextMenuRegHandler
 {
--- a/shell_integration/windows/OCContextMenu/dllmain.cpp
+++ b/shell_integration/windows/OCContextMenu/dllmain.cpp
@ -12,8 +12,6 @@
 * details.
 */

-#include "stdafx.h"
-
 #include <windows.h>
 #include <Guiddef.h>
 #include "OCContextMenuRegHandler.h"
--- a/shell_integration/windows/OCContextMenu/stdafx.cpp
+++ b/shell_integration/windows/OCContextMenu/stdafx.cpp
@ -1,8 +0,0 @@
-// stdafx.cpp : source file that includes just the standard includes
-// OCContextMenu.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
--- a/shell_integration/windows/OCContextMenu/stdafx.h
+++ b/shell_integration/windows/OCContextMenu/stdafx.h
@ -1,17 +0,0 @@
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
-
-#pragma once
-
-#include "targetver.h"
-
-#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
-// Windows Header Files:
-#include <windows.h>
-#include <memory>
-#include <strsafe.h>
-
-
-// TODO: reference additional headers your program requires here
--- a/shell_integration/windows/OCContextMenu/targetver.h
+++ b/shell_integration/windows/OCContextMenu/targetver.h
@ -1,12 +0,0 @@
-#pragma once
-
-// Including SDKDDKVer.h defines the highest available Windows platform.
-
-// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
-// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
-
-// Note: Here was a #define for windows target version
-// e.g. WINVER / _WIN32_WINNT, see https://devblogs.microsoft.com/oldnewthing/20070411-00/?p=27283
-// Unnecessary because we define both in desktop/CMakeLists.txt
-
-#include <SDKDDKVer.h>
--- a/shell_integration/windows/OCOverlays/CMakeLists.txt
+++ b/shell_integration/windows/OCOverlays/CMakeLists.txt
@ -3,7 +3,6 @@ add_library(OCOverlays MODULE
    OCOverlay.cpp
    OCOverlayFactory.cpp
    OCOverlayRegistrationHandler.cpp
-    stdafx.cpp
    OCOverlay.rc
    OCOverlays.def
 )
--- a/shell_integration/windows/OCOverlays/DllMain.cpp
+++ b/shell_integration/windows/OCOverlays/DllMain.cpp
@ -12,10 +12,9 @@
 * details.
 */

-#include "stdafx.h"
-
 #include "OCOverlayRegistrationHandler.h"
 #include "OCOverlayFactory.h"
+#include "OverlayConstants.h"

 HINSTANCE instanceHandle = nullptr;

--- a/shell_integration/windows/OCOverlays/OCOverlay.cpp
+++ b/shell_integration/windows/OCOverlays/OCOverlay.cpp
@ -12,8 +12,6 @@
 * details.
 */

-#include "stdafx.h"
-
 #include "OCOverlay.h"

 #include "OCOverlayFactory.h"
@ -23,8 +21,6 @@
 #include "UtilConstants.h"
 #include "RemotePathChecker.h"

-#include "resource.h"
-
 #include <algorithm>
 #include <iostream>
 #include <fstream>
--- a/shell_integration/windows/OCOverlays/OCOverlay.h
+++ b/shell_integration/windows/OCOverlays/OCOverlay.h
@ -17,6 +17,8 @@

 #pragma once

+#include <shlobj.h>
+
 class OCOverlay : public IShellIconOverlayIdentifier

 {
--- a/shell_integration/windows/OCOverlays/OCOverlayFactory.cpp
+++ b/shell_integration/windows/OCOverlays/OCOverlayFactory.cpp
@ -12,7 +12,8 @@
 * details.
 */

-#include "stdafx.h"
+#include <windows.h>
+#include <new>

 #include "OCOverlayFactory.h"
 #include "OCOverlay.h"
--- a/shell_integration/windows/OCOverlays/OCOverlayRegistrationHandler.cpp
+++ b/shell_integration/windows/OCOverlays/OCOverlayRegistrationHandler.cpp
@ -12,10 +12,10 @@
 * details.
 */

-#include "stdafx.h"
-
 #include "OCOverlayRegistrationHandler.h"
+#include "OverlayConstants.h"

+#include <windows.h>
 #include <iostream>
 #include <fstream>

--- a/shell_integration/windows/OCOverlays/OCOverlayRegistrationHandler.h
+++ b/shell_integration/windows/OCOverlays/OCOverlayRegistrationHandler.h
@ -17,6 +17,8 @@

 #pragma once

+#include <windows.h>
+
 class __declspec(dllexport) OCOverlayRegistrationHandler 
 {
    public:
--- a/shell_integration/windows/OCOverlays/OverlayConstants.h.original
+++ b/shell_integration/windows/OCOverlays/OverlayConstants.h.original
@ -1,32 +0,0 @@
-/**
- * Copyright (c) 2000-2013 Liferay, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-#define	OVERLAY_ID					[$overlay.id$]
-#define OVERLAY_GUID				L"[$overlay.guid$]"
-#define OVERLAY_NAME				L"[$overlay.name$]"
-
-#define REGISTRY_OVERLAY_KEY		L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ShellIconOverlayIdentifiers"
-#define REGISTRY_CLSID				L"CLSID"
-#define REGISTRY_IN_PROCESS		L"InprocServer32"
-#define REGISTRY_THREADING		L"ThreadingModel"
-#define REGISTRY_APARTMENT		L"Apartment"
-#define REGISTRY_VERSION		L"Version"
-#define REGISTRY_VERSION_NUMBER		L"1.0"
-
-//Registry values for running
-#define REGISTRY_ENABLE_OVERLAY		L"EnableOverlay"
-
-#define GET_FILE_OVERLAY_ID		L"getFileIconId"
-
-#define PORT				33001
--- a/shell_integration/windows/OCOverlays/stdafx.cpp
+++ b/shell_integration/windows/OCOverlays/stdafx.cpp
@ -1 +0,0 @@
-#include "stdafx.h"
--- a/shell_integration/windows/OCOverlays/stdafx.h
+++ b/shell_integration/windows/OCOverlays/stdafx.h
@ -1,34 +0,0 @@
-/**
- *  Copyright (c) 2000-2013 Liferay, Inc. All rights reserved.
- *  
- *  This library is free software; you can redistribute it and/or modify it under
- *  the terms of the GNU Lesser General Public License as published by the Free
- *  Software Foundation; either version 2.1 of the License, or (at your option)
- *  any later version.
- *  
- *  This library is distributed in the hope that it will be useful, but WITHOUT
- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- *  FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- *  details.
- */
-
-#define WIN32_LEAN_AND_MEAN
-
-// Note: Here was a #define for windows target version
-// e.g. WINVER / _WIN32_WINNT, see https://devblogs.microsoft.com/oldnewthing/20070411-00/?p=27283
-// Unnecessary because we define both in desktop/CMakeLists.txt
-
-#include "CommunicationSocket.h"
-#include "RegistryUtil.h"
-#include "OverlayConstants.h"
-#include "FileUtil.h"
-
-#include <string>
-#include <new>
-#include <Guiddef.h>
-#include <windows.h>
-#include <Shlwapi.h>
-#include <shlobj.h>
-#include <unknwn.h> 
-#include <vector>
-#include <strsafe.h>
--- a/shell_integration/windows/OCUtil/CMakeLists.txt
+++ b/shell_integration/windows/OCUtil/CMakeLists.txt
@ -3,7 +3,6 @@ add_library(OCUtil STATIC
    FileUtil.cpp
    RegistryUtil.cpp
    RemotePathChecker.cpp
-    stdafx.cpp
    StringUtil.cpp
    OCUtil.rc
 )
--- a/shell_integration/windows/OCUtil/CommunicationSocket.cpp
+++ b/shell_integration/windows/OCUtil/CommunicationSocket.cpp
@ -12,8 +12,6 @@
 * details.
 */

-#include "stdafx.h"
-
 #include "CommunicationSocket.h"
 #include "UtilConstants.h"
 #include "StringUtil.h"
--- a/shell_integration/windows/OCUtil/FileUtil.cpp
+++ b/shell_integration/windows/OCUtil/FileUtil.cpp
@ -12,8 +12,6 @@
 * details.
 */

-#include "stdafx.h"
-
 #include "FileUtil.h"
 #include "RegistryUtil.h"
 #include "UtilConstants.h"
--- a/shell_integration/windows/OCUtil/RegistryUtil.cpp
+++ b/shell_integration/windows/OCUtil/RegistryUtil.cpp
@ -12,7 +12,7 @@
 * details.
 */

-#include "stdafx.h"
+#include <windows.h>

 #include "RegistryUtil.h"

--- a/shell_integration/windows/OCUtil/RemotePathChecker.cpp
+++ b/shell_integration/windows/OCUtil/RemotePathChecker.cpp
@ -11,8 +11,6 @@
 * details.
 */

-#include "stdafx.h"
-
 #include "CommunicationSocket.h"

 #include "RemotePathChecker.h"
--- a/shell_integration/windows/OCUtil/StringUtil.cpp
+++ b/shell_integration/windows/OCUtil/StringUtil.cpp
@ -11,8 +11,6 @@
 * details.
 */

-#include "stdafx.h"
-
 #include <locale>
 #include <string>
 #include <codecvt>
--- a/shell_integration/windows/OCUtil/StringUtil.h
+++ b/shell_integration/windows/OCUtil/StringUtil.h
@ -16,6 +16,7 @@

 #pragma once

+#include <windows.h>
 #include <string>
 #include <cassert>

--- a/shell_integration/windows/OCUtil/stdafx.cpp
+++ b/shell_integration/windows/OCUtil/stdafx.cpp
@ -1 +0,0 @@
-#include "stdafx.h"
--- a/shell_integration/windows/OCUtil/stdafx.h
+++ b/shell_integration/windows/OCUtil/stdafx.h
@ -1,9 +0,0 @@
-#pragma once
-
-#define WIN32_LEAN_AND_MEAN
-
-// Note: Here was a #define for windows target version
-// e.g. WINVER / _WIN32_WINNT, see https://devblogs.microsoft.com/oldnewthing/20070411-00/?p=27283
-// Unnecessary because we define both in desktop/CMakeLists.txt
-
-#include <windows.h>