Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 47108: [NTOSKRNL] - Implement Ke386IoSetAccessProcess, Ke386SetIoAccessMap, and Ke386QueryIoAccessMap [NDK] - Add definition of KIO_ACCESS_MAP - Patch by Samuel Serapion - Fixes bug 2641
by cgutman＠svn.reactos.org 05 May '10

05 May '10

Author: cgutman Date: Thu May 6 01:06:32 2010 New Revision: 47108 URL: http://svn.reactos.org/svn/reactos?rev=47108&view=rev Log: [NTOSKRNL] - Implement Ke386IoSetAccessProcess, Ke386SetIoAccessMap, and Ke386QueryIoAccessMap [NDK] - Add definition of KIO_ACCESS_MAP - Patch by Samuel Serapion - Fixes bug 2641 Modified: trunk/reactos/include/ndk/i386/ketypes.h trunk/reactos/ntoskrnl/ke/i386/v86vdm.c Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] Thu May 6 01:06:32 2010 @@ -150,6 +150,10 @@ (MapNumber == IO_ACCESS_MAP_NONE) ? \ (USHORT)(sizeof(KTSS)) : \ (USHORT)(FIELD_OFFSET(KTSS, IoMaps[MapNumber-1].IoMap)) + +typedef UCHAR KIO_ACCESS_MAP[IOPM_SIZE]; + +typedef KIO_ACCESS_MAP *PKIO_ACCESS_MAP; // // Size of the XMM register save area in the FXSAVE format Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86vdm.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] Thu May 6 01:06:32 2010 @@ -659,37 +659,87 @@ } /* - * @unimplemented + * @implemented */ BOOLEAN NTAPI Ke386IoSetAccessProcess(IN PKPROCESS Process, - IN ULONG Flag) -{ - UNIMPLEMENTED; - return FALSE; + IN ULONG MapNumber) +{ + USHORT MapOffset; + PKPRCB Prcb; + KAFFINITY TargetProcessors; + + if(MapNumber > IOPM_COUNT) + return FALSE; + + MapOffset = KiComputeIopmOffset(MapNumber); + + Process->IopmOffset = MapOffset; + + TargetProcessors = Process->ActiveProcessors; + Prcb = KeGetCurrentPrcb(); + if (TargetProcessors & Prcb->SetMember) + KeGetPcr()->TSS->IoMapBase = MapOffset; + + return TRUE; } /* - * @unimplemented + * @implemented */ BOOLEAN NTAPI -Ke386SetIoAccessMap(IN ULONG Flag, - IN PVOID IopmBuffer) -{ - UNIMPLEMENTED; - return FALSE; +Ke386SetIoAccessMap(IN ULONG MapNumber, + IN PKIO_ACCESS_MAP IopmBuffer) +{ + PKPROCESS CurrentProcess; + PKPRCB Prcb; + PVOID pt; + + if ((MapNumber > IOPM_COUNT) || (MapNumber == IO_ACCESS_MAP_NONE)) + return FALSE; + + Prcb = KeGetCurrentPrcb(); + + // Copy the IOP map and load the map for the current process. + pt = &(KeGetPcr()->TSS->IoMaps[MapNumber-1].IoMap); + RtlMoveMemory(pt, (PVOID)IopmBuffer, IOPM_SIZE); + CurrentProcess = Prcb->CurrentThread->ApcState.Process; + KeGetPcr()->TSS->IoMapBase = CurrentProcess->IopmOffset; + + return TRUE; } /* - * @unimplemented + * @implemented */ BOOLEAN NTAPI -Ke386QueryIoAccessMap(IN ULONG Flag, - IN PVOID IopmBuffer) -{ - UNIMPLEMENTED; - return FALSE; -} +Ke386QueryIoAccessMap(IN ULONG MapNumber, + IN PKIO_ACCESS_MAP IopmBuffer) +{ + ULONG i; + PVOID Map; + PUCHAR p; + + if (MapNumber > IOPM_COUNT) + return FALSE; + + if (MapNumber == IO_ACCESS_MAP_NONE) + { + // no access, simply return a map of all 1s + p = (PUCHAR)IopmBuffer; + for (i = 0; i < IOPM_SIZE; i++) { + p[i] = (UCHAR)-1; + } + } + else + { + // copy the bits + Map = (PVOID)&(KeGetPcr()->TSS->IoMaps[MapNumber-1].IoMap); + RtlMoveMemory((PVOID)IopmBuffer, Map, IOPM_SIZE); + } + + return TRUE; +}

1 0

[ekohl] 47107: [FORMATTING] No code changes.
by ekohl＠svn.reactos.org 05 May '10

05 May '10

Author: ekohl Date: Thu May 6 00:53:01 2010 New Revision: 47107 URL: http://svn.reactos.org/svn/reactos?rev=47107&view=rev Log: [FORMATTING] No code changes. Modified: trunk/reactos/dll/win32/userenv/environment.c Modified: trunk/reactos/dll/win32/userenv/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/environm… ============================================================================== --- trunk/reactos/dll/win32/userenv/environment.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/environment.c [iso-8859-1] Thu May 6 00:53:01 2010 @@ -32,394 +32,396 @@ static BOOL -SetUserEnvironmentVariable (LPVOID *Environment, - LPWSTR lpName, - LPWSTR lpValue, - BOOL bExpand) -{ - WCHAR ShortName[MAX_PATH]; - UNICODE_STRING Name; - UNICODE_STRING SrcValue; - UNICODE_STRING DstValue; - ULONG Length; - NTSTATUS Status; - PVOID Buffer=NULL; - - if (bExpand) - { - RtlInitUnicodeString(&SrcValue, - lpValue); - - Length = 2 * MAX_PATH * sizeof(WCHAR); - - DstValue.Length = 0; - DstValue.MaximumLength = Length; - DstValue.Buffer = Buffer = LocalAlloc(LPTR, - Length); - - if (DstValue.Buffer == NULL) - { - DPRINT1("LocalAlloc() failed\n"); - return FALSE; - } - - Status = RtlExpandEnvironmentStrings_U((PWSTR)*Environment, - &SrcValue, - &DstValue, - &Length); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlExpandEnvironmentStrings_U() failed (Status %lx)\n", Status); - DPRINT1("Length %lu\n", Length); - if (Buffer) LocalFree(Buffer); - return FALSE; - } - } - else - { - RtlInitUnicodeString(&DstValue, - lpValue); - } - - if (!_wcsicmp (lpName, L"temp") || !_wcsicmp (lpName, L"tmp")) - { - if (!GetShortPathNameW(DstValue.Buffer, ShortName, MAX_PATH)) - { - DPRINT1("GetShortPathNameW() failed for %S (Error %lu)\n", DstValue.Buffer, GetLastError()); - if (Buffer) LocalFree(Buffer); - return FALSE; - } - - DPRINT("Buffer: %S\n", ShortName); - RtlInitUnicodeString(&DstValue, - ShortName); - } - - RtlInitUnicodeString(&Name, - lpName); - - DPRINT("Value: %wZ\n", &DstValue); - - Status = RtlSetEnvironmentVariable((PWSTR*)Environment, - &Name, - &DstValue); - - if (Buffer) LocalFree(Buffer); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlSetEnvironmentVariable() failed (Status %lx)\n", Status); - return FALSE; - } - - return TRUE; +SetUserEnvironmentVariable(LPVOID *Environment, + LPWSTR lpName, + LPWSTR lpValue, + BOOL bExpand) +{ + WCHAR ShortName[MAX_PATH]; + UNICODE_STRING Name; + UNICODE_STRING SrcValue; + UNICODE_STRING DstValue; + ULONG Length; + NTSTATUS Status; + PVOID Buffer = NULL; + + if (bExpand) + { + RtlInitUnicodeString(&SrcValue, + lpValue); + + Length = 2 * MAX_PATH * sizeof(WCHAR); + + DstValue.Length = 0; + DstValue.MaximumLength = Length; + DstValue.Buffer = Buffer = LocalAlloc(LPTR, + Length); + if (DstValue.Buffer == NULL) + { + DPRINT1("LocalAlloc() failed\n"); + return FALSE; + } + + Status = RtlExpandEnvironmentStrings_U((PWSTR)*Environment, + &SrcValue, + &DstValue, + &Length); + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlExpandEnvironmentStrings_U() failed (Status %lx)\n", Status); + DPRINT1("Length %lu\n", Length); + if (Buffer) + LocalFree(Buffer); + return FALSE; + } + } + else + { + RtlInitUnicodeString(&DstValue, + lpValue); + } + + if (!_wcsicmp(lpName, L"temp") || !_wcsicmp(lpName, L"tmp")) + { + if (!GetShortPathNameW(DstValue.Buffer, ShortName, MAX_PATH)) + { + DPRINT1("GetShortPathNameW() failed for %S (Error %lu)\n", DstValue.Buffer, GetLastError()); + if (Buffer) + LocalFree(Buffer); + return FALSE; + } + + DPRINT("Buffer: %S\n", ShortName); + RtlInitUnicodeString(&DstValue, + ShortName); + } + + RtlInitUnicodeString(&Name, + lpName); + + DPRINT("Value: %wZ\n", &DstValue); + + Status = RtlSetEnvironmentVariable((PWSTR*)Environment, + &Name, + &DstValue); + + if (Buffer) + LocalFree(Buffer); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlSetEnvironmentVariable() failed (Status %lx)\n", Status); + return FALSE; + } + + return TRUE; } static BOOL -AppendUserEnvironmentVariable (LPVOID *Environment, - LPWSTR lpName, - LPWSTR lpValue) -{ - UNICODE_STRING Name; - UNICODE_STRING Value; - NTSTATUS Status; - - RtlInitUnicodeString (&Name, - lpName); - - Value.Length = 0; - Value.MaximumLength = 1024 * sizeof(WCHAR); - Value.Buffer = LocalAlloc (LPTR, - 1024 * sizeof(WCHAR)); - if (Value.Buffer == NULL) - { - return FALSE; - } - Value.Buffer[0] = UNICODE_NULL; - - Status = RtlQueryEnvironmentVariable_U ((PWSTR)*Environment, - &Name, - &Value); - if (NT_SUCCESS(Status)) - { - RtlAppendUnicodeToString (&Value, - L";"); - } - - RtlAppendUnicodeToString (&Value, - lpValue); - - Status = RtlSetEnvironmentVariable ((PWSTR*)Environment, - &Name, - &Value); - LocalFree (Value.Buffer); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("RtlSetEnvironmentVariable() failed (Status %lx)\n", Status); - return FALSE; - } - - return TRUE; +AppendUserEnvironmentVariable(LPVOID *Environment, + LPWSTR lpName, + LPWSTR lpValue) +{ + UNICODE_STRING Name; + UNICODE_STRING Value; + NTSTATUS Status; + + RtlInitUnicodeString(&Name, + lpName); + + Value.Length = 0; + Value.MaximumLength = 1024 * sizeof(WCHAR); + Value.Buffer = LocalAlloc(LPTR, + 1024 * sizeof(WCHAR)); + if (Value.Buffer == NULL) + { + return FALSE; + } + Value.Buffer[0] = UNICODE_NULL; + + Status = RtlQueryEnvironmentVariable_U((PWSTR)*Environment, + &Name, + &Value); + if (NT_SUCCESS(Status)) + { + RtlAppendUnicodeToString(&Value, + L";"); + } + + RtlAppendUnicodeToString(&Value, + lpValue); + + Status = RtlSetEnvironmentVariable((PWSTR*)Environment, + &Name, + &Value); + LocalFree(Value.Buffer); + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlSetEnvironmentVariable() failed (Status %lx)\n", Status); + return FALSE; + } + + return TRUE; } static HKEY -GetCurrentUserKey (HANDLE hToken) -{ - UNICODE_STRING SidString; - HKEY hKey; - LONG Error; - - if (!GetUserSidFromToken (hToken, - &SidString)) - { - DPRINT1 ("GetUserSidFromToken() failed\n"); - return NULL; - } - - Error = RegOpenKeyExW (HKEY_USERS, - SidString.Buffer, - 0, - MAXIMUM_ALLOWED, - &hKey); - if (Error != ERROR_SUCCESS) - { - DPRINT1 ("RegOpenKeyExW() failed (Error %ld)\n", Error); - RtlFreeUnicodeString (&SidString); - SetLastError((DWORD)Error); - return NULL; - } - - RtlFreeUnicodeString (&SidString); - - return hKey; +GetCurrentUserKey(HANDLE hToken) +{ + UNICODE_STRING SidString; + HKEY hKey; + LONG Error; + + if (!GetUserSidFromToken(hToken, + &SidString)) + { + DPRINT1("GetUserSidFromToken() failed\n"); + return NULL; + } + + Error = RegOpenKeyExW(HKEY_USERS, + SidString.Buffer, + 0, + MAXIMUM_ALLOWED, + &hKey); + if (Error != ERROR_SUCCESS) + { + DPRINT1("RegOpenKeyExW() failed (Error %ld)\n", Error); + RtlFreeUnicodeString(&SidString); + SetLastError((DWORD)Error); + return NULL; + } + + RtlFreeUnicodeString(&SidString); + + return hKey; } static BOOL -SetUserEnvironment (LPVOID *lpEnvironment, - HKEY hKey, - LPWSTR lpSubKeyName) -{ - HKEY hEnvKey; - DWORD dwValues; - DWORD dwMaxValueNameLength; - DWORD dwMaxValueDataLength; - DWORD dwValueNameLength; - DWORD dwValueDataLength; - DWORD dwType; - DWORD i; - LPWSTR lpValueName; - LPWSTR lpValueData; - LONG Error; - - Error = RegOpenKeyExW (hKey, - lpSubKeyName, - 0, - KEY_QUERY_VALUE, - &hEnvKey); - if (Error != ERROR_SUCCESS) - { - DPRINT1 ("RegOpenKeyExW() failed (Error %ld)\n", Error); - SetLastError((DWORD)Error); - return FALSE; - } - - Error = RegQueryInfoKey (hEnvKey, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - &dwValues, - &dwMaxValueNameLength, - &dwMaxValueDataLength, - NULL, - NULL); - if (Error != ERROR_SUCCESS) - { - DPRINT1 ("RegQueryInforKey() failed (Error %ld)\n", Error); - RegCloseKey (hEnvKey); - SetLastError((DWORD)Error); - return FALSE; - } - - if (dwValues == 0) - { - RegCloseKey (hEnvKey); - return TRUE; - } - - /* Allocate buffers */ - lpValueName = LocalAlloc (LPTR, - dwMaxValueNameLength * sizeof(WCHAR)); - if (lpValueName == NULL) - { - RegCloseKey (hEnvKey); - return FALSE; - } - - lpValueData = LocalAlloc (LPTR, - dwMaxValueDataLength); - if (lpValueData == NULL) - { - LocalFree (lpValueName); - RegCloseKey (hEnvKey); - return FALSE; - } - - /* Enumerate values */ - for (i = 0; i < dwValues; i++) - { - dwValueNameLength = dwMaxValueNameLength; - dwValueDataLength = dwMaxValueDataLength; - RegEnumValueW (hEnvKey, - i, - lpValueName, - &dwValueNameLength, - NULL, - &dwType, - (LPBYTE)lpValueData, - &dwValueDataLength); - - if (!_wcsicmp (lpValueName, L"path")) - { - /* Append 'Path' environment variable */ - AppendUserEnvironmentVariable (lpEnvironment, - lpValueName, - lpValueData); - } - else - { - /* Set environment variable */ - SetUserEnvironmentVariable (lpEnvironment, - lpValueName, - lpValueData, - (dwType == REG_EXPAND_SZ)); - } - } - - LocalFree (lpValueData); - LocalFree (lpValueName); - RegCloseKey (hEnvKey); - - return TRUE; +SetUserEnvironment(LPVOID *lpEnvironment, + HKEY hKey, + LPWSTR lpSubKeyName) +{ + HKEY hEnvKey; + DWORD dwValues; + DWORD dwMaxValueNameLength; + DWORD dwMaxValueDataLength; + DWORD dwValueNameLength; + DWORD dwValueDataLength; + DWORD dwType; + DWORD i; + LPWSTR lpValueName; + LPWSTR lpValueData; + LONG Error; + + Error = RegOpenKeyExW(hKey, + lpSubKeyName, + 0, + KEY_QUERY_VALUE, + &hEnvKey); + if (Error != ERROR_SUCCESS) + { + DPRINT1("RegOpenKeyExW() failed (Error %ld)\n", Error); + SetLastError((DWORD)Error); + return FALSE; + } + + Error = RegQueryInfoKey(hEnvKey, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + &dwValues, + &dwMaxValueNameLength, + &dwMaxValueDataLength, + NULL, + NULL); + if (Error != ERROR_SUCCESS) + { + DPRINT1("RegQueryInforKey() failed (Error %ld)\n", Error); + RegCloseKey(hEnvKey); + SetLastError((DWORD)Error); + return FALSE; + } + + if (dwValues == 0) + { + RegCloseKey(hEnvKey); + return TRUE; + } + + /* Allocate buffers */ + lpValueName = LocalAlloc(LPTR, + dwMaxValueNameLength * sizeof(WCHAR)); + if (lpValueName == NULL) + { + RegCloseKey(hEnvKey); + return FALSE; + } + + lpValueData = LocalAlloc(LPTR, + dwMaxValueDataLength); + if (lpValueData == NULL) + { + LocalFree(lpValueName); + RegCloseKey(hEnvKey); + return FALSE; + } + + /* Enumerate values */ + for (i = 0; i < dwValues; i++) + { + dwValueNameLength = dwMaxValueNameLength; + dwValueDataLength = dwMaxValueDataLength; + RegEnumValueW(hEnvKey, + i, + lpValueName, + &dwValueNameLength, + NULL, + &dwType, + (LPBYTE)lpValueData, + &dwValueDataLength); + + if (!_wcsicmp (lpValueName, L"path")) + { + /* Append 'Path' environment variable */ + AppendUserEnvironmentVariable(lpEnvironment, + lpValueName, + lpValueData); + } + else + { + /* Set environment variable */ + SetUserEnvironmentVariable(lpEnvironment, + lpValueName, + lpValueData, + (dwType == REG_EXPAND_SZ)); + } + } + + LocalFree(lpValueData); + LocalFree(lpValueName); + RegCloseKey(hEnvKey); + + return TRUE; } BOOL WINAPI -CreateEnvironmentBlock (LPVOID *lpEnvironment, - HANDLE hToken, - BOOL bInherit) -{ - WCHAR Buffer[MAX_PATH]; - DWORD Length; - HKEY hKeyUser; - NTSTATUS Status; - - DPRINT("CreateEnvironmentBlock() called\n"); - - if (lpEnvironment == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - Status = RtlCreateEnvironment ((BOOLEAN)bInherit, - (PWSTR*)lpEnvironment); - if (!NT_SUCCESS (Status)) - { - DPRINT1 ("RtlCreateEnvironment() failed (Status %lx)\n", Status); - SetLastError (RtlNtStatusToDosError (Status)); - return FALSE; - } - - /* Set 'COMPUTERNAME' variable */ - Length = MAX_PATH; - if (GetComputerNameW (Buffer, - &Length)) - { - SetUserEnvironmentVariable(lpEnvironment, - L"COMPUTERNAME", - Buffer, - FALSE); - } - - if (hToken == NULL) +CreateEnvironmentBlock(LPVOID *lpEnvironment, + HANDLE hToken, + BOOL bInherit) +{ + WCHAR Buffer[MAX_PATH]; + DWORD Length; + HKEY hKeyUser; + NTSTATUS Status; + + DPRINT("CreateEnvironmentBlock() called\n"); + + if (lpEnvironment == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + Status = RtlCreateEnvironment((BOOLEAN)bInherit, + (PWSTR*)lpEnvironment); + if (!NT_SUCCESS (Status)) + { + DPRINT1("RtlCreateEnvironment() failed (Status %lx)\n", Status); + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + /* Set 'COMPUTERNAME' variable */ + Length = MAX_PATH; + if (GetComputerNameW(Buffer, + &Length)) + { + SetUserEnvironmentVariable(lpEnvironment, + L"COMPUTERNAME", + Buffer, + FALSE); + } + + if (hToken == NULL) + return TRUE; + + hKeyUser = GetCurrentUserKey(hToken); + if (hKeyUser == NULL) + { + DPRINT1("GetCurrentUserKey() failed\n"); + RtlDestroyEnvironment(*lpEnvironment); + return FALSE; + } + + /* Set 'ALLUSERSPROFILE' variable */ + Length = MAX_PATH; + if (GetAllUsersProfileDirectoryW(Buffer, + &Length)) + { + SetUserEnvironmentVariable(lpEnvironment, + L"ALLUSERSPROFILE", + Buffer, + FALSE); + } + + /* Set 'USERPROFILE' variable */ + Length = MAX_PATH; + if (GetUserProfileDirectoryW(hToken, + Buffer, + &Length)) + { + SetUserEnvironmentVariable(lpEnvironment, + L"USERPROFILE", + Buffer, + FALSE); + } + + /* FIXME: Set 'USERDOMAIN' variable */ + + Length = MAX_PATH; + if (GetUserNameW(Buffer, + &Length)) + { + SetUserEnvironmentVariable(lpEnvironment, + L"USERNAME", + Buffer, + FALSE); + } + + + + /* Set user environment variables */ + SetUserEnvironment(lpEnvironment, + hKeyUser, + L"Environment"); + + RegCloseKey(hKeyUser); + return TRUE; - - hKeyUser = GetCurrentUserKey (hToken); - if (hKeyUser == NULL) - { - DPRINT1 ("GetCurrentUserKey() failed\n"); - RtlDestroyEnvironment (*lpEnvironment); - return FALSE; - } - - /* Set 'ALLUSERSPROFILE' variable */ - Length = MAX_PATH; - if (GetAllUsersProfileDirectoryW (Buffer, - &Length)) - { - SetUserEnvironmentVariable(lpEnvironment, - L"ALLUSERSPROFILE", - Buffer, - FALSE); - } - - /* Set 'USERPROFILE' variable */ - Length = MAX_PATH; - if (GetUserProfileDirectoryW (hToken, - Buffer, - &Length)) - { - SetUserEnvironmentVariable(lpEnvironment, - L"USERPROFILE", - Buffer, - FALSE); - } - - /* FIXME: Set 'USERDOMAIN' variable */ - - Length = MAX_PATH; - if (GetUserNameW(Buffer, - &Length)) - { - SetUserEnvironmentVariable(lpEnvironment, - L"USERNAME", - Buffer, - FALSE); - } - - - - /* Set user environment variables */ - SetUserEnvironment (lpEnvironment, - hKeyUser, - L"Environment"); - - RegCloseKey (hKeyUser); - - return TRUE; } BOOL WINAPI -DestroyEnvironmentBlock (LPVOID lpEnvironment) -{ - DPRINT ("DestroyEnvironmentBlock() called\n"); - - if (lpEnvironment == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - RtlDestroyEnvironment (lpEnvironment); - - return TRUE; +DestroyEnvironmentBlock(LPVOID lpEnvironment) +{ + DPRINT("DestroyEnvironmentBlock() called\n"); + + if (lpEnvironment == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + RtlDestroyEnvironment(lpEnvironment); + + return TRUE; }

1 0

[ekohl] 47106: [USERENV] - Create 'Default User' and 'All Users' directories without postfix and append a postfix only if they already exist. - Create the user account directory without a prefix and append a prefix if the directory already exists. - Acquire the restore privilege before unloading a hive and remove it after unloading the hive. Patch is based on Gabriel Ilardi's patch. Fixes bug #2972.
by ekohl＠svn.reactos.org 05 May '10

05 May '10

Author: ekohl Date: Thu May 6 00:30:14 2010 New Revision: 47106 URL: http://svn.reactos.org/svn/reactos?rev=47106&view=rev Log: [USERENV] - Create 'Default User' and 'All Users' directories without postfix and append a postfix only if they already exist. - Create the user account directory without a prefix and append a prefix if the directory already exists. - Acquire the restore privilege before unloading a hive and remove it after unloading the hive. Patch is based on Gabriel Ilardi's patch. Fixes bug #2972. Modified: trunk/reactos/dll/win32/userenv/profile.c trunk/reactos/dll/win32/userenv/setup.c Modified: trunk/reactos/dll/win32/userenv/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/profile.… ============================================================================== --- trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] Thu May 6 00:30:14 2010 @@ -170,10 +170,12 @@ WCHAR szProfilesPath[MAX_PATH]; WCHAR szUserProfilePath[MAX_PATH]; WCHAR szDefaultUserPath[MAX_PATH]; + WCHAR szUserProfileName[MAX_PATH]; WCHAR szBuffer[MAX_PATH]; LPWSTR SidString; DWORD dwLength; DWORD dwDisposition; + UINT i; HKEY hKey; LONG Error; @@ -245,14 +247,11 @@ RegCloseKey (hKey); + wcscpy(szUserProfileName, lpUserName); + wcscpy(szUserProfilePath, szProfilesPath); wcscat(szUserProfilePath, L"\\"); - wcscat(szUserProfilePath, lpUserName); - if (!AppendSystemPostfix(szUserProfilePath, MAX_PATH)) - { - DPRINT1("AppendSystemPostfix() failed\n", GetLastError()); - return FALSE; - } + wcscat(szUserProfilePath, szUserProfileName); wcscpy(szDefaultUserPath, szProfilesPath); wcscat(szDefaultUserPath, L"\\"); @@ -265,6 +264,24 @@ { DPRINT1("Error: %lu\n", GetLastError()); return FALSE; + } + + for (i = 0; i < 1000; i++) + { + swprintf(szUserProfileName, L"%s.%03u", lpUserName, i); + + wcscpy(szUserProfilePath, szProfilesPath); + wcscat(szUserProfilePath, L"\\"); + wcscat(szUserProfilePath, szUserProfileName); + + if (CreateDirectoryW(szUserProfilePath, NULL)) + break; + + if (GetLastError() != ERROR_ALREADY_EXISTS) + { + DPRINT1("Error: %lu\n", GetLastError()); + return FALSE; + } } } @@ -308,14 +325,7 @@ /* Create non-expanded user profile path */ wcscpy(szBuffer, szRawProfilesPath); wcscat(szBuffer, L"\\"); - wcscat(szBuffer, lpUserName); - if (!AppendSystemPostfix(szBuffer, MAX_PATH)) - { - DPRINT1("AppendSystemPostfix() failed\n", GetLastError()); - LocalFree((HLOCAL)SidString); - RegCloseKey (hKey); - return FALSE; - } + wcscat(szBuffer, szUserProfileName); /* Set 'ProfileImagePath' value (non-expanded) */ Error = RegSetValueExW(hKey, @@ -958,16 +968,9 @@ } } + /* Create user hive name */ wcscat(szUserHivePath, L"\\"); wcscat(szUserHivePath, lpProfileInfo->lpUserName); - dwLength = sizeof(szUserHivePath) / sizeof(szUserHivePath[0]); - if (!AppendSystemPostfix(szUserHivePath, dwLength)) - { - DPRINT1("AppendSystemPostfix() failed\n", GetLastError()); - return FALSE; - } - - /* Create user hive name */ wcscat(szUserHivePath, L"\\ntuser.dat"); DPRINT("szUserHivePath: %S\n", szUserHivePath); @@ -1129,8 +1132,21 @@ DPRINT("SidString: '%wZ'\n", &SidString); + /* Acquire restore privilege */ + if (!AcquireRemoveRestorePrivilege(TRUE)) + { + DPRINT1("AcquireRemoveRestorePrivilege() failed (Error %ld)\n", GetLastError()); + RtlFreeUnicodeString(&SidString); + return FALSE; + } + + /* Unload the hive */ Error = RegUnLoadKeyW(HKEY_USERS, SidString.Buffer); + + /* Remove restore privilege */ + AcquireRemoveRestorePrivilege(FALSE); + if (Error != ERROR_SUCCESS) { DPRINT1("RegUnLoadKeyW() failed (Error %ld)\n", Error); Modified: trunk/reactos/dll/win32/userenv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/setup.c?… ============================================================================== --- trunk/reactos/dll/win32/userenv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/setup.c [iso-8859-1] Thu May 6 00:30:14 2010 @@ -140,7 +140,28 @@ return FALSE; } - /* Store profiles directory path */ + /* Expand it */ + if (!ExpandEnvironmentStringsW(szBuffer, + szProfilesPath, + MAX_PATH)) + { + DPRINT1("Error: %lu\n", GetLastError()); + RegCloseKey(hKey); + return FALSE; + } + + /* Create profiles directory */ + if (!CreateDirectoryW(szProfilesPath, NULL)) + { + if (GetLastError() != ERROR_ALREADY_EXISTS) + { + DPRINT1("Error: %lu\n", GetLastError()); + RegCloseKey(hKey); + return FALSE; + } + } + + /* Store the profiles directory path in the registry */ dwLength = (wcslen (szBuffer) + 1) * sizeof(WCHAR); Error = RegSetValueExW(hKey, L"ProfilesDirectory", @@ -156,18 +177,16 @@ return FALSE; } - /* Expand it */ - if (!ExpandEnvironmentStringsW(szBuffer, - szProfilesPath, - MAX_PATH)) - { - DPRINT1("Error: %lu\n", GetLastError()); - RegCloseKey(hKey); - return FALSE; - } - - /* Create profiles directory */ - if (!CreateDirectoryW(szProfilesPath, NULL)) + /* Set 'DefaultUserProfile' value */ + wcscpy(szBuffer, L"Default User"); + + /* Create Default User profile directory path */ + wcscpy(szProfilePath, szProfilesPath); + wcscat(szProfilePath, L"\\"); + wcscat(szProfilePath, szBuffer); + + /* Attempt default user directory creation */ + if (!CreateDirectoryW (szProfilePath, NULL)) { if (GetLastError() != ERROR_ALREADY_EXISTS) { @@ -175,17 +194,33 @@ RegCloseKey(hKey); return FALSE; } - } - - /* Set 'DefaultUserProfile' value */ - wcscpy(szBuffer, L"Default User"); - if (!AppendSystemPostfix(szBuffer, MAX_PATH)) - { - DPRINT1("AppendSystemPostfix() failed\n", GetLastError()); - RegCloseKey(hKey); - return FALSE; - } - + + /* Directory existed, let's try to append the postfix */ + if (!AppendSystemPostfix(szBuffer, MAX_PATH)) + { + DPRINT1("AppendSystemPostfix() failed\n", GetLastError()); + RegCloseKey(hKey); + return FALSE; + } + + /* Create Default User profile directory path again */ + wcscpy(szProfilePath, szProfilesPath); + wcscat(szProfilePath, L"\\"); + wcscat(szProfilePath, szBuffer); + + /* Attempt creation again with appended postfix */ + if (!CreateDirectoryW(szProfilePath, NULL)) + { + if (GetLastError() != ERROR_ALREADY_EXISTS) + { + DPRINT1("Error: %lu\n", GetLastError()); + RegCloseKey(hKey); + return FALSE; + } + } + } + + /* Store the default user profile path in the registry */ dwLength = (wcslen (szBuffer) + 1) * sizeof(WCHAR); Error = RegSetValueExW(hKey, L"DefaultUserProfile", @@ -202,19 +237,6 @@ } RegCloseKey(hKey); - - /* Create 'Default User' profile directory */ - wcscpy(szProfilePath, szProfilesPath); - wcscat(szProfilePath, L"\\"); - wcscat(szProfilePath, szBuffer); - if (!CreateDirectoryW (szProfilePath, NULL)) - { - if (GetLastError() != ERROR_ALREADY_EXISTS) - { - DPRINT1("Error: %lu\n", GetLastError()); - return FALSE; - } - } /* Set current user profile */ SetEnvironmentVariableW(L"USERPROFILE", szProfilePath); @@ -382,10 +404,41 @@ /* Set 'AllUsersProfile' value */ wcscpy(szBuffer, L"All Users"); - if (!AppendSystemPostfix(szBuffer, MAX_PATH)) - { - DPRINT1("AppendSystemPostfix() failed\n", GetLastError()); - return FALSE; + + /* Create 'All Users' profile directory path */ + wcscpy(szProfilePath, szProfilesPath); + wcscat(szProfilePath, L"\\"); + wcscat(szProfilePath, szBuffer); + + /* Attempt 'All Users' directory creation */ + if (!CreateDirectoryW (szProfilePath, NULL)) + { + if (GetLastError() != ERROR_ALREADY_EXISTS) + { + DPRINT1("Error: %lu\n", GetLastError()); + return FALSE; + } + + /* Directory existed, let's try to append the postfix */ + if (!AppendSystemPostfix(szBuffer, MAX_PATH)) + { + DPRINT1("AppendSystemPostfix() failed\n", GetLastError()); + return FALSE; + } + + /* Attempt again creation with appended postfix */ + wcscpy(szProfilePath, szProfilesPath); + wcscat(szProfilePath, L"\\"); + wcscat(szProfilePath, szBuffer); + + if (!CreateDirectoryW(szProfilePath, NULL)) + { + if (GetLastError() != ERROR_ALREADY_EXISTS) + { + DPRINT1("Error: %lu\n", GetLastError()); + return FALSE; + } + } } Error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, @@ -407,27 +460,14 @@ REG_SZ, (LPBYTE)szBuffer, dwLength); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - RegCloseKey(hKey); - SetLastError((DWORD)Error); - return FALSE; - } RegCloseKey(hKey); - /* Create 'All Users' profile directory */ - wcscpy(szProfilePath, szProfilesPath); - wcscat(szProfilePath, L"\\"); - wcscat(szProfilePath, szBuffer); - if (!CreateDirectoryW(szProfilePath, NULL)) - { - if (GetLastError() != ERROR_ALREADY_EXISTS) - { - DPRINT1("Error: %lu\n", GetLastError()); - return FALSE; - } + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + SetLastError((DWORD)Error); + return FALSE; } /* Set 'All Users' profile */

1 0

[fireball] 47105: [MSTSC] - Katayama Hirofumi: Remove temporary tchar.h inclusion and usage of _tcslen (replaced with lstrlen). See issue #5360 for more details.
by fireball＠svn.reactos.org 05 May '10

05 May '10

Author: fireball Date: Wed May 5 21:00:13 2010 New Revision: 47105 URL: http://svn.reactos.org/svn/reactos?rev=47105&view=rev Log: [MSTSC] - Katayama Hirofumi: Remove temporary tchar.h inclusion and usage of _tcslen (replaced with lstrlen). See issue #5360 for more details. Modified: trunk/reactos/base/applications/mstsc/win32.c Modified: trunk/reactos/base/applications/mstsc/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/wi… ============================================================================== --- trunk/reactos/base/applications/mstsc/win32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/win32.c [iso-8859-1] Wed May 5 21:00:13 2010 @@ -20,13 +20,6 @@ #include <winsock2.h> /* winsock2.h first */ #include <precomp.h> - -//FIXME: remove eventually -#ifndef _UNICODE -#define _UNICODE -#endif -#include <tchar.h> - extern char g_username[]; extern char g_hostname[]; @@ -89,7 +82,7 @@ int len; int i; - len = _tcslen(size1); + len = lstrlen(size1); for (i = 0; i < len; i++) { sizex[i] = (char)size1[i];

1 0

[fireball] 47104: [FONTVIEW] - Katayama Hirofumi: Redraw the window when string is set. See issue #5357 for more details.
by fireball＠svn.reactos.org 05 May '10

05 May '10

Author: fireball Date: Wed May 5 20:54:36 2010 New Revision: 47104 URL: http://svn.reactos.org/svn/reactos?rev=47104&view=rev Log: [FONTVIEW] - Katayama Hirofumi: Redraw the window when string is set. See issue #5357 for more details. Modified: trunk/reactos/base/applications/fontview/display.c Modified: trunk/reactos/base/applications/fontview/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/display.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/display.c [iso-8859-1] Wed May 5 20:54:36 2010 @@ -204,7 +204,7 @@ pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); _snwprintf(pData->szString, MAX_STRING, (WCHAR*)lParam); - // FIXME: redraw the window + InvalidateRect(hwnd, NULL, TRUE); return 0; }

1 0

[gadamopoulos] 47103: [win32k] -Fix sending WM_KILLFOCUS when we give focus to a window of a different thread Fixes bugs 1546 and 1603
by gadamopoulos＠svn.reactos.org 05 May '10

05 May '10

Author: gadamopoulos Date: Wed May 5 12:08:23 2010 New Revision: 47103 URL: http://svn.reactos.org/svn/reactos?rev=47103&view=rev Log: [win32k] -Fix sending WM_KILLFOCUS when we give focus to a window of a different thread Fixes bugs 1546 and 1603 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] Wed May 5 12:08:23 2010 @@ -227,6 +227,7 @@ if (PrevForegroundQueue != 0) { hWndPrev = PrevForegroundQueue->ActiveWindow; + hWndFocusPrev = PrevForegroundQueue->FocusWindow; } if (hWndPrev == hWnd) @@ -234,9 +235,6 @@ DPRINT("Failed - Same\n"); return TRUE; } - - hWndFocusPrev = (PrevForegroundQueue == FocusWindow->pti->MessageQueue - ? FocusWindow->pti->MessageQueue->FocusWindow : NULL); /* FIXME: Call hooks. */

1 0

[jmorlan] 47102: [NTOSKRNL] In kdbg 'thread list', don't try to read from the kernel stack if there isn't one. (Bug 5318)
by jmorlan＠svn.reactos.org 04 May '10

04 May '10

Author: jmorlan Date: Wed May 5 01:17:30 2010 New Revision: 47102 URL: http://svn.reactos.org/svn/reactos?rev=47102&view=rev Log: [NTOSKRNL] In kdbg 'thread list', don't try to read from the kernel stack if there isn't one. (Bug 5318) Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Wed May 5 01:17:30 2010 @@ -1223,7 +1223,13 @@ str2 = ""; } - if (Thread->Tcb.TrapFrame) + if (!Thread->Tcb.InitialStack) + { + /* Thread has no kernel stack (probably terminated) */ + Esp = Ebp = NULL; + Eip = 0; + } + else if (Thread->Tcb.TrapFrame) { if (Thread->Tcb.TrapFrame->PreviousPreviousMode == KernelMode) Esp = (PULONG)Thread->Tcb.TrapFrame->TempEsp;

1 0

[dreimer] 47101: Feature request by Olaf Siejka. The sSVN parameters "rosapps" and "rostests" were originally made for just creating rosapps / rostests repositories in the modules folder. Now it detects an existant repository and just updates that one. If theres no repository or even no folder for the repository it first generates it and continues. Additionally you can set the revision you wanna checkout or update to. "create" accepts a revision as second parameter now, too. NOT FULLY TESTED YET
by dreimer＠svn.reactos.org 04 May '10

04 May '10

Author: dreimer Date: Tue May 4 12:03:05 2010 New Revision: 47101 URL: http://svn.reactos.org/svn/reactos?rev=47101&view=rev Log: Feature request by Olaf Siejka. The sSVN parameters "rosapps" and "rostests" were originally made for just creating rosapps / rostests repositories in the modules folder. Now it detects an existant repository and just updates that one. If theres no repository or even no folder for the repository it first generates it and continues. Additionally you can set the revision you wanna checkout or update to. "create" accepts a revision as second parameter now, too. NOT FULLY TESTED YET. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] Tue May 4 12:03:05 2010 @@ -232,8 +232,8 @@ " update - Updates to HEAD revision or to a specific one when the second" " parameter specifies one." " create - Creates a new ReactOS source tree." - " rosapps - Creates a new ReactOS RosApps source tree." - " rostests - Creates a new ReactOS RosTests source tree." + " rosapps - Creates / Updates a ReactOS RosApps source tree." + " rostests - Creates / Updates a ReactOS RosTests source tree." " cleanup - Cleans up and fixes errors in the source tree." " status - Show the current local and online revision numbers." } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Tue May 4 12:03:05 2010 @@ -34,14 +34,14 @@ if ("$_BUILDBOT_SVNSKIPMAINTRUNK" -ne "1") { IEX "& svn.exe update -r $temparg" } - if (Test-Path "modules\rosapps\.") { - Set-Location modules\rosapps + if (Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rosapps\.") { + Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rosapps" "Updating RosApps..." IEX "& svn.exe update -r $temparg" Set-Location "$_ROSBE_ROSSOURCEDIR" } - if (Test-Path "modules\rostests\.") { - Set-Location modules\rostests + if (Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rostests\.") { + Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rostests" "Updating RosTests..." IEX "& svn.exe update -r $temparg" Set-Location "$_ROSBE_ROSSOURCEDIR" @@ -50,14 +50,14 @@ if ("$_BUILDBOT_SVNSKIPMAINTRUNK" -ne "1") { IEX "& svn.exe update" } - if (Test-Path "modules\rosapps\.") { - Set-Location modules\rosapps + if (Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rosapps\.") { + Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rosapps" "Updating RosApps..." IEX "& svn.exe update" Set-Location "$_ROSBE_ROSSOURCEDIR" } - if (Test-Path "modules\rostests\.") { - Set-Location modules\rostests + if (Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rostests\.") { + Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rostests" "Updating RosTests..." IEX "& svn.exe update" Set-Location "$_ROSBE_ROSSOURCEDIR" @@ -105,10 +105,18 @@ $null = (Remove-Item "$_ROSBE_LOGDIR" -recurse -force) $dir = get-childitem if ("$dir" -eq "") { - if ("$ENV:ROS_ARCH" -eq "amd64") { - IEX "& svn.exe checkout http://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos ." - } else { - IEX "& svn.exe checkout http://svn.reactos.org/reactos/trunk/reactos ." + if ("$($args[1])" -ne "") { + if ("$ENV:ROS_ARCH" -eq "amd64") { + IEX "& svn.exe -r $($args[1]) checkout http://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos ." + } else { + IEX "& svn.exe -r $($args[1]) checkout http://svn.reactos.org/reactos/trunk/reactos ." + } + } else { + if ("$ENV:ROS_ARCH" -eq "amd64") { + IEX "& svn.exe checkout http://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos ." + } else { + IEX "& svn.exe checkout http://svn.reactos.org/reactos/trunk/reactos ." + } } } else { "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" @@ -118,23 +126,49 @@ # Check if the folder is empty. If not, output an error. elseif ("$($args[0])" -eq "rosapps") { - $host.ui.RawUI.WindowTitle = "SVN RosApps Creating..." - if (Test-Path "modules\rosapps\.svn\.") { - "ERROR: Folder already contains a RosApps repository." - } else { - if (!(Test-Path "modules\rosapps\.")) { + if ("$($args[1])" -ne "") { + if (!(Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rosapps\.")) { new-item -path "$_ROSBE_ROSSOURCEDIR\modules" -name rosapps -type directory } - Set-Location modules\rosapps - $dir = get-childitem - if ("$dir" -eq "") { - if ("$ENV:ROS_ARCH" -eq "amd64") { - IEX "& svn.exe checkout http://svn.reactos.org/reactos/branches/ros-amd64-bringup/rosapps ." - } else { - IEX "& svn.exe checkout http://svn.reactos.org/reactos/trunk/rosapps ." - } - } else { - "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" + if (Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rosapps\.svn\.") { + $host.ui.RawUI.WindowTitle = "SVN RosApps Updating..." + Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rosapps" + IEX "& svn.exe update -r $($args[1])" + } else { + $host.ui.RawUI.WindowTitle = "SVN RosApps Creating..." + Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rosapps" + $dir = get-childitem + if ("$dir" -eq "") { + if("$ENV:ROS_ARCH" -eq "amd64") { + IEX "& svn.exe checkout -r $($args[1]) http://svn.reactos.org/reactos/branches/ros-amd64-bringup/rosapps ." + } else { + IEX "& svn.exe checkout -r $($args[1]) http://svn.reactos.org/reactos/trunk/rosapps ." + } + } else { + "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" + } + } + } else { + if (!(Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rosapps\.")) { + new-item -path "$_ROSBE_ROSSOURCEDIR\modules" -name rosapps -type directory + } + if (Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rosapps\.svn\.") { + $host.ui.RawUI.WindowTitle = "SVN RosApps Updating..." + Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rosapps" + IEX "& svn.exe update" + } else { + $host.ui.RawUI.WindowTitle = "SVN RosApps Creating..." + Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rosapps" + $dir = get-childitem + if ("$dir" -eq "") { + if ("$ENV:ROS_ARCH" -eq "amd64") { + IEX "& svn.exe checkout http://svn.reactos.org/reactos/branches/ros-amd64-bringup/rosapps ." + } else { + IEX "& svn.exe checkout http://svn.reactos.org/reactos/trunk/rosapps ." + } + } else { + "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" + } } } Set-Location "$_ROSBE_ROSSOURCEDIR" @@ -142,23 +176,49 @@ # Check if the folder is empty. If not, output an error. elseif ("$($args[0])" -eq "rostests") { - $host.ui.RawUI.WindowTitle = "SVN RosTests Creating..." - if (Test-Path "modules\rostests\.svn\.") { - "ERROR: Folder already contains a RosTests repository." - } else { - if (!(Test-Path "modules\rostests\.")) { + if ("$($args[1])" -ne "") { + if (!(Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rostests\.")) { new-item -path "$_ROSBE_ROSSOURCEDIR\modules" -name rostests -type directory } - Set-Location modules\rostests - $dir = get-childitem - if ("$dir" -eq "") { - if ("$ENV:ROS_ARCH" -eq "amd64") { - IEX "& svn.exe checkout http://svn.reactos.org/reactos/branches/ros-amd64-bringup/rostests ." - } else { - IEX "& svn.exe checkout http://svn.reactos.org/reactos/trunk/rostests ." - } - } else { - "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" + if (Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rostests\.svn\.") { + $host.ui.RawUI.WindowTitle = "SVN RosTests Updating..." + Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rostests" + IEX "& svn.exe update -r $($args[1])" + } else { + $host.ui.RawUI.WindowTitle = "SVN RosTests Creating..." + Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rostests" + $dir = get-childitem + if ("$dir" -eq "") { + if("$ENV:ROS_ARCH" -eq "amd64") { + IEX "& svn.exe checkout -r $($args[1]) http://svn.reactos.org/reactos/branches/ros-amd64-bringup/rostests ." + } else { + IEX "& svn.exe checkout -r $($args[1]) http://svn.reactos.org/reactos/trunk/rostests ." + } + } else { + "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" + } + } + } else { + if (!(Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rostests\.")) { + new-item -path "$_ROSBE_ROSSOURCEDIR\modules" -name rostests -type directory + } + if (Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rostests\.svn\.") { + $host.ui.RawUI.WindowTitle = "SVN RosTests Updating..." + Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rostests" + IEX "& svn.exe update" + } else { + $host.ui.RawUI.WindowTitle = "SVN RosTests Creating..." + Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rostests" + $dir = get-childitem + if ("$dir" -eq "") { + if ("$ENV:ROS_ARCH" -eq "amd64") { + IEX "& svn.exe checkout http://svn.reactos.org/reactos/branches/ros-amd64-bringup/rostests ." + } else { + IEX "& svn.exe checkout http://svn.reactos.org/reactos/trunk/rostests ." + } + } else { + "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" + } } } Set-Location "$_ROSBE_ROSSOURCEDIR" Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] Tue May 4 12:03:05 2010 @@ -238,8 +238,8 @@ echo update - Updates to HEAD revision or to a specific one when the second echo parameter specifies one. echo create - Creates a new ReactOS source tree. - echo rosapps - Creates a new ReactOS RosApps source tree. - echo rostests - Creates a new ReactOS RosTests source tree. + echo rosapps - Creates / Updates a ReactOS RosApps source tree. + echo rostests - Creates / Updates a ReactOS RosTests source tree. echo cleanup - Cleans up and fixes errors in the source tree. echo status - Show the current local and online revision numbers. ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Tue May 4 12:03:05 2010 @@ -47,10 +47,18 @@ rd /s /q "%_ROSBE_LOGDIR%" 1> NUL 2> NUL dir /b 2>nul | findstr "." >nul if errorlevel 1 ( - if "%ROS_ARCH%" == "amd64" ( - svn.exe checkout http://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos . - ) else ( - svn.exe checkout http://svn.reactos.org/reactos/trunk/reactos . + if not "%2" == "" ( + if "%ROS_ARCH%" == "amd64" ( + svn.exe checkout -r %2 http://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos . + ) else ( + svn.exe checkout -r %2 http://svn.reactos.org/reactos/trunk/reactos . + ) + ) else ( + if "%ROS_ARCH%" == "amd64" ( + svn.exe checkout http://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos . + ) else ( + svn.exe checkout http://svn.reactos.org/reactos/trunk/reactos . + ) ) ) else ( echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED @@ -60,24 +68,50 @@ :: Check if the folder is empty. If not, output an error. if /i "%1" == "rosapps" ( - title SVN RosApps Creating... - if exist "modules\rosapps\.svn\." ( - echo ERROR: Folder already contains a RosApps repository. - goto :EOC - ) - if not exist "modules\rosapps\." ( - md modules\rosapps - ) - cd modules\rosapps - dir /b 2>nul | findstr "." >nul - if errorlevel 1 ( - if "%ROS_ARCH%" == "amd64" ( - svn.exe checkout http://svn.reactos.org/reactos/branches/ros-amd64-bringup/rosapps . - ) else ( - svn.exe checkout http://svn.reactos.org/reactos/trunk/rosapps . - ) - ) else ( - echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED + if not "%2" == "" ( + if not exist "%_ROSBE_ROSSOURCEDIR%\modules\rosapps\." ( + md "%_ROSBE_ROSSOURCEDIR%\modules\rosapps" + ) + if exist "%_ROSBE_ROSSOURCEDIR%\modules\rosapps\.svn\." ( + title SVN RosApps Updating... + cd "%_ROSBE_ROSSOURCEDIR%\modules\rosapps" + svn.exe update -r %2 + ) else ( + title SVN RosApps Creating... + cd "%_ROSBE_ROSSOURCEDIR%\modules\rosapps" + dir /b 2>nul | findstr "." >nul + if errorlevel 1 ( + if "%ROS_ARCH%" == "amd64" ( + svn.exe checkout -r %2 http://svn.reactos.org/reactos/branches/ros-amd64-bringup/rosapps . + ) else ( + svn.exe checkout -r %2 http://svn.reactos.org/reactos/trunk/rosapps . + ) + ) else ( + echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED + ) + ) + ) else ( + if not exist "%_ROSBE_ROSSOURCEDIR%\modules\rosapps\." ( + md "%_ROSBE_ROSSOURCEDIR%\modules\rosapps" + ) + if exist "%_ROSBE_ROSSOURCEDIR%\modules\rosapps\.svn\." ( + title SVN RosApps Updating... + cd "%_ROSBE_ROSSOURCEDIR%\modules\rosapps" + svn.exe update + ) else ( + title SVN RosApps Creating... + cd "%_ROSBE_ROSSOURCEDIR%\modules\rosapps" + dir /b 2>nul | findstr "." >nul + if errorlevel 1 ( + if "%ROS_ARCH%" == "amd64" ( + svn.exe checkout http://svn.reactos.org/reactos/branches/ros-amd64-bringup/rosapps . + ) else ( + svn.exe checkout http://svn.reactos.org/reactos/trunk/rosapps . + ) + ) else ( + echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED + ) + ) ) cd "%_ROSBE_ROSSOURCEDIR%" goto :EOC @@ -85,24 +119,50 @@ :: Check if the folder is empty. If not, output an error. if /i "%1" == "rostests" ( - title SVN RosTests Creating... - if exist "modules\rostests\.svn\." ( - echo ERROR: Folder already contains a RosTests repository. - goto :EOC - ) - if not exist "modules\rostests\." ( - md modules\rostests - ) - cd modules\rostests - dir /b 2>nul | findstr "." >nul - if errorlevel 1 ( - if "%ROS_ARCH%" == "amd64" ( - svn.exe checkout http://svn.reactos.org/reactos/branches/ros-amd64-bringup/rostests . - ) else ( - svn.exe checkout http://svn.reactos.org/reactos/trunk/rostests . - ) - ) else ( - echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED + if not "%2" == "" ( + if not exist "%_ROSBE_ROSSOURCEDIR%\modules\rostests\." ( + md "%_ROSBE_ROSSOURCEDIR%\modules\rostests" + ) + if exist "%_ROSBE_ROSSOURCEDIR%\modules\rostests\.svn\." ( + title SVN RosTests Updating... + cd "%_ROSBE_ROSSOURCEDIR%\modules\rostests" + svn.exe update -r %2 + ) else ( + title SVN RosTests Creating... + cd "%_ROSBE_ROSSOURCEDIR%\modules\rostests" + dir /b 2>nul | findstr "." >nul + if errorlevel 1 ( + if "%ROS_ARCH%" == "amd64" ( + svn.exe checkout -r %2 http://svn.reactos.org/reactos/branches/ros-amd64-bringup/rostests . + ) else ( + svn.exe checkout -r %2 http://svn.reactos.org/reactos/trunk/rostests . + ) + ) else ( + echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED + ) + ) + ) else ( + if not exist "%_ROSBE_ROSSOURCEDIR%\modules\rostests\." ( + md "%_ROSBE_ROSSOURCEDIR%\modules\rostests" + ) + if exist "%_ROSBE_ROSSOURCEDIR%\modules\rostests\.svn\." ( + title SVN RosTests Updating... + cd "%_ROSBE_ROSSOURCEDIR%\modules\rostests" + svn.exe update + ) else ( + title SVN RosTests Creating... + cd "%_ROSBE_ROSSOURCEDIR%\modules\rostests" + dir /b 2>nul | findstr "." >nul + if errorlevel 1 ( + if "%ROS_ARCH%" == "amd64" ( + svn.exe checkout http://svn.reactos.org/reactos/branches/ros-amd64-bringup/rostests . + ) else ( + svn.exe checkout http://svn.reactos.org/reactos/trunk/rostests . + ) + ) else ( + echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED + ) + ) ) cd "%_ROSBE_ROSSOURCEDIR%" goto :EOC @@ -145,14 +205,14 @@ if not "%_BUILDBOT_SVNSKIPMAINTRUNK%" == "1" ( svn.exe update -r %2 ) - if exist "modules\rosapps\." ( - cd modules\rosapps + if exist "%_ROSBE_ROSSOURCEDIR%\modules\rosapps\." ( + cd "%_ROSBE_ROSSOURCEDIR%\modules\rosapps" echo Updating RosApps... svn.exe update -r %2 cd "%_ROSBE_ROSSOURCEDIR%" ) - if exist "modules\rostests\." ( - cd modules\rostests + if exist "%_ROSBE_ROSSOURCEDIR%\modules\rostests\." ( + cd "%_ROSBE_ROSSOURCEDIR%\modules\rostests" echo Updating RosTests... svn.exe update -r %2 cd "%_ROSBE_ROSSOURCEDIR%" @@ -161,14 +221,14 @@ if not "%_BUILDBOT_SVNSKIPMAINTRUNK%" == "1" ( svn.exe update ) - if exist "modules\rosapps\." ( - cd modules\rosapps + if exist "%_ROSBE_ROSSOURCEDIR%\modules\rosapps\." ( + cd "%_ROSBE_ROSSOURCEDIR%\modules\rosapps" echo Updating RosApps... svn.exe update cd "%_ROSBE_ROSSOURCEDIR%" ) - if exist "modules\rostests\." ( - cd modules\rostests + if exist "%_ROSBE_ROSSOURCEDIR%\modules\rostests\." ( + cd "%_ROSBE_ROSSOURCEDIR%\modules\rostests" echo Updating RosTests... svn.exe update cd "%_ROSBE_ROSSOURCEDIR%"

1 0

[janderwald] 47100: [SHELL32] - Use target path when there is no icon path specified
by janderwald＠svn.reactos.org 04 May '10

04 May '10

Author: janderwald Date: Tue May 4 10:28:42 2010 New Revision: 47100 URL: http://svn.reactos.org/svn/reactos?rev=47100&view=rev Log: [SHELL32] - Use target path when there is no icon path specified Modified: trunk/reactos/dll/win32/shell32/shelllink.c Modified: trunk/reactos/dll/win32/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelllink.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelllink.c [iso-8859-1] Tue May 4 10:28:42 2010 @@ -2672,6 +2672,9 @@ case 14021: if (This->sIcoPath) wcscpy(szBuffer, This->sIcoPath); + else + wcscpy(szBuffer, This->sPath); + IconIndex = This->iIcoNdx; if (PickIconDlg(hwndDlg, szBuffer, MAX_PATH, &IconIndex)) {

1 0

[ekohl] 47099: [SETUP] - Don't call InitializeProfiles() twice. This is one part of the fix for bug 2972. Patch by Gabriel Ilardi.
by ekohl＠svn.reactos.org 03 May '10

03 May '10

Author: ekohl Date: Tue May 4 00:15:53 2010 New Revision: 47099 URL: http://svn.reactos.org/svn/reactos?rev=47099&view=rev Log: [SETUP] - Don't call InitializeProfiles() twice. This is one part of the fix for bug 2972. Patch by Gabriel Ilardi. Modified: trunk/reactos/base/setup/setup/setup.c Modified: trunk/reactos/base/setup/setup/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/setup/setup.c?r… ============================================================================== --- trunk/reactos/base/setup/setup/setup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/setup/setup.c [iso-8859-1] Tue May 4 00:15:53 2010 @@ -59,9 +59,6 @@ { HMODULE hDll; PINSTALL_REACTOS InstallReactOS; - - /* some dlls (loaded by syssetup) need a valid user profile */ - InitializeProfiles(); hDll = LoadLibrary (TEXT("syssetup")); if (hDll == NULL)

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