From cc99d3ad5ffe06d351024e207d5f0b39ec9ef30d Mon Sep 17 00:00:00 2001
From: Stanislav Motylkov <x86corez@gmail.com>
Date: Sat, 23 Mar 2019 20:53:01 +0300
Subject: [PATCH] [SHELL32] Add line bar to About dialog for consistence

Addendum to f9d2931. CORE-15215
---
 dll/win32/shell32/bitmap_res.rc        |   1 +
 dll/win32/shell32/res/bitmaps/line.bmp | Bin 0 -> 6254 bytes
 dll/win32/shell32/shresdef.h           |   1 +
 dll/win32/shell32/wine/shell32_main.c  |  19 ++++++++++++++-----
 4 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 dll/win32/shell32/res/bitmaps/line.bmp

diff --git a/dll/win32/shell32/bitmap_res.rc b/dll/win32/shell32/bitmap_res.rc
index f267eb74b1a..80dfa6f0edc 100644
--- a/dll/win32/shell32/bitmap_res.rc
+++ b/dll/win32/shell32/bitmap_res.rc
@@ -1,4 +1,5 @@
 IDB_REACTOS BITMAP "res/bitmaps/reactos.bmp"
+IDB_LINEBAR BITMAP "res/bitmaps/line.bmp"
 
 IDB_SHELL_IEXPLORE_LG        BITMAP "res/bitmaps/204.bmp"
 IDB_SHELL_IEXPLORE_LG_HOT    BITMAP "res/bitmaps/205.bmp"
diff --git a/dll/win32/shell32/res/bitmaps/line.bmp b/dll/win32/shell32/res/bitmaps/line.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..08717d3cbe7738f9fba2ed8d5a3c8e8fd4fd2ec2
GIT binary patch
literal 6254
zcmZ?r&68jN12YB&1`P%VhPjLk46F<c42%pA2@44Zh9i6s3|7d%z>pqbkP&E@8Dx|d
zY@8Khk{xQA6K0khZk`)qkr!#1A7xb#WnB<$Qy61g6l+%;XIC6=Uy|TZn&?=T<W!dI
zT%O`mk?LBR>Q<TNUX|`qo#9!N=~a{EU7PJwm*ZQX>sz1a*O2eum><wo5ZF{0)LazY
zQXJA+653iC)>anYULMg=5!q20-B}gWRTI};o6u92*ju06+mO=Nl-A#zF`*@MVr%xK
zwwy^Fd6PQ}rgRlf?Jl0yQ!>4;Y<hpij0u%9CsxmzR6Bc0-R!9ibEY-Uo!&feM(g}p
zZ3||1ESS@|aBlaadA*Al^etI9Vd<iYOBYXGwq)w^Wz$wHpRscJjFl^9tXeU1^@^Em
zR)WylRWsMEnzeq_to5sBZCE{P<C<BUKxp>nwX?T?(bjddx2>DAeLV>6SU+dyhB>=7
z%-ywN?(U6q_iUWIcM}Nh+ca<g=6MG;&pWVX-oY*N4sDr#XzTpLTjw9yI{)al`A4@c
zIJSMk@$Cyv>{xhW$D)%v7oXg<<kaq^r}r#By=TRly(`b`TXlB->T?IyoI9}g{K56-
z4{f+`c;m$*n=T&NeCg<xOUJfeKECbBi5*u??7Vt%*VR+Iubtj={mkC$XZGDVd*H^o
zgE!9~x^?03tqVtPUp#vI(y=?2kKes~^6r&W_pYA4ckRsm>t`QaKlk9q`G+?zKDu@3
z@$Jix?_7Cu_v+Jo*Pq?L@$A9P=MQhacy#;a<2x^(+<W!({_AHC-aLQ!_Qj*OFQ2@7
z_4NJgXCK}?|M2$3$9Jzjy?_1r!<)|^-hTP`?(3%y-#&l*{^is6ub+Q>`||Vq*Iz%r
z|N8mk_phISe*gOW=l9>gfB*ga_y7O@fB*jd`}_CrpFe+o|N8yw=kK3Ce*O6V^ZU0S
z-@ktU_WAqQPv5?L{QCLBmrw7%e0=x$!<$d<Uw?e}>f_s&AKtup|N8m6S5M!)eDe0i
z<2TPAy?*xa^|J@Bp5A-;<nD{dcV0ZY{rusrXAf>Zy?_1by=zbIUVVJ$%A?ztAKkk2
z@aDw_H_kt}e(wJDv-hr@xp(#S-7BZ=UOsu}^6}f3j@`a^^wxzVx6U8FdH&Fia|dsn
z-GBYezU!y=UOT<#>Z#pVPwu*MV&~=K+b<vAcInvGOGmd{JhJ)1;Y}9~Z#;i!{rQ9I
z&K+2LcK@2Q`&XaYx9ZH^m8bWtIJJA(sohIY?pktk=i(DP79HQd@c8xx$F?mvx^2Oc
zZJ=aucq=GL9NaSh;1*Ci*}r+-zRmOYZJM`t6DSq!-Uv!gyEe?-xna(Z^&qr;{hV#<
z=4@Rzd+Rz-I^4W=_NFznH?0As&kd_VX?6XoS?gBKTDuCAhS#i|xq9WyRV!w$Tmeeq
zE0)h#zHHjErBjzJp1gF?q$LX{EMCyRXnyaadEE==bS;?OF@IM3yqT@@X0*(m-ZW=w
z<LoK*vnJQgnp87$V%3ZZmDBsmr}dUi>nWMqT|A|$aB^qCq>j8vZ8;NLvnRA<_BUtr
zHKp}6ruNn+_tYhI*Cuq;#CKK4c2-4qR7ACxN3@lNx0QyqmV~wxhcp)jHx~sp6$UmI
z1T^IP*XQ}y=la#<_||6o)MR<rWO`L+cvhu*RHnICq`Fn4xRxiolqETrCOVZSI+i3j
z6vx{a#n~0c+7`yx6hvF+M_J`XTINMq<c6E)gqdZBnr4NVWCa^%1{q}p8m0#rjFxMo
z<=SYuHd?NYmTRN!wbAz4XnSq6y*Aoj8|{aV_CrVep`-oK(SGRY_}b|B+UWQiXmD)@
NxN|T%zDDx+8UV;H*y;cP

literal 0
HcmV?d00001

diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h
index 0a8cb724ac0..9f7d6747cfb 100644
--- a/dll/win32/shell32/shresdef.h
+++ b/dll/win32/shell32/shresdef.h
@@ -27,6 +27,7 @@
 
 /* Bitmaps */
 #define IDB_REACTOS                 131
+#define IDB_LINEBAR                 138
 #define IDB_SHELL_IEXPLORE_LG       204
 #define IDB_SHELL_IEXPLORE_LG_HOT   205
 #define IDB_SHELL_IEXPLORE_SM       206
diff --git a/dll/win32/shell32/wine/shell32_main.c b/dll/win32/shell32/wine/shell32_main.c
index 5b9ca5eae83..4ae3ea0d50b 100644
--- a/dll/win32/shell32/wine/shell32_main.c
+++ b/dll/win32/shell32/wine/shell32_main.c
@@ -1132,8 +1132,8 @@ INT_PTR CALLBACK AboutAuthorsDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM
 static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam )
 {
     static DWORD   cxLogoBmp;
-    static DWORD   cyLogoBmp;
-    static HBITMAP hLogoBmp;
+    static DWORD   cyLogoBmp, cyLineBmp;
+    static HBITMAP hLogoBmp, hLineBmp;
     static HWND    hWndAuthors;
 
     switch(msg)
@@ -1153,8 +1153,9 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM
 
                 // Preload the ROS bitmap
                 hLogoBmp = (HBITMAP)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDB_REACTOS), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
+                hLineBmp = (HBITMAP)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDB_LINEBAR), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
 
-                if(hLogoBmp)
+                if(hLogoBmp && hLineBmp)
                 {
                     BITMAP bmpLogo;
 
@@ -1162,6 +1163,9 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM
 
                     cxLogoBmp = bmpLogo.bmWidth;
                     cyLogoBmp = bmpLogo.bmHeight;
+
+                    GetObject( hLineBmp, sizeof(BITMAP), &bmpLogo );
+                    cyLineBmp = bmpLogo.bmHeight;
                 }
 
                 // Set App-specific stuff (icon, app name, szOtherStuff string)
@@ -1258,20 +1262,25 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM
 
         case WM_PAINT:
         {
-            if(hLogoBmp)
+            if(hLogoBmp && hLineBmp)
             {
                 PAINTSTRUCT ps;
                 HDC hdc;
                 HDC hdcMem;
+                HGDIOBJ hOldObj;
 
                 hdc = BeginPaint(hWnd, &ps);
                 hdcMem = CreateCompatibleDC(hdc);
 
                 if(hdcMem)
                 {
-                    SelectObject(hdcMem, hLogoBmp);
+                    hOldObj = SelectObject(hdcMem, hLogoBmp);
                     BitBlt(hdc, 0, 0, cxLogoBmp, cyLogoBmp, hdcMem, 0, 0, SRCCOPY);
 
+                    SelectObject(hdcMem, hLineBmp);
+                    BitBlt(hdc, 0, cyLogoBmp, cxLogoBmp, cyLineBmp, hdcMem, 0, 0, SRCCOPY);
+
+                    SelectObject(hdcMem, hOldObj);
                     DeleteDC(hdcMem);
                 }
 
-- 
2.51.2