Index: src/chext/DropMenuExt.h =================================================================== diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -r47da0c5883b1bf97972b1bcd3dc70b2d64024969 --- src/chext/DropMenuExt.h (.../DropMenuExt.h) (revision 3493e9fc470285b0a0b417d50be281467a071eb7) +++ src/chext/DropMenuExt.h (.../DropMenuExt.h) (revision 47da0c5883b1bf97972b1bcd3dc70b2d64024969) @@ -33,7 +33,7 @@ public CComObjectRootEx, public CComCoClass, public IObjectWithSiteImpl, - public IDispatchImpl, + public IDispatchImpl, public IShellExtInitImpl, public IContextMenuImpl { Index: src/chext/DropMenuExt.rgs =================================================================== diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -r47da0c5883b1bf97972b1bcd3dc70b2d64024969 --- src/chext/DropMenuExt.rgs (.../DropMenuExt.rgs) (revision 3493e9fc470285b0a0b417d50be281467a071eb7) +++ src/chext/DropMenuExt.rgs (.../DropMenuExt.rgs) (revision 47da0c5883b1bf97972b1bcd3dc70b2d64024969) @@ -1,20 +1,20 @@ HKCR { - CopyHandlerShellExt.DropMenuExt.1 = s 'DropMenuExt Class' + chext.DropMenuExt.1 = s 'DropMenuExt Class' { CLSID = s '{B46F8244-86E6-43CF-B8AB-8C3A89928A48}' } - CopyHandlerShellExt.DropMenuExt = s 'DropMenuExt Class' + chext.DropMenuExt = s 'DropMenuExt Class' { CLSID = s '{B46F8244-86E6-43CF-B8AB-8C3A89928A48}' - CurVer = s 'CopyHandlerShellExt.DropMenuExt.1' + CurVer = s 'chext.DropMenuExt.1' } NoRemove CLSID { ForceRemove {B46F8244-86E6-43CF-B8AB-8C3A89928A48} = s 'DropMenuExt Class' { - ProgID = s 'CopyHandlerShellExt.DropMenuExt.1' - VersionIndependentProgID = s 'CopyHandlerShellExt.DropMenuExt' + ProgID = s 'chext.DropMenuExt.1' + VersionIndependentProgID = s 'chext.DropMenuExt' ForceRemove 'Programmable' InprocServer32 = s '%MODULE%' { @@ -34,7 +34,7 @@ { NoRemove DragDropHandlers { - CopyHandlerShellExt = s '{B46F8244-86E6-43CF-B8AB-8C3A89928A48}' + chext = s '{B46F8244-86E6-43CF-B8AB-8C3A89928A48}' } } } @@ -45,7 +45,7 @@ { NoRemove DragDropHandlers { - CopyHandlerShellExt = s '{B46F8244-86E6-43CF-B8AB-8C3A89928A48}' + chext = s '{B46F8244-86E6-43CF-B8AB-8C3A89928A48}' } } } @@ -56,7 +56,7 @@ { NoRemove DragDropHandlers { - CopyHandlerShellExt = s '{B46F8244-86E6-43CF-B8AB-8C3A89928A48}' + chext = s '{B46F8244-86E6-43CF-B8AB-8C3A89928A48}' } } } Index: src/chext/MenuExt.h =================================================================== diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -r47da0c5883b1bf97972b1bcd3dc70b2d64024969 --- src/chext/MenuExt.h (.../MenuExt.h) (revision 3493e9fc470285b0a0b417d50be281467a071eb7) +++ src/chext/MenuExt.h (.../MenuExt.h) (revision 47da0c5883b1bf97972b1bcd3dc70b2d64024969) @@ -39,7 +39,7 @@ public CComObjectRootEx, public CComCoClass, public IObjectWithSiteImpl, - public IDispatchImpl, + public IDispatchImpl, public IShellExtInitImpl, public IContextMenuImpl { Index: src/chext/MenuExt.rgs =================================================================== diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -r47da0c5883b1bf97972b1bcd3dc70b2d64024969 --- src/chext/MenuExt.rgs (.../MenuExt.rgs) (revision 3493e9fc470285b0a0b417d50be281467a071eb7) +++ src/chext/MenuExt.rgs (.../MenuExt.rgs) (revision 47da0c5883b1bf97972b1bcd3dc70b2d64024969) @@ -1,20 +1,20 @@ HKCR { - CopyHandlerShellExt.MenuExt.1 = s 'MenuExt Class' + chext.MenuExt.1 = s 'MenuExt Class' { CLSID = s '{E7A4C2DA-F3AF-4145-AC19-E3B215306A54}' } - CopyHandlerShellExt.MenuExt = s 'MenuExt Class' + chext.MenuExt = s 'MenuExt Class' { CLSID = s '{E7A4C2DA-F3AF-4145-AC19-E3B215306A54}' - CurVer = s 'CopyHandlerShellExt.MenuExt.1' + CurVer = s 'chext.MenuExt.1' } NoRemove CLSID { ForceRemove {E7A4C2DA-F3AF-4145-AC19-E3B215306A54} = s 'MenuExt Class' { - ProgID = s 'CopyHandlerShellExt.MenuExt.1' - VersionIndependentProgID = s 'CopyHandlerShellExt.MenuExt' + ProgID = s 'chext.MenuExt.1' + VersionIndependentProgID = s 'chext.MenuExt' ForceRemove 'Programmable' InprocServer32 = s '%MODULE%' { @@ -30,7 +30,7 @@ { NoRemove ContextMenuHandlers { - CopyHandlerShellExt = s '{E7A4C2DA-F3AF-4145-AC19-E3B215306A54}' + chext = s '{E7A4C2DA-F3AF-4145-AC19-E3B215306A54}' } } } @@ -43,7 +43,7 @@ { NoRemove ContextMenuHandlers { - CopyHandlerShellExt = s '{E7A4C2DA-F3AF-4145-AC19-E3B215306A54}' + chext = s '{E7A4C2DA-F3AF-4145-AC19-E3B215306A54}' } } } @@ -55,7 +55,7 @@ { NoRemove ContextMenuHandlers { - CopyHandlerShellExt = s '{E7A4C2DA-F3AF-4145-AC19-E3B215306A54}' + chext = s '{E7A4C2DA-F3AF-4145-AC19-E3B215306A54}' } } } @@ -66,7 +66,7 @@ { NoRemove ContextMenuHandlers { - CopyHandlerShellExt = s '{E7A4C2DA-F3AF-4145-AC19-E3B215306A54}' + chext = s '{E7A4C2DA-F3AF-4145-AC19-E3B215306A54}' } } } Index: src/chext/chext.cpp =================================================================== diff -u -N -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0 -r47da0c5883b1bf97972b1bcd3dc70b2d64024969 --- src/chext/chext.cpp (.../chext.cpp) (revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0) +++ src/chext/chext.cpp (.../chext.cpp) (revision 47da0c5883b1bf97972b1bcd3dc70b2d64024969) @@ -50,7 +50,7 @@ { if (dwReason == DLL_PROCESS_ATTACH) { - _Module.Init(ObjectMap, hInstance, &LIBID_COPYHANDLERSHELLEXTLib); + _Module.Init(ObjectMap, hInstance, &LIBID_CHEXTLib); DisableThreadLibraryCalls(hInstance); // memory mapped file Index: src/chext/chext.def =================================================================== diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -r47da0c5883b1bf97972b1bcd3dc70b2d64024969 --- src/chext/chext.def (.../chext.def) (revision 3493e9fc470285b0a0b417d50be281467a071eb7) +++ src/chext/chext.def (.../chext.def) (revision 47da0c5883b1bf97972b1bcd3dc70b2d64024969) @@ -1,4 +1,4 @@ -; CopyHandlerShellExt.def : Declares the module parameters. +; chext.def : Declares the module parameters. LIBRARY "chext.dll" Index: src/chext/chext.idl =================================================================== diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -r47da0c5883b1bf97972b1bcd3dc70b2d64024969 --- src/chext/chext.idl (.../chext.idl) (revision 3493e9fc470285b0a0b417d50be281467a071eb7) +++ src/chext/chext.idl (.../chext.idl) (revision 47da0c5883b1bf97972b1bcd3dc70b2d64024969) @@ -1,8 +1,8 @@ -// CopyHandlerShellExt.idl : IDL source for CopyHandlerShellExt.dll +// chext.idl : IDL source for chext.dll // // This file will be processed by the MIDL tool to -// produce the type library (CopyHandlerShellExt.tlb) and marshalling code. +// produce the type library (chext.tlb) and marshalling code. import "oaidl.idl"; import "ocidl.idl"; @@ -39,9 +39,9 @@ [ uuid(68FAFC14-8EB8-4DA1-90EB-6B3D22010505), version(1.0), - helpstring("CopyHandlerShellExt 1.0 Type Library") + helpstring("chext 1.0 Type Library") ] -library COPYHANDLERSHELLEXTLib +library CHEXTLib { importlib("stdole32.tlb"); importlib("stdole2.tlb"); Index: src/chext/chext.rc =================================================================== diff -u -N -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0 -r47da0c5883b1bf97972b1bcd3dc70b2d64024969 --- src/chext/chext.rc (.../chext.rc) (revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0) +++ src/chext/chext.rc (.../chext.rc) (revision 47da0c5883b1bf97972b1bcd3dc70b2d64024969) @@ -70,15 +70,15 @@ BLOCK "040904b0" BEGIN VALUE "Comments", "Copy handler Shell Extension" - VALUE "FileDescription", "CopyHandlerShellExt Module version" + VALUE "FileDescription", "Copy handler Shell Extension Library" VALUE "FileVersion", "1.28.20.207" - VALUE "InternalName", "CopyHandlerShellExt" + VALUE "InternalName", "chext" VALUE "LegalCopyright", "Copyright 2001-2006 J�zef Starosczyk" VALUE "LegalTrademarks", " " VALUE "OLESelfRegister", " " - VALUE "OriginalFilename", "CopyHandlerShellExt.DLL" + VALUE "OriginalFilename", "chext.dll" VALUE "PrivateBuild", " " - VALUE "ProductName", "CopyHandlerShellExt Shell Extension Library version" + VALUE "ProductName", "Copy handler Shell Extension Library" VALUE "ProductVersion", "1.28.20.207" VALUE "SpecialBuild", " " END Index: src/chext/chext.vcproj =================================================================== diff -u -N -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0 -r47da0c5883b1bf97972b1bcd3dc70b2d64024969 --- src/chext/chext.vcproj (.../chext.vcproj) (revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0) +++ src/chext/chext.vcproj (.../chext.vcproj) (revision 47da0c5883b1bf97972b1bcd3dc70b2d64024969) @@ -31,23 +31,20 @@ SuppressStartupBanner="TRUE" DebugInformationFormat="4"/> + Name="VCCustomBuildTool"/> @@ -73,7 +70,7 @@ + Name="VCCustomBuildTool"/> Index: src/chext/chextps.def =================================================================== diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -r47da0c5883b1bf97972b1bcd3dc70b2d64024969 --- src/chext/chextps.def (.../chextps.def) (revision 3493e9fc470285b0a0b417d50be281467a071eb7) +++ src/chext/chextps.def (.../chextps.def) (revision 47da0c5883b1bf97972b1bcd3dc70b2d64024969) @@ -1,5 +1,5 @@ -LIBRARY "CopyHandlerShellExtPS" +LIBRARY "chextPS" DESCRIPTION 'Proxy/Stub DLL' Index: src/chext/chextps.mk =================================================================== diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -r47da0c5883b1bf97972b1bcd3dc70b2d64024969 --- src/chext/chextps.mk (.../chextps.mk) (revision 3493e9fc470285b0a0b417d50be281467a071eb7) +++ src/chext/chextps.mk (.../chextps.mk) (revision 47da0c5883b1bf97972b1bcd3dc70b2d64024969) @@ -1,16 +1,16 @@ -CopyHandlerShellExtps.dll: dlldata.obj CopyHandlerShellExt_p.obj CopyHandlerShellExt_i.obj - link /dll /out:CopyHandlerShellExtps.dll /def:CopyHandlerShellExtps.def /entry:DllMain dlldata.obj CopyHandlerShellExt_p.obj CopyHandlerShellExt_i.obj \ +chextps.dll: dlldata.obj chext_p.obj chext_i.obj + link /dll /out:chextps.dll /def:chextps.def /entry:DllMain dlldata.obj chext_p.obj chext_i.obj \ kernel32.lib rpcndr.lib rpcns4.lib rpcrt4.lib oleaut32.lib uuid.lib \ .c.obj: cl /c /Ox /DWIN32 /D_WIN32_WINNT=0x0400 /DREGISTER_PROXY_DLL \ $< clean: - @del CopyHandlerShellExtps.dll - @del CopyHandlerShellExtps.lib - @del CopyHandlerShellExtps.exp + @del chextps.dll + @del chextps.lib + @del chextps.exp @del dlldata.obj - @del CopyHandlerShellExt_p.obj - @del CopyHandlerShellExt_i.obj + @del chext_p.obj + @del chext_i.obj Index: src/chext/resource.h =================================================================== diff -u -N -r3493e9fc470285b0a0b417d50be281467a071eb7 -r47da0c5883b1bf97972b1bcd3dc70b2d64024969 --- src/chext/resource.h (.../resource.h) (revision 3493e9fc470285b0a0b417d50be281467a071eb7) +++ src/chext/resource.h (.../resource.h) (revision 47da0c5883b1bf97972b1bcd3dc70b2d64024969) @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. -// Used by CopyHandlerShellExt.rc +// Used by chext.rc // #define IDS_COPYBYCH_STRING 1 #define IDS_MOVEBYCH_STRING 2