[ros-diffs] [reactos] 01/01: Revert "[COMCTL32][USER32] Fix radio button regression (#2146)" (#2753)

[Katayama Hirofumi MZ]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=66b0a48a75d41fbc047d6…

commit 66b0a48a75d41fbc047d63df9b561e2c80626376
Author:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Sat May 9 11:30:11 2020 +0900
Commit:     GitHub <noreply(a)github.com>
CommitDate: Sat May 9 11:30:11 2020 +0900

    Revert "[COMCTL32][USER32] Fix radio button regression (#2146)" (#2753)
    
    This reverts commit 2d4d3f5fce0c875d3e714c51de16dfb0cd0a9cd3.
    
    Reverts #2146. I think #2135 (e329e83) and #2146 (2d4d3f5) are my mistakes.
    CORE-16552, CORE-16747
---
 dll/win32/comctl32/button.c           | 4 ----
 win32ss/user/user32/controls/button.c | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/dll/win32/comctl32/button.c b/dll/win32/comctl32/button.c
index db207499e67..37dab409b0d 100644
--- a/dll/win32/comctl32/button.c
+++ b/dll/win32/comctl32/button.c
@@ -1211,11 +1211,7 @@ static UINT BUTTON_CalcLabelRect(const BUTTON_INFO *infoPtr, HDC
hdc, RECT *rc)
           }
 
           if ((hFont = infoPtr->font)) hPrevFont = SelectObject( hdc, hFont );
-#ifdef __REACTOS__
-          DrawTextW(hdc, text, -1, &r, ((dtStyle | DT_CALCRECT) & ~(DT_VCENTER |
DT_BOTTOM)));
-#else
           DrawTextW(hdc, text, -1, &r, dtStyle | DT_CALCRECT);
-#endif
           if (hPrevFont) SelectObject( hdc, hPrevFont );
           heap_free( text );
 #ifdef __REACTOS__
diff --git a/win32ss/user/user32/controls/button.c
b/win32ss/user/user32/controls/button.c
index 6b65c536795..df7fb0e7810 100644
--- a/win32ss/user/user32/controls/button.c
+++ b/win32ss/user/user32/controls/button.c
@@ -773,11 +773,7 @@ static UINT BUTTON_CalcLabelRect(HWND hwnd, HDC hdc, RECT *rc)
           }
 
           if ((hFont = get_button_font( hwnd ))) hPrevFont = SelectObject( hdc, hFont );
-#ifdef __REACTOS__
-          DrawTextW(hdc, text, -1, &r, ((dtStyle | DT_CALCRECT) & ~(DT_VCENTER |
DT_BOTTOM)));
-#else
           DrawTextW(hdc, text, -1, &r, dtStyle | DT_CALCRECT);
-#endif
           if (hPrevFont) SelectObject( hdc, hPrevFont );
           HeapFree( GetProcessHeap(), 0, text );
 #ifdef __REACTOS__