Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 39663: - Fix for Bug 703. - ReactOS can now be installed on systems with as little as 24MB. Memory usage after boot is down by 20-30MB. Application installations will use/require/leak less memory. - Patch by Alex Ionescu. See issue #703 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Feb 18 10:56:42 2009 New Revision: 39663 URL: http://svn.reactos.org/svn/reactos?rev=39663&view=rev Log: - Fix for Bug 703. - ReactOS can now be installed on systems with as little as 24MB. Memory usage after boot is down by 20-30MB. Application installations will use/require/leak less memory. - Patch by Alex Ionescu. See issue #703 for more details. Modified: trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c trunk/reactos/ntoskrnl/mm/balance.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=396… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Wed Feb 18 10:56:42 2009 @@ -70,11 +70,6 @@ static NPAGED_LOOKASIDE_LIST BcbLookasideList; static NPAGED_LOOKASIDE_LIST CacheSegLookasideList; -static ULONG CcTimeStamp; -static KEVENT LazyCloseThreadEvent; -static HANDLE LazyCloseThreadHandle; -static CLIENT_ID LazyCloseThreadId; -static volatile BOOLEAN LazyCloseThreadShouldTerminate; #if defined(__GNUC__) /* void * alloca(size_t size); */ @@ -308,85 +303,97 @@ * actually freed is returned. */ { - PLIST_ENTRY current_entry; - PCACHE_SEGMENT current, last = NULL; - ULONG PagesPerSegment; - ULONG PagesFreed; - KIRQL oldIrql; - LIST_ENTRY FreeList; - - DPRINT("CcRosTrimCache(Target %d)\n", Target); - - *NrFreed = 0; - - InitializeListHead(&FreeList); - - KeAcquireGuardedMutex(&ViewLock); - current_entry = CacheSegmentLRUListHead.Flink; - while (current_entry != &CacheSegmentLRUListHead && Target > 0) - { - current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, - CacheSegmentLRUListEntry); - current_entry = current_entry->Flink; - - KeAcquireSpinLock(&current->Bcb->BcbLock, &oldIrql); - if (current->ReferenceCount == 0) - { - RemoveEntryList(&current->BcbSegmentListEntry); - KeReleaseSpinLock(&current->Bcb->BcbLock, oldIrql); - RemoveEntryList(&current->CacheSegmentListEntry); - RemoveEntryList(&current->CacheSegmentLRUListEntry); - InsertHeadList(&FreeList, &current->BcbSegmentListEntry); - PagesPerSegment = current->Bcb->CacheSegmentSize / PAGE_SIZE; - PagesFreed = min(PagesPerSegment, Target); - Target -= PagesFreed; - (*NrFreed) += PagesFreed; - } - else - { - if (last != current && current->MappedCount > 0 && !current->Dirty && !current->PageOut) - { - ULONG i; - NTSTATUS Status; - - CcRosCacheSegmentIncRefCount(current); - last = current; - current->PageOut = TRUE; - KeReleaseSpinLock(&current->Bcb->BcbLock, oldIrql); - KeReleaseGuardedMutex(&ViewLock); - for (i = 0; i < current->Bcb->CacheSegmentSize / PAGE_SIZE; i++) - { - PFN_TYPE Page; - Page = (PFN_TYPE)(MmGetPhysicalAddress((char*)current->BaseAddress + i * PAGE_SIZE).QuadPart >> PAGE_SHIFT); - Status = MmPageOutPhysicalAddress(Page); - if (!NT_SUCCESS(Status)) - { - break; - } - } - KeAcquireGuardedMutex(&ViewLock); - KeAcquireSpinLock(&current->Bcb->BcbLock, &oldIrql); - CcRosCacheSegmentDecRefCount(current); - current->PageOut = FALSE; - KeReleaseSpinLock(&current->Bcb->BcbLock, oldIrql); - current_entry = &current->CacheSegmentLRUListEntry; - continue; - } - KeReleaseSpinLock(&current->Bcb->BcbLock, oldIrql); - } - } - KeReleaseGuardedMutex(&ViewLock); - - while (!IsListEmpty(&FreeList)) - { - current_entry = RemoveHeadList(&FreeList); - current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, - BcbSegmentListEntry); - CcRosInternalFreeCacheSegment(current); - } - - DPRINT("CcRosTrimCache() finished\n"); - return(STATUS_SUCCESS); + PLIST_ENTRY current_entry; + PCACHE_SEGMENT current; + ULONG PagesPerSegment; + ULONG PagesFreed; + KIRQL oldIrql; + LIST_ENTRY FreeList; + + DPRINT("CcRosTrimCache(Target %d)\n", Target); + + *NrFreed = 0; + + InitializeListHead(&FreeList); + + KeAcquireGuardedMutex(&ViewLock); + current_entry = CacheSegmentLRUListHead.Flink; + while (current_entry != &CacheSegmentLRUListHead && Target > 0) + { + NTSTATUS Status; + + Status = STATUS_SUCCESS; + current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, + CacheSegmentLRUListEntry); + current_entry = current_entry->Flink; + + KeAcquireSpinLock(&current->Bcb->BcbLock, &oldIrql); + + if (current->MappedCount > 0 && !current->Dirty && !current->PageOut) + { + ULONG i; + + CcRosCacheSegmentIncRefCount(current); + current->PageOut = TRUE; + KeReleaseSpinLock(&current->Bcb->BcbLock, oldIrql); + KeReleaseGuardedMutex(&ViewLock); + for (i = 0; i < current->Bcb->CacheSegmentSize / PAGE_SIZE; i++) + { + PFN_TYPE Page; + Page = (PFN_TYPE)(MmGetPhysicalAddress((char*)current->BaseAddress + i * PAGE_SIZE).QuadPart >> PAGE_SHIFT); + Status = MmPageOutPhysicalAddress(Page); + } + KeAcquireGuardedMutex(&ViewLock); + KeAcquireSpinLock(&current->Bcb->BcbLock, &oldIrql); + CcRosCacheSegmentDecRefCount(current); + } + + if (current->ReferenceCount == 0) + { + PagesPerSegment = current->Bcb->CacheSegmentSize / PAGE_SIZE; + // PagesFreed = PagesPerSegment; + PagesFreed = min(PagesPerSegment, Target); + Target -= PagesFreed; + (*NrFreed) += PagesFreed; + } + + KeReleaseSpinLock(&current->Bcb->BcbLock, oldIrql); + } + + current_entry = CacheSegmentLRUListHead.Flink; + while (current_entry != &CacheSegmentLRUListHead) + { + current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, + CacheSegmentLRUListEntry); + current->PageOut = FALSE; + current_entry = current_entry->Flink; + + KeAcquireSpinLock(&current->Bcb->BcbLock, &oldIrql); + if (current->ReferenceCount == 0) + { + RemoveEntryList(&current->BcbSegmentListEntry); + KeReleaseSpinLock(&current->Bcb->BcbLock, oldIrql); + RemoveEntryList(&current->CacheSegmentListEntry); + RemoveEntryList(&current->CacheSegmentLRUListEntry); + InsertHeadList(&FreeList, &current->BcbSegmentListEntry); + } + else + { + KeReleaseSpinLock(&current->Bcb->BcbLock, oldIrql); + } + } + + KeReleaseGuardedMutex(&ViewLock); + + while (!IsListEmpty(&FreeList)) + { + current_entry = RemoveHeadList(&FreeList); + current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, + BcbSegmentListEntry); + CcRosInternalFreeCacheSegment(current); + } + + return(STATUS_SUCCESS); } NTSTATUS @@ -1151,15 +1158,7 @@ if (Bcb->RefCount == 0) { MmFreeSectionSegments(Bcb->FileObject); - if (Bcb->RemoveOnClose) - { CcRosDeleteFileCache(FileObject, Bcb); - } - else - { - Bcb->TimeStamp = CcTimeStamp; - InsertHeadList(&ClosedListHead, &Bcb->BcbRemoveListEntry); - } } } KeReleaseGuardedMutex(&ViewLock); @@ -1188,15 +1187,7 @@ if (Bcb->RefCount == 0) { MmFreeSectionSegments(Bcb->FileObject); - if (Bcb->RemoveOnClose) - { CcRosDeleteFileCache(FileObject, Bcb); - } - else - { - Bcb->TimeStamp = CcTimeStamp; - InsertHeadList(&ClosedListHead, &Bcb->BcbRemoveListEntry); - } } } } @@ -1315,60 +1306,6 @@ return NULL; } -VOID NTAPI -CmLazyCloseThreadMain(PVOID Ignored) -{ - LARGE_INTEGER Timeout; - PLIST_ENTRY current_entry; - PBCB current; - ULONG RemoveTimeStamp; - NTSTATUS Status; - - KeQuerySystemTime (&Timeout); - - while (1) - { - Timeout.QuadPart += (LONGLONG)100000000; // 10sec - Status = KeWaitForSingleObject(&LazyCloseThreadEvent, - 0, - KernelMode, - FALSE, - &Timeout); - - DPRINT("LazyCloseThreadMain %d\n", CcTimeStamp); - - if (!NT_SUCCESS(Status)) - { - DbgPrint("LazyCloseThread: Wait failed\n"); - KeBugCheck(CACHE_MANAGER); - break; - } - if (LazyCloseThreadShouldTerminate) - { - DbgPrint("LazyCloseThread: Terminating\n"); - break; - } - - KeAcquireGuardedMutex(&ViewLock); - CcTimeStamp++; - if (CcTimeStamp >= 30) - { - RemoveTimeStamp = CcTimeStamp - 30; /* 5min = 10sec * 30 */ - while (!IsListEmpty(&ClosedListHead)) - { - current_entry = ClosedListHead.Blink; - current = CONTAINING_RECORD(current_entry, BCB, BcbRemoveListEntry); - if (current->TimeStamp >= RemoveTimeStamp) - { - break; - } - CcRosDeleteFileCache(current->FileObject, current); - } - } - KeReleaseGuardedMutex(&ViewLock); - } -} - VOID INIT_FUNCTION NTAPI @@ -1379,8 +1316,6 @@ PVOID Buffer; PHYSICAL_ADDRESS BoundaryAddressMultiple; #endif - NTSTATUS Status; - KPRIORITY Priority; DPRINT("CcInitView()\n"); #ifdef CACHE_BITMAP @@ -1443,25 +1378,6 @@ CcInitCacheZeroPage(); - CcTimeStamp = 0; - LazyCloseThreadShouldTerminate = FALSE; - KeInitializeEvent (&LazyCloseThreadEvent, SynchronizationEvent, FALSE); - Status = PsCreateSystemThread(&LazyCloseThreadHandle, - THREAD_ALL_ACCESS, - NULL, - NULL, - &LazyCloseThreadId, - (PKSTART_ROUTINE)CmLazyCloseThreadMain, - NULL); - if (NT_SUCCESS(Status)) - { - Priority = LOW_REALTIME_PRIORITY; - NtSetInformationThread(LazyCloseThreadHandle, - ThreadPriority, - &Priority, - sizeof(Priority)); - } - } /* EOF */ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_symbols.… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] Wed Feb 18 10:56:42 2009 @@ -684,7 +684,7 @@ ULONG BootPhase) { PCHAR p1, p2; - SHORT Found; + SHORT Found = FALSE; CHAR YesNo; LIST_ENTRY *ModuleEntry; PLDR_DATA_TABLE_ENTRY DataTableEntry; @@ -707,12 +707,6 @@ InitializeListHead(&SymbolFileListHead); KeInitializeSpinLock(&SymbolFileListLock); - -#ifdef DBG - LoadSymbols = TRUE; -#else - LoadSymbols = FALSE; -#endif /* Check the command line for /LOADSYMBOLS, /NOLOADSYMBOLS, * /LOADSYMBOLS={YES|NO}, /NOLOADSYMBOLS={YES|NO} */ Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Wed Feb 18 10:56:42 2009 @@ -68,7 +68,18 @@ /* Set up targets. */ MiMinimumAvailablePages = 64; - MiMemoryConsumers[MC_CACHE].PagesTarget = NrAvailablePages / 2; + if ((NrAvailablePages + NrSystemPages) >= 8192) + { + MiMemoryConsumers[MC_CACHE].PagesTarget = NrAvailablePages / 4 * 3; + } + else if ((NrAvailablePages + NrSystemPages) >= 4096) + { + MiMemoryConsumers[MC_CACHE].PagesTarget = NrAvailablePages / 3 * 2; + } + else + { + MiMemoryConsumers[MC_CACHE].PagesTarget = NrAvailablePages / 8; + } MiMemoryConsumers[MC_USER].PagesTarget = NrAvailablePages - MiMinimumAvailablePages; MiMemoryConsumers[MC_PPOOL].PagesTarget = NrAvailablePages / 2;

16 years, 4 months

[fireball] 39662: - Display memory usage in the installer as Kernel Cache and Kernel Pool, instead of Paged and Nonpaged Pool, which doesn't reveal the source of the memory leak. - Remove 40% memory delay hack. - Patch by Alex Ionescu.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Feb 18 10:35:14 2009 New Revision: 39662 URL: http://svn.reactos.org/svn/reactos?rev=39662&view=rev Log: - Display memory usage in the installer as Kernel Cache and Kernel Pool, instead of Paged and Nonpaged Pool, which doesn't reveal the source of the memory leak. - Remove 40% memory delay hack. - Patch by Alex Ionescu. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Wed Feb 18 10:35:14 2009 @@ -3053,18 +3053,9 @@ } /* Set current values */ - ProgressSetStep(CopyContext->MemoryBars[0], PerfInfo.PagedPoolPages); - ProgressSetStep(CopyContext->MemoryBars[1], PerfInfo.NonPagedPoolPages); + ProgressSetStep(CopyContext->MemoryBars[0], PerfInfo.PagedPoolPages + PerfInfo.NonPagedPoolPages); + ProgressSetStep(CopyContext->MemoryBars[1], PerfInfo.ResidentSystemCachePage); ProgressSetStep(CopyContext->MemoryBars[2], PerfInfo.AvailablePages); - - /* Check if memory dropped below 40%! */ - if (CopyContext->MemoryBars[2]->Percent <= 40) - { - /* Wait a while until Mm does its thing */ - LARGE_INTEGER Interval; - Interval.QuadPart = -1 * 15 * 1000 * 100; - NtDelayExecution(FALSE, &Interval); - } } static UINT CALLBACK @@ -3138,7 +3129,7 @@ 13, 44, FALSE, - "Paged Memory"); + "Kernel Pool"); /* Create the non paged pool progress bar */ CopyContext.MemoryBars[1] = CreateProgressBar((xScreen / 2)- (mem_bar_width / 2), @@ -3148,7 +3139,7 @@ (xScreen / 2)- (mem_bar_width / 2), 44, FALSE, - "Nonpaged Memory"); + "Kernel Cache"); /* Create the global memory progress bar */ CopyContext.MemoryBars[2] = CreateProgressBar(xScreen - 13 - mem_bar_width,

16 years, 4 months

[dchapyshev] 39661: - Formatting fix. No code changes

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Feb 18 10:34:10 2009 New Revision: 39661 URL: http://svn.reactos.org/svn/reactos?rev=39661&view=rev Log: - Formatting fix. No code changes Modified: trunk/reactos/dll/win32/userenv/profile.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] Wed Feb 18 10:34:10 2009 @@ -33,76 +33,76 @@ /* FUNCTIONS ***************************************************************/ BOOL -AppendSystemPostfix (LPWSTR lpName, - DWORD dwMaxLength) -{ - WCHAR szSystemRoot[MAX_PATH]; - LPWSTR lpszPostfix; - LPWSTR lpszPtr; - - /* Build profile name postfix */ - if (!ExpandEnvironmentStringsW (L"%SystemRoot%", - szSystemRoot, - MAX_PATH)) - { - DPRINT1("Error: %lu\n", GetLastError()); - return FALSE; - } - - _wcsupr (szSystemRoot); - - /* Get name postfix */ - szSystemRoot[2] = L'.'; - lpszPostfix = &szSystemRoot[2]; - lpszPtr = lpszPostfix; - while (*lpszPtr != (WCHAR)0) - { - if (*lpszPtr == L'\\') - *lpszPtr = '_'; - lpszPtr++; - } - - if (wcslen(lpName) + wcslen(lpszPostfix) + 1 >= dwMaxLength) - { - DPRINT1("Error: buffer overflow\n"); - SetLastError(ERROR_BUFFER_OVERFLOW); - return FALSE; - } - - wcscat(lpName, lpszPostfix); - - return TRUE; -} - - -BOOL WINAPI -CreateUserProfileA (PSID Sid, - LPCSTR lpUserName) -{ - UNICODE_STRING UserName; - BOOL bResult; - NTSTATUS Status; - - Status = RtlCreateUnicodeStringFromAsciiz (&UserName, - (LPSTR)lpUserName); - if (!NT_SUCCESS(Status)) - { - SetLastError (RtlNtStatusToDosError (Status)); - return FALSE; - } - - bResult = CreateUserProfileW (Sid, - UserName.Buffer); - - RtlFreeUnicodeString (&UserName); - - return bResult; -} - - -static BOOL -AcquireRemoveRestorePrivilege( - IN BOOL bAcquire) +AppendSystemPostfix(LPWSTR lpName, + DWORD dwMaxLength) +{ + WCHAR szSystemRoot[MAX_PATH]; + LPWSTR lpszPostfix; + LPWSTR lpszPtr; + + /* Build profile name postfix */ + if (!ExpandEnvironmentStringsW(L"%SystemRoot%", + szSystemRoot, + MAX_PATH)) + { + DPRINT1("Error: %lu\n", GetLastError()); + return FALSE; + } + + _wcsupr(szSystemRoot); + + /* Get name postfix */ + szSystemRoot[2] = L'.'; + lpszPostfix = &szSystemRoot[2]; + lpszPtr = lpszPostfix; + while (*lpszPtr != (WCHAR)0) + { + if (*lpszPtr == L'\\') + *lpszPtr = '_'; + lpszPtr++; + } + + if (wcslen(lpName) + wcslen(lpszPostfix) + 1 >= dwMaxLength) + { + DPRINT1("Error: buffer overflow\n"); + SetLastError(ERROR_BUFFER_OVERFLOW); + return FALSE; + } + + wcscat(lpName, lpszPostfix); + + return TRUE; +} + + +BOOL +WINAPI +CreateUserProfileA(PSID Sid, + LPCSTR lpUserName) +{ + UNICODE_STRING UserName; + BOOL bResult; + NTSTATUS Status; + + Status = RtlCreateUnicodeStringFromAsciiz(&UserName, + (LPSTR)lpUserName); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + bResult = CreateUserProfileW(Sid, UserName.Buffer); + + RtlFreeUnicodeString(&UserName); + + return bResult; +} + + +static +BOOL +AcquireRemoveRestorePrivilege(IN BOOL bAcquire) { HANDLE Process; HANDLE Token; @@ -161,751 +161,760 @@ } -BOOL WINAPI -CreateUserProfileW (PSID Sid, - LPCWSTR lpUserName) -{ - WCHAR szRawProfilesPath[MAX_PATH]; - WCHAR szProfilesPath[MAX_PATH]; - WCHAR szUserProfilePath[MAX_PATH]; - WCHAR szDefaultUserPath[MAX_PATH]; - WCHAR szBuffer[MAX_PATH]; - LPWSTR SidString; - DWORD dwLength; - DWORD dwDisposition; - HKEY hKey; - LONG Error; - - DPRINT("CreateUserProfileW() called\n"); - - Error = RegOpenKeyExW (HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", - 0, - KEY_QUERY_VALUE, - &hKey); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - SetLastError((DWORD)Error); - return FALSE; - } - - /* Get profiles path */ - dwLength = MAX_PATH * sizeof(WCHAR); - Error = RegQueryValueExW (hKey, - L"ProfilesDirectory", - NULL, - NULL, - (LPBYTE)szRawProfilesPath, - &dwLength); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - RegCloseKey (hKey); - SetLastError((DWORD)Error); - return FALSE; - } - - /* Expand it */ - if (!ExpandEnvironmentStringsW (szRawProfilesPath, - szProfilesPath, - MAX_PATH)) - { - DPRINT1("Error: %lu\n", GetLastError()); - RegCloseKey (hKey); - return FALSE; - } - - /* create the profiles directory if it does not yet exist */ - if (!CreateDirectoryW(szProfilesPath, NULL)) - { - if (GetLastError () != ERROR_ALREADY_EXISTS) - { +BOOL +WINAPI +CreateUserProfileW(PSID Sid, + LPCWSTR lpUserName) +{ + WCHAR szRawProfilesPath[MAX_PATH]; + WCHAR szProfilesPath[MAX_PATH]; + WCHAR szUserProfilePath[MAX_PATH]; + WCHAR szDefaultUserPath[MAX_PATH]; + WCHAR szBuffer[MAX_PATH]; + LPWSTR SidString; + DWORD dwLength; + DWORD dwDisposition; + HKEY hKey; + LONG Error; + + DPRINT("CreateUserProfileW() called\n"); + + Error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", + 0, + KEY_QUERY_VALUE, + &hKey); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + SetLastError((DWORD)Error); + return FALSE; + } + + /* Get profiles path */ + dwLength = MAX_PATH * sizeof(WCHAR); + Error = RegQueryValueExW(hKey, + L"ProfilesDirectory", + NULL, + NULL, + (LPBYTE)szRawProfilesPath, + &dwLength); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + RegCloseKey(hKey); + SetLastError((DWORD)Error); + return FALSE; + } + + /* Expand it */ + if (!ExpandEnvironmentStringsW(szRawProfilesPath, + szProfilesPath, + MAX_PATH)) + { DPRINT1("Error: %lu\n", GetLastError()); - return FALSE; - } - } - - /* Get default user path */ - dwLength = MAX_PATH * sizeof(WCHAR); - Error = RegQueryValueExW (hKey, - L"DefaultUserProfile", - NULL, - NULL, - (LPBYTE)szBuffer, - &dwLength); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - RegCloseKey (hKey); - SetLastError((DWORD)Error); - return FALSE; - } - - RegCloseKey (hKey); - - wcscpy (szUserProfilePath, szProfilesPath); - wcscat (szUserProfilePath, L"\\"); - wcscat (szUserProfilePath, lpUserName); - if (!AppendSystemPostfix (szUserProfilePath, MAX_PATH)) - { - DPRINT1("AppendSystemPostfix() failed\n", GetLastError()); - return FALSE; - } - - wcscpy (szDefaultUserPath, szProfilesPath); - wcscat (szDefaultUserPath, L"\\"); - wcscat (szDefaultUserPath, szBuffer); - - /* Create user profile directory */ - if (!CreateDirectoryW (szUserProfilePath, NULL)) - { - if (GetLastError () != ERROR_ALREADY_EXISTS) - { - DPRINT1("Error: %lu\n", GetLastError()); - return FALSE; - } - } - - /* Copy default user directory */ - if (!CopyDirectory (szUserProfilePath, szDefaultUserPath)) - { - DPRINT1("Error: %lu\n", GetLastError()); - return FALSE; - } - - /* Add profile to profile list */ - if (!ConvertSidToStringSidW (Sid, - &SidString)) - { - DPRINT1("Error: %lu\n", GetLastError()); - return FALSE; - } - - wcscpy (szBuffer, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList\\"); - wcscat (szBuffer, SidString); - - /* Create user profile key */ - Error = RegCreateKeyExW (HKEY_LOCAL_MACHINE, - szBuffer, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hKey, - &dwDisposition); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - LocalFree ((HLOCAL)SidString); - SetLastError((DWORD)Error); - return FALSE; - } - - /* 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; - } - - /* Set 'ProfileImagePath' value (non-expanded) */ - Error = RegSetValueExW (hKey, - L"ProfileImagePath", - 0, - REG_EXPAND_SZ, - (LPBYTE)szBuffer, - (wcslen (szBuffer) + 1) * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - LocalFree ((HLOCAL)SidString); - RegCloseKey (hKey); - SetLastError((DWORD)Error); - return FALSE; - } - - /* Set 'Sid' value */ - Error = RegSetValueExW (hKey, - L"Sid", - 0, - REG_BINARY, - Sid, - GetLengthSid (Sid)); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - LocalFree ((HLOCAL)SidString); - RegCloseKey (hKey); - SetLastError((DWORD)Error); - return FALSE; - } - - RegCloseKey (hKey); - - /* Create user hive name */ - wcscpy (szBuffer, szUserProfilePath); - wcscat (szBuffer, L"\\ntuser.dat"); - - /* Acquire restore privilege */ - if (!AcquireRemoveRestorePrivilege(TRUE)) - { - DPRINT1("Error: %lu\n", Error); - LocalFree ((HLOCAL)SidString); - return FALSE; - } - - /* Create new user hive */ - Error = RegLoadKeyW (HKEY_USERS, - SidString, - szBuffer); - AcquireRemoveRestorePrivilege(FALSE); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - LocalFree ((HLOCAL)SidString); - SetLastError((DWORD)Error); - return FALSE; - } - - /* Initialize user hive */ - if (!CreateUserHive (SidString, szUserProfilePath)) - { - DPRINT1("Error: %lu\n", GetLastError()); - LocalFree ((HLOCAL)SidString); - return FALSE; - } - - RegUnLoadKeyW (HKEY_USERS, - SidString); - - LocalFree ((HLOCAL)SidString); - - DPRINT("CreateUserProfileW() done\n"); - - return TRUE; -} - - -BOOL WINAPI -GetAllUsersProfileDirectoryA (LPSTR lpProfileDir, - LPDWORD lpcchSize) -{ - LPWSTR lpBuffer; - BOOL bResult; - - lpBuffer = GlobalAlloc (GMEM_FIXED, - *lpcchSize * sizeof(WCHAR)); - if (lpBuffer == NULL) + RegCloseKey(hKey); + return FALSE; + } + + /* create the profiles directory if it does not yet exist */ + if (!CreateDirectoryW(szProfilesPath, NULL)) + { + if (GetLastError() != ERROR_ALREADY_EXISTS) + { + DPRINT1("Error: %lu\n", GetLastError()); + return FALSE; + } + } + + /* Get default user path */ + dwLength = MAX_PATH * sizeof(WCHAR); + Error = RegQueryValueExW(hKey, + L"DefaultUserProfile", + NULL, + NULL, + (LPBYTE)szBuffer, + &dwLength); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + RegCloseKey(hKey); + SetLastError((DWORD)Error); + return FALSE; + } + + RegCloseKey (hKey); + + wcscpy(szUserProfilePath, szProfilesPath); + wcscat(szUserProfilePath, L"\\"); + wcscat(szUserProfilePath, lpUserName); + if (!AppendSystemPostfix(szUserProfilePath, MAX_PATH)) + { + DPRINT1("AppendSystemPostfix() failed\n", GetLastError()); + return FALSE; + } + + wcscpy(szDefaultUserPath, szProfilesPath); + wcscat(szDefaultUserPath, L"\\"); + wcscat(szDefaultUserPath, szBuffer); + + /* Create user profile directory */ + if (!CreateDirectoryW(szUserProfilePath, NULL)) + { + if (GetLastError() != ERROR_ALREADY_EXISTS) + { + DPRINT1("Error: %lu\n", GetLastError()); + return FALSE; + } + } + + /* Copy default user directory */ + if (!CopyDirectory(szUserProfilePath, szDefaultUserPath)) + { + DPRINT1("Error: %lu\n", GetLastError()); + return FALSE; + } + + /* Add profile to profile list */ + if (!ConvertSidToStringSidW(Sid, + &SidString)) + { + DPRINT1("Error: %lu\n", GetLastError()); + return FALSE; + } + + wcscpy(szBuffer, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList\\"); + wcscat(szBuffer, SidString); + + /* Create user profile key */ + Error = RegCreateKeyExW(HKEY_LOCAL_MACHINE, + szBuffer, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hKey, + &dwDisposition); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + LocalFree((HLOCAL)SidString); + SetLastError((DWORD)Error); + return FALSE; + } + + /* 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; + } + + /* Set 'ProfileImagePath' value (non-expanded) */ + Error = RegSetValueExW(hKey, + L"ProfileImagePath", + 0, + REG_EXPAND_SZ, + (LPBYTE)szBuffer, + (wcslen (szBuffer) + 1) * sizeof(WCHAR)); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + LocalFree((HLOCAL)SidString); + RegCloseKey(hKey); + SetLastError((DWORD)Error); + return FALSE; + } + + /* Set 'Sid' value */ + Error = RegSetValueExW(hKey, + L"Sid", + 0, + REG_BINARY, + Sid, + GetLengthSid(Sid)); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + LocalFree((HLOCAL)SidString); + RegCloseKey(hKey); + SetLastError((DWORD)Error); + return FALSE; + } + + RegCloseKey (hKey); + + /* Create user hive name */ + wcscpy(szBuffer, szUserProfilePath); + wcscat(szBuffer, L"\\ntuser.dat"); + + /* Acquire restore privilege */ + if (!AcquireRemoveRestorePrivilege(TRUE)) + { + DPRINT1("Error: %lu\n", Error); + LocalFree((HLOCAL)SidString); + return FALSE; + } + + /* Create new user hive */ + Error = RegLoadKeyW(HKEY_USERS, + SidString, + szBuffer); + AcquireRemoveRestorePrivilege(FALSE); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + LocalFree((HLOCAL)SidString); + SetLastError((DWORD)Error); + return FALSE; + } + + /* Initialize user hive */ + if (!CreateUserHive(SidString, szUserProfilePath)) + { + DPRINT1("Error: %lu\n", GetLastError()); + LocalFree((HLOCAL)SidString); + return FALSE; + } + + RegUnLoadKeyW(HKEY_USERS, SidString); + + LocalFree((HLOCAL)SidString); + + DPRINT("CreateUserProfileW() done\n"); + + return TRUE; +} + + +BOOL +WINAPI +GetAllUsersProfileDirectoryA(LPSTR lpProfileDir, + LPDWORD lpcchSize) +{ + LPWSTR lpBuffer; + BOOL bResult; + + lpBuffer = GlobalAlloc(GMEM_FIXED, + *lpcchSize * sizeof(WCHAR)); + if (lpBuffer == NULL) + return FALSE; + + bResult = GetAllUsersProfileDirectoryW(lpBuffer, + lpcchSize); + if (bResult) + { + WideCharToMultiByte(CP_ACP, + 0, + lpBuffer, + -1, + lpProfileDir, + *lpcchSize, + NULL, + NULL); + } + + GlobalFree(lpBuffer); + + return bResult; +} + + +BOOL +WINAPI +GetAllUsersProfileDirectoryW(LPWSTR lpProfileDir, + LPDWORD lpcchSize) +{ + WCHAR szProfilePath[MAX_PATH]; + WCHAR szBuffer[MAX_PATH]; + DWORD dwLength; + HKEY hKey; + LONG Error; + + Error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", + 0, + KEY_QUERY_VALUE, + &hKey); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + SetLastError((DWORD)Error); + return FALSE; + } + + /* Get profiles path */ + dwLength = sizeof(szBuffer); + Error = RegQueryValueExW(hKey, + L"ProfilesDirectory", + NULL, + NULL, + (LPBYTE)szBuffer, + &dwLength); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + RegCloseKey(hKey); + SetLastError((DWORD)Error); + return FALSE; + } + + /* Expand it */ + if (!ExpandEnvironmentStringsW(szBuffer, + szProfilePath, + MAX_PATH)) + { + DPRINT1("Error: %lu\n", GetLastError()); + RegCloseKey (hKey); + return FALSE; + } + + /* Get 'AllUsersProfile' name */ + dwLength = sizeof(szBuffer); + Error = RegQueryValueExW(hKey, + L"AllUsersProfile", + NULL, + NULL, + (LPBYTE)szBuffer, + &dwLength); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + RegCloseKey(hKey); + SetLastError((DWORD)Error); + return FALSE; + } + + RegCloseKey (hKey); + + wcscat(szProfilePath, L"\\"); + wcscat(szProfilePath, szBuffer); + + dwLength = wcslen(szProfilePath) + 1; + if (lpProfileDir != NULL) + { + if (*lpcchSize < dwLength) + { + *lpcchSize = dwLength; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + wcscpy(lpProfileDir, szProfilePath); + } + + *lpcchSize = dwLength; + + return TRUE; +} + + +BOOL +WINAPI +GetDefaultUserProfileDirectoryA(LPSTR lpProfileDir, + LPDWORD lpcchSize) +{ + LPWSTR lpBuffer; + BOOL bResult; + + lpBuffer = GlobalAlloc(GMEM_FIXED, + *lpcchSize * sizeof(WCHAR)); + if (lpBuffer == NULL) + return FALSE; + + bResult = GetDefaultUserProfileDirectoryW(lpBuffer, + lpcchSize); + if (bResult) + { + WideCharToMultiByte(CP_ACP, + 0, + lpBuffer, + -1, + lpProfileDir, + *lpcchSize, + NULL, + NULL); + } + + GlobalFree(lpBuffer); + + return bResult; +} + + +BOOL +WINAPI +GetDefaultUserProfileDirectoryW(LPWSTR lpProfileDir, + LPDWORD lpcchSize) +{ + WCHAR szProfilePath[MAX_PATH]; + WCHAR szBuffer[MAX_PATH]; + DWORD dwLength; + HKEY hKey; + LONG Error; + + Error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", + 0, + KEY_QUERY_VALUE, + &hKey); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + SetLastError((DWORD)Error); + return FALSE; + } + + /* Get profiles path */ + dwLength = sizeof(szBuffer); + Error = RegQueryValueExW(hKey, + L"ProfilesDirectory", + NULL, + NULL, + (LPBYTE)szBuffer, + &dwLength); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + RegCloseKey(hKey); + SetLastError((DWORD)Error); + return FALSE; + } + + /* Expand it */ + if (!ExpandEnvironmentStringsW(szBuffer, + szProfilePath, + MAX_PATH)) + { + DPRINT1("Error: %lu\n", GetLastError()); + RegCloseKey(hKey); + return FALSE; + } + + /* Get 'DefaultUserProfile' name */ + dwLength = sizeof(szBuffer); + Error = RegQueryValueExW(hKey, + L"DefaultUserProfile", + NULL, + NULL, + (LPBYTE)szBuffer, + &dwLength); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + RegCloseKey(hKey); + SetLastError((DWORD)Error); + return FALSE; + } + + RegCloseKey(hKey); + + wcscat(szProfilePath, L"\\"); + wcscat(szProfilePath, szBuffer); + + dwLength = wcslen(szProfilePath) + 1; + if (lpProfileDir != NULL) + { + if (*lpcchSize < dwLength) + { + *lpcchSize = dwLength; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + wcscpy(lpProfileDir, szProfilePath); + } + + *lpcchSize = dwLength; + + return TRUE; +} + + +BOOL +WINAPI +GetProfilesDirectoryA(LPSTR lpProfileDir, + LPDWORD lpcchSize) +{ + LPWSTR lpBuffer; + BOOL bResult; + + lpBuffer = GlobalAlloc(GMEM_FIXED, + *lpcchSize * sizeof(WCHAR)); + if (lpBuffer == NULL) + return FALSE; + + bResult = GetProfilesDirectoryW(lpBuffer, + lpcchSize); + if (bResult) + { + WideCharToMultiByte(CP_ACP, + 0, + lpBuffer, + -1, + lpProfileDir, + *lpcchSize, + NULL, + NULL); + } + + GlobalFree(lpBuffer); + + return bResult; +} + + +BOOL +WINAPI +GetProfilesDirectoryW(LPWSTR lpProfilesDir, + LPDWORD lpcchSize) +{ + WCHAR szProfilesPath[MAX_PATH]; + WCHAR szBuffer[MAX_PATH]; + DWORD dwLength; + HKEY hKey; + LONG Error; + + Error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", + 0, + KEY_QUERY_VALUE, + &hKey); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + SetLastError((DWORD)Error); + return FALSE; + } + + /* Get profiles path */ + dwLength = sizeof(szBuffer); + Error = RegQueryValueExW(hKey, + L"ProfilesDirectory", + NULL, + NULL, + (LPBYTE)szBuffer, + &dwLength); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + RegCloseKey(hKey); + SetLastError((DWORD)Error); + return FALSE; + } + + RegCloseKey(hKey); + + /* Expand it */ + if (!ExpandEnvironmentStringsW(szBuffer, + szProfilesPath, + MAX_PATH)) + { + DPRINT1("Error: %lu\n", GetLastError()); + return FALSE; + } + + dwLength = wcslen (szProfilesPath) + 1; + if (lpProfilesDir != NULL) + { + if (*lpcchSize < dwLength) + { + *lpcchSize = dwLength; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + wcscpy(lpProfilesDir, szProfilesPath); + } + + *lpcchSize = dwLength; + + return TRUE; +} + + +BOOL +WINAPI +GetUserProfileDirectoryA(HANDLE hToken, + LPSTR lpProfileDir, + LPDWORD lpcchSize) +{ + LPWSTR lpBuffer; + BOOL bResult; + + lpBuffer = GlobalAlloc(GMEM_FIXED, + *lpcchSize * sizeof(WCHAR)); + if (lpBuffer == NULL) + return FALSE; + + bResult = GetUserProfileDirectoryW(hToken, + lpBuffer, + lpcchSize); + if (bResult) + { + WideCharToMultiByte(CP_ACP, + 0, + lpBuffer, + -1, + lpProfileDir, + *lpcchSize, + NULL, + NULL); + } + + GlobalFree(lpBuffer); + + return bResult; +} + + +BOOL +WINAPI +GetUserProfileDirectoryW(HANDLE hToken, + LPWSTR lpProfileDir, + LPDWORD lpcchSize) +{ + UNICODE_STRING SidString; + WCHAR szKeyName[MAX_PATH]; + WCHAR szRawImagePath[MAX_PATH]; + WCHAR szImagePath[MAX_PATH]; + DWORD dwLength; + HKEY hKey; + LONG Error; + + if (!GetUserSidFromToken(hToken, + &SidString)) + { + DPRINT1("GetUserSidFromToken() failed\n"); + return FALSE; + } + + DPRINT("SidString: '%wZ'\n", &SidString); + + wcscpy(szKeyName, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList\\"); + wcscat(szKeyName, + SidString.Buffer); + + RtlFreeUnicodeString(&SidString); + + DPRINT("KeyName: '%S'\n", szKeyName); + + Error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + szKeyName, + 0, + KEY_QUERY_VALUE, + &hKey); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + SetLastError((DWORD)Error); + return FALSE; + } + + dwLength = sizeof(szRawImagePath); + Error = RegQueryValueExW(hKey, + L"ProfileImagePath", + NULL, + NULL, + (LPBYTE)szRawImagePath, + &dwLength); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + RegCloseKey(hKey); + SetLastError((DWORD)Error); + return FALSE; + } + + RegCloseKey(hKey); + + DPRINT("RawImagePath: '%S'\n", szRawImagePath); + + /* Expand it */ + if (!ExpandEnvironmentStringsW(szRawImagePath, + szImagePath, + MAX_PATH)) + { + DPRINT1 ("Error: %lu\n", GetLastError()); + return FALSE; + } + + DPRINT("ImagePath: '%S'\n", szImagePath); + + dwLength = wcslen (szImagePath) + 1; + if (*lpcchSize < dwLength) + { + *lpcchSize = dwLength; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + *lpcchSize = dwLength; + wcscpy(lpProfileDir, szImagePath); + + return TRUE; +} + + +static +BOOL +CheckForLoadedProfile(HANDLE hToken) +{ + UNICODE_STRING SidString; + HKEY hKey; + + DPRINT("CheckForLoadedProfile() called\n"); + + if (!GetUserSidFromToken(hToken, + &SidString)) + { + DPRINT1("GetUserSidFromToken() failed\n"); + return FALSE; + } + + if (RegOpenKeyExW(HKEY_USERS, + SidString.Buffer, + 0, + MAXIMUM_ALLOWED, + &hKey)) + { + DPRINT("Profile not loaded\n"); + RtlFreeUnicodeString(&SidString); + return FALSE; + } + + RegCloseKey(hKey); + + RtlFreeUnicodeString(&SidString); + + DPRINT("Profile already loaded\n"); + + return TRUE; +} + + +BOOL +WINAPI +LoadUserProfileA(HANDLE hToken, + LPPROFILEINFOA lpProfileInfo) +{ + DPRINT ("LoadUserProfileA() not implemented\n"); return FALSE; - - bResult = GetAllUsersProfileDirectoryW (lpBuffer, - lpcchSize); - if (bResult) - { - WideCharToMultiByte (CP_ACP, - 0, - lpBuffer, - -1, - lpProfileDir, - *lpcchSize, - NULL, - NULL); - } - - GlobalFree (lpBuffer); - - return bResult; -} - - -BOOL WINAPI -GetAllUsersProfileDirectoryW (LPWSTR lpProfileDir, - LPDWORD lpcchSize) -{ - WCHAR szProfilePath[MAX_PATH]; - WCHAR szBuffer[MAX_PATH]; - DWORD dwLength; - HKEY hKey; - LONG Error; - - Error = RegOpenKeyExW (HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", - 0, - KEY_QUERY_VALUE, - &hKey); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - SetLastError((DWORD)Error); - return FALSE; - } - - /* Get profiles path */ - dwLength = sizeof(szBuffer); - Error = RegQueryValueExW (hKey, - L"ProfilesDirectory", - NULL, - NULL, - (LPBYTE)szBuffer, - &dwLength); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - RegCloseKey (hKey); - SetLastError((DWORD)Error); - return FALSE; - } - - /* Expand it */ - if (!ExpandEnvironmentStringsW (szBuffer, - szProfilePath, - MAX_PATH)) - { - DPRINT1("Error: %lu\n", GetLastError()); - RegCloseKey (hKey); - return FALSE; - } - - /* Get 'AllUsersProfile' name */ - dwLength = sizeof(szBuffer); - Error = RegQueryValueExW (hKey, - L"AllUsersProfile", - NULL, - NULL, - (LPBYTE)szBuffer, - &dwLength); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - RegCloseKey (hKey); - SetLastError((DWORD)Error); - return FALSE; - } - - RegCloseKey (hKey); - - wcscat (szProfilePath, L"\\"); - wcscat (szProfilePath, szBuffer); - - dwLength = wcslen (szProfilePath) + 1; - if (lpProfileDir != NULL) - { - if (*lpcchSize < dwLength) - { - *lpcchSize = dwLength; - SetLastError (ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - - wcscpy (lpProfileDir, szProfilePath); - } - - *lpcchSize = dwLength; - - return TRUE; -} - - -BOOL WINAPI -GetDefaultUserProfileDirectoryA (LPSTR lpProfileDir, - LPDWORD lpcchSize) -{ - LPWSTR lpBuffer; - BOOL bResult; - - lpBuffer = GlobalAlloc (GMEM_FIXED, - *lpcchSize * sizeof(WCHAR)); - if (lpBuffer == NULL) - return FALSE; - - bResult = GetDefaultUserProfileDirectoryW (lpBuffer, - lpcchSize); - if (bResult) - { - WideCharToMultiByte (CP_ACP, - 0, - lpBuffer, - -1, - lpProfileDir, - *lpcchSize, - NULL, - NULL); - } - - GlobalFree (lpBuffer); - - return bResult; -} - - -BOOL WINAPI -GetDefaultUserProfileDirectoryW (LPWSTR lpProfileDir, - LPDWORD lpcchSize) -{ - WCHAR szProfilePath[MAX_PATH]; - WCHAR szBuffer[MAX_PATH]; - DWORD dwLength; - HKEY hKey; - LONG Error; - - Error = RegOpenKeyExW (HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", - 0, - KEY_QUERY_VALUE, - &hKey); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - SetLastError((DWORD)Error); - return FALSE; - } - - /* Get profiles path */ - dwLength = sizeof(szBuffer); - Error = RegQueryValueExW (hKey, - L"ProfilesDirectory", - NULL, - NULL, - (LPBYTE)szBuffer, - &dwLength); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - RegCloseKey (hKey); - SetLastError((DWORD)Error); - return FALSE; - } - - /* Expand it */ - if (!ExpandEnvironmentStringsW (szBuffer, - szProfilePath, - MAX_PATH)) - { - DPRINT1("Error: %lu\n", GetLastError()); - RegCloseKey (hKey); - return FALSE; - } - - /* Get 'DefaultUserProfile' name */ - dwLength = sizeof(szBuffer); - Error = RegQueryValueExW (hKey, - L"DefaultUserProfile", - NULL, - NULL, - (LPBYTE)szBuffer, - &dwLength); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - RegCloseKey (hKey); - SetLastError((DWORD)Error); - return FALSE; - } - - RegCloseKey (hKey); - - wcscat (szProfilePath, L"\\"); - wcscat (szProfilePath, szBuffer); - - dwLength = wcslen (szProfilePath) + 1; - if (lpProfileDir != NULL) - { - if (*lpcchSize < dwLength) - { - *lpcchSize = dwLength; - SetLastError (ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - - wcscpy (lpProfileDir, szProfilePath); - } - - *lpcchSize = dwLength; - - return TRUE; -} - - -BOOL WINAPI -GetProfilesDirectoryA (LPSTR lpProfileDir, - LPDWORD lpcchSize) -{ - LPWSTR lpBuffer; - BOOL bResult; - - lpBuffer = GlobalAlloc (GMEM_FIXED, - *lpcchSize * sizeof(WCHAR)); - if (lpBuffer == NULL) - return FALSE; - - bResult = GetProfilesDirectoryW (lpBuffer, - lpcchSize); - if (bResult) - { - WideCharToMultiByte (CP_ACP, - 0, - lpBuffer, - -1, - lpProfileDir, - *lpcchSize, - NULL, - NULL); - } - - GlobalFree (lpBuffer); - - return bResult; -} - - -BOOL WINAPI -GetProfilesDirectoryW (LPWSTR lpProfilesDir, - LPDWORD lpcchSize) -{ - WCHAR szProfilesPath[MAX_PATH]; - WCHAR szBuffer[MAX_PATH]; - DWORD dwLength; - HKEY hKey; - LONG Error; - - Error = RegOpenKeyExW (HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", - 0, - KEY_QUERY_VALUE, - &hKey); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - SetLastError((DWORD)Error); - return FALSE; - } - - /* Get profiles path */ - dwLength = sizeof(szBuffer); - Error = RegQueryValueExW (hKey, - L"ProfilesDirectory", - NULL, - NULL, - (LPBYTE)szBuffer, - &dwLength); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - RegCloseKey (hKey); - SetLastError((DWORD)Error); - return FALSE; - } - - RegCloseKey (hKey); - - /* Expand it */ - if (!ExpandEnvironmentStringsW (szBuffer, - szProfilesPath, - MAX_PATH)) - { - DPRINT1("Error: %lu\n", GetLastError()); - return FALSE; - } - - dwLength = wcslen (szProfilesPath) + 1; - if (lpProfilesDir != NULL) - { - if (*lpcchSize < dwLength) - { - *lpcchSize = dwLength; - SetLastError (ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - - wcscpy (lpProfilesDir, szProfilesPath); - } - - *lpcchSize = dwLength; - - return TRUE; -} - - -BOOL WINAPI -GetUserProfileDirectoryA (HANDLE hToken, - LPSTR lpProfileDir, - LPDWORD lpcchSize) -{ - LPWSTR lpBuffer; - BOOL bResult; - - lpBuffer = GlobalAlloc (GMEM_FIXED, - *lpcchSize * sizeof(WCHAR)); - if (lpBuffer == NULL) - return FALSE; - - bResult = GetUserProfileDirectoryW (hToken, - lpBuffer, - lpcchSize); - if (bResult) - { - WideCharToMultiByte (CP_ACP, - 0, - lpBuffer, - -1, - lpProfileDir, - *lpcchSize, - NULL, - NULL); - } - - GlobalFree (lpBuffer); - - return bResult; -} - - -BOOL WINAPI -GetUserProfileDirectoryW (HANDLE hToken, - LPWSTR lpProfileDir, - LPDWORD lpcchSize) -{ - UNICODE_STRING SidString; - WCHAR szKeyName[MAX_PATH]; - WCHAR szRawImagePath[MAX_PATH]; - WCHAR szImagePath[MAX_PATH]; - DWORD dwLength; - HKEY hKey; - LONG Error; - - if (!GetUserSidFromToken (hToken, - &SidString)) - { - DPRINT1 ("GetUserSidFromToken() failed\n"); - return FALSE; - } - - DPRINT ("SidString: '%wZ'\n", &SidString); - - wcscpy (szKeyName, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList\\"); - wcscat (szKeyName, - SidString.Buffer); - - RtlFreeUnicodeString (&SidString); - - DPRINT ("KeyName: '%S'\n", szKeyName); - - Error = RegOpenKeyExW (HKEY_LOCAL_MACHINE, - szKeyName, - 0, - KEY_QUERY_VALUE, - &hKey); - if (Error != ERROR_SUCCESS) - { - DPRINT1 ("Error: %lu\n", Error); - SetLastError((DWORD)Error); - return FALSE; - } - - dwLength = sizeof(szRawImagePath); - Error = RegQueryValueExW (hKey, - L"ProfileImagePath", - NULL, - NULL, - (LPBYTE)szRawImagePath, - &dwLength); - if (Error != ERROR_SUCCESS) - { - DPRINT1 ("Error: %lu\n", Error); - RegCloseKey (hKey); - SetLastError((DWORD)Error); - return FALSE; - } - - RegCloseKey (hKey); - - DPRINT ("RawImagePath: '%S'\n", szRawImagePath); - - /* Expand it */ - if (!ExpandEnvironmentStringsW (szRawImagePath, - szImagePath, - MAX_PATH)) - { - DPRINT1 ("Error: %lu\n", GetLastError()); - return FALSE; - } - - DPRINT ("ImagePath: '%S'\n", szImagePath); - - dwLength = wcslen (szImagePath) + 1; - if (*lpcchSize < dwLength) - { - *lpcchSize = dwLength; - SetLastError (ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - - *lpcchSize = dwLength; - wcscpy (lpProfileDir, - szImagePath); - - return TRUE; -} - - -static BOOL -CheckForLoadedProfile (HANDLE hToken) -{ - UNICODE_STRING SidString; - HKEY hKey; - - DPRINT ("CheckForLoadedProfile() called \n"); - - if (!GetUserSidFromToken (hToken, - &SidString)) - { - DPRINT1 ("GetUserSidFromToken() failed\n"); - return FALSE; - } - - if (RegOpenKeyExW (HKEY_USERS, - SidString.Buffer, - 0, - MAXIMUM_ALLOWED, - &hKey)) - { - DPRINT ("Profile not loaded\n"); - RtlFreeUnicodeString (&SidString); - return FALSE; - } - - RegCloseKey (hKey); - - RtlFreeUnicodeString (&SidString); - - DPRINT ("Profile already loaded\n"); - - return TRUE; -} - - -BOOL WINAPI -LoadUserProfileA (HANDLE hToken, - LPPROFILEINFOA lpProfileInfo) -{ - DPRINT ("LoadUserProfileA() not implemented\n"); - return FALSE; -} - - -BOOL WINAPI -LoadUserProfileW( - IN HANDLE hToken, - IN OUT LPPROFILEINFOW lpProfileInfo) +} + + +BOOL +WINAPI +LoadUserProfileW(IN HANDLE hToken, + IN OUT LPPROFILEINFOW lpProfileInfo) { WCHAR szUserHivePath[MAX_PATH]; LPWSTR UserName = NULL, Domain = NULL; @@ -920,10 +929,8 @@ DPRINT("LoadUserProfileW() called\n"); /* Check profile info */ - if (!lpProfileInfo - || lpProfileInfo->dwSize != sizeof(PROFILEINFOW) - || lpProfileInfo->lpUserName == NULL - || lpProfileInfo->lpUserName[0] == 0) + if (!lpProfileInfo || (lpProfileInfo->dwSize != sizeof(PROFILEINFOW)) || + (lpProfileInfo->lpUserName == NULL) || (lpProfileInfo->lpUserName[0] == 0)) { SetLastError(ERROR_INVALID_PARAMETER); return TRUE; @@ -968,22 +975,24 @@ if (GetFileAttributesW(szUserHivePath) == INVALID_FILE_ATTRIBUTES) { /* Get user sid */ - if (GetTokenInformation(hToken, TokenUser, NULL, 0, &dwLength) - || GetLastError() != ERROR_INSUFFICIENT_BUFFER) + if (GetTokenInformation(hToken, TokenUser, NULL, 0, &dwLength) || + GetLastError() != ERROR_INSUFFICIENT_BUFFER) { DPRINT1 ("GetTokenInformation() failed\n"); return FALSE; } + UserSid = (PTOKEN_USER)HeapAlloc(GetProcessHeap(), 0, dwLength); if (!UserSid) { - DPRINT1 ("HeapAlloc() failed\n"); + DPRINT1("HeapAlloc() failed\n"); SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto cleanup; } + if (!GetTokenInformation(hToken, TokenUser, UserSid, dwLength, &dwLength)) { - DPRINT1 ("GetTokenInformation() failed\n"); + DPRINT1("GetTokenInformation() failed\n"); goto cleanup; } @@ -1012,11 +1021,13 @@ goto cleanup; } } - ret = LookupAccountSidW( - NULL, UserSid->User.Sid, - UserName, &UserNameLength, - Domain, &DomainLength, - &AccountType); + ret = LookupAccountSidW(NULL, + UserSid->User.Sid, + UserName, + &UserNameLength, + Domain, + &DomainLength, + &AccountType); } while (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER); if (!ret) @@ -1090,51 +1101,53 @@ } -BOOL WINAPI -UnloadUserProfile (HANDLE hToken, - HANDLE hProfile) -{ - UNICODE_STRING SidString; - LONG Error; - - DPRINT ("UnloadUserProfile() called\n"); - - if (hProfile == NULL) - { - DPRINT1 ("Invalide profile handle\n"); - SetLastError (ERROR_INVALID_PARAMETER); - return FALSE; - } - - RegCloseKey (hProfile); - - if (!GetUserSidFromToken (hToken, - &SidString)) - { - DPRINT1 ("GetUserSidFromToken() failed\n"); - return FALSE; - } - - DPRINT ("SidString: '%wZ'\n", &SidString); - - Error = RegUnLoadKeyW (HKEY_USERS, - SidString.Buffer); - if (Error != ERROR_SUCCESS) - { - DPRINT1 ("RegUnLoadKeyW() failed (Error %ld)\n", Error); - RtlFreeUnicodeString (&SidString); - SetLastError((DWORD)Error); - return FALSE; - } - - RtlFreeUnicodeString (&SidString); - - DPRINT ("UnloadUserProfile() done\n"); - - return TRUE; -} - -BOOL WINAPI +BOOL +WINAPI +UnloadUserProfile(HANDLE hToken, + HANDLE hProfile) +{ + UNICODE_STRING SidString; + LONG Error; + + DPRINT("UnloadUserProfile() called\n"); + + if (hProfile == NULL) + { + DPRINT1("Invalide profile handle\n"); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + RegCloseKey(hProfile); + + if (!GetUserSidFromToken(hToken, + &SidString)) + { + DPRINT1("GetUserSidFromToken() failed\n"); + return FALSE; + } + + DPRINT("SidString: '%wZ'\n", &SidString); + + Error = RegUnLoadKeyW(HKEY_USERS, + SidString.Buffer); + if (Error != ERROR_SUCCESS) + { + DPRINT1("RegUnLoadKeyW() failed (Error %ld)\n", Error); + RtlFreeUnicodeString(&SidString); + SetLastError((DWORD)Error); + return FALSE; + } + + RtlFreeUnicodeString(&SidString); + + DPRINT("UnloadUserProfile() done\n"); + + return TRUE; +} + +BOOL +WINAPI DeleteProfileW(LPCWSTR lpSidString, LPCWSTR lpProfilePath, LPCWSTR lpComputerName) @@ -1143,7 +1156,8 @@ return FALSE; } -BOOL WINAPI +BOOL +WINAPI DeleteProfileA(LPCSTR lpSidString, LPCSTR lpProfilePath, LPCSTR lpComputerName)

16 years, 4 months

[mkupfer] 39660: - use current appearance settings for drawing the color button

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Wed Feb 18 10:28:00 2009 New Revision: 39660 URL: http://svn.reactos.org/svn/reactos?rev=39660&view=rev Log: - use current appearance settings for drawing the color button Modified: trunk/reactos/dll/cpl/desk/advappdlg.c Modified: trunk/reactos/dll/cpl/desk/advappdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advappdlg.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/advappdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/advappdlg.c [iso-8859-1] Wed Feb 18 10:28:00 2009 @@ -92,7 +92,7 @@ rect.top = 0; rect.right = 36; rect.bottom = 15; - hbrush = CreateSolidBrush(g->crCOLOR_BTNFACE); + hbrush = CreateSolidBrush(GetSysColor(COLOR_BTNFACE)); FillRect(hdcCompat, &rect, hbrush); DeleteObject(hbrush); @@ -101,12 +101,12 @@ rect.top = 1; rect.right = 23; rect.bottom = 14; - hbrush = CreateSolidBrush(g->crCOLOR_BTNTEXT); + hbrush = CreateSolidBrush(GetSysColor(COLOR_BTNTEXT)); FillRect(hdcCompat, &rect, hbrush); DeleteObject(hbrush); /* Draw left side of line */ - hPen = CreatePen(PS_SOLID, 1, g->crCOLOR_BTNSHADOW); + hPen = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_BTNSHADOW)); SelectObject(hdcCompat, hPen); MoveToEx(hdcCompat, 26, 1, NULL); LineTo(hdcCompat, 26, 14); @@ -114,7 +114,7 @@ DeleteObject(hPen); /* Draw right side of line */ - hPen = CreatePen(PS_SOLID, 1, g->crCOLOR_BTNHIGHLIGHT); + hPen = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_BTNHIGHLIGHT)); SelectObject(hdcCompat,hPen); MoveToEx(hdcCompat, 27, 1, NULL); LineTo(hdcCompat, 27, 14); @@ -122,8 +122,8 @@ DeleteObject(hPen); /* Draw triangle */ - hPen = CreatePen(PS_SOLID, 1, g->crCOLOR_BTNTEXT); - hbrush = CreateSolidBrush(g->crCOLOR_BTNTEXT); + hPen = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_BTNTEXT)); + hbrush = CreateSolidBrush(GetSysColor(COLOR_BTNTEXT)); SelectObject(hdcCompat, hPen); SelectObject(hdcCompat, hbrush); SetPolyFillMode(hdcCompat, WINDING);

16 years, 4 months

[sginsberg] 39659: - Fix freeldr release build breakage from 39638 by correcting non-debug DPRINTM, and wrap some debug code inside a DBG to silence a 'unused variable' warning

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Wed Feb 18 09:15:37 2009 New Revision: 39659 URL: http://svn.reactos.org/svn/reactos?rev=39659&view=rev Log: - Fix freeldr release build breakage from 39638 by correcting non-debug DPRINTM, and wrap some debug code inside a DBG to silence a 'unused variable' warning Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c trunk/reactos/boot/freeldr/freeldr/include/debug.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c [iso-8859-1] Wed Feb 18 09:15:37 2009 @@ -163,6 +163,7 @@ memcpy(Buffer, Ptr, BufferSize); +#ifdef DBG DPRINTM(DPRINT_DISK, "size of buffer: %x\n", Ptr[0]); DPRINTM(DPRINT_DISK, "information flags: %x\n", Ptr[1]); DPRINTM(DPRINT_DISK, "number of physical cylinders on drive: %u\n", *(PULONG)&Ptr[2]); @@ -192,6 +193,7 @@ { DPRINTM(DPRINT_DISK, "signature: %x\n", Ptr[15]); } +#endif return TRUE; } Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/debug.h [iso-8859-1] Wed Feb 18 09:15:37 2009 @@ -80,7 +80,7 @@ #else #define DebugInit() - #define DPRINTM(_x_) + #define DPRINTM(_x_, ...) #define BugCheck(_x_) #define DbgDumpBuffer(_x_, _y_, _z_)

16 years, 4 months

[fireball] 39658: - Turn on multi-character constants support in GCC. Makes TAG macro usage redundant.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Feb 18 08:51:07 2009 New Revision: 39658 URL: http://svn.reactos.org/svn/reactos?rev=39658&view=rev Log: - Turn on multi-character constants support in GCC. Makes TAG macro usage redundant. Modified: trunk/reactos/ReactOS-i386.rbuild Modified: trunk/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=39… ============================================================================== --- trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] Wed Feb 18 08:51:07 2009 @@ -41,6 +41,7 @@ <compilerflag>-fno-strict-aliasing</compilerflag> <compilerflag>-Wno-strict-aliasing</compilerflag> <compilerflag>-Wpointer-arith</compilerflag> + <compilerflag>-Wno-multichar</compilerflag>  <linkerflag>-disable-stdcall-fixup</linkerflag>

16 years, 4 months

[dchapyshev] 39657: - Formatting fix. No code changes

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Feb 18 08:30:44 2009 New Revision: 39657 URL: http://svn.reactos.org/svn/reactos?rev=39657&view=rev Log: - Formatting fix. No code changes Modified: trunk/reactos/dll/win32/userenv/setup.c 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] Wed Feb 18 08:30:44 2009 @@ -33,685 +33,683 @@ typedef struct _FOLDERDATA { - LPWSTR lpValueName; - LPWSTR lpPath; - UINT uId; - BOOL bHidden; - BOOL bShellFolder; - BOOL bUserShellFolder; + LPWSTR lpValueName; + LPWSTR lpPath; + UINT uId; + BOOL bHidden; + BOOL bShellFolder; + BOOL bUserShellFolder; } FOLDERDATA, *PFOLDERDATA; static FOLDERDATA UserShellFolders[] = { - {L"AppData", L"Application Data", IDS_APPDATA, TRUE, TRUE, TRUE}, - {L"Desktop", L"Desktop", IDS_DESKTOP, FALSE, TRUE, TRUE}, - {L"Favorites", L"Favorites", IDS_FAVORITES, FALSE, TRUE, TRUE}, - {L"Personal", L"My Documents", IDS_MYDOCUMENTS, FALSE, TRUE, TRUE}, - {L"My Pictures", L"My Documents\\My Pictures", IDS_MYPICTURES, FALSE, TRUE, TRUE}, - {L"My Music", L"My Documents\\My Music", IDS_MYMUSIC, FALSE, TRUE, TRUE}, - {L"My Video", L"My Documents\\My Videos", IDS_MYVIDEOS, FALSE, TRUE, TRUE}, - {L"NetHood", L"NetHood", IDS_NETHOOD, TRUE, TRUE, TRUE}, - {L"PrintHood", L"PrintHood", IDS_PRINTHOOD, TRUE, TRUE, TRUE}, - {L"Recent", L"Recent", IDS_RECENT, TRUE, TRUE, TRUE}, - {L"SendTo", L"SendTo", IDS_SENDTO, FALSE, TRUE, TRUE}, - {L"Templates", L"Templates", IDS_TEMPLATES, FALSE, TRUE, TRUE}, - {L"Start Menu", L"Start Menu", IDS_STARTMENU, FALSE, TRUE, TRUE}, - {L"Programs", L"Start Menu\\Programs", IDS_PROGRAMS, FALSE, TRUE, TRUE}, - {L"Startup", L"Start Menu\\Programs\\Startup", IDS_STARTUP, FALSE, TRUE, TRUE}, - {L"Local Settings", L"Local Settings", IDS_LOCALSETTINGS, TRUE, TRUE, TRUE}, - {L"Local AppData", L"Local Settings\\Application Data", IDS_LOCALAPPDATA, TRUE, TRUE, TRUE}, - {L"Temp", L"Local Settings\\Temp", IDS_TEMP, FALSE, FALSE, FALSE}, - {L"Cache", L"Local Settings\\Temporary Internet Files", IDS_CACHE, FALSE, TRUE, TRUE}, - {L"History", L"Local Settings\\History", IDS_HISTORY, FALSE, TRUE, TRUE}, - {L"Cookies", L"Cookies", IDS_COOKIES, FALSE, TRUE, TRUE}, - {NULL, NULL, -1, FALSE, FALSE, FALSE} + {L"AppData", L"Application Data", IDS_APPDATA, TRUE, TRUE, TRUE}, + {L"Desktop", L"Desktop", IDS_DESKTOP, FALSE, TRUE, TRUE}, + {L"Favorites", L"Favorites", IDS_FAVORITES, FALSE, TRUE, TRUE}, + {L"Personal", L"My Documents", IDS_MYDOCUMENTS, FALSE, TRUE, TRUE}, + {L"My Pictures", L"My Documents\\My Pictures", IDS_MYPICTURES, FALSE, TRUE, TRUE}, + {L"My Music", L"My Documents\\My Music", IDS_MYMUSIC, FALSE, TRUE, TRUE}, + {L"My Video", L"My Documents\\My Videos", IDS_MYVIDEOS, FALSE, TRUE, TRUE}, + {L"NetHood", L"NetHood", IDS_NETHOOD, TRUE, TRUE, TRUE}, + {L"PrintHood", L"PrintHood", IDS_PRINTHOOD, TRUE, TRUE, TRUE}, + {L"Recent", L"Recent", IDS_RECENT, TRUE, TRUE, TRUE}, + {L"SendTo", L"SendTo", IDS_SENDTO, FALSE, TRUE, TRUE}, + {L"Templates", L"Templates", IDS_TEMPLATES, FALSE, TRUE, TRUE}, + {L"Start Menu", L"Start Menu", IDS_STARTMENU, FALSE, TRUE, TRUE}, + {L"Programs", L"Start Menu\\Programs", IDS_PROGRAMS, FALSE, TRUE, TRUE}, + {L"Startup", L"Start Menu\\Programs\\Startup", IDS_STARTUP, FALSE, TRUE, TRUE}, + {L"Local Settings", L"Local Settings", IDS_LOCALSETTINGS, TRUE, TRUE, TRUE}, + {L"Local AppData", L"Local Settings\\Application Data", IDS_LOCALAPPDATA, TRUE, TRUE, TRUE}, + {L"Temp", L"Local Settings\\Temp", IDS_TEMP, FALSE, FALSE, FALSE}, + {L"Cache", L"Local Settings\\Temporary Internet Files", IDS_CACHE, FALSE, TRUE, TRUE}, + {L"History", L"Local Settings\\History", IDS_HISTORY, FALSE, TRUE, TRUE}, + {L"Cookies", L"Cookies", IDS_COOKIES, FALSE, TRUE, TRUE}, + {NULL, NULL, -1, FALSE, FALSE, FALSE} }; static FOLDERDATA CommonShellFolders[] = { - {L"Common AppData", L"Application Data", IDS_APPDATA, TRUE, TRUE, TRUE}, - {L"Common Desktop", L"Desktop", IDS_DESKTOP, FALSE, TRUE, TRUE}, - {L"Common Favorites", L"Favorites", IDS_FAVORITES, FALSE, TRUE, TRUE}, - {L"Common Start Menu", L"Start Menu", IDS_STARTMENU, FALSE, TRUE, TRUE}, - {L"Common Programs", L"Start Menu\\Programs", IDS_PROGRAMS, FALSE, TRUE, TRUE}, - {L"Common Administrative Tools", L"Start Menu\\Programs\\Administrative Tools", IDS_ADMINTOOLS, FALSE, TRUE, FALSE}, - {L"Common Startup", L"Start Menu\\Programs\\Startup", IDS_STARTUP, FALSE, TRUE, TRUE}, - {L"Common Templates", L"Templates", IDS_TEMPLATES, TRUE, TRUE, TRUE}, - {L"Common Documents", L"My Documents", IDS_MYDOCUMENTS, FALSE, TRUE, TRUE}, - {L"CommonPictures", L"My Documents\\My Pictures", IDS_MYPICTURES, FALSE, TRUE, TRUE}, - {L"CommonMusic", L"My Documents\\My Music", IDS_MYMUSIC, FALSE, TRUE, TRUE}, - {L"CommonVideo", L"My Documents\\My Videos", IDS_MYVIDEOS, FALSE, TRUE, TRUE}, - {NULL, NULL, -1, FALSE, FALSE, FALSE} + {L"Common AppData", L"Application Data", IDS_APPDATA, TRUE, TRUE, TRUE}, + {L"Common Desktop", L"Desktop", IDS_DESKTOP, FALSE, TRUE, TRUE}, + {L"Common Favorites", L"Favorites", IDS_FAVORITES, FALSE, TRUE, TRUE}, + {L"Common Start Menu", L"Start Menu", IDS_STARTMENU, FALSE, TRUE, TRUE}, + {L"Common Programs", L"Start Menu\\Programs", IDS_PROGRAMS, FALSE, TRUE, TRUE}, + {L"Common Administrative Tools", L"Start Menu\\Programs\\Administrative Tools", IDS_ADMINTOOLS, FALSE, TRUE, FALSE}, + {L"Common Startup", L"Start Menu\\Programs\\Startup", IDS_STARTUP, FALSE, TRUE, TRUE}, + {L"Common Templates", L"Templates", IDS_TEMPLATES, TRUE, TRUE, TRUE}, + {L"Common Documents", L"My Documents", IDS_MYDOCUMENTS, FALSE, TRUE, TRUE}, + {L"CommonPictures", L"My Documents\\My Pictures", IDS_MYPICTURES, FALSE, TRUE, TRUE}, + {L"CommonMusic", L"My Documents\\My Music", IDS_MYMUSIC, FALSE, TRUE, TRUE}, + {L"CommonVideo", L"My Documents\\My Videos", IDS_MYVIDEOS, FALSE, TRUE, TRUE}, + {NULL, NULL, -1, FALSE, FALSE, FALSE} }; void DebugPrint(char* fmt,...) { - char buffer[512]; - va_list ap; - - va_start(ap, fmt); - vsprintf(buffer, fmt, ap); - va_end(ap); - - OutputDebugStringA(buffer); + char buffer[512]; + va_list ap; + + va_start(ap, fmt); + vsprintf(buffer, fmt, ap); + va_end(ap); + + OutputDebugStringA(buffer); } -BOOL WINAPI -InitializeProfiles (VOID) +BOOL +WINAPI +InitializeProfiles(VOID) { - WCHAR szProfilesPath[MAX_PATH]; - WCHAR szProfilePath[MAX_PATH]; - WCHAR szBuffer[MAX_PATH]; - DWORD dwLength; - PFOLDERDATA lpFolderData; - HKEY hKey; - LONG Error; - - DPRINT("InitializeProfiles()\n"); - - /* Load profiles directory path */ - if (!LoadStringW(hInstance, - IDS_PROFILEPATH, - szBuffer, - MAX_PATH)) - { - DPRINT1("Error: %lu\n", GetLastError()); - return FALSE; - } - - Error = RegOpenKeyExW (HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", - 0, - KEY_SET_VALUE, - &hKey); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - SetLastError((DWORD)Error); - return FALSE; - } - - /* Store profiles directory path */ - dwLength = (wcslen (szBuffer) + 1) * sizeof(WCHAR); - Error = RegSetValueExW (hKey, - L"ProfilesDirectory", - 0, - REG_EXPAND_SZ, - (LPBYTE)szBuffer, - dwLength); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - RegCloseKey (hKey); - SetLastError((DWORD)Error); - 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)) - { - if (GetLastError () != ERROR_ALREADY_EXISTS) - { - DPRINT1("Error: %lu\n", GetLastError()); - 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; - } - - dwLength = (wcslen (szBuffer) + 1) * sizeof(WCHAR); - Error = RegSetValueExW (hKey, - L"DefaultUserProfile", - 0, - REG_SZ, - (LPBYTE)szBuffer, - dwLength); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - RegCloseKey (hKey); - SetLastError((DWORD)Error); - return FALSE; - } - - 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); - - /* Create 'Default User' subdirectories */ - /* FIXME: Get these paths from the registry */ - lpFolderData = &UserShellFolders[0]; - while (lpFolderData->lpValueName != NULL) - { - wcscpy(szBuffer, szProfilePath); - wcscat(szBuffer, L"\\"); - - /* Append the folder name */ - dwLength = wcslen(szBuffer); - if (!LoadStringW(hInstance, - lpFolderData->uId, - &szBuffer[dwLength], - MAX_PATH - dwLength)) - { - /* Use the default name instead */ - wcscat(szBuffer, lpFolderData->lpPath); - } - - if (!CreateDirectoryW(szBuffer, NULL)) - { - if (GetLastError() != ERROR_ALREADY_EXISTS) - { - DPRINT1("Error: %lu\n", GetLastError()); - return FALSE; - } - } - - if (lpFolderData->bHidden == TRUE) - { - SetFileAttributesW(szBuffer, - FILE_ATTRIBUTE_HIDDEN); - } - - lpFolderData++; - } - - /* Set default 'Shell Folders' values */ - Error = RegOpenKeyExW(HKEY_USERS, - L".Default\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", - 0, - KEY_SET_VALUE, - &hKey); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - SetLastError((DWORD)Error); - return FALSE; - } - - lpFolderData = &UserShellFolders[0]; - while (lpFolderData->lpValueName != NULL) - { - if (lpFolderData->bShellFolder) - { - wcscpy(szBuffer, szProfilePath); - wcscat(szBuffer, L"\\"); - - /* Append the folder name */ - dwLength = wcslen(szBuffer); - if (!LoadStringW(hInstance, - lpFolderData->uId, - &szBuffer[dwLength], - MAX_PATH - dwLength)) - { - /* Use the default name instead */ - wcscat(szBuffer, lpFolderData->lpPath); - } - - dwLength = (wcslen(szBuffer) + 1) * sizeof(WCHAR); - Error = RegSetValueExW(hKey, - lpFolderData->lpValueName, - 0, - REG_SZ, - (LPBYTE)szBuffer, - dwLength); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - RegCloseKey(hKey); - SetLastError((DWORD)Error); - return FALSE; - } - } - - lpFolderData++; - } - - /* Set 'Fonts' folder path */ - GetWindowsDirectoryW(szBuffer, MAX_PATH); - wcscat(szBuffer, L"\\fonts"); - - dwLength = (wcslen(szBuffer) + 1) * sizeof(WCHAR); - Error = RegSetValueExW(hKey, - L"Fonts", - 0, - REG_SZ, - (LPBYTE)szBuffer, - dwLength); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - RegCloseKey(hKey); - SetLastError((DWORD)Error); - return FALSE; - } - - RegCloseKey(hKey); - - /* Set default 'User Shell Folders' values */ - Error = RegOpenKeyExW(HKEY_USERS, - L".Default\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders", - 0, - KEY_SET_VALUE, - &hKey); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - SetLastError((DWORD)Error); - return FALSE; - } - - lpFolderData = &UserShellFolders[0]; - while (lpFolderData->lpValueName != NULL) - { - if (lpFolderData->bUserShellFolder) - { - wcscpy(szBuffer, L"%USERPROFILE%\\"); - - /* Append the folder name */ - dwLength = wcslen(szBuffer); - if (!LoadStringW(hInstance, - lpFolderData->uId, - &szBuffer[dwLength], - MAX_PATH - dwLength)) - { - /* Use the default name instead */ - wcscat(szBuffer, lpFolderData->lpPath); - } - - dwLength = (wcslen(szBuffer) + 1) * sizeof(WCHAR); - Error = RegSetValueExW(hKey, - lpFolderData->lpValueName, - 0, - REG_EXPAND_SZ, - (LPBYTE)szBuffer, - dwLength); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - RegCloseKey(hKey); - SetLastError((DWORD)Error); - return FALSE; - } - } - - lpFolderData++; - } - - RegCloseKey(hKey); - - - /* Set 'AllUsersProfile' value */ - wcscpy(szBuffer, L"All Users"); - if (!AppendSystemPostfix(szBuffer, MAX_PATH)) - { - DPRINT1("AppendSystemPostfix() failed\n", GetLastError()); - return FALSE; - } - - Error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", - 0, - KEY_SET_VALUE, - &hKey); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - SetLastError((DWORD)Error); - return FALSE; - } - - dwLength = (wcslen(szBuffer) + 1) * sizeof(WCHAR); - Error = RegSetValueExW(hKey, - L"AllUsersProfile", - 0, - 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; - } - } - - /* Set 'All Users' profile */ - SetEnvironmentVariableW(L"ALLUSERSPROFILE", szProfilePath); - - /* Create 'All Users' subdirectories */ - /* FIXME: Take these paths from the registry */ - lpFolderData = &CommonShellFolders[0]; - while (lpFolderData->lpValueName != NULL) - { - wcscpy(szBuffer, szProfilePath); - wcscat(szBuffer, L"\\"); - - /* Append the folder name */ - dwLength = wcslen(szBuffer); - if (!LoadStringW(hInstance, - lpFolderData->uId, - &szBuffer[dwLength], - MAX_PATH - dwLength)) - { - /* Use the default name instead */ - wcscat(szBuffer, lpFolderData->lpPath); - } - - if (!CreateDirectoryW(szBuffer, NULL)) - { - if (GetLastError() != ERROR_ALREADY_EXISTS) - { - DPRINT1("Error: %lu\n", GetLastError()); - return FALSE; - } - } - - if (lpFolderData->bHidden) - { - SetFileAttributesW(szBuffer, - FILE_ATTRIBUTE_HIDDEN); - } - - lpFolderData++; - } - - /* Set common 'Shell Folders' values */ - Error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", - 0, - KEY_SET_VALUE, - &hKey); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - SetLastError((DWORD)Error); - return FALSE; - } - - lpFolderData = &CommonShellFolders[0]; - while (lpFolderData->lpValueName != NULL) - { - if (lpFolderData->bShellFolder) - { - wcscpy(szBuffer, szProfilePath); - wcscat(szBuffer, L"\\"); - - /* Append the folder name */ - dwLength = wcslen(szBuffer); - if (!LoadStringW(hInstance, - lpFolderData->uId, - &szBuffer[dwLength], - MAX_PATH - dwLength)) - { - /* Use the default name instead */ - wcscat(szBuffer, lpFolderData->lpPath); - } - - dwLength = (wcslen(szBuffer) + 1) * sizeof(WCHAR); - Error = RegSetValueExW(hKey, - lpFolderData->lpValueName, - 0, - REG_SZ, - (LPBYTE)szBuffer, - dwLength); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - RegCloseKey(hKey); - SetLastError((DWORD)Error); - return FALSE; - } - } - - lpFolderData++; - } - - RegCloseKey(hKey); - - /* Set common 'User Shell Folders' values */ - Error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders", - 0, - KEY_SET_VALUE, - &hKey); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - SetLastError((DWORD)Error); - return FALSE; - } - - lpFolderData = &CommonShellFolders[0]; - while (lpFolderData->lpValueName != NULL) - { - if (lpFolderData->bUserShellFolder) - { - wcscpy(szBuffer, L"%ALLUSERSPROFILE%\\"); - - /* Append the folder name */ - dwLength = wcslen(szBuffer); - if (!LoadStringW(hInstance, - lpFolderData->uId, - &szBuffer[dwLength], - MAX_PATH - dwLength)) - { - /* Use the default name instead */ - wcscat(szBuffer, lpFolderData->lpPath); - } - - dwLength = (wcslen(szBuffer) + 1) * sizeof(WCHAR); - Error = RegSetValueExW(hKey, - lpFolderData->lpValueName, - 0, - REG_EXPAND_SZ, - (LPBYTE)szBuffer, - dwLength); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - RegCloseKey(hKey); - SetLastError((DWORD)Error); - return FALSE; - } - } - - lpFolderData++; - } - - RegCloseKey(hKey); - - /* Load 'Program Files' location */ - if (!LoadStringW(hInstance, - IDS_PROGRAMFILES, - szBuffer, - MAX_PATH)) - { - DPRINT1("Error: %lu\n", GetLastError()); - return FALSE; - } - - /* Expand it */ - if (!ExpandEnvironmentStringsW (szBuffer, - szProfilesPath, - MAX_PATH)) - { - DPRINT1("Error: %lu\n", GetLastError()); - return FALSE; - } - - /* Store it */ - Error = RegOpenKeyExW (HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion", - 0, - KEY_SET_VALUE, - &hKey); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - SetLastError((DWORD)Error); - return FALSE; - } - - dwLength = (wcslen (szProfilesPath) + 1) * sizeof(WCHAR); - Error = RegSetValueExW (hKey, - L"ProgramFilesDir", - 0, - REG_SZ, - (LPBYTE)szProfilesPath, - dwLength); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - RegCloseKey (hKey); - SetLastError((DWORD)Error); - return FALSE; - } - - RegCloseKey (hKey); - - /* Create directory */ - if (!CreateDirectoryW (szProfilesPath, NULL)) - { - if (GetLastError () != ERROR_ALREADY_EXISTS) - { - DPRINT1("Error: %lu\n", GetLastError()); - return FALSE; - } - } - - - DPRINT("Success\n"); - - return TRUE; + WCHAR szProfilesPath[MAX_PATH]; + WCHAR szProfilePath[MAX_PATH]; + WCHAR szBuffer[MAX_PATH]; + DWORD dwLength; + PFOLDERDATA lpFolderData; + HKEY hKey; + LONG Error; + + DPRINT("InitializeProfiles()\n"); + + /* Load profiles directory path */ + if (!LoadStringW(hInstance, + IDS_PROFILEPATH, + szBuffer, + MAX_PATH)) + { + DPRINT1("Error: %lu\n", GetLastError()); + return FALSE; + } + + Error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", + 0, + KEY_SET_VALUE, + &hKey); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + SetLastError((DWORD)Error); + return FALSE; + } + + /* Store profiles directory path */ + dwLength = (wcslen (szBuffer) + 1) * sizeof(WCHAR); + Error = RegSetValueExW(hKey, + L"ProfilesDirectory", + 0, + REG_EXPAND_SZ, + (LPBYTE)szBuffer, + dwLength); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + RegCloseKey(hKey); + SetLastError((DWORD)Error); + 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)) + { + if (GetLastError() != ERROR_ALREADY_EXISTS) + { + DPRINT1("Error: %lu\n", GetLastError()); + 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; + } + + dwLength = (wcslen (szBuffer) + 1) * sizeof(WCHAR); + Error = RegSetValueExW(hKey, + L"DefaultUserProfile", + 0, + REG_SZ, + (LPBYTE)szBuffer, + dwLength); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + RegCloseKey(hKey); + SetLastError((DWORD)Error); + return FALSE; + } + + 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); + + /* Create 'Default User' subdirectories */ + /* FIXME: Get these paths from the registry */ + lpFolderData = &UserShellFolders[0]; + while (lpFolderData->lpValueName != NULL) + { + wcscpy(szBuffer, szProfilePath); + wcscat(szBuffer, L"\\"); + + /* Append the folder name */ + dwLength = wcslen(szBuffer); + if (!LoadStringW(hInstance, + lpFolderData->uId, + &szBuffer[dwLength], + MAX_PATH - dwLength)) + { + /* Use the default name instead */ + wcscat(szBuffer, lpFolderData->lpPath); + } + + if (!CreateDirectoryW(szBuffer, NULL)) + { + if (GetLastError() != ERROR_ALREADY_EXISTS) + { + DPRINT1("Error: %lu\n", GetLastError()); + return FALSE; + } + } + + if (lpFolderData->bHidden == TRUE) + { + SetFileAttributesW(szBuffer, + FILE_ATTRIBUTE_HIDDEN); + } + + lpFolderData++; + } + + /* Set default 'Shell Folders' values */ + Error = RegOpenKeyExW(HKEY_USERS, + L".Default\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", + 0, + KEY_SET_VALUE, + &hKey); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + SetLastError((DWORD)Error); + return FALSE; + } + + lpFolderData = &UserShellFolders[0]; + while (lpFolderData->lpValueName != NULL) + { + if (lpFolderData->bShellFolder) + { + wcscpy(szBuffer, szProfilePath); + wcscat(szBuffer, L"\\"); + + /* Append the folder name */ + dwLength = wcslen(szBuffer); + if (!LoadStringW(hInstance, + lpFolderData->uId, + &szBuffer[dwLength], + MAX_PATH - dwLength)) + { + /* Use the default name instead */ + wcscat(szBuffer, lpFolderData->lpPath); + } + + dwLength = (wcslen(szBuffer) + 1) * sizeof(WCHAR); + Error = RegSetValueExW(hKey, + lpFolderData->lpValueName, + 0, + REG_SZ, + (LPBYTE)szBuffer, + dwLength); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + RegCloseKey(hKey); + SetLastError((DWORD)Error); + return FALSE; + } + } + + lpFolderData++; + } + + /* Set 'Fonts' folder path */ + GetWindowsDirectoryW(szBuffer, MAX_PATH); + wcscat(szBuffer, L"\\fonts"); + + dwLength = (wcslen(szBuffer) + 1) * sizeof(WCHAR); + Error = RegSetValueExW(hKey, + L"Fonts", + 0, + REG_SZ, + (LPBYTE)szBuffer, + dwLength); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + RegCloseKey(hKey); + SetLastError((DWORD)Error); + return FALSE; + } + + RegCloseKey(hKey); + + /* Set default 'User Shell Folders' values */ + Error = RegOpenKeyExW(HKEY_USERS, + L".Default\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders", + 0, + KEY_SET_VALUE, + &hKey); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + SetLastError((DWORD)Error); + return FALSE; + } + + lpFolderData = &UserShellFolders[0]; + while (lpFolderData->lpValueName != NULL) + { + if (lpFolderData->bUserShellFolder) + { + wcscpy(szBuffer, L"%USERPROFILE%\\"); + + /* Append the folder name */ + dwLength = wcslen(szBuffer); + if (!LoadStringW(hInstance, + lpFolderData->uId, + &szBuffer[dwLength], + MAX_PATH - dwLength)) + { + /* Use the default name instead */ + wcscat(szBuffer, lpFolderData->lpPath); + } + + dwLength = (wcslen(szBuffer) + 1) * sizeof(WCHAR); + Error = RegSetValueExW(hKey, + lpFolderData->lpValueName, + 0, + REG_EXPAND_SZ, + (LPBYTE)szBuffer, + dwLength); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + RegCloseKey(hKey); + SetLastError((DWORD)Error); + return FALSE; + } + } + + lpFolderData++; + } + + RegCloseKey(hKey); + + /* Set 'AllUsersProfile' value */ + wcscpy(szBuffer, L"All Users"); + if (!AppendSystemPostfix(szBuffer, MAX_PATH)) + { + DPRINT1("AppendSystemPostfix() failed\n", GetLastError()); + return FALSE; + } + + Error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", + 0, + KEY_SET_VALUE, + &hKey); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + SetLastError((DWORD)Error); + return FALSE; + } + + dwLength = (wcslen(szBuffer) + 1) * sizeof(WCHAR); + Error = RegSetValueExW(hKey, + L"AllUsersProfile", + 0, + 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; + } + } + + /* Set 'All Users' profile */ + SetEnvironmentVariableW(L"ALLUSERSPROFILE", szProfilePath); + + /* Create 'All Users' subdirectories */ + /* FIXME: Take these paths from the registry */ + lpFolderData = &CommonShellFolders[0]; + while (lpFolderData->lpValueName != NULL) + { + wcscpy(szBuffer, szProfilePath); + wcscat(szBuffer, L"\\"); + + /* Append the folder name */ + dwLength = wcslen(szBuffer); + if (!LoadStringW(hInstance, + lpFolderData->uId, + &szBuffer[dwLength], + MAX_PATH - dwLength)) + { + /* Use the default name instead */ + wcscat(szBuffer, lpFolderData->lpPath); + } + + if (!CreateDirectoryW(szBuffer, NULL)) + { + if (GetLastError() != ERROR_ALREADY_EXISTS) + { + DPRINT1("Error: %lu\n", GetLastError()); + return FALSE; + } + } + + if (lpFolderData->bHidden) + { + SetFileAttributesW(szBuffer, + FILE_ATTRIBUTE_HIDDEN); + } + + lpFolderData++; + } + + /* Set common 'Shell Folders' values */ + Error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", + 0, + KEY_SET_VALUE, + &hKey); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + SetLastError((DWORD)Error); + return FALSE; + } + + lpFolderData = &CommonShellFolders[0]; + while (lpFolderData->lpValueName != NULL) + { + if (lpFolderData->bShellFolder) + { + wcscpy(szBuffer, szProfilePath); + wcscat(szBuffer, L"\\"); + + /* Append the folder name */ + dwLength = wcslen(szBuffer); + if (!LoadStringW(hInstance, + lpFolderData->uId, + &szBuffer[dwLength], + MAX_PATH - dwLength)) + { + /* Use the default name instead */ + wcscat(szBuffer, lpFolderData->lpPath); + } + + dwLength = (wcslen(szBuffer) + 1) * sizeof(WCHAR); + Error = RegSetValueExW(hKey, + lpFolderData->lpValueName, + 0, + REG_SZ, + (LPBYTE)szBuffer, + dwLength); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + RegCloseKey(hKey); + SetLastError((DWORD)Error); + return FALSE; + } + } + + lpFolderData++; + } + + RegCloseKey(hKey); + + /* Set common 'User Shell Folders' values */ + Error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders", + 0, + KEY_SET_VALUE, + &hKey); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + SetLastError((DWORD)Error); + return FALSE; + } + + lpFolderData = &CommonShellFolders[0]; + while (lpFolderData->lpValueName != NULL) + { + if (lpFolderData->bUserShellFolder) + { + wcscpy(szBuffer, L"%ALLUSERSPROFILE%\\"); + + /* Append the folder name */ + dwLength = wcslen(szBuffer); + if (!LoadStringW(hInstance, + lpFolderData->uId, + &szBuffer[dwLength], + MAX_PATH - dwLength)) + { + /* Use the default name instead */ + wcscat(szBuffer, lpFolderData->lpPath); + } + + dwLength = (wcslen(szBuffer) + 1) * sizeof(WCHAR); + Error = RegSetValueExW(hKey, + lpFolderData->lpValueName, + 0, + REG_EXPAND_SZ, + (LPBYTE)szBuffer, + dwLength); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + RegCloseKey(hKey); + SetLastError((DWORD)Error); + return FALSE; + } + } + + lpFolderData++; + } + + RegCloseKey(hKey); + + /* Load 'Program Files' location */ + if (!LoadStringW(hInstance, + IDS_PROGRAMFILES, + szBuffer, + MAX_PATH)) + { + DPRINT1("Error: %lu\n", GetLastError()); + return FALSE; + } + + /* Expand it */ + if (!ExpandEnvironmentStringsW(szBuffer, + szProfilesPath, + MAX_PATH)) + { + DPRINT1("Error: %lu\n", GetLastError()); + return FALSE; + } + + /* Store it */ + Error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion", + 0, + KEY_SET_VALUE, + &hKey); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + SetLastError((DWORD)Error); + return FALSE; + } + + dwLength = (wcslen (szProfilesPath) + 1) * sizeof(WCHAR); + Error = RegSetValueExW(hKey, + L"ProgramFilesDir", + 0, + REG_SZ, + (LPBYTE)szProfilesPath, + dwLength); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + RegCloseKey(hKey); + SetLastError((DWORD)Error); + return FALSE; + } + + RegCloseKey (hKey); + + /* Create directory */ + if (!CreateDirectoryW(szProfilesPath, NULL)) + { + if (GetLastError () != ERROR_ALREADY_EXISTS) + { + DPRINT1("Error: %lu\n", GetLastError()); + return FALSE; + } + } + + DPRINT("Success\n"); + + return TRUE; } BOOL UpdateUsersShellFolderSettings(LPCWSTR lpUserProfilePath, - HKEY hUserKey) + HKEY hUserKey) { - WCHAR szBuffer[MAX_PATH]; - DWORD dwLength; - PFOLDERDATA lpFolderData; - HKEY hFoldersKey; - LONG Error; - - DPRINT("UpdateUsersShellFolderSettings() called\n"); - - DPRINT("User profile path: %S\n", lpUserProfilePath); - - Error = RegOpenKeyExW(hUserKey, - L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", - 0, - KEY_SET_VALUE, - &hFoldersKey); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - SetLastError((DWORD)Error); - return FALSE; - } - - lpFolderData = &UserShellFolders[0]; - while (lpFolderData->lpValueName != NULL) - { - if (lpFolderData->bShellFolder) - { - wcscpy(szBuffer, lpUserProfilePath); - wcscat(szBuffer, L"\\"); - - /* Append the folder name */ - dwLength = wcslen(szBuffer); - if (!LoadStringW(hInstance, - lpFolderData->uId, - &szBuffer[dwLength], - MAX_PATH - dwLength)) - { - /* Use the default name instead */ - wcscat(szBuffer, lpFolderData->lpPath); - } - - DPRINT("%S: %S\n", lpFolderData->lpValueName, szBuffer); - - dwLength = (wcslen(szBuffer) + 1) * sizeof(WCHAR); - Error = RegSetValueExW(hFoldersKey, - lpFolderData->lpValueName, - 0, - REG_SZ, - (LPBYTE)szBuffer, - dwLength); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - RegCloseKey(hFoldersKey); - SetLastError((DWORD)Error); - return FALSE; - } - } - - lpFolderData++; - } - - RegCloseKey(hFoldersKey); - - DPRINT("UpdateUsersShellFolderSettings() done\n"); - - return TRUE; + WCHAR szBuffer[MAX_PATH]; + DWORD dwLength; + PFOLDERDATA lpFolderData; + HKEY hFoldersKey; + LONG Error; + + DPRINT("UpdateUsersShellFolderSettings() called\n"); + + DPRINT("User profile path: %S\n", lpUserProfilePath); + + Error = RegOpenKeyExW(hUserKey, + L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", + 0, + KEY_SET_VALUE, + &hFoldersKey); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + SetLastError((DWORD)Error); + return FALSE; + } + + lpFolderData = &UserShellFolders[0]; + while (lpFolderData->lpValueName != NULL) + { + if (lpFolderData->bShellFolder) + { + wcscpy(szBuffer, lpUserProfilePath); + wcscat(szBuffer, L"\\"); + + /* Append the folder name */ + dwLength = wcslen(szBuffer); + if (!LoadStringW(hInstance, + lpFolderData->uId, + &szBuffer[dwLength], + MAX_PATH - dwLength)) + { + /* Use the default name instead */ + wcscat(szBuffer, lpFolderData->lpPath); + } + + DPRINT("%S: %S\n", lpFolderData->lpValueName, szBuffer); + + dwLength = (wcslen(szBuffer) + 1) * sizeof(WCHAR); + Error = RegSetValueExW(hFoldersKey, + lpFolderData->lpValueName, + 0, + REG_SZ, + (LPBYTE)szBuffer, + dwLength); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + RegCloseKey(hFoldersKey); + SetLastError((DWORD)Error); + return FALSE; + } + } + + lpFolderData++; + } + + RegCloseKey(hFoldersKey); + + DPRINT("UpdateUsersShellFolderSettings() done\n"); + + return TRUE; } /* EOF */

16 years, 4 months

[dchapyshev] 39656: - Add sti.dll from Wine

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Feb 18 02:01:23 2009 New Revision: 39656 URL: http://svn.reactos.org/svn/reactos?rev=39656&view=rev Log: - Add sti.dll from Wine Added: trunk/reactos/dll/win32/sti/ (with props) trunk/reactos/dll/win32/sti/sti.rbuild (with props) trunk/reactos/dll/win32/sti/sti.spec (with props) trunk/reactos/dll/win32/sti/sti_main.c (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=396… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Wed Feb 18 02:01:23 2009 @@ -119,12 +119,14 @@ <property name="BASEADDRESS_MSDMO" value="0x73670000" /> <property name="BASEADDRESS_AVIFIL32" value="0x73ac0000" /> <property name="BASEADDRESS_DCIMAN32" value="0x73b10000" /> + <property name="BASEADDRESS_STI" value="0x73b60000" /> <property name="BASEADDRESS_LZ32" value="0x73d80000" /> <property name="BASEADDRESS_COREDLL" value="0x73d80000" /> <property name="BASEADDRESS_KSUSER" value="0x73ea0000" /> <property name="BASEADDRESS_ICMP" value="0x741f0000" /> <property name="BASEADDRESS_SPOOLSS" value="0x742a0000" /> <property name="BASEADDRESS_MSIMTF" value="0x746b0000" /> + <property name="BASEADDRESS_MSCTF" value="0x746e0000" /> <property name="BASEADDRESS_QUARTZ" value="0x747d0000" /> <property name="BASEADDRESS_USERENV" value="0x74850000" /> <property name="BASEADDRESS_WS2_32" value="0x74aa0000" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Wed Feb 18 02:01:23 2009 @@ -370,6 +370,7 @@ dll\win32\srclient\srclient.dll 1 dll\win32\stdole2.tlb\stdole2.tlb 1 dll\win32\stdole32.tlb\stdole32.tlb 1 +dll\win32\sti\sti.dll 1 dll\win32\sxs\sxs.dll 1 dll\win32\syssetup\syssetup.dll 1 dll\win32\tapi32\tapi32.dll 1 Propchange: trunk/reactos/dll/win32/sti/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Feb 18 02:01:23 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/sti/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/sti/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/sti/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/sti/sti.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/sti.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/sti/sti.rbuild (added) +++ trunk/reactos/dll/win32/sti/sti.rbuild [iso-8859-1] Wed Feb 18 02:01:23 2009 @@ -1,0 +1,15 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="sti" type="win32dll" baseaddress="${BASEADDRESS_STI}" installbase="system32" installname="sti.dll" allowwarnings="true" entrypoint="0"> +  + <importlibrary definition="sti.spec" /> + <include base="sti">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <file>sti_main.c</file> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> +</module> +</group> Propchange: trunk/reactos/dll/win32/sti/sti.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/sti/sti.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/sti.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/sti/sti.spec (added) +++ trunk/reactos/dll/win32/sti/sti.spec [iso-8859-1] Wed Feb 18 02:01:23 2009 @@ -1,0 +1,7 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stdcall StiCreateInstance(ptr long ptr ptr) +@ stdcall StiCreateInstanceA(ptr long ptr ptr) +@ stdcall StiCreateInstanceW(ptr long ptr ptr) Propchange: trunk/reactos/dll/win32/sti/sti.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/sti/sti_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/sti_main.c?r… ============================================================================== --- trunk/reactos/dll/win32/sti/sti_main.c (added) +++ trunk/reactos/dll/win32/sti/sti_main.c [iso-8859-1] Wed Feb 18 02:01:23 2009 @@ -1,0 +1,48 @@ +/* + * Copyright (C) 2002 Aric Stewart for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winerror.h" + +/****************************************************************************** + * StiCreateInstance (STI.@) + */ +HRESULT WINAPI StiCreateInstance( HINSTANCE a, DWORD b, LPVOID c, LPVOID d) +{ + return STG_E_UNIMPLEMENTEDFUNCTION; +} + +/****************************************************************************** + * StiCreateInstanceA (STI.@) + */ +HRESULT WINAPI StiCreateInstanceA( HINSTANCE a, DWORD b, LPVOID c, LPVOID d) +{ + return STG_E_UNIMPLEMENTEDFUNCTION; +} + +/****************************************************************************** + * StiCreateInstanceW (STI.@) + */ +HRESULT WINAPI StiCreateInstanceW( HINSTANCE a, DWORD b, LPVOID c, LPVOID d) +{ + return STG_E_UNIMPLEMENTEDFUNCTION; +} Propchange: trunk/reactos/dll/win32/sti/sti_main.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Wed Feb 18 02:01:23 2009 @@ -412,6 +412,9 @@ <directory name="stdole32.tlb"> <xi:include href="stdole32.tlb/stdole32.rbuild" /> </directory> +<directory name="sti"> + <xi:include href="sti/sti.rbuild" /> +</directory> <directory name="sxs"> <xi:include href="sxs/sxs.rbuild" /> </directory> Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Feb 18 02:01:23 2009 @@ -108,6 +108,7 @@ reactos/dll/win32/shlwapi # Autosync reactos/dll/win32/spoolss # Autosync reactos/dll/win32/stdole2.tlb # Autosync +reactos/dll/win32/sti # Autosync reactos/dll/win32/sxs # Autosync reactos/dll/win32/tapi32 # Autosync reactos/dll/win32/twain_32 # Out of sync

16 years, 4 months

[tkreuzer] 39655: Fix formatting, no code change

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Feb 17 21:07:20 2009 New Revision: 39655 URL: http://svn.reactos.org/svn/reactos?rev=39655&view=rev Log: Fix formatting, no code change Modified: trunk/reactos/subsystems/win32/csrss/api/handle.c Modified: trunk/reactos/subsystems/win32/csrss/api/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/handle.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/api/handle.c [iso-8859-1] Tue Feb 17 21:07:20 2009 @@ -19,159 +19,185 @@ static unsigned ObjectDefinitionsCount = 0; static PCSRSS_OBJECT_DEFINITION ObjectDefinitions = NULL; -static BOOL +static +BOOL CsrIsConsoleHandle(HANDLE Handle) { - return ((ULONG)Handle & 0x10000003) == 0x3; -} - - -NTSTATUS FASTCALL -CsrRegisterObjectDefinitions(PCSRSS_OBJECT_DEFINITION NewDefinitions) -{ - unsigned NewCount; - PCSRSS_OBJECT_DEFINITION Scan; - PCSRSS_OBJECT_DEFINITION New; - - NewCount = 0; - for (Scan = NewDefinitions; 0 != Scan->Type; Scan++) - { - NewCount++; - } - - New = RtlAllocateHeap(CsrssApiHeap, 0, - (ObjectDefinitionsCount + NewCount) - * sizeof(CSRSS_OBJECT_DEFINITION)); - if (NULL == New) - { - DPRINT1("Unable to allocate memory\n"); - return STATUS_NO_MEMORY; - } - if (0 != ObjectDefinitionsCount) - { - RtlCopyMemory(New, ObjectDefinitions, - ObjectDefinitionsCount * sizeof(CSRSS_OBJECT_DEFINITION)); - RtlFreeHeap(CsrssApiHeap, 0, ObjectDefinitions); - } - RtlCopyMemory(New + ObjectDefinitionsCount, NewDefinitions, - NewCount * sizeof(CSRSS_OBJECT_DEFINITION)); - ObjectDefinitions = New; - ObjectDefinitionsCount += NewCount; - - return STATUS_SUCCESS; -} - -NTSTATUS WINAPI CsrGetObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle, Object_t **Object, DWORD Access ) -{ - ULONG h = (ULONG)Handle >> 2; - DPRINT("CsrGetObject, Object: %x, %x, %x\n", Object, Handle, ProcessData ? ProcessData->HandleTableSize : 0); - - RtlEnterCriticalSection(&ProcessData->HandleTableLock); - if (!CsrIsConsoleHandle(Handle) || h >= ProcessData->HandleTableSize - || (*Object = ProcessData->HandleTable[h].Object) == NULL - || ~ProcessData->HandleTable[h].Access & Access) - { - DPRINT1("CsrGetObject returning invalid handle (%x)\n", Handle); - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - return STATUS_INVALID_HANDLE; - } - _InterlockedIncrement(&(*Object)->ReferenceCount); - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - // DbgPrint( "CsrGetObject returning\n" ); - return STATUS_SUCCESS; -} - - -NTSTATUS WINAPI -CsrReleaseObjectByPointer(Object_t *Object) -{ - unsigned DefIndex; - - /* dec ref count */ - if (_InterlockedDecrement(&Object->ReferenceCount) == 0) - { - for (DefIndex = 0; DefIndex < ObjectDefinitionsCount; DefIndex++) - { - if (Object->Type == ObjectDefinitions[DefIndex].Type) + return ((ULONG)Handle & 0x10000003) == 0x3; +} + + +NTSTATUS +FASTCALL +CsrRegisterObjectDefinitions( + PCSRSS_OBJECT_DEFINITION NewDefinitions) +{ + unsigned NewCount; + PCSRSS_OBJECT_DEFINITION Scan; + PCSRSS_OBJECT_DEFINITION New; + + NewCount = 0; + for (Scan = NewDefinitions; 0 != Scan->Type; Scan++) + { + NewCount++; + } + + New = RtlAllocateHeap(CsrssApiHeap, + 0, + (ObjectDefinitionsCount + NewCount) + * sizeof(CSRSS_OBJECT_DEFINITION)); + if (NULL == New) + { + DPRINT1("Unable to allocate memory\n"); + return STATUS_NO_MEMORY; + } + + if (0 != ObjectDefinitionsCount) + { + RtlCopyMemory(New, + ObjectDefinitions, + ObjectDefinitionsCount * sizeof(CSRSS_OBJECT_DEFINITION)); + RtlFreeHeap(CsrssApiHeap, 0, ObjectDefinitions); + } + + RtlCopyMemory(New + ObjectDefinitionsCount, + NewDefinitions, + NewCount * sizeof(CSRSS_OBJECT_DEFINITION)); + ObjectDefinitions = New; + ObjectDefinitionsCount += NewCount; + + return STATUS_SUCCESS; +} + +NTSTATUS +WINAPI +CsrGetObject( + PCSRSS_PROCESS_DATA ProcessData, + HANDLE Handle, + Object_t **Object, + DWORD Access ) +{ + ULONG h = (ULONG)Handle >> 2; + + DPRINT("CsrGetObject, Object: %x, %x, %x\n", + Object, Handle, ProcessData ? ProcessData->HandleTableSize : 0); + + RtlEnterCriticalSection(&ProcessData->HandleTableLock); + if (!CsrIsConsoleHandle(Handle) || h >= ProcessData->HandleTableSize + || (*Object = ProcessData->HandleTable[h].Object) == NULL + || ~ProcessData->HandleTable[h].Access & Access) + { + DPRINT1("CsrGetObject returning invalid handle (%x)\n", Handle); + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + return STATUS_INVALID_HANDLE; + } + _InterlockedIncrement(&(*Object)->ReferenceCount); + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + // DbgPrint( "CsrGetObject returning\n" ); + return STATUS_SUCCESS; +} + + +NTSTATUS +WINAPI +CsrReleaseObjectByPointer( + Object_t *Object) +{ + unsigned DefIndex; + + /* dec ref count */ + if (_InterlockedDecrement(&Object->ReferenceCount) == 0) + { + for (DefIndex = 0; DefIndex < ObjectDefinitionsCount; DefIndex++) + { + if (Object->Type == ObjectDefinitions[DefIndex].Type) { - (ObjectDefinitions[DefIndex].CsrCleanupObjectProc)(Object); - return STATUS_SUCCESS; + (ObjectDefinitions[DefIndex].CsrCleanupObjectProc)(Object); + return STATUS_SUCCESS; } } - DPRINT1("CSR: Error: releasing unknown object type 0x%x", Object->Type); - } - - return STATUS_SUCCESS; -} - - -NTSTATUS WINAPI -CsrReleaseObject(PCSRSS_PROCESS_DATA ProcessData, - HANDLE Handle) -{ - ULONG h = (ULONG)Handle >> 2; - Object_t *Object; - - RtlEnterCriticalSection(&ProcessData->HandleTableLock); - if (h >= ProcessData->HandleTableSize - || (Object = ProcessData->HandleTable[h].Object) == NULL) - { - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - return STATUS_INVALID_HANDLE; - } - ProcessData->HandleTable[h].Object = NULL; - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - - return CsrReleaseObjectByPointer(Object); -} - -NTSTATUS WINAPI CsrInsertObject(PCSRSS_PROCESS_DATA ProcessData, - PHANDLE Handle, - Object_t *Object, - DWORD Access, - BOOL Inheritable) -{ - ULONG i; - PVOID* Block; - - RtlEnterCriticalSection(&ProcessData->HandleTableLock); - - for (i = 0; i < ProcessData->HandleTableSize; i++) - { - if (ProcessData->HandleTable[i].Object == NULL) - { + DPRINT1("CSR: Error: releasing unknown object type 0x%x", Object->Type); + } + + return STATUS_SUCCESS; +} + + +NTSTATUS +WINAPI +CsrReleaseObject( + PCSRSS_PROCESS_DATA ProcessData, + HANDLE Handle) +{ + ULONG h = (ULONG)Handle >> 2; + Object_t *Object; + + RtlEnterCriticalSection(&ProcessData->HandleTableLock); + if (h >= ProcessData->HandleTableSize + || (Object = ProcessData->HandleTable[h].Object) == NULL) + { + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + return STATUS_INVALID_HANDLE; + } + ProcessData->HandleTable[h].Object = NULL; + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + + return CsrReleaseObjectByPointer(Object); +} + +NTSTATUS +WINAPI +CsrInsertObject( + PCSRSS_PROCESS_DATA ProcessData, + PHANDLE Handle, + Object_t *Object, + DWORD Access, + BOOL Inheritable) +{ + ULONG i; + PVOID* Block; + + RtlEnterCriticalSection(&ProcessData->HandleTableLock); + + for (i = 0; i < ProcessData->HandleTableSize; i++) + { + if (ProcessData->HandleTable[i].Object == NULL) + { break; - } - } - if (i >= ProcessData->HandleTableSize) - { - Block = RtlAllocateHeap(CsrssApiHeap, - HEAP_ZERO_MEMORY, - (ProcessData->HandleTableSize + 64) * sizeof(CSRSS_HANDLE)); - if (Block == NULL) - { - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - return(STATUS_UNSUCCESSFUL); - } - RtlCopyMemory(Block, - ProcessData->HandleTable, - ProcessData->HandleTableSize * sizeof(CSRSS_HANDLE)); - Block = _InterlockedExchangePointer((volatile void*)&ProcessData->HandleTable, Block); - RtlFreeHeap( CsrssApiHeap, 0, Block ); - ProcessData->HandleTableSize += 64; - } - ProcessData->HandleTable[i].Object = Object; - ProcessData->HandleTable[i].Access = Access; - ProcessData->HandleTable[i].Inheritable = Inheritable; - *Handle = (HANDLE)((i << 2) | 0x3); - _InterlockedIncrement( &Object->ReferenceCount ); - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - return(STATUS_SUCCESS); -} - -NTSTATUS WINAPI CsrDuplicateHandleTable(PCSRSS_PROCESS_DATA SourceProcessData, - PCSRSS_PROCESS_DATA TargetProcessData) + } + } + if (i >= ProcessData->HandleTableSize) + { + Block = RtlAllocateHeap(CsrssApiHeap, + HEAP_ZERO_MEMORY, + (ProcessData->HandleTableSize + 64) * sizeof(CSRSS_HANDLE)); + if (Block == NULL) + { + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + return(STATUS_UNSUCCESSFUL); + } + RtlCopyMemory(Block, + ProcessData->HandleTable, + ProcessData->HandleTableSize * sizeof(CSRSS_HANDLE)); + Block = _InterlockedExchangePointer((volatile void*)&ProcessData->HandleTable, Block); + RtlFreeHeap( CsrssApiHeap, 0, Block ); + ProcessData->HandleTableSize += 64; + } + ProcessData->HandleTable[i].Object = Object; + ProcessData->HandleTable[i].Access = Access; + ProcessData->HandleTable[i].Inheritable = Inheritable; + *Handle = (HANDLE)((i << 2) | 0x3); + _InterlockedIncrement( &Object->ReferenceCount ); + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + return(STATUS_SUCCESS); +} + +NTSTATUS +WINAPI +CsrDuplicateHandleTable( + PCSRSS_PROCESS_DATA SourceProcessData, + PCSRSS_PROCESS_DATA TargetProcessData) { ULONG i; @@ -185,38 +211,43 @@ /* we are called from CreateProcessData, it isn't necessary to lock the target process data */ TargetProcessData->HandleTable = RtlAllocateHeap(CsrssApiHeap, - HEAP_ZERO_MEMORY, - SourceProcessData->HandleTableSize * sizeof(CSRSS_HANDLE)); + HEAP_ZERO_MEMORY, + SourceProcessData->HandleTableSize + * sizeof(CSRSS_HANDLE)); if (TargetProcessData->HandleTable == NULL) { RtlLeaveCriticalSection(&SourceProcessData->HandleTableLock); - return(STATUS_UNSUCCESSFUL); + return(STATUS_UNSUCCESSFUL); } TargetProcessData->HandleTableSize = SourceProcessData->HandleTableSize; for (i = 0; i < SourceProcessData->HandleTableSize; i++) { - if (SourceProcessData->HandleTable[i].Object != NULL - && SourceProcessData->HandleTable[i].Inheritable) + if (SourceProcessData->HandleTable[i].Object != NULL && + SourceProcessData->HandleTable[i].Inheritable) { TargetProcessData->HandleTable[i] = SourceProcessData->HandleTable[i]; _InterlockedIncrement( &SourceProcessData->HandleTable[i].Object->ReferenceCount ); } } - RtlLeaveCriticalSection(&SourceProcessData->HandleTableLock); - return(STATUS_SUCCESS); -} - -NTSTATUS WINAPI CsrVerifyObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle ) -{ - ULONG h = (ULONG)Handle >> 2; - - if (h >= ProcessData->HandleTableSize - || ProcessData->HandleTable[h].Object == NULL) - { - return STATUS_INVALID_HANDLE; - } - - return STATUS_SUCCESS; + RtlLeaveCriticalSection(&SourceProcessData->HandleTableLock); + return(STATUS_SUCCESS); +} + +NTSTATUS +WINAPI +CsrVerifyObject( + PCSRSS_PROCESS_DATA ProcessData, + HANDLE Handle) +{ + ULONG h = (ULONG)Handle >> 2; + + if (h >= ProcessData->HandleTableSize || + ProcessData->HandleTable[h].Object == NULL) + { + return STATUS_INVALID_HANDLE; + } + + return STATUS_SUCCESS; } /* EOF */

16 years, 4 months

[tkreuzer] 39654: co_IntCallHookProc: Don't dereference the ResultPointer returned from KeUserModeCallback and then probe the LRESULT cast to PVOID, but probe the ResultPointer. Fixes bug #4114 See issue #4114 for more details.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Feb 17 15:28:22 2009 New Revision: 39654 URL: http://svn.reactos.org/svn/reactos?rev=39654&view=rev Log: co_IntCallHookProc: Don't dereference the ResultPointer returned from KeUserModeCallback and then probe the LRESULT cast to PVOID, but probe the ResultPointer. Fixes bug #4114 See issue #4114 for more details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Tue Feb 17 15:28:22 2009 @@ -495,9 +495,7 @@ _SEH2_TRY { - ProbeForRead((PVOID)*(LRESULT*)ResultPointer, - sizeof(LRESULT), - 1); + ProbeForRead(ResultPointer, sizeof(LRESULT), 1); /* Simulate old behaviour: copy into our local buffer */ Result = *(LRESULT*)ResultPointer; }

16 years, 4 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs