Author: akhaldi
Date: Fri Dec 18 10:49:29 2015
New Revision: 70392
URL:
http://svn.reactos.org/svn/reactos?rev=70392&view=rev
Log:
[0.4.0] * Merge the Add New Bitmap to the New Menu fix by Jared Smudde in r70385.
CORE-10668
Modified:
branches/ros-branch-0_4_0/ (props changed)
branches/ros-branch-0_4_0/reactos/ (props changed)
branches/ros-branch-0_4_0/reactos/boot/bootdata/hivecls.inf
Propchange: branches/ros-branch-0_4_0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 18 10:49:29 2015
@@ -1 +1 @@
-/trunk:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384,70387-70388
+/trunk:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70388
Propchange: branches/ros-branch-0_4_0/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 18 10:49:29 2015
@@ -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:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384,70387-70388
+/trunk/reactos:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70388
Modified: branches/ros-branch-0_4_0/reactos/boot/bootdata/hivecls.inf
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/boot/b…
==============================================================================
--- branches/ros-branch-0_4_0/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original)
+++ branches/ros-branch-0_4_0/reactos/boot/bootdata/hivecls.inf [iso-8859-1] Fri Dec 18
10:49:29 2015
@@ -177,6 +177,8 @@
; Bitmap Images
HKCR,".bmp","",0x00000000,"bmpfile"
HKCR,"bmpfile","",0x00000000,"Bitmap Image"
+HKCR,".bmp\shellnew","",0x00000000,""
+HKCR,".bmp\shellnew","NullFile",0x00020000,""
HKCR,"bmpfile","FriendlyTypeName",0x00020000,"(a)%SystemRoot%\system32\shimgvw.dll,-304"
HKCR,"bmpfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shimgvw.dll,1"
HKCR,"bmpfile\shell\open\command","",0x00020000,"rundll32.exe
%SystemRoot%\system32\shimgvw.dll,ImageView_Fullscreen %1"