From a7c21d9dbf8e618446db4c9b8f96e782d57da586 Mon Sep 17 00:00:00 2001 From: Ged Murphy Date: Fri, 6 Jan 2006 00:01:20 +0000 Subject: [PATCH] New icon. Couple of code changes linked to that. Just playing :) svn path=/trunk/; revision=20600 --- reactos/subsys/system/servman/res/applet.ico | Bin 1398 -> 0 bytes reactos/subsys/system/servman/res/system.ico | Bin 0 -> 3638 bytes reactos/subsys/system/servman/servman.c | 5 ++--- reactos/subsys/system/servman/servman.rc | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 reactos/subsys/system/servman/res/applet.ico create mode 100644 reactos/subsys/system/servman/res/system.ico diff --git a/reactos/subsys/system/servman/res/applet.ico b/reactos/subsys/system/servman/res/applet.ico deleted file mode 100644 index 3eae16df58c7f5b9a6b80827d788f7416afccbda..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1398 zcmds1v2MaJ5Pcy?>6oosVPx#onJ?g5x|yL8-r%#mb?JxX50cHi7sup4K?uN%Pj@Bxs|$P2s|z*`B_b@H#sH*;X6HIy|)ae`;;G(4U3c%KwU zng}6K%Mtq*G0LLw(UgYY#`a*~ft@q>4}8aK8_?=J=D_=@^L_oC@Gbu>Zm!E|ecnu( z+`8Q-9);RO1DVO`5*Ex${7*rzT$k>q>YY}5t123;JHup-7leVI7nk`P|W&Ys_ z_r*N>-jMqObGQP}oF-9>st~smS_|yFs$V?oA+Ep34wa~LO!6G5 MKQVRI!ab7Xj@&-27XSbN diff --git a/reactos/subsys/system/servman/res/system.ico b/reactos/subsys/system/servman/res/system.ico new file mode 100644 index 0000000000000000000000000000000000000000..cc3fb03ac2b8f4c3d44acb022b720dcd56da85bc GIT binary patch literal 3638 zcmeHKcU08Z68>O~Sb#MWkw`RX)M%m+TkMpG8as&%)Tpo;ELc!Xup}ays1byyUOoOjMU=lzvA=i57X=FXk_yJcn;(19+@ z%%G*PCO~I$Em}16=e`46q^t|OW`q@?0}4p)jkL`hKSBtIwG{hQV#}G8z*sMcJUjRg zGlF^fCCppm29XII_xT*SEs&IHg__`jFn0~a%%V_WK{C$IY72K?2Rw;xhIFMp;*-}R z&#Nse6YK!*%RpQmKtIZ#M&h>rK-ju^;`-`dP=9X#u?vVDt`AK}TOc?G>b)Hi?PZU; zKU+hbq1my1h|0A^`3dSh?xQGv7#;=a12Yez{L(l;^%QWsjPyzRFk2D<6j$P^O9!}z z%|Tv>4a6T51#|;;3&@up!4)S1ltgv~w&vo2cR%2~KwbQBh&v9b@#~H1Bsm222TpAQ zB1=)Y#Srx=<8gCSAC!h0?X8h9X36iV6GelT=7#qY8Q<{w7>3d%|aaFXyN0t$FgH-Kd-RKyLy?NwbN zLiLanGz8b2+W@)GfQVXD1vEywQwNCSK>5*D$n^LO*pP*L+bmG1>_q+&kW>lmxrN%q zp?JJ^1dve!%>i@dd3Qv8++aWv2NA+^&n$!R1!@!8;GUZio*n0zqyuW70YDVj9W2L< z`OSf9uCGX1XEiD!O<=w#5Sqg}z*T{a1@x(^#ntb+^P))K!Sjxyf3FLuJ1fI^dqWf` z^--V23%V_z=Xe*$=D5AY@^pwCp7Va7E>XriM!O4DJfB)XSpoFHNdCFeZEitTIQck^ z-94eYue+H~IbzXzc@4NLG*S`HntH1bh zc>DH=HM9QFUlG>VrVs9G+Ec!q5tKAzUR4z@8tD{qdapvUucxzVuA-Z_R*0cp^VVy* z1FMeD{5@2uP$;4`ngT^aj|P3?Q3Do8oY!N|r0+dFA5gEQWs%weUmZDEv8W~Wep#uC zw4~G*YDG#`M?Nu_UtFP{EZL*@Yy%alVjK^hJv+#;@Le?T-ras(Yld^u*&vDXw*khD znh1&C-FE)`{!Tw=wY1+zN|ib`x(2368y8-0H+r<|gkg4)=xR_l>yR9sLnNTq5}!{p-@C7V^pzUg%M(+!f6RP5`U6646ruB8#r${b=+ zBKqwb`&@vH(Il;NNix3HK^YxArxgSGb7~X)K!~*Go&DLFcg5^pFLc`WNnv!IFJlT{ zrYa^k*ZRv>w7?F9>dvpy<_$WO@2FBuWw>~ig6htkNu&NkQP7|iWyZu;wS0WHs%vlk zy0Jj9(NVuJ{p9OvT(*AXTU}C8Qdx5Q&o`6}f};+mF=5HIj&D%|DQ{Q3)#krbF!#Si zIZ7e2y$L;0Z>1+RkO@!di1mcK-pNYHPiGU!&|8}f*}81#%Cb!$&vt_xRgmjcVU3Ok zLZ;CXvMRY)n{6rFVJVWeSR;~ULR9Gqp?S%pRHw8c%!n6tiWS5Cei_72 z%Ujz)y@&pt!x1`1hLZTN7~iizdY4fvMgWe9sEBEU)E%^mCiF|{Lk2TZ;>6E#1t8vqbCXZoG876#o a5*RPnGsPJa?c{*IC1q;}+DPS|WcwGRO~5t) literal 0 HcmV?d00001 diff --git a/reactos/subsys/system/servman/servman.c b/reactos/subsys/system/servman/servman.c index 31e828f2f35..daf24bc8328 100644 --- a/reactos/subsys/system/servman/servman.c +++ b/reactos/subsys/system/servman/servman.c @@ -91,9 +91,8 @@ GetServices ( void ) GetSystemMetrics(SM_CYSMICON), ILC_MASK, 1, 1); /* Add an icon to each image list */ - hiconItem = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_SM_ICON)); + hiconItem = LoadImage(hInstance, MAKEINTRESOURCE(IDI_SM_ICON), IMAGE_ICON, 16, 16, 0); ImageList_AddIcon(hSmall, hiconItem); - DestroyIcon(hiconItem); ListView_SetImageList(hListView, hSmall, LVSIL_SMALL); @@ -574,7 +573,7 @@ int WINAPI WinMain(HINSTANCE hThisInstance, HINSTANCE hPrevInstance, wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); wc.lpszMenuName = MAKEINTRESOURCE(IDR_MAINMENU); wc.lpszClassName = ClassName; - wc.hIconSm = (HICON)LoadImage(GetModuleHandle(NULL), + wc.hIconSm = (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_SM_ICON), IMAGE_ICON, 16, 16, 0); if(!RegisterClassEx(&wc)) diff --git a/reactos/subsys/system/servman/servman.rc b/reactos/subsys/system/servman/servman.rc index 1bbcc574a40..3af53555fda 100644 --- a/reactos/subsys/system/servman/servman.rc +++ b/reactos/subsys/system/servman/servman.rc @@ -10,7 +10,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDI_SM_ICON ICON "res/applet.ico" +IDI_SM_ICON ICON "res/system.ico" #include "En.rc" #include "De.rc" -- 2.17.1