Ros-diffs February 2015

ros-diffs@reactos.org

16 participants
372 discussions

[tfaber] 66187: [RTL] - Implement RtlIpv4StringToAddressA and RtlIpv4StringToAddressExA using their -W counterparts CORE-6490

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Feb 7 10:07:24 2015 New Revision: 66187 URL: http://svn.reactos.org/svn/reactos?rev=66187&view=rev Log: [RTL] - Implement RtlIpv4StringToAddressA and RtlIpv4StringToAddressExA using their -W counterparts CORE-6490 Modified: trunk/reactos/lib/rtl/network.c Modified: trunk/reactos/lib/rtl/network.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/network.c?rev=6618… ============================================================================== --- trunk/reactos/lib/rtl/network.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/network.c [iso-8859-1] Sat Feb 7 10:07:24 2015 @@ -131,31 +131,70 @@ } /* - * @unimplemented - */ -NTSTATUS -NTAPI -RtlIpv4StringToAddressA(IN PCSTR String, - IN BOOLEAN Strict, - OUT PCSTR *Terminator, - OUT struct in_addr *Addr) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* -* @unimplemented -*/ -NTSTATUS -NTAPI -RtlIpv4StringToAddressExA(IN PCSTR AddressString, - IN BOOLEAN Strict, - OUT struct in_addr *Address, - OUT PUSHORT Port) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + * @implemented + */ +NTSTATUS +NTAPI +RtlIpv4StringToAddressA( + _In_ PCSTR String, + _In_ BOOLEAN Strict, + _Out_ PCSTR *Terminator, + _Out_ struct in_addr *Addr) +{ + NTSTATUS Status; + ANSI_STRING AddressA; + UNICODE_STRING AddressW; + PCWSTR TerminatorW = NULL; + + Status = RtlInitAnsiStringEx(&AddressA, String); + if (!NT_SUCCESS(Status)) + return Status; + + Status = RtlAnsiStringToUnicodeString(&AddressW, &AddressA, TRUE); + if (!NT_SUCCESS(Status)) + return Status; + + Status = RtlIpv4StringToAddressW(AddressW.Buffer, + Strict, + &TerminatorW, + Addr); + + ASSERT(TerminatorW >= AddressW.Buffer); + *Terminator = String + (TerminatorW - AddressW.Buffer); + + RtlFreeUnicodeString(&AddressW); + + return Status; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlIpv4StringToAddressExA( + _In_ PCSTR AddressString, + _In_ BOOLEAN Strict, + _Out_ struct in_addr *Address, + _Out_ PUSHORT Port) +{ + NTSTATUS Status; + ANSI_STRING AddressA; + UNICODE_STRING AddressW; + + Status = RtlInitAnsiStringEx(&AddressA, AddressString); + if (!NT_SUCCESS(Status)) + return Status; + + Status = RtlAnsiStringToUnicodeString(&AddressW, &AddressA, TRUE); + if (!NT_SUCCESS(Status)) + return Status; + + Status = RtlIpv4StringToAddressExW(AddressW.Buffer, Strict, Address, Port); + + RtlFreeUnicodeString(&AddressW); + + return Status; } /*

9 years, 7 months

[hbelusca] 66186: [WINLOGON][WIN32K]: Tend towards Win2k3-compatible winlogon logoff/shutdown messaging. Something that needs to be fixed is that it is not winlogon that checks whether the app requ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Feb 7 01:18:40 2015 New Revision: 66186 URL: http://svn.reactos.org/svn/reactos?rev=66186&view=rev Log: [WINLOGON][WIN32K]: Tend towards Win2k3-compatible winlogon logoff/shutdown messaging. Something that needs to be fixed is that it is not winlogon that checks whether the app requesting the shutdown has the correct rights, but it is win32k. I temporarily disable this check in winlogon (it's not as if we introduced a security breach in ReactOS ^^) Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/include/reactos/undocuser.h trunk/reactos/include/reactos/winlogon.h trunk/reactos/win32ss/user/ntuser/simplecall.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Sat Feb 7 01:18:40 2015 @@ -1148,6 +1148,7 @@ return TRUE; } +#if 0 static NTSTATUS CheckForShutdownPrivilege( @@ -1206,6 +1207,7 @@ } return STATUS_SUCCESS; } +#endif BOOL WINAPI @@ -1329,6 +1331,38 @@ DoGenericAction(Session, WLX_SAS_ACTION_LOCK_WKSTA); break; } + case LN_LOGOFF: + { + UINT Flags = (UINT)lParam; + UINT Action = Flags & EWX_ACTION_MASK; + DWORD wlxAction; + + /* Check parameters */ + switch (Action) + { + case EWX_LOGOFF: wlxAction = WLX_SAS_ACTION_LOGOFF; break; + case EWX_SHUTDOWN: wlxAction = WLX_SAS_ACTION_SHUTDOWN; break; + case EWX_REBOOT: wlxAction = WLX_SAS_ACTION_SHUTDOWN_REBOOT; break; + case EWX_POWEROFF: wlxAction = WLX_SAS_ACTION_SHUTDOWN_POWER_OFF; break; + default: + { + ERR("Invalid ExitWindows action 0x%x\n", Action); + return STATUS_INVALID_PARAMETER; + } + } + +#if 0 + // FIXME: This check must be done by Win32k, not by us! + if (WLX_SHUTTINGDOWN(wlxAction)) + { + NTSTATUS Status = CheckForShutdownPrivilege(wParam); + if (!NT_SUCCESS(Status)) + return Status; + } +#endif + DoGenericAction(Session, wlxAction); + return 1; + } default: { ERR("WM_LOGONNOTIFY case %d is unimplemented\n", wParam); @@ -1349,35 +1383,6 @@ { DispatchSAS(Session, (DWORD)wParam); return TRUE; - } - case PM_WINLOGON_EXITWINDOWS: - { - UINT Flags = (UINT)lParam; - UINT Action = Flags & EWX_ACTION_MASK; - DWORD wlxAction; - - /* Check parameters */ - switch (Action) - { - case EWX_LOGOFF: wlxAction = WLX_SAS_ACTION_LOGOFF; break; - case EWX_SHUTDOWN: wlxAction = WLX_SAS_ACTION_SHUTDOWN; break; - case EWX_REBOOT: wlxAction = WLX_SAS_ACTION_SHUTDOWN_REBOOT; break; - case EWX_POWEROFF: wlxAction = WLX_SAS_ACTION_SHUTDOWN_POWER_OFF; break; - default: - { - ERR("Invalid ExitWindows action 0x%x\n", Action); - return STATUS_INVALID_PARAMETER; - } - } - - if (WLX_SHUTTINGDOWN(wlxAction)) - { - NTSTATUS Status = CheckForShutdownPrivilege((DWORD)wParam); - if (!NT_SUCCESS(Status)) - return Status; - } - DoGenericAction(Session, wlxAction); - return 1; } } Modified: trunk/reactos/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocuser.… ============================================================================== --- trunk/reactos/include/reactos/undocuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/undocuser.h [iso-8859-1] Sat Feb 7 01:18:40 2015 @@ -100,12 +100,14 @@ // // Definitions used by WM_LOGONNOTIFY // +#define LN_LOGOFF 0x0 #define LN_SHELL_EXITED 0x2 #define LN_START_TASK_MANAGER 0x4 #define LN_LOCK_WORKSTATION 0x5 #define LN_UNLOCK_WORKSTATION 0x6 #define LN_MESSAGE_BEEP 0x9 #define LN_START_SCREENSAVE 0xA +#define LN_LOGOFF_CANCELED 0xB // From WinCE 6.0 Imm.h SDK // Returns for ImmProcessHotKey @@ -174,8 +176,8 @@ typedef struct _UAHOWP { - BYTE* MsgBitArray; - DWORD Size; + BYTE* MsgBitArray; + DWORD Size; } UAHOWP, *PUAHOWP; #define UAH_HOOK_MESSAGE(uahowp, msg) uahowp.MsgBitArray[msg/8] |= (1 << (msg % 8)); @@ -184,47 +186,47 @@ typedef struct tagUSERAPIHOOK { - DWORD size; - WNDPROC DefWindowProcA; - WNDPROC DefWindowProcW; - UAHOWP DefWndProcArray; - FARPROC GetScrollInfo; - FARPROC SetScrollInfo; - FARPROC EnableScrollBar; - FARPROC AdjustWindowRectEx; - SETWINDOWRGN SetWindowRgn; - WNDPROC_OWP PreWndProc; - WNDPROC_OWP PostWndProc; - UAHOWP WndProcArray; - WNDPROC_OWP PreDefDlgProc; - WNDPROC_OWP PostDefDlgProc; - UAHOWP DlgProcArray; - FARPROC GetSystemMetrics; - FARPROC SystemParametersInfoA; - FARPROC SystemParametersInfoW; - FARPROC ForceResetUserApiHook; - FARPROC DrawFrameControl; - FARPROC DrawCaption; - FARPROC MDIRedrawFrame; - FARPROC GetRealWindowOwner; + DWORD size; + WNDPROC DefWindowProcA; + WNDPROC DefWindowProcW; + UAHOWP DefWndProcArray; + FARPROC GetScrollInfo; + FARPROC SetScrollInfo; + FARPROC EnableScrollBar; + FARPROC AdjustWindowRectEx; + SETWINDOWRGN SetWindowRgn; + WNDPROC_OWP PreWndProc; + WNDPROC_OWP PostWndProc; + UAHOWP WndProcArray; + WNDPROC_OWP PreDefDlgProc; + WNDPROC_OWP PostDefDlgProc; + UAHOWP DlgProcArray; + FARPROC GetSystemMetrics; + FARPROC SystemParametersInfoA; + FARPROC SystemParametersInfoW; + FARPROC ForceResetUserApiHook; + FARPROC DrawFrameControl; + FARPROC DrawCaption; + FARPROC MDIRedrawFrame; + FARPROC GetRealWindowOwner; } USERAPIHOOK, *PUSERAPIHOOK; typedef enum _UAPIHK { - uahLoadInit, - uahStop, - uahShutdown + uahLoadInit, + uahStop, + uahShutdown } UAPIHK, *PUAPIHK; typedef BOOL(CALLBACK *USERAPIHOOKPROC)(UAPIHK State, PUSERAPIHOOK puah); typedef struct _USERAPIHOOKINFO { - DWORD m_size; - LPCWSTR m_dllname1; - LPCWSTR m_funname1; - LPCWSTR m_dllname2; - LPCWSTR m_funname2; + DWORD m_size; + LPCWSTR m_dllname1; + LPCWSTR m_funname1; + LPCWSTR m_dllname2; + LPCWSTR m_funname2; } USERAPIHOOKINFO,*PUSERAPIHOOKINFO; #if (WINVER == _WIN32_WINNT_WINXP) Modified: trunk/reactos/include/reactos/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/winlogon.h… ============================================================================== --- trunk/reactos/include/reactos/winlogon.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/winlogon.h [iso-8859-1] Sat Feb 7 01:18:40 2015 @@ -9,8 +9,6 @@ #ifndef REACTOS_WINLOGON_H_INCLUDED #define REACTOS_WINLOGON_H_INCLUDED -#define PM_WINLOGON_EXITWINDOWS WM_APP - #define EWX_INTERNAL_FLAG 0x10000 #define EWX_INTERNAL_KILL_USER_APPS (EWX_INTERNAL_FLAG | 0x100) #define EWX_INTERNAL_KILL_ALL_APPS (EWX_INTERNAL_FLAG | 0x200) Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Sat Feb 7 01:18:40 2015 @@ -449,13 +449,18 @@ case TWOPARAM_ROUTINE_UNHOOKWINDOWSHOOK: RETURN( IntUnhookWindowsHook((int)Param1, (HOOKPROC)Param2)); + case TWOPARAM_ROUTINE_EXITREACTOS: + { + UNREFERENCED_PARAMETER(Param1 /* ProcessId */); + if(hwndSAS == NULL) { ASSERT(hwndSAS); RETURN(STATUS_NOT_FOUND); } - RETURN( co_IntSendMessage (hwndSAS, PM_WINLOGON_EXITWINDOWS, (WPARAM) Param1, (LPARAM)Param2)); + RETURN(co_IntSendMessage(hwndSAS, WM_LOGONNOTIFY, LN_LOGOFF, Param2 /* Flags */)); + } } ERR("Calling invalid routine number 0x%x in NtUserCallTwoParam(), Param1=0x%x Parm2=0x%x\n", Routine, Param1, Param2);

9 years, 7 months

[hbelusca] 66185: [WINSRV]: Remove a long standing hack (added 4 years ago) that is now useless. CORE-5138 #comment Hack from r51460 finally removed.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Feb 6 23:29:09 2015 New Revision: 66185 URL: http://svn.reactos.org/svn/reactos?rev=66185&view=rev Log: [WINSRV]: Remove a long standing hack (added 4 years ago) that is now useless. CORE-5138 #comment Hack from r51460 finally removed. Modified: trunk/reactos/win32ss/user/winsrv/init.c Modified: trunk/reactos/win32ss/user/winsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/init.c… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/init.c [iso-8859-1] Fri Feb 6 23:29:09 2015 @@ -9,33 +9,12 @@ /* INCLUDES *******************************************************************/ -/* PSDK Headers */ -#include <stdarg.h> -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#include <windef.h> -#include <winuser.h> +#include "winsrv.h" #define NDEBUG #include <debug.h> - /* ENTRY-POINT ****************************************************************/ - -/*** HACK from win32csr... ***/ -static HHOOK hhk = NULL; - -LRESULT -CALLBACK -KeyboardHookProc(int nCode, - WPARAM wParam, - LPARAM lParam) -{ - DPRINT1("KeyboardHookProc Processing!\n"); - return CallNextHookEx(hhk, nCode, wParam, lParam); -} -/*** END - HACK from win32csr... ***/ BOOL WINAPI @@ -47,21 +26,6 @@ UNREFERENCED_PARAMETER(dwReason); UNREFERENCED_PARAMETER(lpReserved); - if (DLL_PROCESS_ATTACH == dwReason) - { - DPRINT1("WINSRV - HACK: Use keyboard hook hack\n"); -/*** HACK from win32csr... ***/ -// -// HACK HACK HACK ReactOS to BOOT! Initialization BUG ALERT! See bug 5655. -// - hhk = SetWindowsHookEx(WH_KEYBOARD_LL, KeyboardHookProc, NULL, 0); -// BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! -// BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! -// BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! - -/*** END - HACK from win32csr... ***/ - } - return TRUE; }

9 years, 7 months

[jimtabor] 66184: [User32] - Patch by Huw Davies : Merge the blitting of the centered and non-centered cases.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Feb 6 21:17:10 2015 New Revision: 66184 URL: http://svn.reactos.org/svn/reactos?rev=66184&view=rev Log: [User32] - Patch by Huw Davies : Merge the blitting of the centered and non-centered cases. Modified: trunk/reactos/win32ss/user/user32/controls/static.c Modified: trunk/reactos/win32ss/user/user32/controls/static.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/static.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/static.c [iso-8859-1] Fri Feb 6 21:17:10 2015 @@ -823,19 +823,14 @@ GetClientRect(hwnd, &rcClient); if (style & SS_CENTERIMAGE) { - INT x, y; - x = (rcClient.right - rcClient.left)/2 - bm.bmWidth/2; - y = (rcClient.bottom - rcClient.top)/2 - bm.bmHeight/2; - FillRect( hdc, &rcClient, hbrush ); - BitBlt(hdc, x, y, bm.bmWidth, bm.bmHeight, hMemDC, 0, 0, - SRCCOPY); - } - else - { - StretchBlt(hdc, 0, 0, rcClient.right - rcClient.left, - rcClient.bottom - rcClient.top, hMemDC, - 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY); - } + rcClient.left = (rcClient.right - rcClient.left)/2 - bm.bmWidth/2; + rcClient.top = (rcClient.bottom - rcClient.top)/2 - bm.bmHeight/2; + rcClient.right = rcClient.left + bm.bmWidth; + rcClient.bottom = rcClient.top + bm.bmHeight; + } + StretchBlt(hdc, rcClient.left, rcClient.top, rcClient.right - rcClient.left, + rcClient.bottom - rcClient.top, hMemDC, + 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY); SelectObject(hMemDC, oldbitmap); DeleteDC(hMemDC); }

9 years, 7 months

[jimtabor] 66183: [WineTests|User32] - Sync Combo to wine head. Patch by Huw Davies : Make the combo's listbox a topmost window. See CORE-5186 for prior report.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Feb 6 21:07:59 2015 New Revision: 66183 URL: http://svn.reactos.org/svn/reactos?rev=66183&view=rev Log: [WineTests|User32] - Sync Combo to wine head. Patch by Huw Davies : Make the combo's listbox a topmost window. See CORE-5186 for prior report. Modified: trunk/rostests/winetests/user32/combo.c Modified: trunk/rostests/winetests/user32/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/combo.c?… ============================================================================== --- trunk/rostests/winetests/user32/combo.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/combo.c [iso-8859-1] Fri Feb 6 21:07:59 2015 @@ -537,6 +537,61 @@ DestroyWindow(hCombo); } +static void test_listbox_styles(DWORD cb_style) +{ + BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); + HWND combo; + COMBOBOXINFO info; + DWORD style, exstyle, expect_style, expect_exstyle; + BOOL ret; + + pGetComboBoxInfo = (void*)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); + if (!pGetComboBoxInfo){ + win_skip("GetComboBoxInfo is not available\n"); + return; + } + + expect_style = WS_CHILD|WS_CLIPSIBLINGS|LBS_COMBOBOX|LBS_HASSTRINGS|LBS_NOTIFY; + if (cb_style == CBS_SIMPLE) + { + expect_style |= WS_VISIBLE; + expect_exstyle = WS_EX_CLIENTEDGE; + } + else + { + expect_style |= WS_BORDER; + expect_exstyle = WS_EX_TOOLWINDOW; + } + + combo = build_combo(cb_style); + info.cbSize = sizeof(COMBOBOXINFO); + SetLastError(0xdeadbeef); + ret = pGetComboBoxInfo(combo, &info); + ok(ret, "Failed to get combobox info structure.\n"); + + style = GetWindowLongW( info.hwndList, GWL_STYLE ); + exstyle = GetWindowLongW( info.hwndList, GWL_EXSTYLE ); + ok(style == expect_style, "%08x: got %08x\n", cb_style, style); + ok(exstyle == expect_exstyle, "%08x: got %08x\n", cb_style, exstyle); + + if (cb_style != CBS_SIMPLE) + expect_exstyle |= WS_EX_TOPMOST; + + SendMessageW(combo, CB_SHOWDROPDOWN, TRUE, 0 ); + style = GetWindowLongW( info.hwndList, GWL_STYLE ); + exstyle = GetWindowLongW( info.hwndList, GWL_EXSTYLE ); + ok(style == (expect_style | WS_VISIBLE), "%08x: got %08x\n", cb_style, style); + ok(exstyle == expect_exstyle, "%08x: got %08x\n", cb_style, exstyle); + + SendMessageW(combo, CB_SHOWDROPDOWN, FALSE, 0 ); + style = GetWindowLongW( info.hwndList, GWL_STYLE ); + exstyle = GetWindowLongW( info.hwndList, GWL_EXSTYLE ); + ok(style == expect_style, "%08x: got %08x\n", cb_style, style); + ok(exstyle == expect_exstyle, "%08x: got %08x\n", cb_style, exstyle); + + DestroyWindow(combo); +} + START_TEST(combo) { hMainWnd = CreateWindowA("static", "Test", WS_OVERLAPPEDWINDOW, 10, 10, 300, 300, NULL, NULL, NULL, 0); @@ -551,6 +606,9 @@ test_changesize(CBS_DROPDOWN); test_changesize(CBS_DROPDOWNLIST); test_editselection(); + test_listbox_styles(CBS_SIMPLE); + test_listbox_styles(CBS_DROPDOWN); + test_listbox_styles(CBS_DROPDOWNLIST); DestroyWindow(hMainWnd); }

9 years, 7 months

[jimtabor] 66182: [User32] - Patch by Piotr Caban : Only store dialog focus when window is hidden or inactive. Only use DIALOGINFO-> hwndFocus to store last focus of inactive windows.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Feb 6 20:57:45 2015 New Revision: 66182 URL: http://svn.reactos.org/svn/reactos?rev=66182&view=rev Log: [User32] - Patch by Piotr Caban : Only store dialog focus when window is hidden or inactive. Only use DIALOGINFO-> hwndFocus to store last focus of inactive windows. Modified: trunk/reactos/win32ss/user/user32/windows/dialog.c Modified: trunk/reactos/win32ss/user/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] Fri Feb 6 20:57:45 2015 @@ -802,8 +802,7 @@ else DEFDLG_SetFocus( infoPtr->hwndFocus ); - /* This used to set infoPtr->hwndFocus to NULL for no apparent reason, - sometimes losing focus when receiving WM_SETFOCUS messages. */ + infoPtr->hwndFocus = NULL; } /*********************************************************************** @@ -1047,13 +1046,14 @@ /* By returning TRUE, app has requested a default focus assignment. * WM_INITDIALOG may have changed the tab order, so find the first * tabstop control again. */ - dlgInfo->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE ); - if (!dlgInfo->hwndFocus) dlgInfo->hwndFocus = GetNextDlgGroupItem( hwnd, 0, FALSE ); - if( dlgInfo->hwndFocus ) - SetFocus( dlgInfo->hwndFocus ); + focus = GetNextDlgTabItem( hwnd, 0, FALSE ); + if (!focus) focus = GetNextDlgGroupItem( hwnd, 0, FALSE ); + if (focus) + SetFocus( focus ); } -//// ReactOS - DEFDLG_SaveFocus( hwnd ); +//// ReactOS see 43396, Fixes setting focus on Open and Close dialogs to the FileName edit control in OpenOffice. +//// This now breaks test_SaveRestoreFocus. + //DEFDLG_SaveFocus( hwnd ); //// } //// ReactOS Rev 30613 & 30644

9 years, 7 months

[jimtabor] 66181: [WineTests|User32] - Sync Dialog to wine head.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Feb 6 20:56:57 2015 New Revision: 66181 URL: http://svn.reactos.org/svn/reactos?rev=66181&view=rev Log: [WineTests|User32] - Sync Dialog to wine head. Modified: trunk/rostests/winetests/user32/dialog.c Modified: trunk/rostests/winetests/user32/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/dialog.c… ============================================================================== --- trunk/rostests/winetests/user32/dialog.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/dialog.c [iso-8859-1] Fri Feb 6 20:56:57 2015 @@ -1227,7 +1227,12 @@ static INT_PTR CALLBACK messageBoxFontDlgWinProc (HWND hDlg, UINT uiMsg, WPARAM wParam, LPARAM lParam) { - return (uiMsg == WM_INITDIALOG); + if (uiMsg == WM_INITDIALOG) { + SetFocus(hDlg); + return 1; + } + + return 0; } static void test_MessageBoxFontTest(void) @@ -1337,6 +1342,12 @@ foundId = GetWindowLongPtrA(GetFocus(), GWLP_ID); ok (foundId == 1000, "First edit box should have gained focus on dialog creation. Expected: %d, Found: %ld\n", 1000, foundId); + SetFocus(GetNextDlgTabItem(hDlg, GetFocus(), FALSE)); + SendMessageA(hDlg, WM_ACTIVATE, MAKEWPARAM(WA_ACTIVE, 0), 0); + foundId = GetWindowLongPtrA(GetFocus(), GWLP_ID); + ok (foundId == 1001, "First edit box should have regained focus after dialog reactivation. Expected: %d, Found: %ld\n", 1001, foundId); + SetFocus(GetNextDlgTabItem(hDlg, NULL, FALSE)); + /* de- then reactivate the dialog */ SendMessageA(hDlg, WM_ACTIVATE, MAKEWPARAM(WA_INACTIVE, 0), 0); SendMessageA(hDlg, WM_ACTIVATE, MAKEWPARAM(WA_ACTIVE, 0), 0); @@ -1356,6 +1367,24 @@ foundId = GetWindowLongPtrA(GetFocus(), GWLP_ID); ok (foundId == 1001, "Second edit box should have gained focus after dialog reactivation. Expected: %d, Found: %ld\n", 1001, foundId); + + /* set focus to the dialog */ + SetFocus(hDlg); + + foundId = GetWindowLongPtrA(GetFocus(), GWLP_ID); + ok (foundId == 1000, "First edit box should have gained focus on dialog focus. Expected: %d, Found: %ld\n", 1000, foundId); + + /* select second tabbable item */ + SetFocus(GetNextDlgTabItem(hDlg, GetNextDlgTabItem(hDlg, NULL, FALSE), FALSE)); + + foundId = GetWindowLongPtrA(GetFocus(), GWLP_ID); + ok (foundId == 1001, "Second edit box should have gained focus. Expected: %d, Found: %ld\n", 1001, foundId); + + /* send WM_ACTIVATE message to already active dialog */ + SendMessageA(hDlg, WM_ACTIVATE, MAKEWPARAM(WA_ACTIVE, 0), 0); + + foundId = GetWindowLongPtrA(GetFocus(), GWLP_ID); + ok (foundId == 1001, "Second edit box should have gained focus. Expected: %d, Found: %ld\n", 1001, foundId); /* disable the 2nd box */ EnableWindow(GetFocus(), FALSE);

9 years, 7 months

[jgardou] 66180: [KMTEST/TCPIP] - Add tests checking for TDI_CONNECT behaviour.

by jgardou＠svn.reactos.org

Author: jgardou Date: Fri Feb 6 10:49:04 2015 New Revision: 66180 URL: http://svn.reactos.org/svn/reactos?rev=66180&view=rev Log: [KMTEST/TCPIP] - Add tests checking for TDI_CONNECT behaviour. Added: trunk/rostests/kmtests/tcpip/connect.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kmtest/testlist.c trunk/rostests/kmtests/tcpip/CMakeLists.txt trunk/rostests/kmtests/tcpip/TcpIp_drv.c trunk/rostests/kmtests/tcpip/TcpIp_user.c trunk/rostests/kmtests/tcpip/tcpip.h Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Fri Feb 6 10:49:04 2015 @@ -117,7 +117,7 @@ add_executable(kmtest ${KMTEST_SOURCE}) set_module_type(kmtest win32cui) target_link_libraries(kmtest ${PSEH_LIB}) -add_importlibs(kmtest advapi32 msvcrt kernel32 ntdll) +add_importlibs(kmtest advapi32 ws2_32 msvcrt kernel32 ntdll) add_target_compile_definitions(kmtest KMT_USER_MODE) #add_pch(kmtest include/kmt_test.h) set_target_properties(kmtest PROPERTIES OUTPUT_NAME "kmtest_") Modified: trunk/rostests/kmtests/kmtest/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest/testlist.c… ============================================================================== --- trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] Fri Feb 6 10:49:04 2015 @@ -19,6 +19,7 @@ KMT_TESTFUNC Test_RtlUnicodeString; KMT_TESTFUNC Test_TcpIpIoctl; KMT_TESTFUNC Test_TcpIpTdi; +KMT_TESTFUNC Test_TcpIpConnect; /* tests with a leading '-' will not be listed */ const KMT_TEST TestList[] = @@ -34,5 +35,6 @@ { "RtlSplayTree", Test_RtlSplayTree }, { "RtlUnicodeString", Test_RtlUnicodeString }, { "TcpIpTdi", Test_TcpIpTdi }, + { "TcpIpConnect", Test_TcpIpConnect }, { NULL, NULL }, }; Modified: trunk/rostests/kmtests/tcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/tcpip/CMakeLists.… ============================================================================== --- trunk/rostests/kmtests/tcpip/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/tcpip/CMakeLists.txt [iso-8859-1] Fri Feb 6 10:49:04 2015 @@ -3,6 +3,7 @@ list(APPEND TCPIP_TEST_DRV_SOURCE ../kmtest_drv/kmtest_standalone.c + connect.c tdi.c TcpIp_drv.c) Modified: trunk/rostests/kmtests/tcpip/TcpIp_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/tcpip/TcpIp_drv.c… ============================================================================== --- trunk/rostests/kmtests/tcpip/TcpIp_drv.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/tcpip/TcpIp_drv.c [iso-8859-1] Fri Feb 6 10:49:04 2015 @@ -9,6 +9,7 @@ #include "tcpip.h" extern KMT_MESSAGE_HANDLER TestTdi; +extern KMT_MESSAGE_HANDLER TestConnect; static struct { @@ -16,7 +17,8 @@ PKMT_MESSAGE_HANDLER Handler; } MessageHandlers[] = { - { IOCTL_TEST_TDI, TestTdi }, + { IOCTL_TEST_TDI, TestTdi }, + { IOCTL_TEST_CONNECT, TestConnect }, }; NTSTATUS Modified: trunk/rostests/kmtests/tcpip/TcpIp_user.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/tcpip/TcpIp_user.… ============================================================================== --- trunk/rostests/kmtests/tcpip/TcpIp_user.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/tcpip/TcpIp_user.c [iso-8859-1] Fri Feb 6 10:49:04 2015 @@ -6,6 +6,7 @@ */ #include <kmt_test.h> +#include <winsock2.h> #include "tcpip.h" @@ -35,3 +36,72 @@ UnloadTcpIpTestDriver(); } + +static +DWORD +WINAPI +AcceptProc( + _In_ LPVOID Parameter) +{ + WORD WinsockVersion; + WSADATA WsaData; + int Error; + SOCKET ListenSocket, AcceptSocket; + struct sockaddr_in ListenAddress, AcceptAddress; + int AcceptAddressLength; + HANDLE ReadyToConnectEvent = (HANDLE)Parameter; + + /* Initialize winsock */ + WinsockVersion = MAKEWORD(2, 0); + Error = WSAStartup(WinsockVersion, &WsaData); + ok(Error == 0, ""); + + ListenSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok_bool_true(ListenSocket != INVALID_SOCKET, "socket failed"); + + ZeroMemory(&ListenAddress, sizeof(ListenAddress)); + ListenAddress.sin_addr.S_un.S_addr = inet_addr("127.0.0.1"); + ListenAddress.sin_port = htons(TEST_CONNECT_SERVER_PORT); + ListenAddress.sin_family = AF_INET; + + Error = bind(ListenSocket, (struct sockaddr*)&ListenAddress, sizeof(ListenAddress)); + ok(Error == 0, ""); + + Error = listen(ListenSocket, 1); + ok(Error == 0, ""); + + SetEvent(ReadyToConnectEvent); + + AcceptAddressLength = sizeof(AcceptAddress); + AcceptSocket = accept(ListenSocket, (struct sockaddr*)&AcceptAddress, &AcceptAddressLength); + ok(AcceptSocket != INVALID_SOCKET, "\n"); + ok_eq_long(AcceptAddressLength, sizeof(AcceptAddress)); + ok_eq_hex(AcceptAddress.sin_addr.S_un.S_addr, inet_addr("127.0.0.1")); + ok_eq_hex(AcceptAddress.sin_port, ntohs(TEST_CONNECT_CLIENT_PORT)); + + return 0; +} + +START_TEST(TcpIpConnect) +{ + HANDLE AcceptThread; + HANDLE ReadyToConnectEvent; + + ReadyToConnectEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + ok(ReadyToConnectEvent != NULL, "\n"); + + AcceptThread = CreateThread(NULL, 0, AcceptProc, (PVOID)ReadyToConnectEvent, 0, NULL); + ok(AcceptThread != NULL, ""); + + WaitForSingleObject(ReadyToConnectEvent, INFINITE); + + LoadTcpIpTestDriver(); + + ok(KmtSendToDriver(IOCTL_TEST_CONNECT) == ERROR_SUCCESS, "\n"); + + WaitForSingleObject(AcceptThread, INFINITE); + + UnloadTcpIpTestDriver(); + + WSACleanup(); +} Added: trunk/rostests/kmtests/tcpip/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/tcpip/connect.c?r… ============================================================================== --- trunk/rostests/kmtests/tcpip/connect.c (added) +++ trunk/rostests/kmtests/tcpip/connect.c [iso-8859-1] Fri Feb 6 10:49:04 2015 @@ -0,0 +1,272 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2+ - See COPYING.LIB in the top level directory + * PURPOSE: Kernel-Mode Test Suite for TCPIP.sys + * PROGRAMMER: JÃ©rÃ´me Gardou <jerome.gardou(a)reactos.org> + */ + +#include <kmt_test.h> +#include <tdikrnl.h> +#include <ndk/rtlfuncs.h> + +#include <sys/param.h> + +#include "tcpip.h" + +#define TAG_TEST 'tseT' + +#if BYTE_ORDER == LITTLE_ENDIAN +USHORT +htons(USHORT x) +{ + return ((x & 0x00FF) << 8) | ((x & 0xFF00) >> 8); +} +#else +#define htons(x) (x) +#endif + +static +NTSTATUS +NTAPI +IrpCompletionRoutine( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp, + _In_ PVOID Context) +{ + UNREFERENCED_PARAMETER(DeviceObject); + UNREFERENCED_PARAMETER(Irp); + + KeSetEvent((PKEVENT)Context, IO_NETWORK_INCREMENT, FALSE); + + return STATUS_MORE_PROCESSING_REQUIRED; +} + +static +VOID +TestTcpConnect(void) +{ + PIRP Irp; + HANDLE AddressHandle, ConnectionHandle; + FILE_OBJECT* ConnectionFileObject; + DEVICE_OBJECT* DeviceObject; + UNICODE_STRING TcpDeviceName = RTL_CONSTANT_STRING(L"\\Device\\Tcp"); + NTSTATUS Status; + PFILE_FULL_EA_INFORMATION FileInfo; + TA_IP_ADDRESS* IpAddress; + TA_IP_ADDRESS ConnectAddress, ReturnAddress; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK StatusBlock; + ULONG FileInfoSize; + IN_ADDR InAddr; + LPCWSTR AddressTerminator; + CONNECTION_CONTEXT ConnectionContext = (CONNECTION_CONTEXT)0xC0CAC01A; + KEVENT Event; + TDI_CONNECTION_INFORMATION RequestInfo, ReturnInfo; + + /* Create a TCP address file */ + FileInfoSize = FIELD_OFFSET(FILE_FULL_EA_INFORMATION, EaName[TDI_TRANSPORT_ADDRESS_LENGTH]) + 1 + sizeof(TA_IP_ADDRESS); + FileInfo = ExAllocatePoolWithTag(NonPagedPool, + FileInfoSize, + TAG_TEST); + ok(FileInfo != NULL, ""); + RtlZeroMemory(FileInfo, FileInfoSize); + + FileInfo->EaNameLength = TDI_TRANSPORT_ADDRESS_LENGTH; + FileInfo->EaValueLength = sizeof(TA_IP_ADDRESS); + RtlCopyMemory(&FileInfo->EaName[0], TdiTransportAddress, TDI_TRANSPORT_ADDRESS_LENGTH); + + IpAddress = (PTA_IP_ADDRESS)(&FileInfo->EaName[TDI_TRANSPORT_ADDRESS_LENGTH + 1]); + IpAddress->TAAddressCount = 1; + IpAddress->Address[0].AddressType = TDI_ADDRESS_TYPE_IP; + IpAddress->Address[0].AddressLength = TDI_ADDRESS_LENGTH_IP; + IpAddress->Address[0].Address[0].sin_port = htons(TEST_CONNECT_CLIENT_PORT); + Status = RtlIpv4StringToAddressW(L"127.0.0.1", TRUE, &AddressTerminator, &InAddr); + ok_eq_hex(Status, STATUS_SUCCESS); + IpAddress->Address[0].Address[0].in_addr = InAddr.S_un.S_addr; + + InitializeObjectAttributes(&ObjectAttributes, + &TcpDeviceName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + + Status = ZwCreateFile( + &AddressHandle, + GENERIC_READ | GENERIC_WRITE, + &ObjectAttributes, + &StatusBlock, + 0, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN_IF, + 0L, + FileInfo, + FileInfoSize); + ok_eq_hex(Status, STATUS_SUCCESS); + + ExFreePoolWithTag(FileInfo, TAG_TEST); + + /* Create a TCP connection file */ + FileInfoSize = FIELD_OFFSET(FILE_FULL_EA_INFORMATION, EaName[TDI_CONNECTION_CONTEXT_LENGTH]) + 1 + sizeof(CONNECTION_CONTEXT); + FileInfo = ExAllocatePoolWithTag(NonPagedPool, + FileInfoSize, + TAG_TEST); + ok(FileInfo != NULL, ""); + RtlZeroMemory(FileInfo, FileInfoSize); + + FileInfo->EaNameLength = TDI_CONNECTION_CONTEXT_LENGTH; + FileInfo->EaValueLength = sizeof(CONNECTION_CONTEXT); + RtlCopyMemory(&FileInfo->EaName[0], TdiConnectionContext, TDI_CONNECTION_CONTEXT_LENGTH); + *((CONNECTION_CONTEXT*)&FileInfo->EaName[TDI_CONNECTION_CONTEXT_LENGTH + 1]) = ConnectionContext; + + Status = ZwCreateFile( + &ConnectionHandle, + GENERIC_READ | GENERIC_WRITE, + &ObjectAttributes, + &StatusBlock, + 0, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN_IF, + 0L, + FileInfo, + FileInfoSize); + ok_eq_hex(Status, STATUS_SUCCESS); + + ExFreePoolWithTag(FileInfo, TAG_TEST); + + /* Get the file and device object for the upcoming IRPs */ + Status = ObReferenceObjectByHandle( + ConnectionHandle, + GENERIC_READ, + *IoFileObjectType, + KernelMode, + (PVOID*)&ConnectionFileObject, + NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + DeviceObject = IoGetRelatedDeviceObject(ConnectionFileObject); + ok(DeviceObject != NULL, "Device object is NULL!\n"); + + /* Associate the connection file and the address */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + ok(Irp != NULL, "IoAllocateIrp failed.\n"); + + TdiBuildAssociateAddress(Irp, DeviceObject, ConnectionFileObject, NULL, NULL, AddressHandle); + IoSetCompletionRoutine(Irp, IrpCompletionRoutine, &Event, TRUE, TRUE, TRUE); + + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + trace("Associate address IRP is pending.\n"); + KeWaitForSingleObject( + &Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = Irp->IoStatus.Status; + } + ok_eq_hex(Status, STATUS_SUCCESS); + IoFreeIrp(Irp); + + + KeClearEvent(&Event); + + /* Build the connect IRP. */ + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + ok(Irp != NULL, "IoAllocateIrp failed.\n"); + + /* Prepare the request */ + RtlZeroMemory(&RequestInfo, sizeof(RequestInfo)); + RtlZeroMemory(&ConnectAddress, sizeof(ConnectAddress)); + RequestInfo.RemoteAddressLength = sizeof(TA_IP_ADDRESS); + RequestInfo.RemoteAddress = &ConnectAddress; + ConnectAddress.TAAddressCount = 1; + ConnectAddress.Address[0].AddressType = TDI_ADDRESS_TYPE_IP; + ConnectAddress.Address[0].AddressLength = TDI_ADDRESS_LENGTH_IP; + ConnectAddress.Address[0].Address[0].sin_port = htons(TEST_CONNECT_SERVER_PORT); + Status = RtlIpv4StringToAddressW(L"127.0.0.1", TRUE, &AddressTerminator, &InAddr); + ConnectAddress.Address[0].Address[0].in_addr = InAddr.S_un.S_addr; + + /* See what we will get in exchange */ + RtlZeroMemory(&ReturnInfo, sizeof(ReturnInfo)); + RtlZeroMemory(&ReturnAddress, sizeof(ReturnAddress)); + ReturnInfo.RemoteAddressLength = sizeof(TA_IP_ADDRESS); + ReturnInfo.RemoteAddress = &ReturnAddress; + + TdiBuildConnect(Irp, + DeviceObject, + ConnectionFileObject, + NULL, + NULL, + NULL, + &RequestInfo, + &ReturnInfo); + IoSetCompletionRoutine(Irp, IrpCompletionRoutine, &Event, TRUE, TRUE, TRUE); + + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + trace("Connect IRP is pending.\n"); + KeWaitForSingleObject( + &Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = Irp->IoStatus.Status; + trace("Connect IRP completed.\n"); + } + ok_eq_hex(Status, STATUS_SUCCESS); + IoFreeIrp(Irp); + + /* The IRP doesn't touch the return info */ + ok_eq_long(ReturnInfo.RemoteAddressLength, sizeof(TA_IP_ADDRESS)); + ok_eq_pointer(ReturnInfo.RemoteAddress, &ReturnAddress); + ok_eq_long(ReturnInfo.OptionsLength, 0); + ok_eq_pointer(ReturnInfo.Options, NULL); + ok_eq_long(ReturnInfo.UserDataLength, 0); + ok_eq_pointer(ReturnInfo.UserData, NULL); + + ok_eq_long(ReturnAddress.TAAddressCount, 0); + ok_eq_hex(ReturnAddress.Address[0].AddressType, 0); + ok_eq_hex(ReturnAddress.Address[0].AddressLength, 0); + ok_eq_hex(ReturnAddress.Address[0].Address[0].sin_port, 0); + ok_eq_hex(ReturnAddress.Address[0].Address[0].in_addr, 0); + + ObDereferenceObject(ConnectionFileObject); + + ZwClose(ConnectionHandle); + ZwClose(AddressHandle); +} + +static KSTART_ROUTINE RunTest; +static +VOID +NTAPI +RunTest( + _In_ PVOID Context) +{ + UNREFERENCED_PARAMETER(Context); + + TestTcpConnect(); +} + +KMT_MESSAGE_HANDLER TestConnect; +NTSTATUS +TestConnect( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ ULONG ControlCode, + _In_opt_ PVOID Buffer, + _In_ SIZE_T InLength, + _Inout_ PSIZE_T OutLength +) +{ + PKTHREAD Thread; + + Thread = KmtStartThread(RunTest, NULL); + KmtFinishThread(Thread, NULL); + + return STATUS_SUCCESS; +} Propchange: trunk/rostests/kmtests/tcpip/connect.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/kmtests/tcpip/connect.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/rostests/kmtests/tcpip/tcpip.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/tcpip/tcpip.h?rev… ============================================================================== --- trunk/rostests/kmtests/tcpip/tcpip.h [iso-8859-1] (original) +++ trunk/rostests/kmtests/tcpip/tcpip.h [iso-8859-1] Fri Feb 6 10:49:04 2015 @@ -1,2 +1,7 @@ #define IOCTL_TEST_TDI 1 +#define IOCTL_TEST_CONNECT 2 + +/* For the TDI_CONNECT test */ +#define TEST_CONNECT_SERVER_PORT 12345 +#define TEST_CONNECT_CLIENT_PORT 54321

9 years, 7 months

[hbelusca] 66179: [FREELDR] - For now, only activate custom ReactOS boot on non-x86 builds. - Fix INI section item list initialization before using it! Fixes custom ReactOS boots (ie. remove an inv...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Feb 6 01:21:45 2015 New Revision: 66179 URL: http://svn.reactos.org/svn/reactos?rev=66179&view=rev Log: [FREELDR] - For now, only activate custom ReactOS boot on non-x86 builds. - Fix INI section item list initialization before using it! Fixes custom ReactOS boots (ie. remove an invalid heap free). Now custom ReactOS boots work! Modified: trunk/reactos/boot/freeldr/freeldr/custom.c trunk/reactos/boot/freeldr/freeldr/lib/inifile/inifile.c Modified: trunk/reactos/boot/freeldr/freeldr/custom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/custo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/custom.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/custom.c [iso-8859-1] Fri Feb 6 01:21:45 2015 @@ -17,13 +17,13 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +/* INCLUDES *******************************************************************/ + +#include <freeldr.h> + +/* GLOBALS ********************************************************************/ + #ifdef _M_IX86 - -/* INCLUDES *******************************************************************/ - -#include <freeldr.h> - -/* GLOBALS ********************************************************************/ const CHAR BootDrivePrompt[] = "Enter the boot drive.\n\nExamples:\nfd0 - first floppy drive\nhd0 - first hard drive\nhd1 - second hard drive\ncd0 - first CD-ROM drive.\n\nBIOS drive numbers may also be used:\n0 - first floppy drive\n0x80 - first hard drive\n0x81 - second hard drive"; const CHAR BootPartitionPrompt[] = "Enter the boot partition.\n\nEnter 0 for the active (bootable) partition."; @@ -31,6 +31,9 @@ const CHAR LinuxKernelPrompt[] = "Enter the Linux kernel image path.\n\nExamples:\n/vmlinuz\n/boot/vmlinuz-2.4.18"; const CHAR LinuxInitrdPrompt[] = "Enter the initrd image path.\n\nExamples:\n/initrd.gz\n/boot/root.img.gz\n\nLeave blank for no initial ram disk."; const CHAR LinuxCommandLinePrompt[] = "Enter the Linux kernel command line.\n\nExamples:\nroot=/dev/hda1\nroot=/dev/fd0 read-only\nroot=/dev/sdb1 init=/sbin/init"; + +#endif // _M_IX86 + const CHAR ReactOSSystemPathPrompt[] = "Enter the path to your ReactOS system directory.\n\nExamples:\n\\REACTOS\n\\ROS"; const CHAR ReactOSOptionsPrompt[] = "Enter the options you want passed to the kernel.\n\nExamples:\n/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200\n/FASTDETECT /SOS /NOGUIBOOT\n/BASEVIDEO /MAXMEM=64\n/KERNEL=NTKRNLMP.EXE /HAL=HALMPS.DLL"; const CHAR CustomBootPrompt[] = "Press ENTER to boot your custom boot setup."; @@ -40,11 +43,13 @@ VOID OptionMenuCustomBoot(VOID) { PCSTR CustomBootMenuList[] = { +#ifdef _M_IX86 "Disk", "Partition", "Boot Sector File", - "ReactOS", - "Linux" + "Linux", +#endif + "ReactOS" }; ULONG CustomBootMenuCount = sizeof(CustomBootMenuList) / sizeof(CustomBootMenuList[0]); ULONG SelectedMenuItem; @@ -64,6 +69,7 @@ switch (SelectedMenuItem) { +#ifdef _M_IX86 case 0: // Disk OptionMenuCustomBootDisk(); break; @@ -73,14 +79,19 @@ case 2: // Boot Sector File OptionMenuCustomBootBootSectorFile(); break; - case 3: // ReactOS + case 3: // Linux + OptionMenuCustomBootLinux(); + break; + case 4: // ReactOS +#else + case 0: +#endif OptionMenuCustomBootReactOS(); break; - case 4: // Linux - OptionMenuCustomBootLinux(); - break; } } + +#ifdef _M_IX86 VOID OptionMenuCustomBootDisk(VOID) { @@ -226,69 +237,6 @@ OperatingSystem.OsLoadOptions = NULL; // LoadAndBootBootSector(&OperatingSystem, 0); - LoadOperatingSystem(&OperatingSystem); -} - -VOID OptionMenuCustomBootReactOS(VOID) -{ - ULONG_PTR SectionId; - CHAR SectionName[100]; - CHAR BootDriveString[20]; - CHAR BootPartitionString[20]; - CHAR ReactOSSystemPath[200]; - CHAR ReactOSARCPath[200]; - CHAR ReactOSOptions[200]; - TIMEINFO* TimeInfo; - OperatingSystemItem OperatingSystem; - - RtlZeroMemory(SectionName, sizeof(SectionName)); - RtlZeroMemory(BootDriveString, sizeof(BootDriveString)); - RtlZeroMemory(BootPartitionString, sizeof(BootPartitionString)); - RtlZeroMemory(ReactOSSystemPath, sizeof(ReactOSSystemPath)); - RtlZeroMemory(ReactOSOptions, sizeof(ReactOSOptions)); - - if (!UiEditBox(BootDrivePrompt, BootDriveString, 20)) - return; - - if (!UiEditBox(BootPartitionPrompt, BootPartitionString, 20)) - return; - - if (!UiEditBox(ReactOSSystemPathPrompt, ReactOSSystemPath, 200)) - return; - - if (!UiEditBox(ReactOSOptionsPrompt, ReactOSOptions, 200)) - return; - - /* Generate a unique section name */ - TimeInfo = ArcGetTime(); - sprintf(SectionName, "CustomReactOS%u%u%u%u%u%u", TimeInfo->Year, TimeInfo->Day, TimeInfo->Month, TimeInfo->Hour, TimeInfo->Minute, TimeInfo->Second); - - /* Add the section */ - if (!IniAddSection(SectionName, &SectionId)) - return; - - /* Add the BootType */ - if (!IniAddSettingValueToSection(SectionId, "BootType", "Windows2003")) - return; - - /* Construct the ReactOS ARC system path */ - ConstructArcPath(ReactOSARCPath, ReactOSSystemPath, DriveMapGetBiosDriveNumber(BootDriveString), atoi(BootPartitionString)); - - /* Add the system path */ - if (!IniAddSettingValueToSection(SectionId, "SystemPath", ReactOSARCPath)) - return; - - /* Add the CommandLine */ - if (!IniAddSettingValueToSection(SectionId, "Options", ReactOSOptions)) - return; - - UiMessageBox(CustomBootPrompt); - - OperatingSystem.SystemPartition = SectionName; - OperatingSystem.LoadIdentifier = NULL; - OperatingSystem.OsLoadOptions = NULL; // ReactOSOptions - - // LoadAndBootWindows(&OperatingSystem, _WIN32_WINNT_WS03); LoadOperatingSystem(&OperatingSystem); } @@ -371,6 +319,71 @@ LoadOperatingSystem(&OperatingSystem); } +#endif // _M_IX86 + +VOID OptionMenuCustomBootReactOS(VOID) +{ + ULONG_PTR SectionId; + CHAR SectionName[100]; + CHAR BootDriveString[20]; + CHAR BootPartitionString[20]; + CHAR ReactOSSystemPath[200]; + CHAR ReactOSARCPath[200]; + CHAR ReactOSOptions[200]; + TIMEINFO* TimeInfo; + OperatingSystemItem OperatingSystem; + + RtlZeroMemory(SectionName, sizeof(SectionName)); + RtlZeroMemory(BootDriveString, sizeof(BootDriveString)); + RtlZeroMemory(BootPartitionString, sizeof(BootPartitionString)); + RtlZeroMemory(ReactOSSystemPath, sizeof(ReactOSSystemPath)); + RtlZeroMemory(ReactOSOptions, sizeof(ReactOSOptions)); + + if (!UiEditBox(BootDrivePrompt, BootDriveString, 20)) + return; + + if (!UiEditBox(BootPartitionPrompt, BootPartitionString, 20)) + return; + + if (!UiEditBox(ReactOSSystemPathPrompt, ReactOSSystemPath, 200)) + return; + + if (!UiEditBox(ReactOSOptionsPrompt, ReactOSOptions, 200)) + return; + + /* Generate a unique section name */ + TimeInfo = ArcGetTime(); + sprintf(SectionName, "CustomReactOS%u%u%u%u%u%u", TimeInfo->Year, TimeInfo->Day, TimeInfo->Month, TimeInfo->Hour, TimeInfo->Minute, TimeInfo->Second); + + /* Add the section */ + if (!IniAddSection(SectionName, &SectionId)) + return; + + /* Add the BootType */ + if (!IniAddSettingValueToSection(SectionId, "BootType", "Windows2003")) + return; + + /* Construct the ReactOS ARC system path */ + ConstructArcPath(ReactOSARCPath, ReactOSSystemPath, DriveMapGetBiosDriveNumber(BootDriveString), atoi(BootPartitionString)); + + /* Add the system path */ + if (!IniAddSettingValueToSection(SectionId, "SystemPath", ReactOSARCPath)) + return; + + /* Add the CommandLine */ + if (!IniAddSettingValueToSection(SectionId, "Options", ReactOSOptions)) + return; + + UiMessageBox(CustomBootPrompt); + + OperatingSystem.SystemPartition = SectionName; + OperatingSystem.LoadIdentifier = NULL; + OperatingSystem.OsLoadOptions = NULL; // ReactOSOptions + + // LoadAndBootWindows(&OperatingSystem, _WIN32_WINNT_WS03); + LoadOperatingSystem(&OperatingSystem); +} + VOID OptionMenuReboot(VOID) { UiMessageBox("The system will now reboot."); @@ -378,5 +391,3 @@ DiskStopFloppyMotor(); Reboot(); } - -#endif // _M_IX86 Modified: trunk/reactos/boot/freeldr/freeldr/lib/inifile/inifile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/lib/i… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/lib/inifile/inifile.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/lib/inifile/inifile.c [iso-8859-1] Fri Feb 6 01:21:45 2015 @@ -199,6 +199,7 @@ // Get the section name strcpy(Section->SectionName, SectionName); + InitializeListHead(&Section->SectionItemList); // Add it to the section list head IniFileSectionCount++;

9 years, 7 months

[hbelusca] 66178: [SHELL32] - Fix registry value retrieval with RegGetValue (RRF_RT_REG_EXPAND_SZ has a non-obvious functioning: it should be used with NO_EXPAND flag. Otherwise use RRF_RT_REG_SZ t...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Feb 6 00:07:23 2015 New Revision: 66178 URL: http://svn.reactos.org/svn/reactos?rev=66178&view=rev Log: [SHELL32] - Fix registry value retrieval with RegGetValue (RRF_RT_REG_EXPAND_SZ has a non-obvious functioning: it should be used with NO_EXPAND flag. Otherwise use RRF_RT_REG_SZ to retrieve REG_SZ values, or REG_EXPAND_SZ values with automatic expansion as expected). CORE-9001 #resolve #comment Fixed, thanks for reporting! - Fix whitespace. Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp trunk/reactos/dll/win32/shell32/dialogs/drvdefext.cpp trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefault… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] Fri Feb 6 00:07:23 2015 @@ -450,12 +450,12 @@ if (m_bGroupPolicyActive) { if (RegGetValueW(HKEY_LOCAL_MACHINE, - L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", - pwszClsid, - RRF_RT_REG_SZ, - NULL, - NULL, - NULL) == ERROR_SUCCESS) + L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", + pwszClsid, + RRF_RT_REG_SZ, + NULL, + NULL, + NULL) == ERROR_SUCCESS) { LoadDynamicContextMenuHandler(hKey, &clsid); } Modified: trunk/reactos/dll/win32/shell32/dialogs/drvdefext.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/drvdefext.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/drvdefext.cpp [iso-8859-1] Fri Feb 6 00:07:23 2015 @@ -366,12 +366,12 @@ DWORD cbBuf = sizeof(wszBuf); if (RegGetValueW(HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\MyComputer\\CleanupPath", - NULL, - RRF_RT_REG_SZ, - NULL, - (PVOID)wszBuf, - &cbBuf) == ERROR_SUCCESS) + L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\MyComputer\\CleanupPath", + NULL, + RRF_RT_REG_SZ, + NULL, + (PVOID)wszBuf, + &cbBuf) == ERROR_SUCCESS) { WCHAR wszCmd[MAX_PATH]; @@ -460,7 +460,7 @@ if (RegGetValueW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\MyComputer\\BackupPath", NULL, - RRF_RT_REG_EXPAND_SZ, + RRF_RT_REG_SZ, NULL, (PVOID)wszBuf, &cbBuf) == ERROR_SUCCESS) Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Fri Feb 6 00:07:23 2015 @@ -1810,12 +1810,12 @@ if (m_bGroupPolicyActive) { if (RegGetValueW(HKEY_LOCAL_MACHINE, - L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", - pwszClsid, - RRF_RT_REG_SZ, - NULL, - NULL, - NULL) == ERROR_SUCCESS) + L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", + pwszClsid, + RRF_RT_REG_SZ, + NULL, + NULL, + NULL) == ERROR_SUCCESS) { hr = _LoadDynamicDropTargetHandler(&clsid, pwcsname, ppvOut); } Modified: trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] Fri Feb 6 00:07:23 2015 @@ -1639,7 +1639,7 @@ ret = RegGetValueW(HKEY_CURRENT_USER, L"AppEvents\\Schemes\\Apps\\Explorer\\EmptyRecycleBin\\.Current", NULL, - RRF_RT_REG_EXPAND_SZ, + RRF_RT_REG_SZ, &dwType, (PVOID)szPath, &dwSize);

9 years, 7 months

← Newer
1
...
30
31
32
33
34
35
36
37
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2015