Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 72772: [HIVECLS.INF] - Drive property page is registered by sehll32.
by gadamopoulos＠svn.reactos.org 22 Sep '16

22 Sep '16

Author: gadamopoulos Date: Thu Sep 22 16:48:12 2016 New Revision: 72772 URL: http://svn.reactos.org/svn/reactos?rev=72772&view=rev Log: [HIVECLS.INF] - Drive property page is registered by sehll32. Modified: trunk/reactos/boot/bootdata/hivecls.inf Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] Thu Sep 22 16:48:12 2016 @@ -1,4 +1,4 @@ -[Version] +ï»¿[Version] Signature="$ReactOS$" [AddReg] @@ -17,11 +17,6 @@ HKCR,"Folder\shell\explore","BrowserFlags",0x00010001,"0x00000022" HKCR,"Folder\shell\explore","ExplorerFlags",0x00010001,"0x00000021" HKCR,"Folder\shell\explore\command","",0x00000000,"explorer.exe /e,""%1""" - -; Drive property page -HKCR,"CLSID\{5F5295E0-429F-1069-A2E2-08002B30309D}","",0x00000000,"Drive Property Page Extension" -HKCR,"CLSID\{5F5295E0-429F-1069-A2E2-08002B30309D}\InProcServer32","",0x00000000,"shell32.dll" -HKCR,"CLSID\{5F5295E0-429F-1069-A2E2-08002B30309D}\InProcServer32","ThreadingModel",0x00000000,"Apartment" ; Clipboard Element HKCR,".clp","",0x00000000,"clpfile"

1 0

[gadamopoulos] 72771: [SHELL32] - Handle failure in SHELL32_CompareDetails.
by gadamopoulos＠svn.reactos.org 22 Sep '16

22 Sep '16

Author: gadamopoulos Date: Thu Sep 22 16:22:44 2016 New Revision: 72771 URL: http://svn.reactos.org/svn/reactos?rev=72771&view=rev Log: [SHELL32] - Handle failure in SHELL32_CompareDetails. Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Thu Sep 22 16:22:44 2016 @@ -439,11 +439,24 @@ { SHELLDETAILS sd; WCHAR wszItem1[MAX_PATH], wszItem2[MAX_PATH]; - - isf->GetDetailsOf(pidl1, lParam, &sd); - StrRetToBufW(&sd.str, pidl1, wszItem1, MAX_PATH); - isf->GetDetailsOf(pidl2, lParam, &sd); - StrRetToBufW(&sd.str, pidl2, wszItem2, MAX_PATH); + HRESULT hres; + + hres = isf->GetDetailsOf(pidl1, lParam, &sd); + if (FAILED(hres)) + return MAKE_COMPARE_HRESULT(1); + + hres = StrRetToBufW(&sd.str, pidl1, wszItem1, MAX_PATH); + if (FAILED(hres)) + return MAKE_COMPARE_HRESULT(1); + + hres = isf->GetDetailsOf(pidl2, lParam, &sd); + if (FAILED(hres)) + return MAKE_COMPARE_HRESULT(1); + + hres = StrRetToBufW(&sd.str, pidl2, wszItem2, MAX_PATH); + if (FAILED(hres)) + return MAKE_COMPARE_HRESULT(1); + int ret = wcsicmp(wszItem1, wszItem2); return MAKE_COMPARE_HRESULT(ret);

1 0

[gadamopoulos] 72770: [SHELL32] - COpenWithMenu: Don't try to close the same registry key twice.
by gadamopoulos＠svn.reactos.org 22 Sep '16

22 Sep '16

Author: gadamopoulos Date: Thu Sep 22 16:14:07 2016 New Revision: 72770 URL: http://svn.reactos.org/svn/reactos?rev=72770&view=rev Log: [SHELL32] - COpenWithMenu: Don't try to close the same registry key twice. Modified: trunk/reactos/dll/win32/shell32/COpenWithMenu.cpp Modified: trunk/reactos/dll/win32/shell32/COpenWithMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/COpenWit… ============================================================================== --- trunk/reactos/dll/win32/shell32/COpenWithMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/COpenWithMenu.cpp [iso-8859-1] Thu Sep 22 16:14:07 2016 @@ -600,8 +600,6 @@ dwSize = sizeof(wszBuf); if (RegGetValueW(hKey, NULL, L"PerceivedType", RRF_RT_REG_SZ, NULL, wszBuf, &dwSize) == ERROR_SUCCESS) { - RegCloseKey(hKey); - StringCbPrintfW(wszBuf2, sizeof(wszBuf2), L"SystemFileAssociations\\%s", wszBuf); if (RegOpenKeyExW(HKEY_CLASSES_ROOT, wszBuf2, 0, KEY_READ | KEY_WRITE, &hSubkey) == ERROR_SUCCESS) {

1 0

[gadamopoulos] 72769: [SHELL32] - HCR_GetFolderAttributes already calls GetAttributesOf when needed, calling it when it is not needed can lead to crashes.
by gadamopoulos＠svn.reactos.org 22 Sep '16

22 Sep '16

Author: gadamopoulos Date: Thu Sep 22 16:09:28 2016 New Revision: 72769 URL: http://svn.reactos.org/svn/reactos?rev=72769&view=rev Log: [SHELL32] - HCR_GetFolderAttributes already calls GetAttributesOf when needed, calling it when it is not needed can lead to crashes. Modified: trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp [iso-8859-1] Thu Sep 22 16:09:28 2016 @@ -179,15 +179,6 @@ if (HCR_GetFolderAttributes(pidl, pdwAttributes) && *pdwAttributes) { return S_OK; - } - else - { - /* If we can't get it from the registry we have to query the child */ - CComPtr<IShellFolder> psf2; - if (SUCCEEDED(BindToObject(pidl, 0, IID_PPV_ARG(IShellFolder, &psf2)))) - { - return psf2->GetAttributesOf(0, NULL, pdwAttributes); - } } *pdwAttributes &= SFGAO_CANLINK;

1 0

[cwittich] 72768: [SHELL32] implement CreateViewWindow3 and fix CreateViewWindow2
by cwittich＠svn.reactos.org 22 Sep '16

22 Sep '16

Author: cwittich Date: Thu Sep 22 14:28:44 2016 New Revision: 72768 URL: http://svn.reactos.org/svn/reactos?rev=72768&view=rev Log: [SHELL32] implement CreateViewWindow3 and fix CreateViewWindow2 Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Thu Sep 22 14:28:44 2016 @@ -172,6 +172,9 @@ virtual HRESULT STDMETHODCALLTYPE CreateViewWindow2(LPSV2CVW2_PARAMS view_params); virtual HRESULT STDMETHODCALLTYPE HandleRename(LPCITEMIDLIST new_pidl); virtual HRESULT STDMETHODCALLTYPE SelectAndPositionItem(LPCITEMIDLIST item, UINT flags, POINT *point); + + // *** IShellView3 methods *** + virtual HRESULT STDMETHODCALLTYPE CreateViewWindow3(IShellBrowser *psb, IShellView *psvPrevious, SV3CVW3_FLAGS view_flags, FOLDERFLAGS mask, FOLDERFLAGS flags, FOLDERVIEWMODE mode, const SHELLVIEWID *view_id, RECT *prcView, HWND *hwnd); // *** IFolderView methods *** virtual HRESULT STDMETHODCALLTYPE GetCurrentViewMode(UINT *pViewMode); @@ -2144,20 +2147,8 @@ HRESULT WINAPI CDefView::CreateViewWindow(IShellView *lpPrevView, LPCFOLDERSETTINGS lpfs, IShellBrowser *psb, RECT *prcView, HWND *phWnd) { - SV2CVW2_PARAMS view_params; - HRESULT hr; - - view_params.cbSize = sizeof(view_params); - view_params.pfs = lpfs; - view_params.psvPrev = lpPrevView; - view_params.psbOwner = psb; - view_params.prcView = prcView; - view_params.pvid = NULL; - - hr = CreateViewWindow2(&view_params); - *phWnd = view_params.hwndView; - - return hr; + return CreateViewWindow3(psb, lpPrevView, SV3CVW3_DEFAULT, + (FOLDERFLAGS)lpfs->fFlags, (FOLDERFLAGS)lpfs->fFlags, (FOLDERVIEWMODE)lpfs->ViewMode, NULL, prcView, phWnd); } HRESULT WINAPI CDefView::DestroyViewWindow() @@ -2513,33 +2504,52 @@ HRESULT STDMETHODCALLTYPE CDefView::CreateViewWindow2(LPSV2CVW2_PARAMS view_params) { + return CreateViewWindow3(view_params->psbOwner, view_params->psvPrev, + SV3CVW3_DEFAULT, (FOLDERFLAGS)view_params->pfs->fFlags, (FOLDERFLAGS)view_params->pfs->fFlags, + (FOLDERVIEWMODE)view_params->pfs->ViewMode, view_params->pvid, view_params->prcView, &view_params->hwndView); +} + +HRESULT STDMETHODCALLTYPE CDefView::CreateViewWindow3(IShellBrowser *psb, IShellView *psvPrevious, SV3CVW3_FLAGS view_flags, FOLDERFLAGS mask, FOLDERFLAGS flags, FOLDERVIEWMODE mode, const SHELLVIEWID *view_id, RECT *prcView, HWND *hwnd) +{ OLEMENUGROUPWIDTHS omw = { { 0, 0, 0, 0, 0, 0 } }; - if (view_params->cbSize != sizeof(SV2CVW2_PARAMS)) - return E_FAIL; + *hwnd = NULL; + + TRACE("(%p)->(shlview=%p shlbrs=%p rec=%p hwnd=%p vmode=%x flags=%x)\n", this, psvPrevious, psb, prcView, hwnd, mode, flags); + if (prcView != NULL) + TRACE("-- left=%i top=%i right=%i bottom=%i\n", prcView->left, prcView->top, prcView->right, prcView->bottom); - if (view_params->pvid != NULL) - { - FIXME("SHELLVIEWID not handled, FAIL\n"); - - } - - view_params->hwndView = 0; - - TRACE("(%p)->(shlview=%p set=%p shlbrs=%p rec=%p hwnd=%p) incomplete\n", this, view_params->psvPrev, view_params->pfs, view_params->psbOwner, view_params->prcView, view_params->hwndView); - - if (view_params->pfs != NULL) - TRACE("-- vmode=%x flags=%x\n", view_params->pfs->ViewMode, view_params->pfs->fFlags); - if (view_params->prcView != NULL) - TRACE("-- left=%i top=%i right=%i bottom=%i\n", view_params->prcView->left, view_params->prcView->top, view_params->prcView->right, view_params->prcView->bottom); - /* Validate the Shell Browser */ - if (view_params->psbOwner == NULL || m_hWnd) + if (psb == NULL || m_hWnd) return E_UNEXPECTED; + if (view_flags != SV3CVW3_DEFAULT) + FIXME("unsupported view flags 0x%08x\n", view_flags); + /* Set up the member variables */ - m_pShellBrowser = view_params->psbOwner; - m_FolderSettings = *view_params->pfs; + m_pShellBrowser = psb; + m_FolderSettings.ViewMode = mode; + m_FolderSettings.fFlags = mask & flags; + + if (view_id) + { + if (IsEqualIID(*view_id, VID_LargeIcons)) + m_FolderSettings.ViewMode = FVM_ICON; + else if (IsEqualIID(*view_id, VID_SmallIcons)) + m_FolderSettings.ViewMode = FVM_SMALLICON; + else if (IsEqualIID(*view_id, VID_List)) + m_FolderSettings.ViewMode = FVM_LIST; + else if (IsEqualIID(*view_id, VID_Details)) + m_FolderSettings.ViewMode = FVM_DETAILS; + else if (IsEqualIID(*view_id, VID_Thumbnails)) + m_FolderSettings.ViewMode = FVM_THUMBNAIL; + else if (IsEqualIID(*view_id, VID_Tile)) + m_FolderSettings.ViewMode = FVM_TILE; + else if (IsEqualIID(*view_id, VID_ThumbStrip)) + m_FolderSettings.ViewMode = FVM_THUMBSTRIP; + else + FIXME("Ignoring unrecognized VID %s\n", debugstr_guid(view_id)); + } /* Get our parent window */ m_pShellBrowser->GetWindow(&m_hWndParent); @@ -2551,15 +2561,15 @@ TRACE("-- CommDlgBrowser\n"); } - Create(m_hWndParent, view_params->prcView, NULL, WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP, 0, 0U); + Create(m_hWndParent, prcView, NULL, WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP, 0, 0U); if (m_hWnd == NULL) return E_FAIL; - view_params->hwndView = m_hWnd; + *hwnd = m_hWnd; CheckToolbar(); - if (!view_params->hwndView) + if (!*hwnd) return E_FAIL; SetWindowPos(HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);

1 0

[ekohl] 72767: [LSASRV] LsapGetLogonSessionData: Marshall the session data before sending them to the client. [SECUR32] LsaConnectUntrusted: Wait for the authentication thread. LsaGetLogonSessionDa...
by ekohl＠svn.reactos.org 22 Sep '16

22 Sep '16

Author: ekohl Date: Thu Sep 22 11:27:05 2016 New Revision: 72767 URL: http://svn.reactos.org/svn/reactos?rev=72767&view=rev Log: [LSASRV] LsapGetLogonSessionData: Marshall the session data before sending them to the client. [SECUR32] LsaConnectUntrusted: Wait for the authentication thread. LsaGetLogonSessionData: Unmarshall the session data after receiving them from the server. Modified: trunk/reactos/dll/win32/lsasrv/session.c trunk/reactos/dll/win32/secur32/lsalpc.c trunk/reactos/dll/win32/secur32/precomp.h Modified: trunk/reactos/dll/win32/lsasrv/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/session.c… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/session.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/session.c [iso-8859-1] Thu Sep 22 11:27:05 2016 @@ -320,8 +320,8 @@ PLSAP_LOGON_SESSION Session; PSECURITY_LOGON_SESSION_DATA LocalSessionData; PVOID ClientBaseAddress = NULL; - ULONG Length, MemSize; - LPWSTR Ptr; + ULONG TotalLength, MemSize, SidLength = 0; + PUCHAR Ptr; NTSTATUS Status; TRACE("LsapGetLogonSessionData(%p)\n", RequestMsg); @@ -332,47 +332,117 @@ return STATUS_NO_SUCH_LOGON_SESSION; /* Calculate the required buffer size */ - Length = sizeof(SECURITY_LOGON_SESSION_DATA) + - Session->UserName.MaximumLength; -/* - Session->LogonDomain.MaximumLength + - Session->AuthenticationPackage.MaximumLength + - Session->LogonServer.MaximumLength + - Session->DnsDomainName.MaximumLength + - Session->Upn.MaximumLength; - + TotalLength = sizeof(SECURITY_LOGON_SESSION_DATA) + + Session->UserName.MaximumLength + + Session->LogonDomain.MaximumLength + + Session->AuthenticationPackage.MaximumLength + + Session->LogonServer.MaximumLength + + Session->DnsDomainName.MaximumLength + + Session->Upn.MaximumLength; if (Session->Sid != NULL) - RtlLengthSid(Session->Sid); -*/ - - TRACE("Length: %lu\n", Length); + { + SidLength = RtlLengthSid(Session->Sid); + TotalLength += SidLength; + } + TRACE("TotalLength: %lu\n", TotalLength); /* Allocate the buffer */ LocalSessionData = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, - Length); + TotalLength); if (LocalSessionData == NULL) return STATUS_INSUFFICIENT_RESOURCES; - Ptr = (LPWSTR)((ULONG_PTR)LocalSessionData + sizeof(SECURITY_LOGON_SESSION_DATA)); + Ptr = (PUCHAR)((ULONG_PTR)LocalSessionData + sizeof(SECURITY_LOGON_SESSION_DATA)); TRACE("LocalSessionData: %p Ptr: %p\n", LocalSessionData, Ptr); LocalSessionData->Size = sizeof(SECURITY_LOGON_SESSION_DATA); + /* Copy the LogonId */ RtlCopyLuid(&LocalSessionData->LogonId, &RequestMsg->GetLogonSessionData.Request.LogonId); + /* Copy the UserName string*/ LocalSessionData->UserName.Length = Session->UserName.Length; LocalSessionData->UserName.MaximumLength = Session->UserName.MaximumLength; - LocalSessionData->UserName.Buffer = Ptr; - -// RtlCopyMemory(Ptr) - + + if (Session->UserName.MaximumLength != 0) + { + RtlCopyMemory(Ptr, Session->UserName.Buffer, Session->UserName.MaximumLength); + Ptr = (PUCHAR)((ULONG_PTR)Ptr + Session->UserName.MaximumLength); + + LocalSessionData->UserName.Buffer = (PWSTR)((ULONG_PTR)Ptr - (ULONG_PTR)LocalSessionData); + } + + /* Copy the LogonDomain string */ + LocalSessionData->LogonDomain.Length = Session->LogonDomain.Length; + LocalSessionData->LogonDomain.MaximumLength = Session->LogonDomain.MaximumLength; + if (Session->LogonDomain.MaximumLength != 0) + { + RtlCopyMemory(Ptr, Session->LogonDomain.Buffer, Session->LogonDomain.MaximumLength); + Ptr = (PUCHAR)((ULONG_PTR)Ptr + Session->LogonDomain.MaximumLength); + + LocalSessionData->LogonDomain.Buffer = (PWSTR)((ULONG_PTR)Ptr - (ULONG_PTR)LocalSessionData); + } + + /* Copy the AuthenticationPackage string */ + LocalSessionData->AuthenticationPackage.Length = Session->AuthenticationPackage.Length; + LocalSessionData->AuthenticationPackage.MaximumLength = Session->AuthenticationPackage.MaximumLength; + if (Session->AuthenticationPackage.MaximumLength != 0) + { + RtlCopyMemory(Ptr, Session->AuthenticationPackage.Buffer, Session->AuthenticationPackage.MaximumLength); + Ptr = (PUCHAR)((ULONG_PTR)Ptr + Session->AuthenticationPackage.MaximumLength); + + LocalSessionData->AuthenticationPackage.Buffer = (PWSTR)((ULONG_PTR)Ptr - (ULONG_PTR)LocalSessionData); + } LocalSessionData->LogonType = Session->LogonType; LocalSessionData->Session = 0; - + /* Sid */ + if (Session->Sid != NULL) + { + RtlCopyMemory(Ptr, Session->Sid, SidLength); + Ptr = (PUCHAR)((ULONG_PTR)Ptr + SidLength); + + LocalSessionData->Sid = (PSID)((ULONG_PTR)Ptr - (ULONG_PTR)LocalSessionData); + } + + /* LogonTime */ + LocalSessionData->LogonTime.QuadPart = Session->LogonTime.QuadPart; + + /* Copy the LogonServer string */ + LocalSessionData->LogonServer.Length = Session->LogonServer.Length; + LocalSessionData->LogonServer.MaximumLength = Session->LogonServer.MaximumLength; + if (Session->LogonServer.MaximumLength != 0) + { + RtlCopyMemory(Ptr, Session->LogonServer.Buffer, Session->LogonServer.MaximumLength); + Ptr = (PUCHAR)((ULONG_PTR)Ptr + Session->LogonServer.MaximumLength); + + LocalSessionData->LogonServer.Buffer = (PWSTR)((ULONG_PTR)Ptr - (ULONG_PTR)LocalSessionData); + } + + /* Copy the DnsDomainName string */ + LocalSessionData->DnsDomainName.Length = Session->DnsDomainName.Length; + LocalSessionData->DnsDomainName.MaximumLength = Session->DnsDomainName.MaximumLength; + if (Session->DnsDomainName.MaximumLength != 0) + { + RtlCopyMemory(Ptr, Session->DnsDomainName.Buffer, Session->DnsDomainName.MaximumLength); + Ptr = (PUCHAR)((ULONG_PTR)Ptr + Session->DnsDomainName.MaximumLength); + + LocalSessionData->DnsDomainName.Buffer = (PWSTR)((ULONG_PTR)Ptr - (ULONG_PTR)LocalSessionData); + } + + /* Copy the Upn string */ + LocalSessionData->Upn.Length = Session->Upn.Length; + LocalSessionData->Upn.MaximumLength = Session->Upn.MaximumLength; + if (Session->Upn.MaximumLength != 0) + { + RtlCopyMemory(Ptr, Session->Upn.Buffer, Session->Upn.MaximumLength); + Ptr = (PUCHAR)((ULONG_PTR)Ptr + Session->Upn.MaximumLength); + + LocalSessionData->Upn.Buffer = (PWSTR)((ULONG_PTR)Ptr - (ULONG_PTR)LocalSessionData); + } InitializeObjectAttributes(&ObjectAttributes, @@ -391,7 +461,7 @@ goto done; } - MemSize = Length; + MemSize = TotalLength; Status = NtAllocateVirtualMemory(ProcessHandle, &ClientBaseAddress, 0, @@ -410,7 +480,7 @@ Status = NtWriteVirtualMemory(ProcessHandle, ClientBaseAddress, LocalSessionData, - Length, + TotalLength, NULL); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/dll/win32/secur32/lsalpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/lsalpc.c… ============================================================================== --- trunk/reactos/dll/win32/secur32/lsalpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/lsalpc.c [iso-8859-1] Thu Sep 22 11:27:05 2016 @@ -115,14 +115,53 @@ SECURITY_QUALITY_OF_SERVICE SecurityQos; LSA_CONNECTION_INFO ConnectInfo; ULONG ConnectInfoLength = sizeof(ConnectInfo); + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING EventName; + HANDLE EventHandle; NTSTATUS Status; TRACE("LsaConnectUntrusted(%p)\n", LsaHandle); - // TODO: Wait on L"\\SECURITY\\LSA_AUTHENTICATION_INITIALIZED" event - // for the LSA server to be ready, and because we are untrusted, - // we may need to impersonate ourselves before! - + // TODO: we may need to impersonate ourselves before, because we are untrusted! + + /* Wait for the LSA authentication thread */ + RtlInitUnicodeString(&EventName, + L"\\SECURITY\\LSA_AUTHENTICATION_INITIALIZED"); + InitializeObjectAttributes(&ObjectAttributes, + &EventName, + OBJ_CASE_INSENSITIVE | OBJ_PERMANENT, + NULL, + NULL); + Status = NtOpenEvent(&EventHandle, + SYNCHRONIZE, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + WARN("NtOpenEvent failed (Status 0x%08lx)\n", Status); + + Status = NtCreateEvent(&EventHandle, + SYNCHRONIZE, + &ObjectAttributes, + NotificationEvent, + FALSE); + if (!NT_SUCCESS(Status)) + { + WARN("NtCreateEvent failed (Status 0x%08lx)\n", Status); + return Status; + } + } + + Status = NtWaitForSingleObject(EventHandle, + TRUE, + NULL); + NtClose(EventHandle); + if (!NT_SUCCESS(Status)) + { + ERR("NtWaitForSingleObject failed (Status 0x%08lx)\n", Status); + return Status; + } + + /* Connect to the authentication port */ RtlInitUnicodeString(&PortName, L"\\LsaAuthenticationPort"); @@ -248,11 +287,33 @@ SessionData = ApiMessage.GetLogonSessionData.Reply.SessionDataBuffer; + TRACE("UserName: %p\n", SessionData->UserName.Buffer); if (SessionData->UserName.Buffer != NULL) - SessionData->UserName.Buffer = (LPWSTR)((ULONG_PTR)&SessionData->UserName.Buffer + (ULONG_PTR)SessionData->UserName.Buffer); - + SessionData->UserName.Buffer = (LPWSTR)((ULONG_PTR)SessionData + (ULONG_PTR)SessionData->UserName.Buffer); + + TRACE("LogonDomain: %p\n", SessionData->LogonDomain.Buffer); + if (SessionData->LogonDomain.Buffer != NULL) + SessionData->LogonDomain.Buffer = (LPWSTR)((ULONG_PTR)SessionData + (ULONG_PTR)SessionData->LogonDomain.Buffer); + + TRACE("AuthenticationPackage: %p\n", SessionData->AuthenticationPackage.Buffer); + if (SessionData->AuthenticationPackage.Buffer != NULL) + SessionData->AuthenticationPackage.Buffer = (LPWSTR)((ULONG_PTR)SessionData + (ULONG_PTR)SessionData->AuthenticationPackage.Buffer); + + TRACE("Sid: %p\n", SessionData->Sid); if (SessionData->Sid != NULL) - SessionData->Sid = (LPWSTR)((ULONG_PTR)&SessionData->Sid + (ULONG_PTR)SessionData->Sid); + SessionData->Sid = (LPWSTR)((ULONG_PTR)SessionData + (ULONG_PTR)SessionData->Sid); + + TRACE("LogonServer: %p\n", SessionData->LogonServer.Buffer); + if (SessionData->LogonServer.Buffer != NULL) + SessionData->LogonServer.Buffer = (LPWSTR)((ULONG_PTR)SessionData + (ULONG_PTR)SessionData->LogonServer.Buffer); + + TRACE("DnsDomainName: %p\n", SessionData->DnsDomainName.Buffer); + if (SessionData->DnsDomainName.Buffer != NULL) + SessionData->DnsDomainName.Buffer = (LPWSTR)((ULONG_PTR)SessionData + (ULONG_PTR)SessionData->DnsDomainName.Buffer); + + TRACE("Upn: %p\n", SessionData->Upn.Buffer); + if (SessionData->Upn.Buffer != NULL) + SessionData->Upn.Buffer = (LPWSTR)((ULONG_PTR)SessionData + (ULONG_PTR)SessionData->Upn.Buffer); *ppLogonSessionData = SessionData; Modified: trunk/reactos/dll/win32/secur32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/precomp.… ============================================================================== --- trunk/reactos/dll/win32/secur32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/precomp.h [iso-8859-1] Thu Sep 22 11:27:05 2016 @@ -20,6 +20,7 @@ #include <winnls.h> #include <winreg.h> #define NTOS_MODE_USER +#include <ndk/exfuncs.h> #include <ndk/rtlfuncs.h> #include <secext.h>

1 0

[bfreisen] 72766: [MSPAINT] Lets
by bfreisen＠svn.reactos.org 22 Sep '16

22 Sep '16

Author: bfreisen Date: Thu Sep 22 10:03:32 2016 New Revision: 72766 URL: http://svn.reactos.org/svn/reactos?rev=72766&view=rev Log: [MSPAINT] Lets Modified: trunk/reactos/base/applications/mspaint/lang/en-US.rc Modified: trunk/reactos/base/applications/mspaint/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/en-US.rc [iso-8859-1] Thu Sep 22 10:03:32 2016 @@ -196,7 +196,7 @@ IDS_MINIATURETITLE "Miniature" IDS_TOOLTIP1 "Free selection" IDS_TOOLTIP2 "Selection" - IDS_TOOLTIP3 "Rubber" + IDS_TOOLTIP3 "Eraser" IDS_TOOLTIP4 "Fill with color" IDS_TOOLTIP5 "Select color" IDS_TOOLTIP6 "Zoom"

1 0

[akhaldi] 72765: [PING] Rewrite ping. It now uses the Icmp* functions in iphlpapi, supports IPv4 and IPv6, and adds more options than available in the current ReactOS ping. Brought to you by Tim Cr...
by akhaldi＠svn.reactos.org 22 Sep '16

22 Sep '16

Author: akhaldi Date: Thu Sep 22 08:10:47 2016 New Revision: 72765 URL: http://svn.reactos.org/svn/reactos?rev=72765&view=rev Log: [PING] Rewrite ping. It now uses the Icmp* functions in iphlpapi, supports IPv4 and IPv6, and adds more options than available in the current ReactOS ping. Brought to you by Tim Crawford. CORE-10573 Modified: trunk/reactos/base/applications/network/ping/CMakeLists.txt trunk/reactos/base/applications/network/ping/lang/bg-BG.rc trunk/reactos/base/applications/network/ping/lang/cs-CZ.rc trunk/reactos/base/applications/network/ping/lang/de-DE.rc trunk/reactos/base/applications/network/ping/lang/en-US.rc trunk/reactos/base/applications/network/ping/lang/es-ES.rc trunk/reactos/base/applications/network/ping/lang/fr-FR.rc trunk/reactos/base/applications/network/ping/lang/it-IT.rc trunk/reactos/base/applications/network/ping/lang/pl-PL.rc trunk/reactos/base/applications/network/ping/lang/ro-RO.rc trunk/reactos/base/applications/network/ping/lang/ru-RU.rc trunk/reactos/base/applications/network/ping/lang/sq-AL.rc trunk/reactos/base/applications/network/ping/lang/sv-SE.rc trunk/reactos/base/applications/network/ping/lang/tr-TR.rc trunk/reactos/base/applications/network/ping/lang/uk-UA.rc trunk/reactos/base/applications/network/ping/lang/zh-CN.rc trunk/reactos/base/applications/network/ping/lang/zh-TW.rc trunk/reactos/base/applications/network/ping/ping.c trunk/reactos/base/applications/network/ping/ping.rc trunk/reactos/base/applications/network/ping/resource.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/network/ping/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/ping.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…

1 0

[cwittich] 72764: [SHELL32] revert 72685 the testman hang wasn't related
by cwittich＠svn.reactos.org 21 Sep '16

21 Sep '16

Author: cwittich Date: Wed Sep 21 19:51:35 2016 New Revision: 72764 URL: http://svn.reactos.org/svn/reactos?rev=72764&view=rev Log: [SHELL32] revert 72685 the testman hang wasn't related Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Wed Sep 21 19:51:35 2016 @@ -2521,9 +2521,9 @@ if (view_params->pvid != NULL) { FIXME("SHELLVIEWID not handled, FAIL\n"); - return E_NOTIMPL; - } - + + } + view_params->hwndView = 0; TRACE("(%p)->(shlview=%p set=%p shlbrs=%p rec=%p hwnd=%p) incomplete\n", this, view_params->psvPrev, view_params->pfs, view_params->psbOwner, view_params->prcView, view_params->hwndView);

1 0

[mjansen] 72763: [CRT] Fix __getmainargs parsing for a commandline ending with spaces. Patch by Yaroslav Veremenko CORE-9199 #comment Thanks, please re-test!
by mjansen＠svn.reactos.org 21 Sep '16

21 Sep '16

Author: mjansen Date: Wed Sep 21 19:34:42 2016 New Revision: 72763 URL: http://svn.reactos.org/svn/reactos?rev=72763&view=rev Log: [CRT] Fix __getmainargs parsing for a commandline ending with spaces. Patch by Yaroslav Veremenko CORE-9199 #comment Thanks, please re-test! Modified: trunk/reactos/sdk/lib/crt/misc/getargs.c Modified: trunk/reactos/sdk/lib/crt/misc/getargs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/misc/getargs.c… ============================================================================== --- trunk/reactos/sdk/lib/crt/misc/getargs.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/misc/getargs.c [iso-8859-1] Wed Sep 21 19:34:42 2016 @@ -181,7 +181,7 @@ */ void __getmainargs(int* argc, char*** argv, char*** env, int expand_wildcards, int* new_mode) { - int i, doexpand, slashesAdded, escapedQuote, inQuotes, bufferIndex; + int i, doexpand, slashesAdded, escapedQuote, inQuotes, bufferIndex, anyLetter; size_t len; char* buffer; @@ -190,6 +190,7 @@ i = 0; doexpand = expand_wildcards; escapedQuote = FALSE; + anyLetter = FALSE; slashesAdded = 0; inQuotes = 0; bufferIndex = 0; @@ -213,7 +214,11 @@ // Arguments are delimited by white space, which is either a space or a tab. if (i >= len || ((_acmdln[i] == ' ' || _acmdln[i] == '\t') && !inQuotes)) { - aexpand(strndup(buffer, bufferIndex), doexpand); + // Handle the case when empty spaces are in the end of the cmdline + if (anyLetter) + { + aexpand(strndup(buffer, bufferIndex), doexpand); + } // Copy the last element from buffer and quit the loop if (i >= len) { @@ -222,11 +227,14 @@ while (_acmdln[i] == ' ' || _acmdln[i] == '\t') ++i; + anyLetter = FALSE; bufferIndex = 0; slashesAdded = 0; escapedQuote = FALSE; continue; } + + anyLetter = TRUE; if (_acmdln[i] == '\\') { @@ -307,7 +315,7 @@ void __wgetmainargs(int* argc, wchar_t*** wargv, wchar_t*** wenv, int expand_wildcards, int* new_mode) { - int i, doexpand, slashesAdded, escapedQuote, inQuotes, bufferIndex; + int i, doexpand, slashesAdded, escapedQuote, inQuotes, bufferIndex, anyLetter; size_t len; wchar_t* buffer; @@ -316,6 +324,7 @@ i = 0; doexpand = expand_wildcards; escapedQuote = FALSE; + anyLetter = TRUE; slashesAdded = 0; inQuotes = 0; bufferIndex = 0; @@ -339,7 +348,11 @@ // Arguments are delimited by white space, which is either a space or a tab. if (i >= len || ((_wcmdln[i] == ' ' || _wcmdln[i] == '\t') && !inQuotes)) { - wexpand(wcsndup(buffer, bufferIndex), doexpand); + // Handle the case when empty spaces are in the end of the cmdline + if (anyLetter) + { + wexpand(wcsndup(buffer, bufferIndex), doexpand); + } // Copy the last element from buffer and quit the loop if (i >= len) { @@ -348,11 +361,14 @@ while (_wcmdln[i] == ' ' || _wcmdln[i] == '\t') ++i; + anyLetter = FALSE; bufferIndex = 0; slashesAdded = 0; escapedQuote = FALSE; continue; } + + anyLetter = TRUE; if (_wcmdln[i] == '\\') {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs