зеркало из https://github.com/nextcloud/desktop.git
Cleanup Windows shell extensions
Signed-off-by: Michael Schuster <michael@schuster.ms>
This commit is contained in:
Hannah von Reth
Michael Schuster
Родитель
6c9a31f6ee
Коммит
34e9e2f288
|
|
@ -4,7 +4,6 @@ add_library(OCContextMenu MODULE
|
|||
OCContextMenu.cpp
|
||||
OCContextMenuFactory.cpp
|
||||
OCContextMenuRegHandler.cpp
|
||||
stdafx.cpp
|
||||
OCContextMenu.rc
|
||||
OCContextMenu.def
|
||||
)
|
||||
|
|
|
|||
|
|
@ -12,8 +12,6 @@
|
|||
* details.
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
|
||||
#include "OCClientInterface.h"
|
||||
|
||||
#include "CommunicationSocket.h"
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -12,8 +12,6 @@
|
|||
* details.
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
|
||||
#include "OCContextMenuFactory.h"
|
||||
#include "OCContextMenu.h"
|
||||
#include <new>
|
||||
|
|
|
|||
|
|
@ -12,8 +12,6 @@
|
|||
* details.
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
|
||||
#include "OCContextMenuRegHandler.h"
|
||||
#include "RegDelnode.h"
|
||||
#include <strsafe.h>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "stdafx.h"
|
||||
#include <windows.h>
|
||||
|
||||
class __declspec(dllexport) OCContextMenuRegHandler
|
||||
{
|
||||
|
|
|
|||
|
|
@ -12,8 +12,6 @@
|
|||
* details.
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
|
||||
#include <windows.h>
|
||||
#include <Guiddef.h>
|
||||
#include "OCContextMenuRegHandler.h"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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>
|
||||
|
|
@ -3,7 +3,6 @@ add_library(OCOverlays MODULE
|
|||
OCOverlay.cpp
|
||||
OCOverlayFactory.cpp
|
||||
OCOverlayRegistrationHandler.cpp
|
||||
stdafx.cpp
|
||||
OCOverlay.rc
|
||||
OCOverlays.def
|
||||
)
|
||||
|
|
|
|||
|
|
@ -12,10 +12,9 @@
|
|||
* details.
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
|
||||
#include "OCOverlayRegistrationHandler.h"
|
||||
#include "OCOverlayFactory.h"
|
||||
#include "OverlayConstants.h"
|
||||
|
||||
HINSTANCE instanceHandle = nullptr;
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -17,6 +17,8 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <shlobj.h>
|
||||
|
||||
class OCOverlay : public IShellIconOverlayIdentifier
|
||||
|
||||
{
|
||||
|
|
|
|||
|
|
@ -12,7 +12,8 @@
|
|||
* details.
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
#include <windows.h>
|
||||
#include <new>
|
||||
|
||||
#include "OCOverlayFactory.h"
|
||||
#include "OCOverlay.h"
|
||||
|
|
|
|||
|
|
@ -12,10 +12,10 @@
|
|||
* details.
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
|
||||
#include "OCOverlayRegistrationHandler.h"
|
||||
#include "OverlayConstants.h"
|
||||
|
||||
#include <windows.h>
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
|
||||
|
|
|
|||
|
|
@ -17,6 +17,8 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <windows.h>
|
||||
|
||||
class __declspec(dllexport) OCOverlayRegistrationHandler
|
||||
{
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -1 +0,0 @@
|
|||
#include "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>
|
||||
|
|
@ -3,7 +3,6 @@ add_library(OCUtil STATIC
|
|||
FileUtil.cpp
|
||||
RegistryUtil.cpp
|
||||
RemotePathChecker.cpp
|
||||
stdafx.cpp
|
||||
StringUtil.cpp
|
||||
OCUtil.rc
|
||||
)
|
||||
|
|
|
|||
|
|
@ -12,8 +12,6 @@
|
|||
* details.
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
|
||||
#include "CommunicationSocket.h"
|
||||
#include "UtilConstants.h"
|
||||
#include "StringUtil.h"
|
||||
|
|
|
|||
|
|
@ -12,8 +12,6 @@
|
|||
* details.
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
|
||||
#include "FileUtil.h"
|
||||
#include "RegistryUtil.h"
|
||||
#include "UtilConstants.h"
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
* details.
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
#include <windows.h>
|
||||
|
||||
#include "RegistryUtil.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -11,8 +11,6 @@
|
|||
* details.
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
|
||||
#include "CommunicationSocket.h"
|
||||
|
||||
#include "RemotePathChecker.h"
|
||||
|
|
|
|||
|
|
@ -11,8 +11,6 @@
|
|||
* details.
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
|
||||
#include <locale>
|
||||
#include <string>
|
||||
#include <codecvt>
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <windows.h>
|
||||
#include <string>
|
||||
#include <cassert>
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
#include "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>
|
||||
Загрузка…
Ссылка в новой задаче