ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
January 2024
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
17 participants
181 discussions
Start a n
N
ew thread
[reactos] 01/01: [MORE] Update Romanian (ro-RO) translation (#6259)
by Andrei Miloiu
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8080492b39aef38699975…
commit 8080492b39aef386999755cae99c9a8fad626dce Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Mon Jan 15 22:53:42 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 15 21:53:42 2024 +0100 [MORE] Update Romanian (ro-RO) translation (#6259) --- base/applications/cmdutils/more/lang/ro-RO.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/cmdutils/more/lang/ro-RO.rc b/base/applications/cmdutils/more/lang/ro-RO.rc index 56e6e11259f..be4bac0b7ae 100644 --- a/base/applications/cmdutils/more/lang/ro-RO.rc +++ b/base/applications/cmdutils/more/lang/ro-RO.rc @@ -20,7 +20,7 @@ command | MORE [/E [opțiuni]\n\ comandă O comandă a cărei ieșire\n\ urmează să fie afișată.\n\ \n\ -Atunci când opțiunea Caracteristici extinse e activată,\n\ +Atunci când Caracteristicile extinse sunt activate,\n\ următoarea formă este acceptată:\n\ MORE [/E] [opțiuni] [fișiere]\n\ \n\
11 months, 2 weeks
1
0
0
0
[reactos] 01/01: [SDK] cicuif.h: Fix CUIFSchemeDef::DrawCtrlEdge (#6347)
by Katayama Hirofumi MZ
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6294f5b3ff443af360227…
commit 6294f5b3ff443af3602275954c1a450c0e7eca45 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 15 10:36:42 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 15 10:36:42 2024 +0900 [SDK] cicuif.h: Fix CUIFSchemeDef::DrawCtrlEdge (#6347) Supporting TIPs... JIRA issue: CORE-19360 Implement CUIFSchemeDef::DrawCtrlEdge method. --- sdk/include/reactos/cicero/cicuif.h | 81 +++++++++++++++++++++++++++---------- 1 file changed, 60 insertions(+), 21 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index 5e3ac117ea4..64388328801 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -451,15 +451,15 @@ public: STDMETHOD_(void, FrameRect)(HDC hDC, LPCRECT prc, INT iColor); STDMETHOD_(void, DrawSelectionRect)(HDC hDC, LPCRECT prc, int) = 0; STDMETHOD_(INT, GetCtrlFaceOffset)(DWORD, DWORD dwDrawFlags, LPSIZE pSize) = 0; - STDMETHOD_(void, DrawCtrlBkgd)(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlags) = 0; - STDMETHOD_(void, DrawCtrlEdge)(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlags) = 0; + STDMETHOD_(void, DrawCtrlBkgd)(HDC hDC, LPCRECT prc, DWORD dwUnknownFlags, DWORD dwDrawFlags) = 0; + STDMETHOD_(void, DrawCtrlEdge)(HDC hDC, LPCRECT prc, DWORD dwUnknownFlags, DWORD dwDrawFlags) = 0; STDMETHOD_(void, DrawCtrlText)(HDC hDC, LPCRECT prc, LPCWSTR pszText, INT cchText, DWORD dwDrawFlags, BOOL bRight) = 0; STDMETHOD_(void, DrawCtrlIcon)(HDC hDC, LPCRECT prc, HICON hIcon, DWORD dwDrawFlags, LPSIZE pSize) = 0; STDMETHOD_(void, DrawCtrlBitmap)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD dwDrawFlags) = 0; STDMETHOD_(void, DrawMenuBitmap)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD dwDrawFlags) = 0; STDMETHOD_(void, DrawMenuSeparator)(HDC hDC, LPCRECT prc) = 0; - STDMETHOD_(void, DrawFrameCtrlBkgd)(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlags) = 0; - STDMETHOD_(void, DrawFrameCtrlEdge)(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlags) = 0; + STDMETHOD_(void, DrawFrameCtrlBkgd)(HDC hDC, LPCRECT prc, DWORD dwUnknownFlags, DWORD dwDrawFlags) = 0; + STDMETHOD_(void, DrawFrameCtrlEdge)(HDC hDC, LPCRECT prc, DWORD dwUnknownFlags, DWORD dwDrawFlags) = 0; STDMETHOD_(void, DrawFrameCtrlIcon)(HDC hDC, LPCRECT prc, HICON hIcon, DWORD dwDrawFlags, LPSIZE pSize) = 0; STDMETHOD_(void, DrawFrameCtrlBitmap)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD dwDrawFlags) = 0; STDMETHOD_(void, DrawWndFrame)(HDC hDC, LPCRECT prc, DWORD type, DWORD unused1, DWORD unused2) = 0; @@ -485,15 +485,15 @@ public: STDMETHOD_(INT, CyWndBorder)() override; STDMETHOD_(void, DrawSelectionRect)(HDC hDC, LPCRECT prc, int) override; STDMETHOD_(INT, GetCtrlFaceOffset)(DWORD, DWORD dwDrawFlags, LPSIZE pSize) override; - STDMETHOD_(void, DrawCtrlBkgd)(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlags) override; - STDMETHOD_(void, DrawCtrlEdge)(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlags) override; + STDMETHOD_(void, DrawCtrlBkgd)(HDC hDC, LPCRECT prc, DWORD dwUnknownFlags, DWORD dwDrawFlags) override; + STDMETHOD_(void, DrawCtrlEdge)(HDC hDC, LPCRECT prc, DWORD dwUnknownFlags, DWORD dwDrawFlags) override; STDMETHOD_(void, DrawCtrlText)(HDC hDC, LPCRECT prc, LPCWSTR pszText, INT cchText, DWORD dwDrawFlags, BOOL bRight) override; STDMETHOD_(void, DrawCtrlIcon)(HDC hDC, LPCRECT prc, HICON hIcon, DWORD dwDrawFlags, LPSIZE pSize) override; STDMETHOD_(void, DrawCtrlBitmap)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD dwDrawFlags) override; STDMETHOD_(void, DrawMenuBitmap)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD dwDrawFlags) override; STDMETHOD_(void, DrawMenuSeparator)(HDC hDC, LPCRECT prc) override; - STDMETHOD_(void, DrawFrameCtrlBkgd)(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlags) override; - STDMETHOD_(void, DrawFrameCtrlEdge)(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlags) override; + STDMETHOD_(void, DrawFrameCtrlBkgd)(HDC hDC, LPCRECT prc, DWORD dwUnknownFlags, DWORD dwDrawFlags) override; + STDMETHOD_(void, DrawFrameCtrlEdge)(HDC hDC, LPCRECT prc, DWORD dwUnknownFlags, DWORD dwDrawFlags) override; STDMETHOD_(void, DrawFrameCtrlIcon)(HDC hDC, LPCRECT prc, HICON hIcon, DWORD dwDrawFlags, LPSIZE pSize) override; STDMETHOD_(void, DrawFrameCtrlBitmap)(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD dwDrawFlags) override; STDMETHOD_(void, DrawWndFrame)(HDC hDC, LPCRECT prc, DWORD type, DWORD unused1, DWORD unused2) override; @@ -1606,7 +1606,7 @@ inline STDMETHODIMP_(INT) CUIFSchemeDef::GetCtrlFaceOffset(DWORD, DWORD dwDrawFl } inline STDMETHODIMP_(void) -CUIFSchemeDef::DrawCtrlBkgd(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlags) +CUIFSchemeDef::DrawCtrlBkgd(HDC hDC, LPCRECT prc, DWORD dwUnknownFlags, DWORD dwDrawFlags) { ::FillRect(hDC, prc, GetBrush(9)); @@ -1628,12 +1628,52 @@ CUIFSchemeDef::DrawCtrlBkgd(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlag ::DeleteObject(hbrDither); } -/// @unimplemented -inline STDMETHODIMP_(void) CUIFSchemeDef::DrawCtrlEdge(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlags) +inline STDMETHODIMP_(void) +CUIFSchemeDef::DrawCtrlEdge( + HDC hDC, + LPCRECT prc, + DWORD dwUnknownFlags, + DWORD dwDrawFlags) { - //FIXME + UINT uEdge = BDR_RAISEDINNER; + + if (dwDrawFlags & 0x10) + { + if (!(dwUnknownFlags & 0x40)) + { + if (dwUnknownFlags & 0x80) + uEdge = BDR_SUNKENOUTER; + else + return; + } + } + else if (dwDrawFlags & 0x2) + { + if (!(dwUnknownFlags & 0x10)) + { + if (dwUnknownFlags & 0x20) + uEdge = BDR_SUNKENOUTER; + else + return; + } + } + else if (dwDrawFlags & 0x1) + { + if (!(dwUnknownFlags & 0x4)) + { + if (dwUnknownFlags & 0x8) + uEdge = BDR_SUNKENOUTER; + else + return; + } + } + else if (!(dwUnknownFlags & 0x1)) + { + return; + } + RECT rc = *prc; - ::DrawEdge(hDC, &rc, BDR_RAISEDINNER, BF_RECT); + ::DrawEdge(hDC, &rc, uEdge, BF_RECT); } inline STDMETHODIMP_(void) @@ -1772,15 +1812,15 @@ CUIFSchemeDef::DrawMenuSeparator(HDC hDC, LPCRECT prc) } inline STDMETHODIMP_(void) -CUIFSchemeDef::DrawFrameCtrlBkgd(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlags) +CUIFSchemeDef::DrawFrameCtrlBkgd(HDC hDC, LPCRECT prc, DWORD dwUnknownFlags, DWORD dwDrawFlags) { - DrawCtrlBkgd(hDC, prc, unused, dwDrawFlags); + DrawCtrlBkgd(hDC, prc, dwUnknownFlags, dwDrawFlags); } inline STDMETHODIMP_(void) -CUIFSchemeDef::DrawFrameCtrlEdge(HDC hDC, LPCRECT prc, DWORD unused, DWORD dwDrawFlags) +CUIFSchemeDef::DrawFrameCtrlEdge(HDC hDC, LPCRECT prc, DWORD dwUnknownFlags, DWORD dwDrawFlags) { - DrawCtrlEdge(hDC, prc, unused, dwDrawFlags); + DrawCtrlEdge(hDC, prc, dwUnknownFlags, dwDrawFlags); } inline STDMETHODIMP_(void) @@ -3780,7 +3820,6 @@ inline void CUIFButton::DrawIconProc(HDC hDC, LPRECT prc, BOOL bPressed) ::DeleteDC(hMemDC); } -/// @unimplemented inline void CUIFButton::DrawTextProc(HDC hDC, LPCRECT prc, BOOL bPressed) { @@ -4182,7 +4221,7 @@ CUIFButton2::OnPaintNoTheme(HDC hDC) RECT rc = { xOffset, yOffset, xOffset + cxButton, cyButton + yOffset }; SIZE offsetSize = { 0, 0 }; DWORD dwDrawFlags = MakeDrawFlag(); - m_pScheme->GetCtrlFaceOffset(((m_style & 0x200) ? 165 : 84), + m_pScheme->GetCtrlFaceOffset(((m_style & 0x200) ? 0xA5 : 0x54), dwDrawFlags, &offsetSize); ::OffsetRect(&rc, offsetSize.cx, offsetSize.cy); @@ -4216,7 +4255,7 @@ CUIFButton2::OnPaintNoTheme(HDC hDC) m_pScheme->DrawCtrlBkgd(hdcMem, &rcBack, - ((m_style & 0x200) ? 165 : 84), + ((m_style & 0x200) ? 0xA5 : 0x54), dwDrawFlags); if (m_pszButtonText) { @@ -4234,7 +4273,7 @@ CUIFButton2::OnPaintNoTheme(HDC hDC) m_pScheme->DrawCtrlEdge(hdcMem, &rcBack, - ((m_style & 0x200) ? 165 : 84), + ((m_style & 0x200) ? 0xA5 : 0x54), dwDrawFlags); ::BitBlt(hDC, m_rc.left, m_rc.top, width, height, hdcMem, 0, 0, SRCCOPY);
11 months, 2 weeks
1
0
0
0
[reactos] 01/01: [SDK] cicuif.h: Fix CUIFSchemeDef::DrawCtrlBitmap (#6348)
by Katayama Hirofumi MZ
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1156249d631cf79b2daaa…
commit 1156249d631cf79b2daaa3c52c68bc465d431739 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 15 10:36:12 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 15 10:36:12 2024 +0900 [SDK] cicuif.h: Fix CUIFSchemeDef::DrawCtrlBitmap (#6348) Supporting TIPs... JIRA issue: CORE-19360 Implement CUIFSchemeDef::DrawCtrlBitmap method. --- sdk/include/reactos/cicero/cicuif.h | 59 +++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index c3f5df67245..5e3ac117ea4 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -1691,11 +1691,66 @@ CUIFSchemeDef::DrawCtrlIcon(HDC hDC, LPCRECT prc, HICON hIcon, DWORD dwDrawFlags } } -/// @unimplemented inline STDMETHODIMP_(void) CUIFSchemeDef::DrawCtrlBitmap(HDC hDC, LPCRECT prc, HBITMAP hbm1, HBITMAP hbm2, DWORD dwDrawFlags) { - //FIXME + if (m_bMirroring) + { + hbm1 = cicMirrorBitmap(hbm1, GetBrush(9)); + hbm2 = cicMirrorBitmap(hbm2, (HBRUSH)GetStockObject(BLACK_BRUSH)); + } + + HBRUSH hBrush = (HBRUSH)UlongToHandle(COLOR_BTNFACE + 1); + BOOL bBrushCreated = FALSE; + if (hbm2) + { + HBITMAP hBitmap = NULL; + if (dwDrawFlags & UIF_DRAW_DISABLED) + { + hBitmap = cicCreateDisabledBitmap(prc, hbm2, GetBrush(9), GetBrush(11), TRUE); + } + else + { + if ((dwDrawFlags & UIF_DRAW_PRESSED) && !(dwDrawFlags & 0x2)) + { + hBrush = cicCreateDitherBrush(); + bBrushCreated = TRUE; + } + + COLORREF rgbFace = ::GetSysColor(COLOR_BTNFACE); + COLORREF rgbHighlight = ::GetSysColor(COLOR_BTNHIGHLIGHT); + hBitmap = cicCreateMaskBmp(prc, hbm1, hbm2, hBrush, rgbFace, rgbHighlight); + } + + if (hBitmap) + { + ::DrawState(hDC, NULL, NULL, (LPARAM)hBitmap, 0, + prc->left, prc->top, + prc->right - prc->left, prc->bottom - prc->top, + DST_BITMAP); + ::DeleteObject(hBitmap); + } + } + else + { + UINT uFlags = DST_BITMAP; + if (dwDrawFlags & 0x20) + uFlags |= (DSS_MONO | DSS_DISABLED); + + ::DrawState(hDC, NULL, NULL, (LPARAM)hbm1, 0, + prc->left, prc->top, + prc->right - prc->left, prc->bottom - prc->top, + uFlags); + } + + if (bBrushCreated) + ::DeleteObject(hBrush); + + if (m_bMirroring) + { + ::DeleteObject(hbm1); + ::DeleteObject(hbm2); + } } inline STDMETHODIMP_(void)
11 months, 2 weeks
1
0
0
0
[reactos] 01/01: [FREELDR:UI] Update display after restoring screen contents
by Hervé Poussineau
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=922757e2e3860695344fd…
commit 922757e2e3860695344fd104367db2678c5a4fd6 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Jan 14 19:09:48 2024 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun Jan 14 19:12:11 2024 +0100 [FREELDR:UI] Update display after restoring screen contents JIRA issue: CORE-18186 --- boot/freeldr/freeldr/ui/tui.c | 1 + 1 file changed, 1 insertion(+) diff --git a/boot/freeldr/freeldr/ui/tui.c b/boot/freeldr/freeldr/ui/tui.c index bb5646aa917..d8669ea196b 100644 --- a/boot/freeldr/freeldr/ui/tui.c +++ b/boot/freeldr/freeldr/ui/tui.c @@ -626,6 +626,7 @@ VOID TuiRestoreScreen(PUCHAR Buffer) { ScreenMemory[i] = Buffer[i]; } + VideoCopyOffScreenBufferToVRAM(); } VOID TuiMessageBox(PCSTR MessageText)
11 months, 2 weeks
1
0
0
0
[reactos] 01/01: [CMAKE][WIN32U_APITEST] Remove 3 useless 'set_module_type(... IMAGEBASE default)' (#6328)
by Serge Gautherie
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c895c986ffb7df63c4a8…
commit 2c895c986ffb7df63c4a8845e7786d660f3c121c Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun Jan 14 16:07:00 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 14 16:07:00 2024 +0100 [CMAKE][WIN32U_APITEST] Remove 3 useless 'set_module_type(... IMAGEBASE default)' (#6328) And add an explicit documentation comment. Addendum to commit 2b7246fd3. --- modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt | 2 +- modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt | 2 +- modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt | 2 +- sdk/cmake/CMakeMacros.cmake | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt index 8c086a367a4..021fba309c2 100644 --- a/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt +++ b/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt @@ -7,5 +7,5 @@ add_library(win32u_2k3sp2 MODULE ${win32u_2k3sp2_asm} ${CMAKE_CURRENT_BINARY_DIR}/win32u_2k3sp2.def) -set_module_type(win32u_2k3sp2 module IMAGEBASE default) +set_module_type(win32u_2k3sp2 module) add_dependencies(win32u_2k3sp2 psdk) diff --git a/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt index 743ded25e1f..38737886d0c 100644 --- a/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt +++ b/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt @@ -7,5 +7,5 @@ add_library(win32u_vista MODULE ${win32u_vista_asm} ${CMAKE_CURRENT_BINARY_DIR}/win32u_vista.def) -set_module_type(win32u_vista module IMAGEBASE default) +set_module_type(win32u_vista module) add_dependencies(win32u_vista psdk) diff --git a/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt index 6939993703a..457d5c1868a 100644 --- a/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt +++ b/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt @@ -7,5 +7,5 @@ add_library(win32u_xpsp2 MODULE ${win32u_xpsp2_asm} ${CMAKE_CURRENT_BINARY_DIR}/win32u_xpsp2.def) -set_module_type(win32u_xpsp2 module IMAGEBASE default) +set_module_type(win32u_xpsp2 module) add_dependencies(win32u_xpsp2 psdk) diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 6fcf476da69..802979c2422 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -642,6 +642,7 @@ function(set_module_type MODULE TYPE) endif() # Set base address + # Use 'IMAGEBASE default' to skip these set_image_base(), especially for win32dll test files if(__module_IMAGEBASE) if(NOT ${__module_IMAGEBASE} STREQUAL "default") set_image_base(${MODULE} ${__module_IMAGEBASE})
11 months, 2 weeks
1
0
0
0
[reactos] 01/01: [JOY] Add IDCANCEL action to MainPageProc (#6346)
by Katayama Hirofumi MZ
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cbc3ee2287c1972ac8257…
commit cbc3ee2287c1972ac8257da60388a5de9ea6c0e5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Jan 14 20:48:34 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 14 20:48:34 2024 +0900 [JOY] Add IDCANCEL action to MainPageProc (#6346) Based on KRosUser's joycancel.patch. Enable Esc key and Close button. JIRA issue: CORE-19424 Insert a line of "case IDCANCEL:". --- dll/cpl/joy/joy.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dll/cpl/joy/joy.c b/dll/cpl/joy/joy.c index 057ec4c8534..dc9482ca34f 100644 --- a/dll/cpl/joy/joy.c +++ b/dll/cpl/joy/joy.c @@ -270,6 +270,7 @@ MainPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) break; case IDOK: + case IDCANCEL: DestroyIcon(s_hIcon); DestroyIcon(s_hIconSm); EndDialog(hwndDlg,LOWORD(wParam));
11 months, 2 weeks
1
0
0
0
[reactos] 02/02: [MSVCRT] Add asm wrapper around RtlUnwind for Wine code
by Timo Kreuzer
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=92db51883abd474f3c3fe…
commit 92db51883abd474f3c3fe3d788a4b5e4201f8515 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jan 8 21:55:15 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jan 13 19:39:23 2024 +0200 [MSVCRT] Add asm wrapper around RtlUnwind for Wine code This is needed, because Wine code expects RtlUnwind to restore the non-volatile registers, before returning, but ours / the native one doesn't do that. Should fix CORE-19392 and CORE-19397 --- sdk/lib/crt/crt.cmake | 1 + sdk/lib/crt/wine/msvcrt.h | 13 ++++++++++++ sdk/lib/crt/wine/rosglue_i386.s | 47 +++++++++++++++++++++++++++++++++++++++++ sdk/lib/crt/wine/wine.cmake | 3 +++ 4 files changed, 64 insertions(+) diff --git a/sdk/lib/crt/crt.cmake b/sdk/lib/crt/crt.cmake index 91f9d4a074e..f4868b27080 100644 --- a/sdk/lib/crt/crt.cmake +++ b/sdk/lib/crt/crt.cmake @@ -31,6 +31,7 @@ list(APPEND CRT_ASM_SOURCE ${CRT_SETJMP_ASM_SOURCE} ${CRT_STDLIB_ASM_SOURCE} ${CRT_STRING_ASM_SOURCE} + ${CRT_WINE_ASM_SOURCE} ) set_source_files_properties(${CRT_ASM_SOURCE} PROPERTIES COMPILE_DEFINITIONS "__MINGW_IMPORT=extern;USE_MSVCRT_PREFIX;_MSVCRT_LIB_;_MSVCRT_;_MT;CRTDLL") diff --git a/sdk/lib/crt/wine/msvcrt.h b/sdk/lib/crt/wine/msvcrt.h index d5dc4cd5366..47199794248 100644 --- a/sdk/lib/crt/wine/msvcrt.h +++ b/sdk/lib/crt/wine/msvcrt.h @@ -1489,6 +1489,19 @@ typedef struct { #ifdef __REACTOS__ #define __wine_longjmp longjmp #define __wine_jmp_buf _JBTYPE + +#ifdef _M_IX86 +// ASM wrapper for Wine code. See rosglue_i386.s for implementation. +void +WINAPI +__wine__RtlUnwind( + struct _EXCEPTION_REGISTRATION_RECORD* pEndFrame, + PVOID targetIp, + struct _EXCEPTION_RECORD* pRecord, + PVOID retval); +#define RtlUnwind __wine__RtlUnwind +#endif /* _M_IX86 */ + #endif #endif /* __WINE_MSVCRT_H */ diff --git a/sdk/lib/crt/wine/rosglue_i386.s b/sdk/lib/crt/wine/rosglue_i386.s new file mode 100644 index 00000000000..bc0b9b384fe --- /dev/null +++ b/sdk/lib/crt/wine/rosglue_i386.s @@ -0,0 +1,47 @@ + +#include <asm.inc> + +.code + +EXTERN _RtlUnwind@16:PROC + +// ASM wrapper for Wine code. This is needed, because Wine code expects +// RtlUnwind to restore the non-volatile registers, before returning, but +// ours / the native one does not do that. +// +// void +// WINAPI +// __wine__RtlUnwind( +// PVOID TargetFrame, +// PVOID TargetIp , +// PEXCEPTION_RECORD ExceptionRecord , +// PVOID ReturnValue); +// +PUBLIC ___wine__RtlUnwind@16 +___wine__RtlUnwind@16: + + push ebp + mov ebp, esp + + /* Save non-volatile registers */ + push ebx + push esi + push edi + + /* Call the native function */ + push dword ptr [ebp + 20] // ReturnValue + push dword ptr [ebp + 16] // ExceptionRecord + push dword ptr [ebp + 12] // TargetIp + push dword ptr [ebp + 8] // TargetFrame + call _RtlUnwind@16 + + /* Restore non-volatile registers */ + pop edi + pop esi + pop ebx + + mov esp, ebp + pop ebp + ret 16 + +END diff --git a/sdk/lib/crt/wine/wine.cmake b/sdk/lib/crt/wine/wine.cmake index d16da073c31..f279fe8bc72 100644 --- a/sdk/lib/crt/wine/wine.cmake +++ b/sdk/lib/crt/wine/wine.cmake @@ -10,6 +10,9 @@ if(ARCH STREQUAL "i386") list(APPEND CRT_WINE_SOURCE wine/except_i386.c ) + list(APPEND CRT_WINE_ASM_SOURCE + wine/rosglue_i386.s + ) elseif(ARCH STREQUAL "amd64") list(APPEND CRT_WINE_SOURCE wine/except_x86_64.c
11 months, 2 weeks
1
0
0
0
[reactos] 01/02: [NTDLL_APITEST] Add test for x86 RtlUnwind
by Timo Kreuzer
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d52b70a73e75293f03aa5…
commit d52b70a73e75293f03aa5d5c2d6fe2d6aaaa901c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jan 8 19:53:28 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jan 13 19:39:23 2024 +0200 [NTDLL_APITEST] Add test for x86 RtlUnwind --- modules/rostests/apitests/ntdll/testlist.c | 4 ++ modules/rostests/apitests/rtl/CMakeLists.txt | 4 ++ modules/rostests/apitests/rtl/i386/RtlUnwind-asm.s | 76 ++++++++++++++++++++++ modules/rostests/apitests/rtl/i386/RtlUnwind.c | 58 +++++++++++++++++ modules/rostests/apitests/rtl/testlist.c | 4 ++ 5 files changed, 146 insertions(+) diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index a34b06f12d7..f837fa29f8f 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -94,6 +94,7 @@ extern void func_RtlRemovePrivileges(void); extern void func_RtlUnicodeStringToAnsiString(void); extern void func_RtlUnicodeStringToCountedOemString(void); extern void func_RtlUnicodeToOemN(void); +extern void func_RtlUnwind(void); extern void func_RtlUpcaseUnicodeStringToCountedOemString(void); extern void func_RtlValidateUnicodeString(void); extern void func_RtlxUnicodeStringToAnsiSize(void); @@ -201,6 +202,9 @@ const struct test winetest_testlist[] = { "StackOverflow", func_StackOverflow }, { "TimerResolution", func_TimerResolution }, { "UserModeException", func_UserModeException }, +#ifdef _M_IX86 + { "RtlUnwind", func_RtlUnwind }, +#endif #ifdef _M_AMD64 { "RtlCaptureContext", func_RtlCaptureContext }, #endif diff --git a/modules/rostests/apitests/rtl/CMakeLists.txt b/modules/rostests/apitests/rtl/CMakeLists.txt index 13bd9b7a718..49d87415d1a 100644 --- a/modules/rostests/apitests/rtl/CMakeLists.txt +++ b/modules/rostests/apitests/rtl/CMakeLists.txt @@ -7,6 +7,10 @@ list(APPEND SOURCE if(ARCH STREQUAL "i386") list(APPEND SOURCE i386/RtlCaptureContext.c + i386/RtlUnwind.c + ) + list(APPEND ASM_SOURCE + i386/RtlUnwind-asm.s ) elseif(ARCH STREQUAL "amd64") list(APPEND ASM_SOURCE diff --git a/modules/rostests/apitests/rtl/i386/RtlUnwind-asm.s b/modules/rostests/apitests/rtl/i386/RtlUnwind-asm.s new file mode 100644 index 00000000000..f9027ada782 --- /dev/null +++ b/modules/rostests/apitests/rtl/i386/RtlUnwind-asm.s @@ -0,0 +1,76 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0+ (
https://spdx.org/licenses/GPL-2.0+
) + * PURPOSE: Test helper for x86 RtlUnwind + * COPYRIGHT: Copyright 2024 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#include <asm.inc> +#include <ks386.inc> + +.code + +EXTERN _g_InContext:DWORD +EXTERN _g_OutContext:DWORD +EXTERN _RtlUnwind@16:PROC + +// +// VOID +// WINAPI +// RtlUnwindWrapper( +// _In_ PVOID TargetFrame, +// _In_ PVOID TargetIp, +// _In_ PEXCEPTION_RECORD ExceptionRecord, +// _In_ PVOID ReturnValue); +// +PUBLIC _RtlUnwindWrapper@16 +FUNC _RtlUnwindWrapper@16 + + push ebp + mov ebp, esp + + /* Save non-volatile registers */ + push ebx + push esi + push edi + + /* Load registers from the in-context */ + mov eax, _g_InContext[CONTEXT_EAX] + mov ebx, _g_InContext[CONTEXT_EBX] + mov ecx, _g_InContext[CONTEXT_ECX] + mov edx, _g_InContext[CONTEXT_EDX] + mov esi, _g_InContext[CONTEXT_ESI] + mov edi, _g_InContext[CONTEXT_EDI] + + /* Call the native function */ + push dword ptr [ebp + 20] // ReturnValue + push dword ptr [ebp + 16] // ExceptionRecord + push dword ptr [ebp + 12] // TargetIp + push dword ptr [ebp + 8] // TargetFrame + call _RtlUnwind@16 + + /* Save registers in the out-context */ + mov _g_OutContext[CONTEXT_EAX], eax + mov _g_OutContext[CONTEXT_EBX], ebx + mov _g_OutContext[CONTEXT_ECX], ecx + mov _g_OutContext[CONTEXT_EDX], edx + mov _g_OutContext[CONTEXT_ESI], esi + mov _g_OutContext[CONTEXT_EDI], edi + mov word ptr _g_OutContext[CONTEXT_SEGCS], cs + mov word ptr _g_OutContext[CONTEXT_SEGDS], ds + mov word ptr _g_OutContext[CONTEXT_SEGES], es + mov word ptr _g_OutContext[CONTEXT_SEGFS], fs + + /* Restore non-volatile registers */ + pop edi + pop esi + pop ebx + + mov esp, ebp + pop ebp + ret 16 + +ENDFUNC + + +END diff --git a/modules/rostests/apitests/rtl/i386/RtlUnwind.c b/modules/rostests/apitests/rtl/i386/RtlUnwind.c new file mode 100644 index 00000000000..958c1318cea --- /dev/null +++ b/modules/rostests/apitests/rtl/i386/RtlUnwind.c @@ -0,0 +1,58 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0+ (
https://spdx.org/licenses/GPL-2.0+
) + * PURPOSE: Test for x86 RtlUnwind + * COPYRIGHT: Copyright 2024 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#include <rtltests.h> + +CONTEXT g_InContext; +CONTEXT g_OutContext; + +VOID +WINAPI +RtlUnwindWrapper( + _In_ PVOID TargetFrame, + _In_ PVOID TargetIp, + _In_ PEXCEPTION_RECORD ExceptionRecord, + _In_ PVOID ReturnValue); + +START_TEST(RtlUnwind) +{ + BOOL IsWow64; + + RtlZeroMemory(&g_InContext, sizeof(g_InContext)); + RtlZeroMemory(&g_OutContext, sizeof(g_OutContext)); + + PEXCEPTION_REGISTRATION_RECORD ExcptReg = (PEXCEPTION_REGISTRATION_RECORD)__readfsdword(0); + ok(ExcptReg != NULL, "ExcpReg is NULL\n"); + + g_InContext.Eax = 0xabcd0001; + g_InContext.Ebx = 0xabcd0002; + g_InContext.Ecx = 0xabcd0003; + g_InContext.Edx = 0xabcd0004; + g_InContext.Esi = 0xabcd0005; + g_InContext.Edi = 0xabcd0006; + RtlUnwindWrapper(ExcptReg, NULL, NULL, (PVOID)0x12345678); + ok_eq_hex(g_OutContext.Eax, 0x12345678ul); + ok_eq_hex(g_OutContext.Ebx, 0ul); + ok_eq_hex(g_OutContext.Ecx, 0ul); + ok_eq_hex(g_OutContext.Edx, 0ul); + ok_eq_hex(g_OutContext.Esi, 0ul); + ok_eq_hex(g_OutContext.Edi, 0ul); + if (IsWow64Process(NtCurrentProcess(), &IsWow64) && IsWow64) + { + ok_eq_hex(g_OutContext.SegCs, 0x23ul); + ok_eq_hex(g_OutContext.SegDs, 0x2bul); + ok_eq_hex(g_OutContext.SegEs, 0x2bul); + ok_eq_hex(g_OutContext.SegFs, 0x53ul); + } + else + { + ok_eq_hex(g_OutContext.SegCs, 0x1bul); + ok_eq_hex(g_OutContext.SegDs, 0x23ul); + ok_eq_hex(g_OutContext.SegEs, 0x23ul); + ok_eq_hex(g_OutContext.SegFs, 0x3bul); + } +} diff --git a/modules/rostests/apitests/rtl/testlist.c b/modules/rostests/apitests/rtl/testlist.c index 1eeed3b056b..62e2694add8 100644 --- a/modules/rostests/apitests/rtl/testlist.c +++ b/modules/rostests/apitests/rtl/testlist.c @@ -5,11 +5,15 @@ extern void func_RtlCaptureContext(void); extern void func_RtlIntSafe(void); +extern void func_RtlUnwind(void); const struct test winetest_testlist[] = { { "RtlIntSafe", func_RtlIntSafe }, +#ifdef _M_IX86 + { "RtlUnwind", func_RtlUnwind }, +#endif #ifdef _M_AMD64 { "RtlCaptureContext", func_RtlCaptureContext }, #endif
11 months, 2 weeks
1
0
0
0
[reactos] 03/03: [TCPIP] Remove code duplication to get max link speed, MTU and max packet size
by Hervé Poussineau
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=382836f08758055948a52…
commit 382836f08758055948a52f3f20c1d33ec00e2a8c Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Dec 13 19:59:43 2023 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sat Jan 13 15:23:46 2024 +0100 [TCPIP] Remove code duplication to get max link speed, MTU and max packet size This is already done when link goes up, in ReconfigureAdapter() function. --- drivers/network/tcpip/datalink/lan.c | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/drivers/network/tcpip/datalink/lan.c b/drivers/network/tcpip/datalink/lan.c index 1da4e2129d6..e24c8985472 100644 --- a/drivers/network/tcpip/datalink/lan.c +++ b/drivers/network/tcpip/datalink/lan.c @@ -1371,38 +1371,6 @@ BOOLEAN BindAdapter( TI_DbgPrint(DEBUG_DATALINK,("Adapter Description: %wZ\n", &IF->Description)); - /* Get maximum link speed */ - NdisStatus = NDISCall(Adapter, - NdisRequestQueryInformation, - OID_GEN_LINK_SPEED, - &IF->Speed, - sizeof(UINT)); - - if (!NT_SUCCESS(NdisStatus)) - IF->Speed = IP_DEFAULT_LINK_SPEED; - - Adapter->Speed = IF->Speed * 100L; - - /* Get maximum frame size */ - NdisStatus = NDISCall(Adapter, - NdisRequestQueryInformation, - OID_GEN_MAXIMUM_FRAME_SIZE, - &Adapter->MTU, - sizeof(UINT)); - if (NdisStatus != NDIS_STATUS_SUCCESS) - return FALSE; - - IF->MTU = Adapter->MTU; - - /* Get maximum packet size */ - NdisStatus = NDISCall(Adapter, - NdisRequestQueryInformation, - OID_GEN_MAXIMUM_TOTAL_SIZE, - &Adapter->MaxPacketSize, - sizeof(UINT)); - if (NdisStatus != NDIS_STATUS_SUCCESS) - return FALSE; - /* Register interface with IP layer */ IPRegisterInterface(IF);
11 months, 2 weeks
1
0
0
0
[reactos] 02/03: [TCPIP] Call netif_set_link_up/netif_set_link_down after link status change
by Hervé Poussineau
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89b685007a4265d764845…
commit 89b685007a4265d764845e42afa5e8b20894d9be Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Dec 13 19:56:52 2023 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sat Jan 13 15:23:46 2024 +0100 [TCPIP] Call netif_set_link_up/netif_set_link_down after link status change - Update TCP cached information only after updating adapter information (so that TCPUpdateInterfaceIPInformation/TCPUpdateInterfaceLinkStatus gets new status) - Call netif_set_link_up/netif_set_link_down in TCPUpdateInterfaceLinkStatus This fixes a lwIP requirement: 2007-07-13 Jared Grubb (integrated by Frédéric Bernon) * [...] Be carefull for port maintainers to add the NETIF_FLAG_LINK_UP flag (like in ethernetif.c) if you want to be sure to be compatible with future changes... --- drivers/network/tcpip/datalink/lan.c | 8 ++++---- drivers/network/tcpip/ip/transport/tcp/if.c | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/network/tcpip/datalink/lan.c b/drivers/network/tcpip/datalink/lan.c index ccd0f555ef5..1da4e2129d6 100644 --- a/drivers/network/tcpip/datalink/lan.c +++ b/drivers/network/tcpip/datalink/lan.c @@ -750,10 +750,6 @@ BOOLEAN ReconfigureAdapter(PRECONFIGURE_CONTEXT Context) Context->Adapter->CompletingReset = FALSE; - /* Update the IP and link status information cached in TCP */ - TCPUpdateInterfaceIPInformation(Interface); - TCPUpdateInterfaceLinkStatus(Interface); - if (Context->State == LAN_STATE_STARTED) { /* Get maximum link speed */ @@ -791,6 +787,10 @@ BOOLEAN ReconfigureAdapter(PRECONFIGURE_CONTEXT Context) Adapter->State = Context->State; + /* Update the IP and link status information cached in TCP */ + TCPUpdateInterfaceIPInformation(Interface); + TCPUpdateInterfaceLinkStatus(Interface); + return TRUE; } diff --git a/drivers/network/tcpip/ip/transport/tcp/if.c b/drivers/network/tcpip/ip/transport/tcp/if.c index aba55d23abd..e69c3667fc3 100644 --- a/drivers/network/tcpip/ip/transport/tcp/if.c +++ b/drivers/network/tcpip/ip/transport/tcp/if.c @@ -6,6 +6,7 @@ #include "lwip/ip.h" #include "lwip/api.h" #include "lwip/tcpip.h" +#include <ipifcons.h> err_t TCPSendDataCallback(struct netif *netif, struct pbuf *p, struct ip_addr *dest) @@ -80,7 +81,6 @@ TCPSendDataCallback(struct netif *netif, struct pbuf *p, struct ip_addr *dest) VOID TCPUpdateInterfaceLinkStatus(PIP_INTERFACE IF) { -#if 0 ULONG OperationalStatus; GetInterfaceConnectionStatus(IF, &OperationalStatus); @@ -89,7 +89,6 @@ TCPUpdateInterfaceLinkStatus(PIP_INTERFACE IF) netif_set_link_up(IF->TCPContext); else netif_set_link_down(IF->TCPContext); -#endif } err_t
11 months, 2 weeks
1
0
0
0
← Newer
1
...
7
8
9
10
11
12
13
...
19
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
Results per page:
10
25
50
100
200