Author: akhaldi
Date: Thu Dec 17 17:08:25 2015
New Revision: 70386
URL: http://svn.reactos.org/svn/reactos?rev=70386&view=rev
Log:
[0.4.0] * Merge rundll32 icon by Jared Smudde in r70384. CORE-10669
Added:
branches/ros-branch-0_4_0/reactos/base/system/rundll32/res/
- copied from r70384, trunk/reactos/base/system/rundll32/res/
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/base/system/rundll32/resource.h
branches/ros-branch-0_4_0/reactos/base/system/rundll32/rundll32.rc
Propchange: branches/ros-branch-0_4_0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 17 17:08:25 2015
@@ -1 +1 @@
-/trunk:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381
+/trunk:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384
Propchange: branches/ros-branch-0_4_0/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 17 17:08:25 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
+/trunk/reactos:70000-70321,70323-70324,70328-70337,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384
Modified: branches/ros-branch-0_4_0/reactos/base/system/rundll32/resource.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/system/rundll32/resource.h?rev=70386&r1=70385&r2=70386&view=diff
==============================================================================
--- branches/ros-branch-0_4_0/reactos/base/system/rundll32/resource.h
[iso-8859-1] (original)
+++ branches/ros-branch-0_4_0/reactos/base/system/rundll32/resource.h
[iso-8859-1] Thu Dec 17 17:08:25 2015
@@ -3,3 +3,5 @@
#define RC_STRING_MAX_SIZE 200
#define IDS_DllNotLoaded 100
#define IDS_MissingEntry 101
+
+#define IDI_MAIN 100
Modified: branches/ros-branch-0_4_0/reactos/base/system/rundll32/rundll32.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/system/rundll32/rundll32.rc?rev=70386&r1=70385&r2=70386&view=diff
==============================================================================
--- branches/ros-branch-0_4_0/reactos/base/system/rundll32/rundll32.rc
[iso-8859-1] (original)
+++ branches/ros-branch-0_4_0/reactos/base/system/rundll32/rundll32.rc
[iso-8859-1] Thu Dec 17 17:08:25 2015
@@ -6,6 +6,8 @@
#define REACTOS_STR_INTERNAL_NAME "rundll32"
#define REACTOS_STR_ORIGINAL_FILENAME "rundll32.exe"
#include <reactos/version.rc>
+
+IDI_MAIN ICON "res/main.ico"
/* UTF-8 */
#pragma code_page(65001)
