Ros-diffs March 2014

ros-diffs@reactos.org

14 participants
233 discussions

[dquintana] 62365: [RSHELL] * Move dependency copying to the target script, so that the target properly depends on the source and not the other way around. * Make all the custom constructors WINAPI...

by dquintana＠svn.reactos.org

Author: dquintana Date: Sat Mar 1 11:46:04 2014 New Revision: 62365 URL: http://svn.reactos.org/svn/reactos?rev=62365&view=rev Log: [RSHELL] * Move dependency copying to the target script, so that the target properly depends on the source and not the other way around. * Make all the custom constructors WINAPI. * Add all the custom constructors to the spec file. CORE-7596 Modified: branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt branches/shell-experiments/base/shell/filebrowser/CMakeLists.txt branches/shell-experiments/base/shell/rshell/CMakeLists.txt branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp branches/shell-experiments/base/shell/rshell/CMenuSite.cpp branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp branches/shell-experiments/base/shell/rshell/logging/CMenuBandWrap.cpp branches/shell-experiments/base/shell/rshell/logging/CMenuDeskBarWrap.cpp branches/shell-experiments/base/shell/rshell/logging/CMenuSiteWrap.cpp branches/shell-experiments/base/shell/rshell/logging/CStartMenuSiteWrap.cpp branches/shell-experiments/base/shell/rshell/precomp.h branches/shell-experiments/base/shell/rshell/rshell.spec branches/shell-experiments/dll/win32/browseui/CMakeLists.txt Modified: branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] Sat Mar 1 11:46:04 2014 @@ -39,3 +39,9 @@ ntdll) add_pch(explorer_new precomp.h SOURCE) add_cd_file(TARGET explorer_new DESTINATION reactos FOR all) + +add_custom_command(TARGET explorer_new POST_BUILD + COMMAND "${CMAKE_COMMAND}" -E copy + "$<TARGET_FILE:rshell>" + "$<TARGET_FILE_DIR:explorer_new>/$<TARGET_FILE_NAME:rshell>" + COMMENT "Copying $<TARGET_FILE_NAME:rshell> to output") Modified: branches/shell-experiments/base/shell/filebrowser/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/fi… ============================================================================== --- branches/shell-experiments/base/shell/filebrowser/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/filebrowser/CMakeLists.txt [iso-8859-1] Sat Mar 1 11:46:04 2014 @@ -11,4 +11,15 @@ shell32 msvcrt kernel32) - + +add_custom_command(TARGET filebrowser POST_BUILD + COMMAND "${CMAKE_COMMAND}" -E copy + "$<TARGET_FILE:rshell>" + "$<TARGET_FILE_DIR:filebrowser>/$<TARGET_FILE_NAME:rshell>" + COMMENT "Copying $<TARGET_FILE_NAME:rshell> to output") + +add_custom_command(TARGET filebrowser POST_BUILD + COMMAND "${CMAKE_COMMAND}" -E copy + "$<TARGET_FILE:browseui>" + "$<TARGET_FILE_DIR:filebrowser>/$<TARGET_FILE_NAME:browseui>" + COMMENT "Copying $<TARGET_FILE_NAME:browseui> to output") Modified: branches/shell-experiments/base/shell/rshell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMakeLists.txt [iso-8859-1] Sat Mar 1 11:46:04 2014 @@ -43,9 +43,3 @@ ntdll) add_cd_file(TARGET rshell DESTINATION reactos FOR all) - -add_custom_command(TARGET rshell POST_BUILD - COMMAND "${CMAKE_COMMAND}" -E copy - "$<TARGET_FILE:rshell>" - "$<TARGET_FILE_DIR:explorer_new>/$<TARGET_FILE_NAME:rshell>" - COMMENT "Copying to output directory") Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Sat Mar 1 11:46:04 2014 @@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(CMenuBand); extern "C" -HRESULT CMenuBand_Constructor(REFIID riid, LPVOID *ppv) +HRESULT WINAPI CMenuBand_Constructor(REFIID riid, LPVOID *ppv) { *ppv = NULL; Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Sat Mar 1 11:46:04 2014 @@ -28,7 +28,7 @@ const static GUID CGID_MenuDeskBar = { 0x5C9F0A12, 0x959E, 0x11D0, { 0xA3, 0xA4, 0x00, 0xA0, 0xC9, 0x08, 0x26, 0x36 } }; extern "C" -HRESULT CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv) +HRESULT WINAPI CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv) { *ppv = NULL; Modified: branches/shell-experiments/base/shell/rshell/CMenuSite.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuSite.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuSite.cpp [iso-8859-1] Sat Mar 1 11:46:04 2014 @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(menusite); extern "C" -HRESULT CMenuSite_Constructor(REFIID riid, LPVOID *ppv) +HRESULT WINAPI CMenuSite_Constructor(REFIID riid, LPVOID *ppv) { *ppv = NULL; Modified: branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp [iso-8859-1] Sat Mar 1 11:46:04 2014 @@ -124,7 +124,7 @@ }; extern "C" -HRESULT CMergedFolder_Constructor(IShellFolder* userLocal, IShellFolder* allUsers, REFIID riid, LPVOID *ppv) +HRESULT WINAPI CMergedFolder_Constructor(IShellFolder* userLocal, IShellFolder* allUsers, REFIID riid, LPVOID *ppv) { *ppv = NULL; Modified: branches/shell-experiments/base/shell/rshell/logging/CMenuBandWrap.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/logging/CMenuBandWrap.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/logging/CMenuBandWrap.cpp [iso-8859-1] Sat Mar 1 11:46:04 2014 @@ -170,7 +170,7 @@ }; extern "C" -HRESULT CMenuBand_Wrapper(IShellMenu * shellMenu, REFIID riid, LPVOID *ppv) +HRESULT WINAPI CMenuBand_Wrapper(IShellMenu * shellMenu, REFIID riid, LPVOID *ppv) { HRESULT hr; Modified: branches/shell-experiments/base/shell/rshell/logging/CMenuDeskBarWrap.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/logging/CMenuDeskBarWrap.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/logging/CMenuDeskBarWrap.cpp [iso-8859-1] Sat Mar 1 11:46:04 2014 @@ -110,7 +110,7 @@ }; extern "C" -HRESULT CMenuDeskBar_Wrapper(IDeskBar * deskBar, REFIID riid, LPVOID *ppv) +HRESULT WINAPI CMenuDeskBar_Wrapper(IDeskBar * deskBar, REFIID riid, LPVOID *ppv) { HRESULT hr; Modified: branches/shell-experiments/base/shell/rshell/logging/CMenuSiteWrap.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/logging/CMenuSiteWrap.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/logging/CMenuSiteWrap.cpp [iso-8859-1] Sat Mar 1 11:46:04 2014 @@ -104,7 +104,7 @@ }; extern "C" -HRESULT CMenuSite_Wrapper(IBandSite * bandSite, REFIID riid, LPVOID *ppv) +HRESULT WINAPI CMenuSite_Wrapper(IBandSite * bandSite, REFIID riid, LPVOID *ppv) { HRESULT hr; Modified: branches/shell-experiments/base/shell/rshell/logging/CStartMenuSiteWrap.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/logging/CStartMenuSiteWrap.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/logging/CStartMenuSiteWrap.cpp [iso-8859-1] Sat Mar 1 11:46:04 2014 @@ -70,7 +70,7 @@ }; extern "C" -HRESULT CStartMenuSite_Wrapper(ITrayPriv * trayPriv, REFIID riid, LPVOID *ppv) +HRESULT WINAPI CStartMenuSite_Wrapper(ITrayPriv * trayPriv, REFIID riid, LPVOID *ppv) { HRESULT hr; Modified: branches/shell-experiments/base/shell/rshell/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] Sat Mar 1 11:46:04 2014 @@ -41,14 +41,16 @@ #define SMC_EXEC 4 extern "C" INT WINAPI Shell_GetCachedImageIndex(LPCWSTR szPath, INT nIndex, UINT bSimulateDoc); -extern "C" HRESULT CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv); -extern "C" HRESULT CMenuSite_Constructor(REFIID riid, LPVOID *ppv); -extern "C" HRESULT CMenuBand_Constructor(REFIID riid, LPVOID *ppv); -extern "C" HRESULT CMenuDeskBar_Wrapper(IDeskBar * db, REFIID riid, LPVOID *ppv); -extern "C" HRESULT CMenuSite_Wrapper(IBandSite * bs, REFIID riid, LPVOID *ppv); -extern "C" HRESULT CMenuBand_Wrapper(IShellMenu * sm, REFIID riid, LPVOID *ppv); -extern "C" HRESULT CMergedFolder_Constructor(IShellFolder* userLocal, IShellFolder* allUsers, REFIID riid, LPVOID *ppv); -extern "C" HRESULT CStartMenuSite_Wrapper(ITrayPriv * trayPriv, REFIID riid, LPVOID *ppv); + +extern "C" HRESULT WINAPI CStartMenu_Constructor(REFIID riid, void **ppv); +extern "C" HRESULT WINAPI CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv); +extern "C" HRESULT WINAPI CMenuSite_Constructor(REFIID riid, LPVOID *ppv); +extern "C" HRESULT WINAPI CMenuBand_Constructor(REFIID riid, LPVOID *ppv); +extern "C" HRESULT WINAPI CMenuDeskBar_Wrapper(IDeskBar * db, REFIID riid, LPVOID *ppv); +extern "C" HRESULT WINAPI CMenuSite_Wrapper(IBandSite * bs, REFIID riid, LPVOID *ppv); +extern "C" HRESULT WINAPI CMenuBand_Wrapper(IShellMenu * sm, REFIID riid, LPVOID *ppv); +extern "C" HRESULT WINAPI CMergedFolder_Constructor(IShellFolder* userLocal, IShellFolder* allUsers, REFIID riid, LPVOID *ppv); +extern "C" HRESULT WINAPI CStartMenuSite_Wrapper(ITrayPriv * trayPriv, REFIID riid, LPVOID *ppv); static __inline ULONG Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...) Modified: branches/shell-experiments/base/shell/rshell/rshell.spec URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/rshell.spec [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/rshell.spec [iso-8859-1] Sat Mar 1 11:46:04 2014 @@ -1,4 +1,7 @@ @ stdcall CStartMenu_Constructor(ptr ptr) +@ stdcall CMenuDeskBar_Constructor(ptr ptr); +@ stdcall CMenuSite_Constructor(ptr ptr); +@ stdcall CMenuBand_Constructor(ptr ptr); @ stdcall SHDesktopMessageLoop(ptr) @ stdcall SHCreateDesktop(ptr) @ stdcall WinList_Init() Modified: branches/shell-experiments/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/CMakeLists.txt [iso-8859-1] Sat Mar 1 11:46:04 2014 @@ -1,3 +1,4 @@ +PROJECT(SHELL) set_cpp(WITH_RUNTIME)

10 years, 9 months

[ekohl] 62364: [NETAPI32] - NetUserSetInfo: Implement the info level 22. - Update the users DACL according to the user flags for the info levels 1, 2, 3, 4, 22 and 1008.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Mar 1 11:37:23 2014 New Revision: 62364 URL: http://svn.reactos.org/svn/reactos?rev=62364&view=rev Log: [NETAPI32] - NetUserSetInfo: Implement the info level 22. - Update the users DACL according to the user flags for the info levels 1, 2, 3, 4, 22 and 1008. Modified: trunk/reactos/dll/win32/netapi32/user.c Modified: trunk/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/user.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] Sat Mar 1 11:37:23 2014 @@ -247,6 +247,28 @@ RtlTimeToSecondsSince1970(PasswordLastSet, &PasswordSecondsSince1970); return SystemSecondsSince1970 - PasswordSecondsSince1970; +} + + +static +VOID +ChangeUserDacl(IN PACL Dacl, + IN ULONG Flags) +{ + PACCESS_ALLOWED_ACE Ace = NULL; + NTSTATUS Status; + + if (Dacl == NULL) + return; + + Status = GetAllowedWorldAce(Dacl, &Ace); + if (!NT_SUCCESS(Status)) + return; + + if (Flags & UF_PASSWD_CANT_CHANGE) + Ace->Mask &= ~USER_CHANGE_PASSWORD; + else + Ace->Mask |= USER_CHANGE_PASSWORD; } @@ -1511,6 +1533,7 @@ PUSER_INFO_2 UserInfo2; PUSER_INFO_3 UserInfo3; PUSER_INFO_4 UserInfo4; + PUSER_INFO_22 UserInfo22; PUSER_INFO_1003 UserInfo1003; PUSER_INFO_1006 UserInfo1006; PUSER_INFO_1007 UserInfo1007; @@ -1527,10 +1550,19 @@ PUSER_INFO_1051 UserInfo1051; PUSER_INFO_1052 UserInfo1052; PUSER_INFO_1053 UserInfo1053; + PACL Dacl = NULL; NET_API_STATUS ApiStatus = NERR_Success; NTSTATUS Status = STATUS_SUCCESS; ZeroMemory(&UserAllInfo, sizeof(USER_ALL_INFORMATION)); + + if ((Level == 1) || (Level == 2) || (Level == 3) || + (Level == 4) || (Level == 22) || (Level == 1008)) + { + ApiStatus = GetUserDacl(UserHandle, &Dacl); + if (ApiStatus != NERR_Success) + goto done; + } switch (Level) { @@ -1574,6 +1606,7 @@ UserAllInfo.WhichFields |= USER_ALL_ADMINCOMMENT; } + ChangeUserDacl(Dacl, UserInfo1->usri1_flags); UserAllInfo.UserAccountControl = GetAccountControl(UserInfo1->usri1_flags); UserAllInfo.WhichFields |= USER_ALL_USERACCOUNTCONTROL; @@ -1616,6 +1649,7 @@ UserAllInfo.WhichFields |= USER_ALL_ADMINCOMMENT; } + ChangeUserDacl(Dacl, UserInfo2->usri2_flags); UserAllInfo.UserAccountControl = GetAccountControl(UserInfo2->usri2_flags); UserAllInfo.WhichFields |= USER_ALL_USERACCOUNTCONTROL; @@ -1718,6 +1752,7 @@ UserAllInfo.WhichFields |= USER_ALL_ADMINCOMMENT; } + ChangeUserDacl(Dacl, UserInfo3->usri3_flags); UserAllInfo.UserAccountControl = GetAccountControl(UserInfo3->usri3_flags); UserAllInfo.WhichFields |= USER_ALL_USERACCOUNTCONTROL; @@ -1842,6 +1877,7 @@ UserAllInfo.WhichFields |= USER_ALL_ADMINCOMMENT; } + ChangeUserDacl(Dacl, UserInfo4->usri4_flags); UserAllInfo.UserAccountControl = GetAccountControl(UserInfo4->usri4_flags); UserAllInfo.WhichFields |= USER_ALL_USERACCOUNTCONTROL; @@ -1899,8 +1935,8 @@ // usri4_max_storage ignored -// UserInfo3->usri4_units_per_week; -// UserInfo3->usri4_logon_hours; +// UserInfo4->usri4_units_per_week; +// UserInfo4->usri4_logon_hours; // usri4_bad_pw_count ignored // usri4_num_logons ignored @@ -1936,7 +1972,104 @@ break; // case 21: -// case 22: +// break; + + case 22: + UserInfo22 = (PUSER_INFO_22)UserInfo; + + // usri22_name ignored + +// UserInfo22->usri22_password[ENCRYPTED_PWLEN]; + + // usri22_password_age ignored + +// UserInfo3->usri3_priv; + + if (UserInfo22->usri22_home_dir != NULL) + { + RtlInitUnicodeString(&UserAllInfo.HomeDirectory, + UserInfo22->usri22_home_dir); + UserAllInfo.WhichFields |= USER_ALL_HOMEDIRECTORY; + } + + if (UserInfo22->usri22_comment != NULL) + { + RtlInitUnicodeString(&UserAllInfo.AdminComment, + UserInfo22->usri22_comment); + UserAllInfo.WhichFields |= USER_ALL_ADMINCOMMENT; + } + + ChangeUserDacl(Dacl, UserInfo22->usri22_flags); + UserAllInfo.UserAccountControl = GetAccountControl(UserInfo22->usri22_flags); + UserAllInfo.WhichFields |= USER_ALL_USERACCOUNTCONTROL; + + if (UserInfo22->usri22_script_path != NULL) + { + RtlInitUnicodeString(&UserAllInfo.ScriptPath, + UserInfo22->usri22_script_path); + UserAllInfo.WhichFields |= USER_ALL_SCRIPTPATH; + } + +// UserInfo22->usri22_auth_flags; + + if (UserInfo22->usri22_full_name != NULL) + { + RtlInitUnicodeString(&UserAllInfo.FullName, + UserInfo22->usri22_full_name); + UserAllInfo.WhichFields |= USER_ALL_FULLNAME; + } + + if (UserInfo22->usri22_usr_comment != NULL) + { + RtlInitUnicodeString(&UserAllInfo.UserComment, + UserInfo22->usri22_usr_comment); + UserAllInfo.WhichFields |= USER_ALL_USERCOMMENT; + } + + if (UserInfo22->usri22_parms != NULL) + { + RtlInitUnicodeString(&UserAllInfo.Parameters, + UserInfo22->usri22_parms); + UserAllInfo.WhichFields |= USER_ALL_PARAMETERS; + } + + if (UserInfo22->usri22_workstations != NULL) + { + RtlInitUnicodeString(&UserAllInfo.WorkStations, + UserInfo22->usri22_workstations); + UserAllInfo.WhichFields |= USER_ALL_WORKSTATIONS; + } + + // usri22_last_logon ignored + // usri22_last_logoff ignored + + if (UserInfo22->usri22_acct_expires == TIMEQ_FOREVER) + { + UserAllInfo.AccountExpires.LowPart = 0; + UserAllInfo.AccountExpires.HighPart = 0; + } + else + { + RtlSecondsSince1970ToTime(UserInfo22->usri22_acct_expires, + &UserAllInfo.AccountExpires); + } + UserAllInfo.WhichFields |= USER_ALL_ACCOUNTEXPIRES; + + // usri22_max_storage ignored + +// UserInfo22->usri22_units_per_week; +// UserInfo22->usri22_logon_hours; + + // usri22_bad_pw_count ignored + // usri22_num_logons ignored + // usri22_logon_server ignored + + UserAllInfo.CountryCode = UserInfo22->usri22_country_code; + UserAllInfo.WhichFields |= USER_ALL_COUNTRYCODE; + + UserAllInfo.CodePage = UserInfo22->usri22_code_page; + UserAllInfo.WhichFields |= USER_ALL_CODEPAGE; + break; case 1003: UserInfo1003 = (PUSER_INFO_1003)UserInfo; @@ -1951,6 +2084,7 @@ break; // case 1005: +// break; case 1006: UserInfo1006 = (PUSER_INFO_1006)UserInfo; @@ -1976,6 +2110,7 @@ case 1008: UserInfo1008 = (PUSER_INFO_1008)UserInfo; + ChangeUserDacl(Dacl, UserInfo1008->usri1008_flags); UserAllInfo.UserAccountControl = GetAccountControl(UserInfo1008->usri1008_flags); UserAllInfo.WhichFields |= USER_ALL_USERACCOUNTCONTROL; break; @@ -1992,6 +2127,7 @@ break; // case 1010: +// break; case 1011: UserInfo1011 = (PUSER_INFO_1011)UserInfo; @@ -2064,6 +2200,7 @@ break; // case 1020: +// break; case 1024: UserInfo1024 = (PUSER_INFO_1024)UserInfo; @@ -2124,6 +2261,9 @@ } done: + if (Dacl != NULL) + HeapFree(GetProcessHeap(), 0, Dacl); + return ApiStatus; } @@ -2934,14 +3074,6 @@ // *bufptr = (LPBYTE)Buffer; return ApiStatus; - -#if 0 - *bufptr = NULL; - *entriesread = 0; - *totalentries = 0; - - return ERROR_INVALID_LEVEL; -#endif }

10 years, 9 months

[aandrejevic] 62363: [BASESRV] Continue implementing BaseSrvCheckVDM.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Mar 1 04:37:01 2014 New Revision: 62363 URL: http://svn.reactos.org/svn/reactos?rev=62363&view=rev Log: [BASESRV] Continue implementing BaseSrvCheckVDM. Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/vd… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] Sat Mar 1 04:37:01 2014 @@ -184,6 +184,8 @@ PBASE_CHECK_VDM CheckVdmRequest = &((PBASE_API_MESSAGE)ApiMessage)->Data.CheckVDMRequest; PRTL_CRITICAL_SECTION CriticalSection = NULL; PVDM_CONSOLE_RECORD ConsoleRecord = NULL; + PVDM_DOS_RECORD DosRecord = NULL; + BOOLEAN NewConsoleRecord = FALSE; /* Don't do anything if the VDM has been disabled in the registry */ if (!BaseSrvIsVdmAllowed()) return STATUS_ACCESS_DENIED; @@ -253,23 +255,65 @@ ConsoleRecord->CurDirsLength = 0; ConsoleRecord->SessionId = GetNextDosSesId(); InitializeListHead(&ConsoleRecord->DosListHead); - + // TODO: The console record structure is incomplete + + /* Remember that the console record was allocated here */ + NewConsoleRecord = TRUE; + } + + /* Allocate a new DOS record */ + DosRecord = (PVDM_DOS_RECORD)RtlAllocateHeap(BaseSrvHeap, + HEAP_ZERO_MEMORY, + sizeof(VDM_DOS_RECORD)); + if (DosRecord == NULL) + { + Status = STATUS_NO_MEMORY; + goto Cleanup; + } + + /* Initialize the DOS record */ + DosRecord->State = NewConsoleRecord ? VDM_NOT_LOADED : VDM_READY; + DosRecord->ExitCode = 0; + // TODO: The DOS record structure is incomplete + + /* Add the DOS record */ + InsertHeadList(&ConsoleRecord->DosListHead, &DosRecord->Entry); + + if (NewConsoleRecord) + { /* Add the console record */ InsertTailList(&VDMConsoleListHead, &ConsoleRecord->Entry); } + CheckVdmRequest->VDMState = DosRecord->State; + Status = STATUS_SUCCESS; + } + else + { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } - else - { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; - } Cleanup: + /* Check if it failed */ + if (!NT_SUCCESS(Status)) + { + /* Free the DOS record */ + if (DosRecord != NULL) + { + RtlFreeHeap(BaseSrvHeap, 0, DosRecord); + DosRecord = NULL; + } + + /* Free the console record if it was allocated here */ + if (NewConsoleRecord) + { + RtlFreeHeap(BaseSrvHeap, 0, ConsoleRecord); + ConsoleRecord = NULL; + } + } + /* Leave the critical section */ RtlLeaveCriticalSection(CriticalSection);

10 years, 9 months

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 March 2014