Ros-diffs May 2013

ros-diffs@reactos.org

16 participants
234 discussions

[ekohl] 59020: [SYSSETUP] - Move set privilege code into a separate function. - Set the restore privilege to make NtUnloadKey work properly.

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed May 15 21:26:07 2013 New Revision: 59020 URL: http://svn.reactos.org/svn/reactos?rev=59020&view=rev Log: [SYSSETUP] - Move set privilege code into a separate function. - Set the restore privilege to make NtUnloadKey work properly. Modified: trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Wed May 15 21:26:07 2013 @@ -806,12 +806,58 @@ return TRUE; } + +static +BOOL +SetPrivilege(IN LPTSTR lpPrivilegeName, + IN DWORD dwAttribute) +{ + TOKEN_PRIVILEGES privs; + HANDLE hToken = NULL; + BOOL bResult = TRUE; + + if (!OpenProcessToken(GetCurrentProcess(), + TOKEN_ADJUST_PRIVILEGES, + &hToken)) + { + FatalError("OpenProcessToken() failed!"); + return FALSE; + } + + if (!LookupPrivilegeValue(NULL, + lpPrivilegeName, + &privs.Privileges[0].Luid)) + { + FatalError("LookupPrivilegeValue() failed!"); + bResult = FALSE; + goto done; + } + + privs.PrivilegeCount = 1; + privs.Privileges[0].Attributes = dwAttribute; + if (AdjustTokenPrivileges(hToken, + FALSE, + &privs, + 0, + (PTOKEN_PRIVILEGES)NULL, + NULL) == 0) + { + FatalError("AdjustTokenPrivileges() failed!"); + bResult = FALSE; + } + +done: + if (hToken != NULL) + CloseHandle(hToken); + + return bResult; +} + + DWORD WINAPI InstallReactOS(HINSTANCE hInstance) { TCHAR szBuffer[MAX_PATH]; - HANDLE token; - TOKEN_PRIVILEGES privs; HKEY hKey; InitializeSetupActionLog(FALSE); @@ -868,6 +914,8 @@ FatalError("CreateShortcuts() failed"); return 0; } + + SetPrivilege(SE_RESTORE_NAME, SE_PRIVILEGE_ENABLED); /* ROS HACK, as long as NtUnloadKey is not implemented */ { @@ -899,39 +947,15 @@ } /* END OF ROS HACK */ + SetPrivilege(SE_RESTORE_NAME, 0); + SetupCloseInfFile(hSysSetupInf); SetSetupType(0); LogItem(SYSSETUP_SEVERITY_INFORMATION, L"Installing ReactOS done"); TerminateSetupActionLog(); - /* Get shutdown privilege */ - if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &token)) - { - FatalError("OpenProcessToken() failed!"); - return 0; - } - if (!LookupPrivilegeValue( - NULL, - SE_SHUTDOWN_NAME, - &privs.Privileges[0].Luid)) - { - FatalError("LookupPrivilegeValue() failed!"); - return 0; - } - privs.PrivilegeCount = 1; - privs.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; - if (AdjustTokenPrivileges( - token, - FALSE, - &privs, - 0, - (PTOKEN_PRIVILEGES)NULL, - NULL) == 0) - { - FatalError("AdjustTokenPrivileges() failed!"); - return 0; - } + SetPrivilege(SE_SHUTDOWN_NAME, SE_PRIVILEGE_ENABLED); ExitWindowsEx(EWX_REBOOT, 0); return 0;

11 years, 7 months

[akhaldi] 59019: [SHELL32] * Process CPL_STARTWPARMSW and then CPL_DBLCLK when starting control panel applets.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed May 15 17:42:01 2013 New Revision: 59019 URL: http://svn.reactos.org/svn/reactos?rev=59019&view=rev Log: [SHELL32] * Process CPL_STARTWPARMSW and then CPL_DBLCLK when starting control panel applets. Modified: trunk/reactos/dll/win32/shell32/control.cpp Modified: trunk/reactos/dll/win32/shell32/control.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/control.… ============================================================================== --- trunk/reactos/dll/win32/shell32/control.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/control.cpp [iso-8859-1] Wed May 15 17:42:01 2013 @@ -431,8 +431,8 @@ { /* Start the applet */ TRACE("Starting applet %d\n", i); - if (!pApplet->proc(pApplet->hWnd, CPL_DBLCLK, i, pApplet->info[i].lData)) - pApplet->proc(pApplet->hWnd, CPL_STARTWPARMSW, i, (LPARAM)pwszArg); + if (!pApplet->proc(pApplet->hWnd, CPL_STARTWPARMSW, i, (LPARAM)pwszArg)) + pApplet->proc(pApplet->hWnd, CPL_DBLCLK, i, pApplet->info[i].lData); } else ERR("Applet not found: %ls\n", pwszArg ? pwszArg : L"NULL");

11 years, 7 months

[akhaldi] 59018: [VBSCRIPT_WINETEST] * Import from Wine 1.5.26.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed May 15 17:33:58 2013 New Revision: 59018 URL: http://svn.reactos.org/svn/reactos?rev=59018&view=rev Log: [VBSCRIPT_WINETEST] * Import from Wine 1.5.26. Added: trunk/rostests/winetests/vbscript/ trunk/rostests/winetests/vbscript/CMakeLists.txt (with props) trunk/rostests/winetests/vbscript/api.vbs (with props) trunk/rostests/winetests/vbscript/createobj.c (with props) trunk/rostests/winetests/vbscript/lang.vbs (with props) trunk/rostests/winetests/vbscript/regexp.vbs (with props) trunk/rostests/winetests/vbscript/rsrc.rc (with props) trunk/rostests/winetests/vbscript/run.c (with props) trunk/rostests/winetests/vbscript/testlist.c (with props) trunk/rostests/winetests/vbscript/vbscript.c (with props) trunk/rostests/winetests/vbscript/vbscript_defs.h (with props) trunk/rostests/winetests/vbscript/vbsregexp55.idl (with props) Modified: trunk/rostests/winetests/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… Added: trunk/rostests/winetests/vbscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/vbscript/CMakeL… Added: trunk/rostests/winetests/vbscript/api.vbs URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/vbscript/api.vb… Added: trunk/rostests/winetests/vbscript/createobj.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/vbscript/create… Added: trunk/rostests/winetests/vbscript/lang.vbs URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/vbscript/lang.v… Added: trunk/rostests/winetests/vbscript/regexp.vbs URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/vbscript/regexp… Added: trunk/rostests/winetests/vbscript/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/vbscript/rsrc.r… Added: trunk/rostests/winetests/vbscript/run.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/vbscript/run.c?… Added: trunk/rostests/winetests/vbscript/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/vbscript/testli… Added: trunk/rostests/winetests/vbscript/vbscript.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/vbscript/vbscri… Added: trunk/rostests/winetests/vbscript/vbscript_defs.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/vbscript/vbscri… Added: trunk/rostests/winetests/vbscript/vbsregexp55.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/vbscript/vbsreg…

11 years, 7 months

[akhaldi] 59017: [VBSCRIPT] * Import from Wine 1.5.26.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed May 15 17:33:01 2013 New Revision: 59017 URL: http://svn.reactos.org/svn/reactos?rev=59017&view=rev Log: [VBSCRIPT] * Import from Wine 1.5.26. Added: trunk/reactos/dll/win32/vbscript/ (with props) trunk/reactos/dll/win32/vbscript/CMakeLists.txt (with props) trunk/reactos/dll/win32/vbscript/compile.c (with props) trunk/reactos/dll/win32/vbscript/error.c (with props) trunk/reactos/dll/win32/vbscript/global.c (with props) trunk/reactos/dll/win32/vbscript/interp.c (with props) trunk/reactos/dll/win32/vbscript/lex.c (with props) trunk/reactos/dll/win32/vbscript/parse.h (with props) trunk/reactos/dll/win32/vbscript/parser.tab.c (with props) trunk/reactos/dll/win32/vbscript/parser.tab.h (with props) trunk/reactos/dll/win32/vbscript/parser.y (with props) trunk/reactos/dll/win32/vbscript/regexp.c (with props) trunk/reactos/dll/win32/vbscript/regexp.h (with props) trunk/reactos/dll/win32/vbscript/vbdisp.c (with props) trunk/reactos/dll/win32/vbscript/vbregexp.c (with props) trunk/reactos/dll/win32/vbscript/vbscript.c (with props) trunk/reactos/dll/win32/vbscript/vbscript.h (with props) trunk/reactos/dll/win32/vbscript/vbscript.rc (with props) trunk/reactos/dll/win32/vbscript/vbscript.rgs (with props) trunk/reactos/dll/win32/vbscript/vbscript.spec (with props) trunk/reactos/dll/win32/vbscript/vbscript_classes.idl (with props) trunk/reactos/dll/win32/vbscript/vbscript_classes.rgs (with props) trunk/reactos/dll/win32/vbscript/vbscript_defs.h (with props) trunk/reactos/dll/win32/vbscript/vbscript_main.c (with props) trunk/reactos/dll/win32/vbscript/vbsglobal.idl (with props) trunk/reactos/dll/win32/vbscript/vbsglobal.rgs (with props) trunk/reactos/dll/win32/vbscript/vbsregexp10.idl (with props) trunk/reactos/dll/win32/vbscript/vbsregexp10.rgs (with props) trunk/reactos/dll/win32/vbscript/vbsregexp55.idl (with props) trunk/reactos/dll/win32/vbscript/vbsregexp55.rgs (with props) Modified: trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… Added: trunk/reactos/dll/win32/vbscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/CMakeLi… Added: trunk/reactos/dll/win32/vbscript/compile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/compile… Added: trunk/reactos/dll/win32/vbscript/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/error.c… Added: trunk/reactos/dll/win32/vbscript/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/global.… Added: trunk/reactos/dll/win32/vbscript/interp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/interp.… Added: trunk/reactos/dll/win32/vbscript/lex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/lex.c?r… Added: trunk/reactos/dll/win32/vbscript/parse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/parse.h… Added: trunk/reactos/dll/win32/vbscript/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/parser.… Added: trunk/reactos/dll/win32/vbscript/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/parser.… Added: trunk/reactos/dll/win32/vbscript/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/parser.… Added: trunk/reactos/dll/win32/vbscript/regexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/regexp.… Added: trunk/reactos/dll/win32/vbscript/regexp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/regexp.… Added: trunk/reactos/dll/win32/vbscript/vbdisp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbdisp.… Added: trunk/reactos/dll/win32/vbscript/vbregexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbregex… Added: trunk/reactos/dll/win32/vbscript/vbscript.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscrip… Added: trunk/reactos/dll/win32/vbscript/vbscript.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscrip… Added: trunk/reactos/dll/win32/vbscript/vbscript.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscrip… Added: trunk/reactos/dll/win32/vbscript/vbscript.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscrip… Added: trunk/reactos/dll/win32/vbscript/vbscript.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscrip… Added: trunk/reactos/dll/win32/vbscript/vbscript_classes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscrip… Added: trunk/reactos/dll/win32/vbscript/vbscript_classes.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscrip… Added: trunk/reactos/dll/win32/vbscript/vbscript_defs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscrip… Added: trunk/reactos/dll/win32/vbscript/vbscript_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscrip… Added: trunk/reactos/dll/win32/vbscript/vbsglobal.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbsglob… Added: trunk/reactos/dll/win32/vbscript/vbsglobal.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbsglob… Added: trunk/reactos/dll/win32/vbscript/vbsregexp10.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbsrege… Added: trunk/reactos/dll/win32/vbscript/vbsregexp10.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbsrege… Added: trunk/reactos/dll/win32/vbscript/vbsregexp55.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbsrege… Added: trunk/reactos/dll/win32/vbscript/vbsregexp55.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbsrege… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

11 years, 7 months

[akhaldi] 59016: [PSDK] * Add some missing definitions in activscp.idl.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed May 15 17:28:21 2013 New Revision: 59016 URL: http://svn.reactos.org/svn/reactos?rev=59016&view=rev Log: [PSDK] * Add some missing definitions in activscp.idl. Modified: trunk/reactos/include/psdk/activscp.idl Modified: trunk/reactos/include/psdk/activscp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/activscp.idl?… ============================================================================== --- trunk/reactos/include/psdk/activscp.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/activscp.idl [iso-8859-1] Wed May 15 17:28:21 2013 @@ -59,6 +59,17 @@ SCRIPTTHREADSTATE_NOTINSCRIPT = 0, SCRIPTTHREADSTATE_RUNNING = 1 } SCRIPTTHREADSTATE; + +typedef enum tagSCRIPTUICITEM { + SCRIPTUICITEM_INPUTBOX = 1, + SCRIPTUICITEM_MSGBOX = 2 +} SCRIPTUICITEM; + +typedef enum tagSCRIPTUICHANDLING { + SCRIPTUICHANDLING_ALLOW = 0, + SCRIPTUICHANDLING_NOUIERROR = 1, + SCRIPTUICHANDLING_NOUIDEFAULT = 2 +} SCRIPTUICHANDLING; typedef DWORD SCRIPTTHREADID; cpp_quote("#define SCRIPTTHREADID_CURRENT ((SCRIPTTHREADID)-1)") @@ -187,6 +198,18 @@ } [ + object, + uuid(aedae97e-d7ee-4796-b960-7f092ae844ab), + pointer_default(unique) +] +interface IActiveScriptSiteUIControl : IUnknown +{ + HRESULT GetUIBehavior( + [in] SCRIPTUICITEM UicItem, + [out] SCRIPTUICHANDLING *pUicHandling); +} + +[ object, uuid(539698A0-CDCA-11CF-A5EB-00AA0047A063), pointer_default(unique)

11 years, 7 months

[spetreolle] 59015: [RUNDLL32] Rundll32 always returns 0. Mike McCormack (mike at codeweavers dot com)

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Wed May 15 12:41:25 2013 New Revision: 59015 URL: http://svn.reactos.org/svn/reactos?rev=59015&view=rev Log: [RUNDLL32] Rundll32 always returns 0. Mike McCormack (mike at codeweavers dot com) Modified: trunk/reactos/base/system/rundll32/rundll32.c Modified: trunk/reactos/base/system/rundll32/rundll32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rundl… ============================================================================== --- trunk/reactos/base/system/rundll32/rundll32.c [iso-8859-1] (original) +++ trunk/reactos/base/system/rundll32/rundll32.c [iso-8859-1] Wed May 15 12:41:25 2013 @@ -343,7 +343,7 @@ DllWinMainW fnDllWinMainW; DllWinMainA fnDllWinMainA; HWND hWindow; - int nRetVal,i; + int i; size_t nStrLen; // Get command-line in argc-argv format @@ -380,8 +380,6 @@ lptCmdLine = argv[i]; else lptCmdLine = _T(""); - - nRetVal = 0; // Everything is all setup, so load the dll now hDll = LoadLibrary(lptDllName); @@ -439,13 +437,13 @@ if (fnDllWinMainW) { // Convert the command-line string to unicode and call the dll function lpwCmdLine = ConvertToWideChar(lptCmdLine); - nRetVal = fnDllWinMainW(hWindow,hInstance,lpwCmdLine,nCmdShow); + fnDllWinMainW(hWindow,hInstance,lpwCmdLine,nCmdShow); FreeConvertedWideChar(lpwCmdLine); } else if (fnDllWinMainA) { // Convert the command-line string to ansi and call the dll function lpaCmdLine = ConvertToMultiByte(lptCmdLine); - nRetVal = fnDllWinMainA(hWindow,hInstance,lpaCmdLine,nCmdShow); + fnDllWinMainA(hWindow,hInstance,lpaCmdLine,nCmdShow); FreeConvertedMultiByte(lpaCmdLine); } else { @@ -478,6 +476,6 @@ } if (argv) free(argv); - return nRetVal; -} - + return 0; /* rundll32 always returns 0! */ +} +

11 years, 7 months

[ekohl] 59014: [MSV1_0] AppendRidToSid: Copy the whole source SID into the destination SID.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon May 13 13:47:33 2013 New Revision: 59014 URL: http://svn.reactos.org/svn/reactos?rev=59014&view=rev Log: [MSV1_0] AppendRidToSid: Copy the whole source SID into the destination SID. Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.c?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] Mon May 13 13:47:33 2013 @@ -227,22 +227,20 @@ { PSID DstSid = NULL; UCHAR RidCount; - ULONG Size; - ULONG i; RidCount = *RtlSubAuthorityCountSid(SrcSid); if (RidCount >= 8) return NULL; - Size = RtlLengthRequiredSid(RidCount + 1); - - DstSid = DispatchTable.AllocateLsaHeap(Size); + DstSid = DispatchTable.AllocateLsaHeap(RtlLengthRequiredSid(RidCount + 1)); if (DstSid == NULL) return NULL; - for (i = 0; i < RidCount; i++) - *RtlSubAuthoritySid(DstSid, i) = *RtlSubAuthoritySid(SrcSid, i); - + RtlCopyMemory(DstSid, + SrcSid, + RtlLengthRequiredSid(RidCount)); + + *RtlSubAuthorityCountSid(DstSid) = RidCount + 1; *RtlSubAuthoritySid(DstSid, RidCount) = Rid; return DstSid; @@ -256,6 +254,12 @@ { User->User.Sid = AppendRidToSid(AccountDomainSid, RelativeId); + if (User->User.Sid == NULL) + { + ERR("Could not create the user SID\n"); + return STATUS_UNSUCCESSFUL; + } + User->User.Attributes = 0; return STATUS_SUCCESS;

11 years, 7 months

[ekohl] 59013: [LSASRV] - LsapCheckLogonProcess: Open client process using the PROCESS_DUP_HANDLE access right because we need to duplicate the logon token back into the clients handle table.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon May 13 13:05:16 2013 New Revision: 59013 URL: http://svn.reactos.org/svn/reactos?rev=59013&view=rev Log: [LSASRV] - LsapCheckLogonProcess: Open client process using the PROCESS_DUP_HANDLE access right because we need to duplicate the logon token back into the clients handle table. Modified: trunk/reactos/dll/win32/lsasrv/authport.c Modified: trunk/reactos/dll/win32/lsasrv/authport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authport.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authport.c [iso-8859-1] Mon May 13 13:05:16 2013 @@ -59,7 +59,7 @@ NULL); Status = NtOpenProcess(&ProcessHandle, - PROCESS_VM_READ | PROCESS_VM_WRITE | PROCESS_VM_OPERATION, + PROCESS_VM_READ | PROCESS_VM_WRITE | PROCESS_VM_OPERATION | PROCESS_DUP_HANDLE, &ObjectAttributes, &RequestMsg->h.ClientId); if (!NT_SUCCESS(Status)) @@ -163,10 +163,11 @@ for (;;) { + TRACE("Reply: %p\n", ReplyMsg); Status = NtReplyWaitReceivePort(AuthPortHandle, (PVOID*)&LogonContext, - &ReplyMsg->h, - &RequestMsg.h); + (PPORT_MESSAGE)ReplyMsg, + (PPORT_MESSAGE)&RequestMsg); if (!NT_SUCCESS(Status)) { TRACE("NtReplyWaitReceivePort() failed (Status %lx)\n", Status); @@ -208,8 +209,8 @@ ReplyMsg = &RequestMsg; RequestMsg.Status = STATUS_SUCCESS; - Status = NtReplyPort(AuthPortHandle, - &ReplyMsg->h); + NtReplyPort(AuthPortHandle, + &ReplyMsg->h); LsapDeregisterLogonProcess(&RequestMsg, LogonContext); @@ -230,7 +231,7 @@ break; default: - RequestMsg.Status = STATUS_SUCCESS; /* FIXME */ + RequestMsg.Status = STATUS_INVALID_SYSTEM_SERVICE; ReplyMsg = &RequestMsg; break; }

11 years, 7 months

[tfaber] 59012: [HIDUSB] - Unconfigure device, and don't leak memory ... okay, enough HID for now.

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun May 12 19:03:02 2013 New Revision: 59012 URL: http://svn.reactos.org/svn/reactos?rev=59012&view=rev Log: [HIDUSB] - Unconfigure device, and don't leak memory ... okay, enough HID for now. Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidusb/hidusb.… ============================================================================== --- trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] Sun May 12 19:03:02 2013 @@ -1287,6 +1287,90 @@ } NTSTATUS +Hid_DisableConfiguration( + IN PDEVICE_OBJECT DeviceObject) +{ + PHID_DEVICE_EXTENSION DeviceExtension; + PHID_USB_DEVICE_EXTENSION HidDeviceExtension; + NTSTATUS Status; + PURB Urb; + + // + // get device extension + // + DeviceExtension = DeviceObject->DeviceExtension; + HidDeviceExtension = DeviceExtension->MiniDeviceExtension; + + // + // build urb + // + Urb = ExAllocatePoolWithTag(NonPagedPool, + sizeof(struct _URB_SELECT_CONFIGURATION), + HIDUSB_URB_TAG); + if (!Urb) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // format urb + // + UsbBuildSelectConfigurationRequest(Urb, + sizeof(struct _URB_SELECT_CONFIGURATION), + NULL); + + // + // dispatch request + // + Status = Hid_DispatchUrb(DeviceObject, Urb); + if (!NT_SUCCESS(Status)) + { + DPRINT1("[HIDUSB] Dispatching unconfigure URB failed with %lx\n", Status); + } + else if (!USBD_SUCCESS(Urb->UrbHeader.Status)) + { + DPRINT("[HIDUSB] Unconfigure URB failed with %lx\n", Status); + } + + // + // free urb + // + ExFreePoolWithTag(Urb, HIDUSB_URB_TAG); + + // + // free resources + // + HidDeviceExtension->ConfigurationHandle = NULL; + + if (HidDeviceExtension->InterfaceInfo) + { + ExFreePoolWithTag(HidDeviceExtension->InterfaceInfo, HIDUSB_TAG); + HidDeviceExtension->InterfaceInfo = NULL; + } + + if (HidDeviceExtension->ConfigurationDescriptor) + { + ExFreePoolWithTag(HidDeviceExtension->ConfigurationDescriptor, HIDUSB_TAG); + HidDeviceExtension->ConfigurationDescriptor = NULL; + HidDeviceExtension->HidDescriptor = NULL; + } + + if (HidDeviceExtension->DeviceDescriptor) + { + ExFreePoolWithTag(HidDeviceExtension->DeviceDescriptor, HIDUSB_TAG); + HidDeviceExtension->DeviceDescriptor = NULL; + } + + // + // done + // + return Status; +} + +NTSTATUS Hid_SetIdle( IN PDEVICE_OBJECT DeviceObject) { @@ -1646,20 +1730,18 @@ case IRP_MN_REMOVE_DEVICE: { // + // unconfigure device + // FIXME: Call this on IRP_MN_SURPRISE_REMOVAL, but don't send URBs + // FIXME: Don't call this after we've already seen a surprise removal or stop + // + Hid_DisableConfiguration(DeviceObject); + + // // pass request onto lower driver // IoSkipCurrentIrpStackLocation(Irp); Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); - // - // free resources - // - if (HidDeviceExtension->ConfigurationDescriptor) - { - ExFreePoolWithTag(HidDeviceExtension->ConfigurationDescriptor, HIDUSB_TAG); - HidDeviceExtension->ConfigurationDescriptor = NULL; - } - return Status; } case IRP_MN_QUERY_PNP_DEVICE_STATE: @@ -1702,8 +1784,9 @@ case IRP_MN_STOP_DEVICE: { // - // FIXME: unconfigure the device - // + // unconfigure device + // + Hid_DisableConfiguration(DeviceObject); // // prepare irp

11 years, 7 months

[tfaber] 59011: [HID] - Hidclass must delete the FDO, not the minidriver.

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun May 12 18:51:11 2013 New Revision: 59011 URL: http://svn.reactos.org/svn/reactos?rev=59011&view=rev Log: [HID] - Hidclass must delete the FDO, not the minidriver. Modified: trunk/reactos/drivers/hid/hidclass/fdo.c trunk/reactos/drivers/hid/hidusb/hidusb.c Modified: trunk/reactos/drivers/hid/hidclass/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/fdo.c… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/fdo.c [iso-8859-1] Sun May 12 18:51:11 2013 @@ -411,6 +411,13 @@ IN PIRP Irp) { NTSTATUS Status; + PHIDCLASS_FDO_EXTENSION FDODeviceExtension; + + // + // get device extension + // + FDODeviceExtension = DeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension->Common.IsFDO); /* FIXME cleanup */ @@ -425,6 +432,13 @@ // Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); + + // + // detach and delete device + // + IoDetachDevice(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject); + IoDeleteDevice(DeviceObject); + return Status; } Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidusb/hidusb.… ============================================================================== --- trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] Sun May 12 18:51:11 2013 @@ -1660,12 +1660,6 @@ HidDeviceExtension->ConfigurationDescriptor = NULL; } - // - // delete and detach device - // - IoDetachDevice(DeviceExtension->NextDeviceObject); - IoDeleteDevice(DeviceObject); - return Status; } case IRP_MN_QUERY_PNP_DEVICE_STATE:

11 years, 7 months

← Newer
1
...
9
10
11
12
13
14
15
...
24
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 May 2013