Author: akhaldi
Date: Thu Jul 28 19:36:40 2016
New Revision: 72038
URL:
http://svn.reactos.org/svn/reactos?rev=72038&view=rev
Log:
[0.4.2] * Merge the RDP files association fix by Jared in r72032. CORE-11655
Modified:
branches/ros-branch-0_4_2/reactos/ (props changed)
branches/ros-branch-0_4_2/reactos/boot/bootdata/hivecls.inf
Propchange: branches/ros-branch-0_4_2/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 28 19:36:40 2016
@@ -20,4 +20,4 @@
/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
/branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
/branches/wlan-bringup:54809-54998
-/trunk/reactos:72020-72022,72026,72028,72033-72034
+/trunk/reactos:72020-72022,72026,72028,72032-72034
Modified: branches/ros-branch-0_4_2/reactos/boot/bootdata/hivecls.inf
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/boot/b…
==============================================================================
--- branches/ros-branch-0_4_2/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original)
+++ branches/ros-branch-0_4_2/reactos/boot/bootdata/hivecls.inf [iso-8859-1] Thu Jul 28
19:36:40 2016
@@ -340,6 +340,14 @@
HKCR,"regfile\shell\edit\command","",0x00020000,"%SystemRoot%\system32\notepad.exe
%1"
HKCR,"regfile\shell\open","",0x00000000,%MERGE%
HKCR,"regfile\shell\open\command","",0x00000000,"regedit.exe
""%1"""
+
+; Remote Desktop File
+HKCR,".rdp","",0x00000000,"rdpfile"
+HKCR,"rdpfile","",0x00000000,"Remote Desktop Connection"
+;HKCR,"rdpfile","FriendlyTypeName",0x00020000,"%SystemRoot%\mstsc.exe,-4004"
+HKCR,"rdpfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\mstsc.exe,0"
+HKCR,"rdpfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\mstsc.exe
%1"
+;HKCR,"rdpfile\shell\edit\command","",0x00020000,"%SystemRoot%\system32\mstsc.exe
-edit %1"
; Screen Savers
HKCR,".scr","",0x00000000,"scrfile"