https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ed3c50f748050926f4de03...
commit ed3c50f748050926f4de030026f8ddc9f05e1e11 Author: Katayama Hirofumi MZ katayama.hirofumi.mz@gmail.com AuthorDate: Sun Feb 9 23:49:44 2020 +0900 Commit: GitHub noreply@github.com CommitDate: Sun Feb 9 23:49:44 2020 +0900
[SHELL32_APITEST] SHLimitInputEdit: Fix C4509 warning (#2321)
CORE-11701 --- .../rostests/apitests/shell32/SHLimitInputEdit.cpp | 25 +++++++++++++++------- 1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/modules/rostests/apitests/shell32/SHLimitInputEdit.cpp b/modules/rostests/apitests/shell32/SHLimitInputEdit.cpp index 9112b8f7f21..670ccb054ec 100644 --- a/modules/rostests/apitests/shell32/SHLimitInputEdit.cpp +++ b/modules/rostests/apitests/shell32/SHLimitInputEdit.cpp @@ -238,16 +238,10 @@ PropEnumProc( return TRUE; }
-static INT_PTR CALLBACK -DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static void +DoNullFolderTest(HWND hEdt1) { - if (uMsg != WM_INITDIALOG) - return FALSE; - - HWND hEdt1 = GetDlgItem(hwnd, edt1); - INT n; HRESULT hr; - WCHAR szText[64];
_SEH2_TRY { @@ -258,7 +252,22 @@ DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) hr = 0xDEAD; } _SEH2_END; + ok_int(hr, 0xDEAD); +} + +static INT_PTR CALLBACK +DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + if (uMsg != WM_INITDIALOG) + return FALSE; + + HWND hEdt1 = GetDlgItem(hwnd, edt1); + INT n; + HRESULT hr; + WCHAR szText[64]; + + DoNullFolderTest(hEdt1);
{ CShellFolder sf(123, FALSE);