Ros-diffs November 2016

ros-diffs@reactos.org

15 participants
317 discussions

[mjansen] 73180: [SHELL32_APITEST] Add some tests for ShellExecuteEx showing extension completion with the App Paths registry key. Patch by Yaroslav Veremenko. CORE-12049

by mjansen＠svn.reactos.org

Author: mjansen Date: Wed Nov 9 22:13:26 2016 New Revision: 73180 URL: http://svn.reactos.org/svn/reactos?rev=73180&view=rev Log: [SHELL32_APITEST] Add some tests for ShellExecuteEx showing extension completion with the App Paths registry key. Patch by Yaroslav Veremenko. CORE-12049 Added: trunk/rostests/apitests/shell32/shlexec.cpp (with props) Modified: trunk/rostests/apitests/shell32/CMakeLists.txt trunk/rostests/apitests/shell32/testlist.c Modified: trunk/rostests/apitests/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/CMakeLis… ============================================================================== --- trunk/rostests/apitests/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/CMakeLists.txt [iso-8859-1] Wed Nov 9 22:13:26 2016 @@ -10,8 +10,9 @@ menu.cpp shelltest.cpp SHParseDisplayName.cpp + shlexec.cpp testlist.c) target_link_libraries(shell32_apitest wine uuid ${PSEH_LIB}) set_module_type(shell32_apitest win32cui) -add_importlibs(shell32_apitest user32 gdi32 shell32 ole32 oleaut32 shlwapi msvcrt kernel32 ntdll) +add_importlibs(shell32_apitest user32 gdi32 shell32 ole32 oleaut32 advapi32 shlwapi msvcrt kernel32 ntdll) add_cd_file(TARGET shell32_apitest DESTINATION reactos/bin FOR all) Added: trunk/rostests/apitests/shell32/shlexec.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/shlexec.… ============================================================================== --- trunk/rostests/apitests/shell32/shlexec.cpp (added) +++ trunk/rostests/apitests/shell32/shlexec.cpp [iso-8859-1] Wed Nov 9 22:13:26 2016 @@ -0,0 +1,105 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Testing ShellExecuteEx + * PROGRAMMER: Yaroslav Veremenko <yaroslav(a)veremenko.info> + */ + + +#include "shelltest.h" + + + +#define ok_ShellExecuteEx (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : TestShellExecuteEx + +static +BOOL +CreateAppPathRegKey(const WCHAR* Name) +{ + HKEY RegistryKey; + LONG Result; + WCHAR Buffer[1024]; + WCHAR KeyValue[1024]; + DWORD Length = sizeof(KeyValue); + DWORD Disposition; + + wcscpy(Buffer, L"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\"); + wcscat(Buffer, L"IEXPLORE.EXE"); + Result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, Buffer, 0, KEY_READ, &RegistryKey); + if (Result != ERROR_SUCCESS) trace("Could not open iexplore.exe key. Status: %d\n", Result); + if (Result) goto end; + Result = RegQueryValueExW(RegistryKey, NULL, NULL, NULL, (LPBYTE)KeyValue, &Length); + if (Result != ERROR_SUCCESS) trace("Could not read iexplore.exe key. Status: %d\n", Result); + if (Result) goto end; + RegCloseKey(RegistryKey); + + wcscpy(Buffer, L"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\"); + wcscat(Buffer, Name); + Result = RegCreateKeyExW(HKEY_LOCAL_MACHINE, Buffer, 0, NULL, + 0, KEY_WRITE, NULL, &RegistryKey, &Disposition); + if (Result != ERROR_SUCCESS) trace("Could not create test key. Status: %d\n", Result); + if (Result) goto end; + Result = RegSetValueW(RegistryKey, NULL, REG_SZ, KeyValue, 0); + if (Result != ERROR_SUCCESS) trace("Could not set value of the test key. Status: %d\n", Result); + if (Result) goto end; + RegCloseKey(RegistryKey); +end: + if (RegistryKey) RegCloseKey(RegistryKey); + return Result == ERROR_SUCCESS; +} + +static +VOID +DeleteAppPathRegKey(const WCHAR* Name) +{ + LONG Result; + WCHAR Buffer[1024]; + wcscpy(Buffer, L"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\"); + wcscat(Buffer, Name); + Result = RegDeleteKeyW(HKEY_LOCAL_MACHINE, Buffer); + if (Result != ERROR_SUCCESS) trace("Could not remove the test key. Status: %d\n", Result); +} + +static +VOID +TestShellExecuteEx(const WCHAR* Name, BOOL ExpectedResult) +{ + SHELLEXECUTEINFOW ShellExecInfo; + BOOL Result; + ZeroMemory(&ShellExecInfo, sizeof(ShellExecInfo)); + ShellExecInfo.cbSize = sizeof(ShellExecInfo); + ShellExecInfo.fMask = SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI; + ShellExecInfo.hwnd = NULL; + ShellExecInfo.nShow = SW_SHOWNORMAL; + ShellExecInfo.lpFile = Name; + ShellExecInfo.lpDirectory = NULL; + Result = ShellExecuteExW(&ShellExecInfo); + ok(Result == ExpectedResult, "ShellExecuteEx lpFile %s failed. Error: %d\n", wine_dbgstr_w(Name), GetLastError()); + if (ShellExecInfo.hProcess) + { + Result = TerminateProcess(ShellExecInfo.hProcess, 0); + if (!Result) trace("Terminate process failed. Error: %d\n", GetLastError()); + WaitForSingleObject(ShellExecInfo.hProcess, INFINITE); + CloseHandle(ShellExecInfo.hProcess); + } +} + +START_TEST(shlexec) +{ + ok_ShellExecuteEx(L"iexplore", TRUE); + ok_ShellExecuteEx(L"iexplore.exe", TRUE); + + if (CreateAppPathRegKey(L"iexplore.bat")) + { + ok_ShellExecuteEx(L"iexplore.bat", TRUE); + ok_ShellExecuteEx(L"iexplore.bat.exe", FALSE); + DeleteAppPathRegKey(L"iexplore.bat"); + } + + if (CreateAppPathRegKey(L"iexplore.bat.exe")) + { + ok_ShellExecuteEx(L"iexplore.bat", FALSE); + ok_ShellExecuteEx(L"iexplore.bat.exe", TRUE); + DeleteAppPathRegKey(L"iexplore.bat.exe"); + } +} Propchange: trunk/rostests/apitests/shell32/shlexec.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/shell32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/shell32/testlist… ============================================================================== --- trunk/rostests/apitests/shell32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/shell32/testlist.c [iso-8859-1] Wed Nov 9 22:13:26 2016 @@ -8,6 +8,7 @@ extern void func_CShellLink(void); extern void func_menu(void); extern void func_SHParseDisplayName(void); +extern void func_shlexec(void); const struct test winetest_testlist[] = { @@ -16,5 +17,6 @@ { "CShellLink", func_CShellLink }, { "menu", func_menu }, { "SHParseDisplayName", func_SHParseDisplayName }, + { "shlexec", func_shlexec }, { 0, 0 } };

8 years, 1 month

[cwittich] 73179: [PSDK] fix DNS_RECORDW definition

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Nov 9 21:29:09 2016 New Revision: 73179 URL: http://svn.reactos.org/svn/reactos?rev=73179&view=rev Log: [PSDK] fix DNS_RECORDW definition Modified: trunk/reactos/sdk/include/psdk/windns.h Modified: trunk/reactos/sdk/include/psdk/windns.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/windns.h?… ============================================================================== --- trunk/reactos/sdk/include/psdk/windns.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/windns.h [iso-8859-1] Wed Nov 9 21:29:09 2016 @@ -559,7 +559,7 @@ DWORD dwTtl; DWORD dwReserved; [switch_is(wType)] DNS_DATAW Data; -} _DnsRecordW; +} DNS_RECORDW, *PDNS_RECORDW; #else typedef struct _DnsRecordA { struct _DnsRecordA* pNext;

8 years, 1 month

[hbelusca] 73178: [EXPLORER]: Add missing keyboard shortcuts for some commands.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Nov 9 18:03:19 2016 New Revision: 73178 URL: http://svn.reactos.org/svn/reactos?rev=73178&view=rev Log: [EXPLORER]: Add missing keyboard shortcuts for some commands. Modified: trunk/reactos/base/shell/explorer/lang/fr-FR.rc Modified: trunk/reactos/base/shell/explorer/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/f… ============================================================================== --- trunk/reactos/base/shell/explorer/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/lang/fr-FR.rc [iso-8859-1] Wed Nov 9 18:03:19 2016 @@ -38,7 +38,7 @@ BEGIN MENUITEM "(Vide)", -1, MFT_STRING, MFS_GRAYED END - POPUP "ParamÃ¨tre&s", IDM_SETTINGS + POPUP "Para&mÃ¨tres", IDM_SETTINGS BEGIN MENUITEM "Panneau de &contrÃ´le", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED MENUITEM "", -1, MFT_SEPARATOR @@ -47,15 +47,15 @@ MENUITEM "Im&primantes et fax", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "Barre des &tÃ¢ches et Menu DÃ©marrer", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "&Chercher", IDM_SEARCH + POPUP "&Rechercher", IDM_SEARCH BEGIN MENUITEM "", -1, MFT_SEPARATOR END - MENUITEM "Aide et support", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED - MENUITEM "ExÃ©cuter...", IDM_RUN, MFT_STRING, MFS_ENABLED + MENUITEM "&Aide et support", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED + MENUITEM "E&xÃ©cuter...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED MENUITEM "S&ynchroniser", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED - MENUITEM "Fermer &la session %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED + MENUITEM "&Fermer la session %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED MENUITEM "DÃ©connecter...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED MENUITEM "LibÃ©r&er l'ordinateur de la station", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED MENUITEM "Ãteindre...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED

8 years, 1 month

[phater] 73177: [MSAFD] Fix possible memory corruption in WSPIoctl. Brought to you by Andreas Maier aka andy-123. Thanks. CORE-12322

by phater＠svn.reactos.org

Author: phater Date: Wed Nov 9 12:05:48 2016 New Revision: 73177 URL: http://svn.reactos.org/svn/reactos?rev=73177&view=rev Log: [MSAFD] Fix possible memory corruption in WSPIoctl. Brought to you by Andreas Maier aka andy-123. Thanks. CORE-12322 Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Wed Nov 9 12:05:48 2016 @@ -2250,7 +2250,7 @@ OUT LPINT lpErrno) { PSOCKET_INFORMATION Socket = NULL; - BOOLEAN NeedsCompletion = lpOverlapped != NULL; + BOOL NeedsCompletion = lpOverlapped != NULL; BOOLEAN NonBlocking; INT Errno = NO_ERROR, Ret = SOCKET_ERROR; DWORD cbRet = 0; @@ -2394,7 +2394,7 @@ &cbRet, lpOverlapped, lpCompletionRoutine, - (LPBOOL)&NeedsCompletion); + &NeedsCompletion); if (Errno == NO_ERROR) Ret = NO_ERROR;

8 years, 1 month

[phater] 73176: [MSAFD] Minor changes. Code style fixes. tabs->spaces. CORE-12104

by phater＠svn.reactos.org

Author: phater Date: Wed Nov 9 11:49:55 2016 New Revision: 73176 URL: http://svn.reactos.org/svn/reactos?rev=73176&view=rev Log: [MSAFD] Minor changes. Code style fixes. tabs->spaces. CORE-12104 Modified: trunk/reactos/dll/win32/msafd/misc/event.c Modified: trunk/reactos/dll/win32/msafd/misc/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/event… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/event.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/event.c [iso-8859-1] Wed Nov 9 11:49:55 2016 @@ -4,10 +4,10 @@ * FILE: dll/win32/msafd/misc/event.c * PURPOSE: Event handling * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * Alex Ionescu (alex(a)relsoft.net) + * Alex Ionescu (alex(a)relsoft.net) * REVISIONS: - * CSH 15/06-2001 Created - * Alex 16/07/2004 - Complete Rewrite + * CSH 15/06/2001 - Created + * Alex 16/07/2004 - Complete Rewrite */ #include <msafd.h> @@ -18,55 +18,57 @@ int WSPAPI WSPEventSelect( - SOCKET Handle, - WSAEVENT hEventObject, - long lNetworkEvents, - LPINT lpErrno) + IN SOCKET Handle, + IN WSAEVENT hEventObject, + IN long lNetworkEvents, + OUT LPINT lpErrno) { - IO_STATUS_BLOCK IOSB; - AFD_EVENT_SELECT_INFO EventSelectInfo; - PSOCKET_INFORMATION Socket = NULL; - NTSTATUS Status; - BOOLEAN BlockMode; - HANDLE SockEvent; - - /* Get the Socket Structure associate to this Socket*/ - Socket = GetSocketStructure(Handle); - if (!Socket) - { - if (lpErrno) *lpErrno = WSAENOTSOCK; - return SOCKET_ERROR; - } - - Status = NtCreateEvent( &SockEvent, EVENT_ALL_ACCESS, - NULL, 1, FALSE ); - - if( !NT_SUCCESS(Status) ) return SOCKET_ERROR; - - /* Set Socket to Non-Blocking */ - BlockMode = TRUE; - SetSocketInformation(Socket, AFD_INFO_BLOCKING_MODE, &BlockMode, NULL, NULL, NULL, NULL); - Socket->SharedData->NonBlocking = TRUE; - - /* Deactivate Async Select if there is one */ - if (Socket->EventObject) { - Socket->SharedData->hWnd = NULL; - Socket->SharedData->wMsg = 0; - Socket->SharedData->AsyncEvents = 0; - Socket->SharedData->SequenceNumber++; // This will kill Async Select after the next completion - } - - /* Set Structure Info */ - EventSelectInfo.EventObject = hEventObject; - EventSelectInfo.Events = 0; - - /* Set Events to wait for */ - if (lNetworkEvents & FD_READ) { - EventSelectInfo.Events |= AFD_EVENT_RECEIVE; + IO_STATUS_BLOCK IOSB; + AFD_EVENT_SELECT_INFO EventSelectInfo; + PSOCKET_INFORMATION Socket = NULL; + NTSTATUS Status; + BOOLEAN BlockMode; + HANDLE SockEvent; + + TRACE("WSPEventSelect (%lx) %lx %lx\n", Handle, hEventObject, lNetworkEvents); + + /* Get the Socket Structure associate to this Socket*/ + Socket = GetSocketStructure(Handle); + if (!Socket) + { + if (lpErrno) *lpErrno = WSAENOTSOCK; + return SOCKET_ERROR; + } + + Status = NtCreateEvent(&SockEvent, EVENT_ALL_ACCESS, + NULL, 1, FALSE); + + if (!NT_SUCCESS(Status)) return SOCKET_ERROR; + + /* Set Socket to Non-Blocking */ + BlockMode = TRUE; + SetSocketInformation(Socket, AFD_INFO_BLOCKING_MODE, &BlockMode, NULL, NULL, NULL, NULL); + Socket->SharedData->NonBlocking = TRUE; + + /* Deactivate Async Select if there is one */ + if (Socket->EventObject) { + Socket->SharedData->hWnd = NULL; + Socket->SharedData->wMsg = 0; + Socket->SharedData->AsyncEvents = 0; + Socket->SharedData->SequenceNumber++; // This will kill Async Select after the next completion + } + + /* Set Structure Info */ + EventSelectInfo.EventObject = hEventObject; + EventSelectInfo.Events = 0; + + /* Set Events to wait for */ + if (lNetworkEvents & FD_READ) { + EventSelectInfo.Events |= AFD_EVENT_RECEIVE; } if (lNetworkEvents & FD_WRITE) { - EventSelectInfo.Events |= AFD_EVENT_SEND; + EventSelectInfo.Events |= AFD_EVENT_SEND; } if (lNetworkEvents & FD_OOB) { @@ -74,7 +76,7 @@ } if (lNetworkEvents & FD_ACCEPT) { - EventSelectInfo.Events |= AFD_EVENT_ACCEPT; + EventSelectInfo.Events |= AFD_EVENT_ACCEPT; } if (lNetworkEvents & FD_CONNECT) { @@ -82,30 +84,28 @@ } if (lNetworkEvents & FD_CLOSE) { - EventSelectInfo.Events |= AFD_EVENT_DISCONNECT | AFD_EVENT_ABORT | AFD_EVENT_CLOSE; + EventSelectInfo.Events |= AFD_EVENT_DISCONNECT | AFD_EVENT_ABORT | AFD_EVENT_CLOSE; } if (lNetworkEvents & FD_QOS) { - EventSelectInfo.Events |= AFD_EVENT_QOS; + EventSelectInfo.Events |= AFD_EVENT_QOS; } if (lNetworkEvents & FD_GROUP_QOS) { - EventSelectInfo.Events |= AFD_EVENT_GROUP_QOS; + EventSelectInfo.Events |= AFD_EVENT_GROUP_QOS; } /* Send IOCTL */ Status = NtDeviceIoControlFile((HANDLE)Handle, - SockEvent, - NULL, - NULL, - &IOSB, - IOCTL_AFD_EVENT_SELECT, - &EventSelectInfo, - sizeof(EventSelectInfo), - NULL, - 0); - - TRACE("AFD: %x\n", Status); + SockEvent, + NULL, + NULL, + &IOSB, + IOCTL_AFD_EVENT_SELECT, + &EventSelectInfo, + sizeof(EventSelectInfo), + NULL, + 0); /* Wait for return */ if (Status == STATUS_PENDING) { @@ -113,17 +113,13 @@ Status = IOSB.Status; } - TRACE("Waited\n"); - - NtClose( SockEvent ); + NtClose (SockEvent); if (Status != STATUS_SUCCESS) { ERR("Got status 0x%08x.\n", Status); return MsafdReturnWithErrno(Status, lpErrno, 0, NULL); } - - TRACE("Closed event\n"); /* Set Socket Data*/ Socket->EventObject = hEventObject; @@ -138,51 +134,53 @@ INT WSPAPI WSPEnumNetworkEvents( - IN SOCKET Handle, - IN WSAEVENT hEventObject, - OUT LPWSANETWORKEVENTS lpNetworkEvents, - OUT LPINT lpErrno) + IN SOCKET Handle, + IN WSAEVENT hEventObject, + OUT LPWSANETWORKEVENTS lpNetworkEvents, + OUT LPINT lpErrno) { AFD_ENUM_NETWORK_EVENTS_INFO EnumReq; - IO_STATUS_BLOCK IOSB; - PSOCKET_INFORMATION Socket = NULL; - NTSTATUS Status; - HANDLE SockEvent; + IO_STATUS_BLOCK IOSB; + PSOCKET_INFORMATION Socket = NULL; + NTSTATUS Status; + HANDLE SockEvent; TRACE("Called (lpNetworkEvents %x)\n", lpNetworkEvents); - Status = NtCreateEvent( &SockEvent, EVENT_ALL_ACCESS, - NULL, 1, FALSE ); + /* Get the Socket Structure associate to this Socket*/ + Socket = GetSocketStructure(Handle); + if (!Socket) + { + if (lpErrno) *lpErrno = WSAENOTSOCK; + return SOCKET_ERROR; + } + if (!lpNetworkEvents) + { + if (lpErrno) *lpErrno = WSAEFAULT; + return SOCKET_ERROR; + } + + Status = NtCreateEvent(&SockEvent, EVENT_ALL_ACCESS, + NULL, 1, FALSE); if( !NT_SUCCESS(Status) ) { ERR("Could not make an event %x\n", Status); return SOCKET_ERROR; } - /* Get the Socket Structure associate to this Socket*/ - Socket = GetSocketStructure(Handle); - if (!Socket) - { - NtClose(SockEvent); - if (lpErrno) *lpErrno = WSAENOTSOCK; - return SOCKET_ERROR; - } - EnumReq.Event = hEventObject; /* Send IOCTL */ Status = NtDeviceIoControlFile((HANDLE)Handle, - SockEvent, - NULL, - NULL, - &IOSB, - IOCTL_AFD_ENUM_NETWORK_EVENTS, - &EnumReq, - sizeof(EnumReq), - NULL, - 0); - - TRACE("AFD: %x\n", Status); + SockEvent, + NULL, + NULL, + &IOSB, + IOCTL_AFD_ENUM_NETWORK_EVENTS, + &EnumReq, + sizeof(EnumReq), + NULL, + 0); /* Wait for return */ if (Status == STATUS_PENDING) { @@ -190,18 +188,13 @@ Status = IOSB.Status; } - TRACE("Waited\n"); - - NtClose( SockEvent ); + NtClose (SockEvent); if (Status != STATUS_SUCCESS) { ERR("Status 0x%08x", Status); return MsafdReturnWithErrno(Status, lpErrno, 0, NULL); } - - TRACE("Closed event\n"); - TRACE("About to touch struct at %x (%d)\n", lpNetworkEvents, sizeof(*lpNetworkEvents)); lpNetworkEvents->lNetworkEvents = 0; @@ -233,14 +226,14 @@ } if (EnumReq.PollEvents & - (AFD_EVENT_DISCONNECT | AFD_EVENT_ABORT | AFD_EVENT_CLOSE)) { + (AFD_EVENT_DISCONNECT | AFD_EVENT_ABORT | AFD_EVENT_CLOSE)) { lpNetworkEvents->lNetworkEvents |= FD_CLOSE; lpNetworkEvents->iErrorCode[FD_CLOSE_BIT] = TranslateNtStatusError(EnumReq.EventStatus[FD_CLOSE_BIT]); } if (EnumReq.PollEvents & AFD_EVENT_QOS) { - lpNetworkEvents->lNetworkEvents |= FD_QOS; - lpNetworkEvents->iErrorCode[FD_QOS_BIT] = TranslateNtStatusError(EnumReq.EventStatus[FD_QOS_BIT]); + lpNetworkEvents->lNetworkEvents |= FD_QOS; + lpNetworkEvents->iErrorCode[FD_QOS_BIT] = TranslateNtStatusError(EnumReq.EventStatus[FD_QOS_BIT]); } if (EnumReq.PollEvents & AFD_EVENT_GROUP_QOS) {

8 years, 1 month

[gadamopoulos] 73175: [BROWSEUI] - CAddressBand: Call the SetOwner method with NULL parameter to CAddressEditBox to let it know that it should deinitialize. - CAddressEditBox: Release the connectio...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Nov 8 23:38:42 2016 New Revision: 73175 URL: http://svn.reactos.org/svn/reactos?rev=73175&view=rev Log: [BROWSEUI] - CAddressBand: Call the SetOwner method with NULL parameter to CAddressEditBox to let it know that it should deinitialize. - CAddressEditBox: Release the connection with the browse window and release the pointer to the site during deinitialization. - CInternetToolbar: Destroy the toolbar and release pointers when CloseDW method gets called. - CBaseBar: Destroy the window when SetClient is called with NULL parameter. - CToolbarProxy: Add a Destroy method to release resources because we hold a pointer to the CInternetToolbar. - CShellBrowser: When storing the pointer to the new basebar add a new reference because we directly change the pointer in the smart pointer and not the smart pointer itself. Destroy the toolbar proxy and properly release all references to containted objects. Also expect the reference count of the shell view to reach zero after the internet toolbar gets freed because it also keeps a reference. This should fix all the leaking objects and windows when closing the shell browser. It should also fix CORE-12066. Modified: trunk/reactos/dll/win32/browseui/addressband.cpp trunk/reactos/dll/win32/browseui/addresseditbox.cpp trunk/reactos/dll/win32/browseui/basebar.cpp trunk/reactos/dll/win32/browseui/internettoolbar.cpp trunk/reactos/dll/win32/browseui/shellbrowser.cpp Modified: trunk/reactos/dll/win32/browseui/addressband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] Tue Nov 8 23:38:42 2016 @@ -197,7 +197,10 @@ m_hWnd = NULL; - IUnknown_SetSite(fAddressEditBox, NULL); + CComPtr<IShellService> pservice; + HRESULT hres = fAddressEditBox->QueryInterface(IID_PPV_ARG(IShellService, &pservice)); + if (SUCCEEDED(hres )) + pservice->SetOwner(NULL); if (fAddressEditBox) fAddressEditBox.Release(); if (fSite) fSite.Release(); Modified: trunk/reactos/dll/win32/browseui/addresseditbox.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] Tue Nov 8 23:38:42 2016 @@ -43,8 +43,16 @@ { } -HRESULT STDMETHODCALLTYPE CAddressEditBox::SetOwner(IUnknown *) -{ +HRESULT STDMETHODCALLTYPE CAddressEditBox::SetOwner(IUnknown *pOwner) +{ + if (!pOwner) + { + CComPtr<IBrowserService> browserService; + HRESULT hResult = IUnknown_QueryService(fSite, SID_SShellBrowser, IID_PPV_ARG(IBrowserService, &browserService)); + if (SUCCEEDED(hResult)) + AtlUnadvise(browserService, DIID_DWebBrowserEvents, fAdviseCookie); + fSite = NULL; + } // connect to browser connection point return 0; } Modified: trunk/reactos/dll/win32/browseui/basebar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/basebar… ============================================================================== --- trunk/reactos/dll/win32/browseui/basebar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/basebar.cpp [iso-8859-1] Tue Nov 8 23:38:42 2016 @@ -328,6 +328,10 @@ WS_VISIBLE | WS_CHILDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, WS_EX_TOOLWINDOW); ReserveBorderSpace(); } + else + { + DestroyWindow(); + } return S_OK; } Modified: trunk/reactos/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/interne… ============================================================================== --- trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Tue Nov 8 23:38:42 2016 @@ -934,6 +934,8 @@ return hResult; ReleaseCComPtrExpectZero(fLogoBar); } + + SetSite(NULL); return S_OK; } Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Tue Nov 8 23:38:42 2016 @@ -179,7 +179,7 @@ CComPtr<IExplorerToolbar> fExplorerToolbar; public: void Initialize(HWND parent, IUnknown *explorerToolbar); - + void Destroy(); private: // message handlers @@ -205,6 +205,12 @@ hResult = explorerToolbar->QueryInterface( IID_PPV_ARG(IExplorerToolbar, &fExplorerToolbar)); } +} + +void CToolbarProxy::Destroy() +{ + DestroyWindow(); + fExplorerToolbar = NULL; } LRESULT CToolbarProxy::OnAddBitmap(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) @@ -1116,6 +1122,7 @@ // we have to store our basebar into cache now *cache = newBaseBar; + newBaseBar->AddRef(); // tell the new base bar about the shell browser hResult = IUnknown_SetSite(newBaseBar, static_cast<IDropTarget *>(this)); @@ -3362,9 +3369,10 @@ // TODO: rip down everything { + fToolbarProxy.Destroy(); + fCurrentShellView->DestroyViewWindow(); fCurrentShellView->UIActivate(SVUIA_DEACTIVATE); - ReleaseCComPtrExpectZero(fCurrentShellView); for (int i = 0; i < 3; i++) { @@ -3393,16 +3401,14 @@ } } pdw->CloseDW(0); + + pClient = NULL; + pBarSite = NULL; pdw = NULL; - /* For some reasons, it's like we miss some AddRef in ATL when QueryInterface on - * same interface or inherited one, so we are removing already removed (!) object. - * TODO: check with MSVC's ATL to see if this behaviour happens too - */ - bar.Detach(); - pClient.Detach(); - pBarSite.Detach(); + bar = NULL; ReleaseCComPtrExpectZero(fClientBars[i].clientBar); } + ReleaseCComPtrExpectZero(fCurrentShellView); ReleaseCComPtrExpectZero(fTravelLog); fCurrentShellFolder.Release();

8 years, 1 month

[cwittich] 73174: [PSDK] add some missing DNS structures, add incomplete dnsrslvr.idl

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Nov 8 12:27:55 2016 New Revision: 73174 URL: http://svn.reactos.org/svn/reactos?rev=73174&view=rev Log: [PSDK] add some missing DNS structures, add incomplete dnsrslvr.idl Added: trunk/reactos/sdk/include/reactos/idl/dnsrslvr.idl (with props) Modified: trunk/reactos/sdk/include/psdk/windns.h Modified: trunk/reactos/sdk/include/psdk/windns.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/windns.h?… ============================================================================== --- trunk/reactos/sdk/include/psdk/windns.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/windns.h [iso-8859-1] Tue Nov 8 12:27:55 2016 @@ -104,6 +104,8 @@ #define DNS_ATMA_MAX_ADDR_LENGTH 20 +#define DNS_ADDR_MAX_SOCKADDR_LENGTH 32 + typedef enum _DNS_CHARSET { DnsCharSetUnknown, DnsCharSetUnicode, @@ -165,6 +167,36 @@ #pragma pack(push, 1) +typedef struct _DnsAddr +{ + CHAR MaxSa[DNS_ADDR_MAX_SOCKADDR_LENGTH]; +#if defined(__midl) || defined(__WIDL__) + DWORD DnsAddrUserDword[8]; +#else + union { + DWORD DnsAddrUserDword[8]; + } Data; +#endif +} DNS_ADDR, *PDNS_ADDR; + +typedef struct _DnsAddrArray +{ + DWORD MaxCount; + DWORD AddrCount; + DWORD Tag; + WORD Family; + WORD WordReserved; + DWORD Flags; + DWORD MatchFlag; + DWORD Reserved1; + DWORD Reserved2; +#if defined(__midl) || defined(__WIDL__) + [size_is(AddrCount)] DNS_ADDR AddrArray[]; +#else + DNS_ADDR AddrArray[1]; +#endif +} DNS_ADDR_ARRAY, *PDNS_ADDR_ARRAY; + typedef struct _DNS_HEADER { WORD Xid; BYTE RecursionDesired:1; @@ -447,6 +479,88 @@ BYTE BitMask[1]; } DNS_WKS_DATA, *PDNS_WKS_DATA; +typedef struct { + WORD wKeyTag; + BYTE chAlgorithm; + BYTE chDigestType; + WORD wDigestLength; + WORD wPad; + BYTE Digest[1]; +} DNS_DS_DATA; + +typedef struct { + LPWSTR pNextDomainName; + WORD wTypeBitMapsLength; + WORD wPad; + BYTE TypeBitMaps[1]; +} DNS_NSEC_DATAW; + +typedef struct { + WORD wFlags; + BYTE chProtocol; + BYTE chAlgorithm; + WORD wKeyLength; + WORD wPad; + BYTE Key[1]; +} DNS_DNSKEY_DATA; + +typedef struct { + WORD wDataLength; + WORD wPad; + BYTE Data[1]; +} DNS_OPT_DATA; + +typedef struct { + WORD wTypeCovered; + BYTE chAlgorithm; + BYTE chLabelCount; + DWORD dwOriginalTtl; + DWORD dwExpiration; + DWORD dwTimeSigned; + WORD wKeyTag; + WORD Pad; + LPWSTR pNameSigner; + BYTE Signature[1]; +} DNS_RRSIG_DATAW; + +#if defined(__midl) || defined(__WIDL__) +typedef [switch_type(unsigned short )] union DNS_DATAW { + [case(1)] DNS_A_DATA A; + [case(6)] DNS_SOA_DATAW SOA; + [case(12)] DNS_PTR_DATAW PTR; + [case(2)] DNS_PTR_DATAW NS; + [case(5)] DNS_PTR_DATAW CNAME; + [case(7)] DNS_PTR_DATAW MB; + [case(3)] DNS_PTR_DATAW MD; + [case(4)] DNS_PTR_DATAW MF; + [case(8)] DNS_PTR_DATAW MG; + [case(9)] DNS_PTR_DATAW MR; + [case(14)] DNS_MINFO_DATAW MINFO; + [case(17)] DNS_MINFO_DATAW RP; + [case(15)] DNS_MX_DATAW MX; + [case(18)] DNS_MX_DATAW AFSDB; + [case(21)] DNS_MX_DATAW RT; + [case(28)] DNS_AAAA_DATA AAAA; + [case(33)] DNS_SRV_DATAW SRV; + [case(34)] DNS_ATMA_DATA ATMA; + [case(43)] DNS_DS_DATA DS; + [case(46)] DNS_RRSIG_DATAW RRSIG; + [case(47)] DNS_NSEC_DATAW NSEC; + [case(48)] DNS_DNSKEY_DATA DNSKEY; + [case(41)] DNS_OPT_DATA OPT; +} DNS_DATAW; + +typedef struct _DnsRecordW { + [unique]struct _DnsRecordW *pNext; + [unique][string] LPWSTR pName; + WORD wType; + WORD wDataLength; + DWORD Flags; + DWORD dwTtl; + DWORD dwReserved; + [switch_is(wType)] DNS_DATAW Data; +} _DnsRecordW; +#else typedef struct _DnsRecordA { struct _DnsRecordA* pNext; LPSTR pName; @@ -521,6 +635,8 @@ #define PDNS_RECORD PDNS_RECORDA #endif +#endif + typedef struct _DnsRRSet { PDNS_RECORD pFirstRR; PDNS_RECORD pLastRR; @@ -547,6 +663,9 @@ _prrset->pLastRR->pNext = NULL; \ } +#ifndef __WIDL__ +// HACK + DNS_STATUS WINAPI DnsAcquireContextHandle_A( @@ -608,14 +727,14 @@ BOOL WINAPI DnsNameCompare_A( - _In_ PCSTR, - _In_ PCSTR); + _In_ PCSTR pszName1, + _In_ PCSTR pszName2); BOOL WINAPI DnsNameCompare_W( - _In_ PCWSTR, - _In_ PCWSTR); + _In_ PCWSTR pszwName1, + _In_ PCWSTR pszwName2); DNS_STATUS WINAPI @@ -765,6 +884,7 @@ _In_ WORD wType, _In_ WORD Xid, _In_ BOOL fRecursionDesired); +#endif #ifdef UNICODE Added: trunk/reactos/sdk/include/reactos/idl/dnsrslvr.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/idl/dn… ============================================================================== --- trunk/reactos/sdk/include/reactos/idl/dnsrslvr.idl (added) +++ trunk/reactos/sdk/include/reactos/idl/dnsrslvr.idl [iso-8859-1] Tue Nov 8 12:27:55 2016 @@ -0,0 +1,59 @@ +/* + * DNS Resolver Service interface definition + */ + +#include <ms-dtyp.idl> +#include <sal.h> +#include <windns.h> + +typedef [handle, string] LPWSTR DNSRSLVR_HANDLE; + +[ + uuid(45776b01-5956-4485-9f80-f428f7d60129), + version(2.0), + pointer_default(unique) +#ifndef __midl + ,explicit_handle +#endif +] + +interface DnsResolver +{ + /* Function: 0x00 */ + /* CRrReadCache */ + + /* Function: 0x01 */ + /* CRrReadCacheEntry */ + + /* Function: 0x02 */ + /* CRrGetHashTableStats */ + + /* Function: 0x03 */ + /* R_ResolverGetConfig */ + + /* Function: 0x04 */ + DWORD R_ResolverFlushCache( + [in][unique][string] DNSRSLVR_HANDLE pwszServerName); + + /* Function: 0x05 */ + /* R_ResolverFlushCacheEntry */ + + /* Function: 0x06 */ + /* R_ResolverRegisterCluster */ + + /* Function: 0x07 */ + DWORD R_ResolverQuery( + [in][unique][string] DNSRSLVR_HANDLE pwszServerName, + [in][unique][string] LPCWSTR pwsName, + [in] WORD wType, + [in] DWORD Flags, + [in][out] DWORD *dwRecords, + [out][ref] _DnsRecordW** ppResultRecords); + + /* Function: 0x08 */ + /* R_ResolverEnumCache */ + + /* Function: 0x09 */ + /* R_ResolverPoke */ + +} Propchange: trunk/reactos/sdk/include/reactos/idl/dnsrslvr.idl ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 1 month

[cwittich] 73173: [PSDK] disable SAL for WIDL as well

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Nov 8 11:33:54 2016 New Revision: 73173 URL: http://svn.reactos.org/svn/reactos?rev=73173&view=rev Log: [PSDK] disable SAL for WIDL as well Modified: trunk/reactos/sdk/include/psdk/sal.h Modified: trunk/reactos/sdk/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/sal.h?rev… ============================================================================== --- trunk/reactos/sdk/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/sal.h [iso-8859-1] Tue Nov 8 11:33:54 2016 @@ -30,7 +30,7 @@ #endif /* Disable expansion for MIDL and RC */ -#if defined(MIDL_PASS) || defined(__midl) || defined(RC_INVOKED) // [ +#if defined(MIDL_PASS) || defined(__midl) || defined(__WIDL__) || defined(RC_INVOKED) // [ #undef _PREFAST_ #endif // ]

8 years, 1 month

[tfaber] 73172: [USETUP] - Critical errors are worth a debug print CORE-11819

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Nov 8 09:40:05 2016 New Revision: 73172 URL: http://svn.reactos.org/svn/reactos?rev=73172&view=rev Log: [USETUP] - Critical errors are worth a debug print CORE-11819 Modified: trunk/reactos/base/setup/usetup/cabinet.c Modified: trunk/reactos/base/setup/usetup/cabinet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/cabinet.… ============================================================================== --- trunk/reactos/base/setup/usetup/cabinet.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/cabinet.c [iso-8859-1] Tue Nov 8 09:40:05 2016 @@ -529,7 +529,7 @@ if (!NT_SUCCESS(NtStatus)) { - DPRINT("Cannot open file (%S) (%x)\n", CabinetName, NtStatus); + DPRINT1("Cannot open file (%S) (%x)\n", CabinetName, NtStatus); return CAB_STATUS_CANNOT_OPEN; } @@ -544,7 +544,7 @@ if (!NT_SUCCESS(NtStatus)) { - DPRINT("NtCreateSection failed: %x\n", NtStatus); + DPRINT1("NtCreateSection failed: %x\n", NtStatus); return CAB_STATUS_NOMEMORY; } @@ -562,7 +562,7 @@ if (!NT_SUCCESS(NtStatus)) { - DPRINT("NtMapViewOfSection failed: %x\n", NtStatus); + DPRINT1("NtMapViewOfSection failed: %x\n", NtStatus); return CAB_STATUS_NOMEMORY; } @@ -578,7 +578,7 @@ PCABHeader->FileTableOffset < sizeof(CFHEADER)) { CloseCabinet(); - DPRINT("File has invalid header\n"); + DPRINT1("File has invalid header\n"); return CAB_STATUS_INVALID_CAB; } @@ -932,13 +932,13 @@ if (!NT_SUCCESS(NtStatus)) { - DPRINT("NtCreateFile() failed (%S) (%x)\n", DestName, NtStatus); + DPRINT1("NtCreateFile() failed (%S) (%x)\n", DestName, NtStatus); return CAB_STATUS_CANNOT_CREATE; } } else { - DPRINT("File (%S) exists\n", DestName); + DPRINT1("File (%S) exists\n", DestName); return CAB_STATUS_FILE_EXISTS; } } @@ -954,7 +954,7 @@ if (!NT_SUCCESS(NtStatus)) { - DPRINT("NtCreateSection failed: %x\n", NtStatus); + DPRINT1("NtCreateSection failed: %x\n", NtStatus); Status = CAB_STATUS_NOMEMORY; goto CloseDestFile; } @@ -972,7 +972,7 @@ if (!NT_SUCCESS(NtStatus)) { - DPRINT("NtMapViewOfSection failed: %x\n", NtStatus); + DPRINT1("NtMapViewOfSection failed: %x\n", NtStatus); Status = CAB_STATUS_NOMEMORY; goto CloseDestFileSection; } @@ -982,7 +982,7 @@ Search->File->FileTime, &FileTime)) { - DPRINT("DosDateTimeToFileTime() failed\n"); + DPRINT1("DosDateTimeToFileTime() failed\n"); Status = CAB_STATUS_CANNOT_WRITE; goto UnmapDestFile; }

8 years, 1 month

[hbelusca] 73171: [NTOS]: Fix MmPt and DOPE tags.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Nov 7 20:41:24 2016 New Revision: 73171 URL: http://svn.reactos.org/svn/reactos?rev=73171&view=rev Log: [NTOS]: Fix MmPt and DOPE tags. Modified: trunk/reactos/ntoskrnl/cache/section/sptab.c trunk/reactos/ntoskrnl/po/povolume.c Modified: trunk/reactos/ntoskrnl/cache/section/sptab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/spt… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/sptab.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/sptab.c [iso-8859-1] Mon Nov 7 20:41:24 2016 @@ -71,7 +71,7 @@ MiSectionPageTableAllocate(PRTL_GENERIC_TABLE Table, CLONG Bytes) { PVOID Result; - Result = ExAllocatePoolWithTag(NonPagedPool, Bytes, 'MmPt'); + Result = ExAllocatePoolWithTag(NonPagedPool, Bytes, 'tPmM'); //DPRINT("MiSectionPageTableAllocate(%d) => %p\n", Bytes, Result); return Result; } @@ -83,7 +83,7 @@ MiSectionPageTableFree(PRTL_GENERIC_TABLE Table, PVOID Data) { //DPRINT("MiSectionPageTableFree(%p)\n", Data); - ExFreePoolWithTag(Data, 'MmPt'); + ExFreePoolWithTag(Data, 'tPmM'); } _Function_class_(RTL_GENERIC_COMPARE_ROUTINE) Modified: trunk/reactos/ntoskrnl/po/povolume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/povolume.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/po/povolume.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/povolume.c [iso-8859-1] Mon Nov 7 20:41:24 2016 @@ -27,6 +27,8 @@ LIST_ENTRY PopVolumeDevices; KSPIN_LOCK PopDopeGlobalLock; +#define TAG_PO_DOPE 'EPOD' + /* PRIVATE FUNCTIONS *********************************************************/ PDEVICE_OBJECT_POWER_EXTENSION @@ -45,7 +47,7 @@ /* Allocate some dope for the device */ Dope = ExAllocatePoolWithTag(NonPagedPool, sizeof(DEVICE_OBJECT_POWER_EXTENSION), - 'Dope'); + TAG_PO_DOPE); if (!Dope) goto Return; /* Initialize the initial contents of the dope */ @@ -69,7 +71,7 @@ KeReleaseSpinLock(&PopDopeGlobalLock, OldIrql); /* Check if someone other than us already assigned the dope, so free ours */ - if (Dope) ExFreePoolWithTag(Dope, 'Dope'); + if (Dope) ExFreePoolWithTag(Dope, TAG_PO_DOPE); /* Return the dope to the caller */ Return: @@ -140,7 +142,7 @@ KeReleaseSpinLock(&PopDopeGlobalLock, OldIrql); /* Free dope */ - ExFreePoolWithTag(Dope, 'Dope'); + ExFreePoolWithTag(Dope, TAG_PO_DOPE); } VOID

8 years, 1 month

← Newer
1
...
21
22
23
24
25
26
27
...
32
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 November 2016