Ros-diffs October 2013

ros-diffs@reactos.org

14 participants
325 discussions

[akhaldi] 60751: [WMIC] * Properly import WMIC (correcting the previous import committed in r60748). * The import of other WMI related modules is also already done, and will be committed eventually...
by akhaldi＠svn.reactos.org 26 Oct '13

26 Oct '13

Author: akhaldi Date: Sat Oct 26 09:48:25 2013 New Revision: 60751 URL: http://svn.reactos.org/svn/reactos?rev=60751&view=rev Log: [WMIC] * Properly import WMIC (correcting the previous import committed in r60748). * The import of other WMI related modules is also already done, and will be committed eventually in the current ongoing sync. CORE-7469 Added: trunk/reactos/base/applications/cmdutils/wmic/main.c - copied, changed from r60750, trunk/reactos/base/applications/cmdutils/wmic/wmic.c Removed: trunk/reactos/base/applications/cmdutils/wmic/wmic.c Modified: trunk/reactos/base/applications/cmdutils/wmic/CMakeLists.txt trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/cmdutils/wmic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wmic/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wmic/CMakeLists.txt [iso-8859-1] Sat Oct 26 09:48:25 2013 @@ -1,6 +1,6 @@ -add_executable(wmic wmic.c wmic.rc) +add_executable(wmic main.c wmic.rc) target_link_libraries(wmic wine) set_module_type(wmic win32cui UNICODE) add_importlibs(wmic oleaut32 ole32 user32 msvcrt kernel32 ntdll) -add_cd_file(TARGET wmic DESTINATION reactos/system32 FOR all) +add_cd_file(TARGET wmic DESTINATION reactos/system32/wbem FOR all) Copied: trunk/reactos/base/applications/cmdutils/wmic/main.c (from r60750, trunk/reactos/base/applications/cmdutils/wmic/wmic.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wmic/wmic.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wmic/main.c [iso-8859-1] Sat Oct 26 09:48:25 2013 @@ -19,18 +19,16 @@ #define COBJMACROS -#include <stdio.h> -#include <windef.h> -#include <winbase.h> -#include <wincon.h> -#include <ocidl.h> +//#include <stdio.h> +//#include "windows.h" +//#include "ocidl.h" #include <initguid.h> -#include "objidl.h" -#include "wbemcli.h" +//#include "objidl.h" +#include <wbemcli.h> +#include "wmic.h" + #include <wine/debug.h> #include <wine/unicode.h> - -#include "wmic.h" WINE_DEFAULT_DEBUG_CHANNEL(wmic); @@ -231,7 +229,6 @@ } if (IWbemClassObject_Get( obj, prop, 0, &v, NULL, NULL ) == WBEM_S_NO_ERROR) { - VariantChangeType( &v, &v, 0, VT_BSTR ); output_string( fmtW, V_BSTR( &v ) ); VariantClear( &v ); } Removed: trunk/reactos/base/applications/cmdutils/wmic/wmic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wmic/wmic.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wmic/wmic.c (removed) @@ -1,265 +0,0 @@ -/* - * Copyright 2010 Louis Lenders - * Copyright 2012 Hans Leidekker 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 - */ - -#define COBJMACROS - -#include <stdio.h> -#include <windef.h> -#include <winbase.h> -#include <wincon.h> -#include <ocidl.h> -#include <initguid.h> -#include "objidl.h" -#include "wbemcli.h" -#include <wine/debug.h> -#include <wine/unicode.h> - -#include "wmic.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wmic); - -static const WCHAR biosW[] = - {'b','i','o','s',0}; -static const WCHAR computersystemW[] = - {'c','o','m','p','u','t','e','r','s','y','s','t','e','m',0}; -static const WCHAR cpuW[] = - {'c','p','u',0}; -static const WCHAR logicaldiskW[] = - {'L','o','g','i','c','a','l','D','i','s','k',0}; -static const WCHAR nicW[] = - {'n','i','c',0}; -static const WCHAR osW[] = - {'o','s',0}; -static const WCHAR processW[] = - {'p','r','o','c','e','s','s',0}; - -static const WCHAR win32_biosW[] = - {'W','i','n','3','2','_','B','I','O','S',0}; -static const WCHAR win32_computersystemW[] = - {'W','i','n','3','2','_','C','o','m','p','u','t','e','r','S','y','s','t','e','m',0}; -static const WCHAR win32_logicaldiskW[] = - {'W','i','n','3','2','_','L','o','g','i','c','a','l','D','i','s','k',0}; -static const WCHAR win32_networkadapterW[] = - {'W','i','n','3','2','_','N','e','t','w','o','r','k','A','d','a','p','t','e','r',0}; -static const WCHAR win32_operatingsystemW[] = - {'W','i','n','3','2','_','O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; -static const WCHAR win32_processW[] = - {'W','i','n','3','2','_','P','r','o','c','e','s','s',0}; -static const WCHAR win32_processorW[] = - {'W','i','n','3','2','_','P','r','o','c','e','s','s','o','r',0}; - -static const struct -{ - const WCHAR *alias; - const WCHAR *class; -} -alias_map[] = -{ - { biosW, win32_biosW }, - { computersystemW, win32_computersystemW }, - { cpuW, win32_processorW }, - { logicaldiskW, win32_logicaldiskW }, - { nicW, win32_networkadapterW }, - { osW, win32_operatingsystemW }, - { processW, win32_processW } -}; - -static const WCHAR *find_class( const WCHAR *alias ) -{ - unsigned int i; - - for (i = 0; i < sizeof(alias_map)/sizeof(alias_map[0]); i++) - { - if (!strcmpiW( alias, alias_map[i].alias )) return alias_map[i].class; - } - return NULL; -} - -static inline WCHAR *strdupW( const WCHAR *src ) -{ - WCHAR *dst; - if (!src) return NULL; - if (!(dst = HeapAlloc( GetProcessHeap(), 0, (strlenW( src ) + 1) * sizeof(WCHAR) ))) return NULL; - strcpyW( dst, src ); - return dst; -} - -static WCHAR *find_prop( IWbemClassObject *class, const WCHAR *prop ) -{ - SAFEARRAY *sa; - WCHAR *ret = NULL; - LONG i, last_index = 0; - BSTR str; - - if (IWbemClassObject_GetNames( class, NULL, WBEM_FLAG_ALWAYS, NULL, &sa ) != S_OK) return NULL; - - SafeArrayGetUBound( sa, 1, &last_index ); - for (i = 0; i <= last_index; i++) - { - SafeArrayGetElement( sa, &i, &str ); - if (!strcmpiW( str, prop )) - { - ret = strdupW( str ); - break; - } - } - SafeArrayDestroy( sa ); - return ret; -} - -static int output_string( const WCHAR *msg, ... ) -{ - va_list va_args; - int wlen; - DWORD count, ret; - WCHAR buffer[8192]; - - va_start( va_args, msg ); - vsprintfW( buffer, msg, va_args ); - va_end( va_args ); - - wlen = strlenW( buffer ); - ret = WriteConsoleW( GetStdHandle(STD_OUTPUT_HANDLE), buffer, wlen, &count, NULL ); - if (!ret) - { - DWORD len; - char *msgA; - - /* On Windows WriteConsoleW() fails if the output is redirected. So fall - * back to WriteFile(), assuming the console encoding is still the right - * one in that case. - */ - len = WideCharToMultiByte( GetConsoleOutputCP(), 0, buffer, wlen, NULL, 0, NULL, NULL ); - if (!(msgA = HeapAlloc( GetProcessHeap(), 0, len * sizeof(char) ))) return 0; - - WideCharToMultiByte( GetConsoleOutputCP(), 0, buffer, wlen, msgA, len, NULL, NULL ); - WriteFile( GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE ); - HeapFree( GetProcessHeap(), 0, msgA ); - } - return count; -} - -static int output_message( int msg ) -{ - static const WCHAR fmtW[] = {'%','s',0}; - WCHAR buffer[8192]; - - LoadStringW( GetModuleHandleW(NULL), msg, buffer, sizeof(buffer)/sizeof(WCHAR) ); - return output_string( fmtW, buffer ); -} - -static int query_prop( const WCHAR *alias, const WCHAR *propname ) -{ - static const WCHAR select_allW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0}; - static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; - static const WCHAR wqlW[] = {'W','Q','L',0}; - static const WCHAR newlineW[] = {'\n',0}; - static const WCHAR fmtW[] = {'%','s','\n',0}; - HRESULT hr; - IWbemLocator *locator = NULL; - IWbemServices *services = NULL; - IEnumWbemClassObject *result = NULL; - LONG flags = WBEM_FLAG_RETURN_IMMEDIATELY | WBEM_FLAG_FORWARD_ONLY; - BSTR path = NULL, wql = NULL, query = NULL; - const WCHAR *class; - WCHAR *prop = NULL; - BOOL first = TRUE; - int len, ret = -1; - - WINE_TRACE("%s, %s\n", debugstr_w(alias), debugstr_w(propname)); - - if (!(class = find_class( alias ))) - { - output_message( STRING_ALIAS_NOT_FOUND ); - return -1; - } - CoInitialize( NULL ); - CoInitializeSecurity( NULL, -1, NULL, NULL, RPC_C_AUTHN_LEVEL_DEFAULT, - RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE, NULL ); - - hr = CoCreateInstance( &CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemLocator, - (void **)&locator ); - if (hr != S_OK) goto done; - - if (!(path = SysAllocString( cimv2W ))) goto done; - hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); - if (hr != S_OK) goto done; - - len = strlenW( class ) + sizeof(select_allW) / sizeof(select_allW[0]); - if (!(query = SysAllocStringLen( NULL, len ))) goto done; - strcpyW( query, select_allW ); - strcatW( query, class ); - - if (!(wql = SysAllocString( wqlW ))) goto done; - hr = IWbemServices_ExecQuery( services, wql, query, flags, NULL, &result ); - if (hr != S_OK) goto done; - - for (;;) - { - IWbemClassObject *obj; - ULONG count; - VARIANT v; - - IEnumWbemClassObject_Next( result, WBEM_INFINITE, 1, &obj, &count ); - if (!count) break; - - if (first) - { - if (!(prop = find_prop( obj, propname ))) - { - output_message( STRING_INVALID_QUERY ); - goto done; - } - output_string( fmtW, prop ); - first = FALSE; - } - if (IWbemClassObject_Get( obj, prop, 0, &v, NULL, NULL ) == WBEM_S_NO_ERROR) - { - VariantChangeType( &v, &v, 0, VT_BSTR ); - output_string( fmtW, V_BSTR( &v ) ); - VariantClear( &v ); - } - IWbemClassObject_Release( obj ); - } - output_string( newlineW ); - ret = 0; - -done: - if (result) IEnumWbemClassObject_Release( result ); - if (services) IWbemServices_Release( services ); - if (locator) IWbemLocator_Release( locator ); - SysFreeString( path ); - SysFreeString( query ); - SysFreeString( wql ); - HeapFree( GetProcessHeap(), 0, prop ); - CoUninitialize(); - return ret; -} - -int wmain(int argc, WCHAR *argv[]) -{ - static const WCHAR getW[] = {'g','e','t',0}; - - if (argc != 4 || strcmpiW( argv[2], getW )) - { - output_message( STRING_CMDLINE_NOT_SUPPORTED ); - return -1; - } - return query_prop( argv[1], argv[3] ); -} 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] Sat Oct 26 09:48:25 2013 @@ -227,7 +227,7 @@ reactos/base/applications/cmdutils/reg # Synced to Wine-1.1.40 reactos/base/applications/cmdutils/taskkill # Synced to Wine-1.5.25 -reactos/base/applications/cmdutils/wmic # Synced to Wine-1.7.5 +reactos/base/applications/cmdutils/wmic # Synced to Wine-1.7.1 reactos/base/applications/cmdutils/xcopy # Synced to Wine-1.3.37 reactos/base/applications/games/winmine # Forked at Wine-1_3_5 reactos/base/applications/extrac32 # Autosync

1 0

[ekohl] 60750: [SAMSRV] Create and set a security descriptor for new user account objects.
by ekohl＠svn.reactos.org 26 Oct '13

26 Oct '13

Author: ekohl Date: Sat Oct 26 09:09:31 2013 New Revision: 60750 URL: http://svn.reactos.org/svn/reactos?rev=60750&view=rev Log: [SAMSRV] Create and set a security descriptor for new user account objects. Modified: trunk/reactos/dll/win32/samsrv/domain.c trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/dll/win32/samsrv/security.c trunk/reactos/dll/win32/samsrv/setup.c Modified: trunk/reactos/dll/win32/samsrv/domain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/domain.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/domain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/domain.c [iso-8859-1] Sat Oct 26 09:09:31 2013 @@ -303,4 +303,55 @@ return Status; } + +NTSTATUS +SampCreateAccountSid(IN PSAM_DB_OBJECT DomainObject, + IN ULONG ulRelativeId, + IN OUT PSID *AccountSid) +{ + PSID DomainSid = NULL; + ULONG Length = 0; + NTSTATUS Status; + + Status = SampGetObjectAttribute(DomainObject, + L"SID", + NULL, + NULL, + &Length); + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + TRACE("Length: %lu\n", Length); + + DomainSid = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length); + if (DomainSid == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = SampGetObjectAttribute(DomainObject, + L"SID", + NULL, + DomainSid, + &Length); + if (!NT_SUCCESS(Status)) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + *AccountSid = AppendRidToSid(DomainSid, + ulRelativeId); + +done: + if (DomainSid != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); + + return Status; +} + /* EOF */ Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sat Oct 26 09:09:31 2013 @@ -2174,6 +2174,9 @@ ULONG ulSize; ULONG ulRid; WCHAR szRid[9]; + PSECURITY_DESCRIPTOR Sd = NULL; + ULONG SdSize = 0; + PSID UserSid = NULL; NTSTATUS Status; TRACE("SamrCreateUserInDomain(%p %p %lx %p %p)\n", @@ -2239,6 +2242,28 @@ ulRid = FixedDomainData.NextRid; FixedDomainData.NextRid++; + TRACE("RID: %lx\n", ulRid); + + /* Create the user SID */ + Status = SampCreateAccountSid(DomainObject, + ulRid, + &UserSid); + if (!NT_SUCCESS(Status)) + { + TRACE("SampCreateAccountSid failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Create the security descriptor */ + Status = SampCreateUserSD(UserSid, + &Sd, + &SdSize); + if (!NT_SUCCESS(Status)) + { + TRACE("SampCreateUserSD failed (Status 0x%08lx)\n", Status); + goto done; + } + /* Store the fixed domain attributes */ Status = SampSetObjectAttribute(DomainObject, L"F", @@ -2250,8 +2275,6 @@ TRACE("failed with status 0x%08lx\n", Status); goto done; } - - TRACE("RID: %lx\n", ulRid); /* Convert the RID into a string (hex) */ swprintf(szRid, L"%08lX", ulRid); @@ -2505,7 +2528,17 @@ goto done; } - /* FIXME: Set SecDesc attribute*/ + /* Set the SecDesc attribute*/ + Status = SampSetObjectAttribute(UserObject, + L"SecDesc", + REG_BINARY, + Sd, + SdSize); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + goto done; + } if (NT_SUCCESS(Status)) { @@ -2514,6 +2547,12 @@ } done: + if (Sd != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Sd); + + if (UserSid != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, UserSid); + RtlReleaseResource(&SampResource); TRACE("returns with status 0x%08lx\n", Status); @@ -6871,7 +6910,6 @@ if (InfoBuffer->All.WhichFields & USER_ALL_SECURITYDESCRIPTOR) { -#if 0 Length = 0; SampGetObjectAttribute(UserObject, L"SecDesc", @@ -6898,7 +6936,6 @@ if (!NT_SUCCESS(Status)) goto done; } -#endif } *Buffer = InfoBuffer; @@ -7670,13 +7707,11 @@ if (WhichFields & USER_ALL_SECURITYDESCRIPTOR) { -#if 0 Status = SampSetObjectAttribute(UserObject, L"SecDesc", REG_BINARY, Buffer->All.SecurityDescriptor.SecurityDescriptor, Buffer->All.SecurityDescriptor.Length); -#endif } if (WriteFixedData == TRUE) @@ -8523,6 +8558,9 @@ ULONG ulSize; ULONG ulRid; WCHAR szRid[9]; + PSECURITY_DESCRIPTOR Sd = NULL; + ULONG SdSize = 0; + PSID UserSid = NULL; NTSTATUS Status; TRACE("SamrCreateUserInDomain(%p %p %lx %p %p)\n", @@ -8596,6 +8634,28 @@ ulRid = FixedDomainData.NextRid; FixedDomainData.NextRid++; + TRACE("RID: %lx\n", ulRid); + + /* Create the user SID */ + Status = SampCreateAccountSid(DomainObject, + ulRid, + &UserSid); + if (!NT_SUCCESS(Status)) + { + TRACE("SampCreateAccountSid failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Create the security descriptor */ + Status = SampCreateUserSD(UserSid, + &Sd, + &SdSize); + if (!NT_SUCCESS(Status)) + { + TRACE("SampCreateUserSD failed (Status 0x%08lx)\n", Status); + goto done; + } + /* Store the fixed domain attributes */ Status = SampSetObjectAttribute(DomainObject, L"F", @@ -8607,8 +8667,6 @@ TRACE("failed with status 0x%08lx\n", Status); goto done; } - - TRACE("RID: %lx\n", ulRid); /* Convert the RID into a string (hex) */ swprintf(szRid, L"%08lX", ulRid); @@ -8861,7 +8919,17 @@ goto done; } - /* FIXME: Set SecDesc attribute*/ + /* Set the SecDesc attribute*/ + Status = SampSetObjectAttribute(UserObject, + L"SecDesc", + REG_BINARY, + Sd, + SdSize); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + goto done; + } if (NT_SUCCESS(Status)) { @@ -8871,6 +8939,12 @@ } done: + if (Sd != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Sd); + + if (UserSid != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, UserSid); + RtlReleaseResource(&SampResource); TRACE("returns with status 0x%08lx\n", Status); Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Sat Oct 26 09:09:31 2013 @@ -230,6 +230,10 @@ SampRemoveMemberFromAllAliases(IN PSAM_DB_OBJECT DomainObject, IN PRPC_SID MemberSid); +NTSTATUS +SampCreateAccountSid(IN PSAM_DB_OBJECT DomainObject, + IN ULONG ulRelativeId, + IN OUT PSID *AccountSid); /* group.h */ @@ -336,6 +340,10 @@ SampCreateGroupSD(OUT PSECURITY_DESCRIPTOR *GroupSd, OUT PULONG Size); +NTSTATUS +SampCreateUserSD(IN PSID UserSid, + OUT PSECURITY_DESCRIPTOR *UserSd, + OUT PULONG Size); /* setup.c */ Modified: trunk/reactos/dll/win32/samsrv/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/security.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/security.c [iso-8859-1] Sat Oct 26 09:09:31 2013 @@ -1433,4 +1433,276 @@ return Status; } + +NTSTATUS +SampCreateUserSD(IN PSID UserSid, + OUT PSECURITY_DESCRIPTOR *UserSd, + OUT PULONG Size) +{ + PSECURITY_DESCRIPTOR AbsSD = NULL; + PSECURITY_DESCRIPTOR RelSD = NULL; + PSID EveryoneSid = NULL; + PSID AnonymousSid = NULL; + PSID AdministratorsSid = NULL; + PACL Dacl = NULL; + PACL Sacl = NULL; + ULONG DaclSize; + ULONG SaclSize; + ULONG RelSDSize = 0; + NTSTATUS Status = STATUS_SUCCESS; + + + /* Create the Everyone SID */ + Status = RtlAllocateAndInitializeSid(&WorldAuthority, + 1, + SECURITY_WORLD_RID, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + &EveryoneSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + /* Create the Anonymous SID */ + Status = RtlAllocateAndInitializeSid(&NtAuthority, + 1, + SECURITY_ANONYMOUS_LOGON_RID, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + &AnonymousSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + /* Create the Administrators SID */ + Status = RtlAllocateAndInitializeSid(&NtAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, + 0, + 0, + 0, + 0, + 0, + &AdministratorsSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + /* Allocate a buffer for the absolute SD */ + AbsSD = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(SECURITY_DESCRIPTOR)); + if (AbsSD == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + /* Create the absolute SD */ + Status = RtlCreateSecurityDescriptor(AbsSD, + SECURITY_DESCRIPTOR_REVISION); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + /* allocate and create the DACL */ + DaclSize = sizeof(ACL) + + 3 * sizeof(ACE) + + RtlLengthSid(EveryoneSid) + + RtlLengthSid(AdministratorsSid) + + RtlLengthSid(UserSid); + + Dacl = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + DaclSize); + if (Dacl == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + Status = RtlCreateAcl(Dacl, + DaclSize, + ACL_REVISION); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + READ_CONTROL | USER_READ_GROUP_INFORMATION | USER_LIST_GROUPS | + USER_CHANGE_PASSWORD | USER_READ_ACCOUNT | USER_READ_LOGON | + USER_READ_PREFERENCES | USER_READ_GENERAL, + EveryoneSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + USER_ALL_ACCESS, + AdministratorsSid); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + READ_CONTROL | USER_CHANGE_PASSWORD | USER_WRITE_PREFERENCES, + UserSid); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the DACL */ + Status = RtlSetDaclSecurityDescriptor(AbsSD, + TRUE, + Dacl, + FALSE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* allocate and create the SACL */ + SaclSize = sizeof(ACL) + + 2 * sizeof(ACE) + + RtlLengthSid(EveryoneSid) + + RtlLengthSid(AnonymousSid); + + Sacl = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + DaclSize); + if (Sacl == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + Status = RtlCreateAcl(Sacl, + SaclSize, + ACL_REVISION); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAuditAccessAce(Sacl, + ACL_REVISION, + ACCESS_SYSTEM_SECURITY | WRITE_DAC | DELETE | + USER_CHANGE_PASSWORD | USER_WRITE_PREFERENCES, + EveryoneSid, + TRUE, + TRUE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAuditAccessAce(Sacl, + ACL_REVISION, + STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL, + AnonymousSid, + TRUE, + TRUE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the SACL */ + Status = RtlSetSaclSecurityDescriptor(AbsSD, + TRUE, + Sacl, + FALSE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the owner SID */ + Status = RtlSetOwnerSecurityDescriptor(AbsSD, + AdministratorsSid, + FALSE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the group SID */ + Status = RtlSetGroupSecurityDescriptor(AbsSD, + AdministratorsSid, + FALSE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Get the reqired buffer size for the self-relative SD */ + Status = RtlAbsoluteToSelfRelativeSD(AbsSD, + NULL, + &RelSDSize); + if (Status != STATUS_BUFFER_TOO_SMALL) + goto done; + + /* Allocate a buffer for the self-relative SD */ + RelSD = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + RelSDSize); + if (RelSD == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + /* Convert the absolute SD to self-relative format */ + Status = RtlAbsoluteToSelfRelativeSD(AbsSD, + RelSD, + &RelSDSize); + if (Status == STATUS_BUFFER_TOO_SMALL) + { + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + *UserSd = RelSD; + *Size = RelSDSize; + +done: + if (!NT_SUCCESS(Status)) + { + if (RelSD != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, RelSD); + } + + if (EveryoneSid != NULL) + RtlFreeSid(EveryoneSid); + + if (AnonymousSid != NULL) + RtlFreeSid(AnonymousSid); + + if (AdministratorsSid != NULL) + RtlFreeSid(AdministratorsSid); + + if (Dacl != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Dacl); + + if (Sacl != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Sacl); + + if (AbsSD != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, AbsSD); + + return Status; +} + /* EOF */ Modified: trunk/reactos/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/setup.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] Sat Oct 26 09:09:31 2013 @@ -359,6 +359,7 @@ SampSetupCreateUserAccount(HANDLE hDomainKey, LPCWSTR lpAccountName, LPCWSTR lpComment, + PSID lpDomainSid, ULONG ulRelativeId, ULONG UserAccountControl) { @@ -369,7 +370,20 @@ WCHAR szAccountKeyName[32]; HANDLE hAccountKey = NULL; HANDLE hNamesKey = NULL; + PSECURITY_DESCRIPTOR Sd = NULL; + ULONG SdSize = 0; + PSID UserSid = NULL; NTSTATUS Status; + + UserSid = AppendRidToSid(lpDomainSid, + ulRelativeId); + + /* Create the security descriptor */ + Status = SampCreateUserSD(UserSid, + &Sd, + &SdSize); + if (!NT_SUCCESS(Status)) + goto done; /* Initialize fixed user data */ FixedUserData.Version = 1; @@ -558,9 +572,14 @@ if (!NT_SUCCESS(Status)) goto done; - - /* FIXME: Set SecDesc attribute*/ - + /* Set the SecDesc attribute*/ + Status = SampRegSetValue(hAccountKey, + L"SecDesc", + REG_BINARY, + Sd, + SdSize); + if (!NT_SUCCESS(Status)) + goto done; Status = SampRegOpenKey(hDomainKey, L"Users\\Names", @@ -577,6 +596,12 @@ done: SampRegCloseKey(&hNamesKey); + + if (Sd != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Sd); + + if (UserSid != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, UserSid); if (hAccountKey != NULL) { @@ -1057,6 +1082,7 @@ SampSetupCreateUserAccount(hAccountDomainKey, szName, szComment, + AccountDomainInfo->DomainSid, DOMAIN_USER_RID_ADMIN, USER_DONT_EXPIRE_PASSWORD | USER_NORMAL_ACCOUNT); @@ -1070,6 +1096,7 @@ SampSetupCreateUserAccount(hAccountDomainKey, szName, szComment, + AccountDomainInfo->DomainSid, DOMAIN_USER_RID_GUEST, USER_ACCOUNT_DISABLED | USER_DONT_EXPIRE_PASSWORD | USER_NORMAL_ACCOUNT);

1 0

[hbelusca] 60749: [SETUP] The standard writing for ReactOS is with "OS" in capital letters, not in lowercase letters. Patch by Yuntian Zhang. CORE-7524 #resolve #comment Fixed in revision 60749, ch...
by hbelusca＠svn.reactos.org 26 Oct '13

26 Oct '13

Author: hbelusca Date: Sat Oct 26 01:17:11 2013 New Revision: 60749 URL: http://svn.reactos.org/svn/reactos?rev=60749&view=rev Log: [SETUP] The standard writing for ReactOS is with "OS" in capital letters, not in lowercase letters. Patch by Yuntian Zhang. CORE-7524 #resolve #comment Fixed in revision 60749, cheers! Modified: trunk/reactos/base/setup/reactos/lang/el-GR.rc trunk/reactos/base/setup/reactos/lang/en-US.rc trunk/reactos/base/setup/reactos/lang/es-ES.rc trunk/reactos/base/setup/reactos/lang/fi-FI.rc trunk/reactos/base/setup/reactos/lang/fr-FR.rc trunk/reactos/base/setup/reactos/lang/he-IL.rc trunk/reactos/base/setup/reactos/lang/hu-HU.rc trunk/reactos/base/setup/reactos/lang/no-NO.rc trunk/reactos/base/setup/reactos/lang/pl-PL.rc trunk/reactos/base/setup/reactos/lang/sk-SK.rc trunk/reactos/base/setup/reactos/lang/zh-CN.rc Modified: trunk/reactos/base/setup/reactos/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/el… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/el-GR.rc [iso-8859-1] Sat Oct 26 01:17:11 2013 @@ -146,7 +146,7 @@ IDS_RESTARTSUBTITLE "Î¤Î¿ ÏÏÏÏÎ¿ ÏÏÎ¬Î´Î¹Î¿ ÏÎ·Ï ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï Î¿Î»Î¿ÎºÎ»Î·ÏÏÎ¸Î·ÎºÎµ, ÎºÎ¬Î½ÏÎµ ÎµÏÎ±Î½ÎµÎºÎºÎ¯Î½Î·ÏÎ· Î³Î¹Î± Î½Î± ÏÏÎ½ÎµÏÎ¯ÏÎµÏÎµ Î¼Îµ ÏÎ¿ Î´ÎµÏÏÎµÏÎ¿ ÏÏÎ¬Î´Î¹Î¿." IDS_SUMMARYTITLE "Installation Summary" IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" - IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install Reactos. Really quit?" + IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" IDS_ABORTSETUP2 "Abort installation?" END /* EOF */ Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/en… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] Sat Oct 26 01:17:11 2013 @@ -146,7 +146,7 @@ IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" IDS_SUMMARYTITLE "Installation Summary" IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" - IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install Reactos. Really quit?" + IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" IDS_ABORTSETUP2 "Abort installation?" END /* EOF */ Modified: trunk/reactos/base/setup/reactos/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/es… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/es-ES.rc [iso-8859-1] Sat Oct 26 01:17:11 2013 @@ -150,7 +150,7 @@ IDS_RESTARTSUBTITLE "La primera parte de la instalaciÃ³n ha sido completada, reinicie para continuar con la segunda parte" IDS_SUMMARYTITLE "Resumen de la instalaciÃ³n" IDS_SUMMARYSUBTITLE "Lista las propiedades de la instalaciÃ³n para su verificaciÃ³n antes de aplicarlas al dispositivo instalado" - IDS_ABORTSETUP "ReactOS no estÃ¡ completamente instalado en su equipo. Si sale de la instalaciÃ³n ahora, tendrÃ¡ que ejecutar el instalador otra vez para instalar Reactos. Â¿Realmente quiere salir?" + IDS_ABORTSETUP "ReactOS no estÃ¡ completamente instalado en su equipo. Si sale de la instalaciÃ³n ahora, tendrÃ¡ que ejecutar el instalador otra vez para instalar ReactOS. Â¿Realmente quiere salir?" IDS_ABORTSETUP2 "Â¿Abortar instalaciÃ³n?" END /* EOF */ Modified: trunk/reactos/base/setup/reactos/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/fi… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/fi-FI.rc [iso-8859-1] Sat Oct 26 01:17:11 2013 @@ -146,7 +146,7 @@ IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" IDS_SUMMARYTITLE "Installation Summary" IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" - IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install Reactos. Really quit?" + IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" IDS_ABORTSETUP2 "Abort installation?" END /* EOF */ Modified: trunk/reactos/base/setup/reactos/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/fr… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/fr-FR.rc [iso-8859-1] Sat Oct 26 01:17:11 2013 @@ -146,7 +146,7 @@ IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" IDS_SUMMARYTITLE "Installation Summary" IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" - IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install Reactos. Really quit?" + IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" IDS_ABORTSETUP2 "Abort installation?" END /* EOF */ Modified: trunk/reactos/base/setup/reactos/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/he… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/he-IL.rc [iso-8859-1] Sat Oct 26 01:17:11 2013 @@ -148,7 +148,7 @@ IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" IDS_SUMMARYTITLE "Installation Summary" IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" - IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install Reactos. Really quit?" + IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" IDS_ABORTSETUP2 "Abort installation?" END /* EOF */ Modified: trunk/reactos/base/setup/reactos/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/hu… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/hu-HU.rc [iso-8859-1] Sat Oct 26 01:17:11 2013 @@ -148,7 +148,7 @@ IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" IDS_SUMMARYTITLE "Installation Summary" IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" - IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install Reactos. Really quit?" + IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Really quit?" IDS_ABORTSETUP2 "Abort installation?" END /* EOF */ Modified: trunk/reactos/base/setup/reactos/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/no… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/no-NO.rc [iso-8859-1] Sat Oct 26 01:17:11 2013 @@ -146,7 +146,7 @@ IDS_RESTARTSUBTITLE "FÃ¸rste steget av installering har blitt fullfÃ¸rt, start pÃ¥ nytt for Ã¥ fortsette til andre steget" IDS_SUMMARYTITLE "Installasjon oppsumering" IDS_SUMMARYSUBTITLE "Sjekk listen av installasjon egenskapene fÃ¸r du fortsetter installasjon av enhetene" - IDS_ABORTSETUP "ReactOS er ikke fullstendig installert pÃ¥ datamaskinen. Hvis du avslutter nÃ¥, trenger du Ã¥ kjÃ¸re installeringen pÃ¥ nytt for Ã¥ installere Reactos. Vil du virkelig avslutte?" + IDS_ABORTSETUP "ReactOS er ikke fullstendig installert pÃ¥ datamaskinen. Hvis du avslutter nÃ¥, trenger du Ã¥ kjÃ¸re installeringen pÃ¥ nytt for Ã¥ installere ReactOS. Vil du virkelig avslutte?" IDS_ABORTSETUP2 "Avbryt installasjonen?" END /* EOF */ Modified: trunk/reactos/base/setup/reactos/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pl… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/pl-PL.rc [iso-8859-1] Sat Oct 26 01:17:11 2013 @@ -156,7 +156,7 @@ IDS_RESTARTSUBTITLE "Pierwszy etap instalacji zostaÅ zakoÅczony, uruchom ponownie komputer, aby przejÅÄ do drugiego etapu" IDS_SUMMARYTITLE "Podsumowanie instalacji" IDS_SUMMARYSUBTITLE "SprawdÅº ustawienia instalacji przed dokonaniem zmian na dysku" - IDS_ABORTSETUP "Instalacja ReactOS nie zostaÅa ukoÅczona na tym komputerze. JeÅli teraz zakoÅczysz instalacjÄ, bÄdziesz musiaÅ uruchomiÄ Instalator ponownie, aby zainstalowaÄ Reactos. Na pewno zakoÅczyÄ?" + IDS_ABORTSETUP "Instalacja ReactOS nie zostaÅa ukoÅczona na tym komputerze. JeÅli teraz zakoÅczysz instalacjÄ, bÄdziesz musiaÅ uruchomiÄ Instalator ponownie, aby zainstalowaÄ ReactOS. Na pewno zakoÅczyÄ?" IDS_ABORTSETUP2 "PrzerwaÄ instalacjÄ?" END /* EOF */ Modified: trunk/reactos/base/setup/reactos/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/sk… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/sk-SK.rc [iso-8859-1] Sat Oct 26 01:17:11 2013 @@ -151,7 +151,7 @@ IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" IDS_SUMMARYTITLE "Zhrnutie inÅ¡talÃ¡cie" IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" - IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install Reactos. Naozaj skonÄiÅ¥?" + IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install ReactOS. Naozaj skonÄiÅ¥?" IDS_ABORTSETUP2 "PreruÅ¡iÅ¥ inÅ¡talÃ¡ciu?" END /* EOF */ Modified: trunk/reactos/base/setup/reactos/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/zh… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/zh-CN.rc [iso-8859-1] Sat Oct 26 01:17:11 2013 @@ -146,7 +146,7 @@ IDS_RESTARTSUBTITLE "ç¬¬ä¸é¶æ®µå®è£å·²ç»å®æï¼éæ°å¯å¨è¿è¡ç¬¬äºé¶æ®µå®è£" IDS_SUMMARYTITLE "å®è£æ¦è¦" IDS_SUMMARYSUBTITLE "æ£æ¯å®è£åååºå®è£å±æ§ä»¥ä¾æ£æ¥" - IDS_ABORTSETUP "ReactOS æªå¨æ¨ççµèä¸å®è£å®æãå¦ææ¨ç°å¨éåºå®è£ç¨åºï¼æ¨éè¦å¨ä¸æ¬¡è¿è¡å®è£ç¨åºæ¥å®è£ Reactosã ç¡®å®éåºï¼" + IDS_ABORTSETUP "ReactOS æªå¨æ¨ççµèä¸å®è£å®æãå¦ææ¨ç°å¨éåºå®è£ç¨åºï¼æ¨éè¦å¨ä¸æ¬¡è¿è¡å®è£ç¨åºæ¥å®è£ ReactOSã ç¡®å®éåºï¼" IDS_ABORTSETUP2 "ç»æ¢å®è£ï¼" END

1 0

[hbelusca] 60748: [WMIC] Import WMIC ("Windows Management Instrumentation Console") from Wine 1.7.5 (just released yesterday, 25/10/2013), in which we include only the necessary headers. Sync up RE...
by hbelusca＠svn.reactos.org 26 Oct '13

26 Oct '13

Author: hbelusca Date: Sat Oct 26 01:02:19 2013 New Revision: 60748 URL: http://svn.reactos.org/svn/reactos?rev=60748&view=rev Log: [WMIC] Import WMIC ("Windows Management Instrumentation Console") from Wine 1.7.5 (just released yesterday, 25/10/2013), in which we include only the necessary headers. Sync up README.WINE too. WMIC is needed (amongst other things) for retrieving the date of the build when configuring a new build using RosBE. Dedicated to Sylvain Petreolle and Amine Khaldi. Added: trunk/reactos/base/applications/cmdutils/wmic/ (with props) trunk/reactos/base/applications/cmdutils/wmic/CMakeLists.txt (with props) trunk/reactos/base/applications/cmdutils/wmic/wmic.c (with props) trunk/reactos/base/applications/cmdutils/wmic/wmic.h (with props) trunk/reactos/base/applications/cmdutils/wmic/wmic.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] Sat Oct 26 01:02:19 2013 @@ -7,4 +7,5 @@ add_subdirectory(more) add_subdirectory(reg) add_subdirectory(taskkill) +add_subdirectory(wmic) add_subdirectory(xcopy) Propchange: trunk/reactos/base/applications/cmdutils/wmic/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Oct 26 01:02:19 2013 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/base/applications/cmdutils/wmic/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/base/applications/cmdutils/wmic/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/base/applications/cmdutils/wmic/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/applications/cmdutils/wmic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wmic/CMakeLists.txt (added) +++ trunk/reactos/base/applications/cmdutils/wmic/CMakeLists.txt [iso-8859-1] Sat Oct 26 01:02:19 2013 @@ -0,0 +1,6 @@ + +add_executable(wmic wmic.c wmic.rc) +target_link_libraries(wmic wine) +set_module_type(wmic win32cui UNICODE) +add_importlibs(wmic oleaut32 ole32 user32 msvcrt kernel32 ntdll) +add_cd_file(TARGET wmic DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/base/applications/cmdutils/wmic/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/wmic/wmic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wmic/wmic.c (added) +++ trunk/reactos/base/applications/cmdutils/wmic/wmic.c [iso-8859-1] Sat Oct 26 01:02:19 2013 @@ -0,0 +1,265 @@ +/* + * Copyright 2010 Louis Lenders + * Copyright 2012 Hans Leidekker 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 + */ + +#define COBJMACROS + +#include <stdio.h> +#include <windef.h> +#include <winbase.h> +#include <wincon.h> +#include <ocidl.h> +#include <initguid.h> +#include "objidl.h" +#include "wbemcli.h" +#include <wine/debug.h> +#include <wine/unicode.h> + +#include "wmic.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wmic); + +static const WCHAR biosW[] = + {'b','i','o','s',0}; +static const WCHAR computersystemW[] = + {'c','o','m','p','u','t','e','r','s','y','s','t','e','m',0}; +static const WCHAR cpuW[] = + {'c','p','u',0}; +static const WCHAR logicaldiskW[] = + {'L','o','g','i','c','a','l','D','i','s','k',0}; +static const WCHAR nicW[] = + {'n','i','c',0}; +static const WCHAR osW[] = + {'o','s',0}; +static const WCHAR processW[] = + {'p','r','o','c','e','s','s',0}; + +static const WCHAR win32_biosW[] = + {'W','i','n','3','2','_','B','I','O','S',0}; +static const WCHAR win32_computersystemW[] = + {'W','i','n','3','2','_','C','o','m','p','u','t','e','r','S','y','s','t','e','m',0}; +static const WCHAR win32_logicaldiskW[] = + {'W','i','n','3','2','_','L','o','g','i','c','a','l','D','i','s','k',0}; +static const WCHAR win32_networkadapterW[] = + {'W','i','n','3','2','_','N','e','t','w','o','r','k','A','d','a','p','t','e','r',0}; +static const WCHAR win32_operatingsystemW[] = + {'W','i','n','3','2','_','O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; +static const WCHAR win32_processW[] = + {'W','i','n','3','2','_','P','r','o','c','e','s','s',0}; +static const WCHAR win32_processorW[] = + {'W','i','n','3','2','_','P','r','o','c','e','s','s','o','r',0}; + +static const struct +{ + const WCHAR *alias; + const WCHAR *class; +} +alias_map[] = +{ + { biosW, win32_biosW }, + { computersystemW, win32_computersystemW }, + { cpuW, win32_processorW }, + { logicaldiskW, win32_logicaldiskW }, + { nicW, win32_networkadapterW }, + { osW, win32_operatingsystemW }, + { processW, win32_processW } +}; + +static const WCHAR *find_class( const WCHAR *alias ) +{ + unsigned int i; + + for (i = 0; i < sizeof(alias_map)/sizeof(alias_map[0]); i++) + { + if (!strcmpiW( alias, alias_map[i].alias )) return alias_map[i].class; + } + return NULL; +} + +static inline WCHAR *strdupW( const WCHAR *src ) +{ + WCHAR *dst; + if (!src) return NULL; + if (!(dst = HeapAlloc( GetProcessHeap(), 0, (strlenW( src ) + 1) * sizeof(WCHAR) ))) return NULL; + strcpyW( dst, src ); + return dst; +} + +static WCHAR *find_prop( IWbemClassObject *class, const WCHAR *prop ) +{ + SAFEARRAY *sa; + WCHAR *ret = NULL; + LONG i, last_index = 0; + BSTR str; + + if (IWbemClassObject_GetNames( class, NULL, WBEM_FLAG_ALWAYS, NULL, &sa ) != S_OK) return NULL; + + SafeArrayGetUBound( sa, 1, &last_index ); + for (i = 0; i <= last_index; i++) + { + SafeArrayGetElement( sa, &i, &str ); + if (!strcmpiW( str, prop )) + { + ret = strdupW( str ); + break; + } + } + SafeArrayDestroy( sa ); + return ret; +} + +static int output_string( const WCHAR *msg, ... ) +{ + va_list va_args; + int wlen; + DWORD count, ret; + WCHAR buffer[8192]; + + va_start( va_args, msg ); + vsprintfW( buffer, msg, va_args ); + va_end( va_args ); + + wlen = strlenW( buffer ); + ret = WriteConsoleW( GetStdHandle(STD_OUTPUT_HANDLE), buffer, wlen, &count, NULL ); + if (!ret) + { + DWORD len; + char *msgA; + + /* On Windows WriteConsoleW() fails if the output is redirected. So fall + * back to WriteFile(), assuming the console encoding is still the right + * one in that case. + */ + len = WideCharToMultiByte( GetConsoleOutputCP(), 0, buffer, wlen, NULL, 0, NULL, NULL ); + if (!(msgA = HeapAlloc( GetProcessHeap(), 0, len * sizeof(char) ))) return 0; + + WideCharToMultiByte( GetConsoleOutputCP(), 0, buffer, wlen, msgA, len, NULL, NULL ); + WriteFile( GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE ); + HeapFree( GetProcessHeap(), 0, msgA ); + } + return count; +} + +static int output_message( int msg ) +{ + static const WCHAR fmtW[] = {'%','s',0}; + WCHAR buffer[8192]; + + LoadStringW( GetModuleHandleW(NULL), msg, buffer, sizeof(buffer)/sizeof(WCHAR) ); + return output_string( fmtW, buffer ); +} + +static int query_prop( const WCHAR *alias, const WCHAR *propname ) +{ + static const WCHAR select_allW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0}; + static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; + static const WCHAR wqlW[] = {'W','Q','L',0}; + static const WCHAR newlineW[] = {'\n',0}; + static const WCHAR fmtW[] = {'%','s','\n',0}; + HRESULT hr; + IWbemLocator *locator = NULL; + IWbemServices *services = NULL; + IEnumWbemClassObject *result = NULL; + LONG flags = WBEM_FLAG_RETURN_IMMEDIATELY | WBEM_FLAG_FORWARD_ONLY; + BSTR path = NULL, wql = NULL, query = NULL; + const WCHAR *class; + WCHAR *prop = NULL; + BOOL first = TRUE; + int len, ret = -1; + + WINE_TRACE("%s, %s\n", debugstr_w(alias), debugstr_w(propname)); + + if (!(class = find_class( alias ))) + { + output_message( STRING_ALIAS_NOT_FOUND ); + return -1; + } + CoInitialize( NULL ); + CoInitializeSecurity( NULL, -1, NULL, NULL, RPC_C_AUTHN_LEVEL_DEFAULT, + RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE, NULL ); + + hr = CoCreateInstance( &CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemLocator, + (void **)&locator ); + if (hr != S_OK) goto done; + + if (!(path = SysAllocString( cimv2W ))) goto done; + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + if (hr != S_OK) goto done; + + len = strlenW( class ) + sizeof(select_allW) / sizeof(select_allW[0]); + if (!(query = SysAllocStringLen( NULL, len ))) goto done; + strcpyW( query, select_allW ); + strcatW( query, class ); + + if (!(wql = SysAllocString( wqlW ))) goto done; + hr = IWbemServices_ExecQuery( services, wql, query, flags, NULL, &result ); + if (hr != S_OK) goto done; + + for (;;) + { + IWbemClassObject *obj; + ULONG count; + VARIANT v; + + IEnumWbemClassObject_Next( result, WBEM_INFINITE, 1, &obj, &count ); + if (!count) break; + + if (first) + { + if (!(prop = find_prop( obj, propname ))) + { + output_message( STRING_INVALID_QUERY ); + goto done; + } + output_string( fmtW, prop ); + first = FALSE; + } + if (IWbemClassObject_Get( obj, prop, 0, &v, NULL, NULL ) == WBEM_S_NO_ERROR) + { + VariantChangeType( &v, &v, 0, VT_BSTR ); + output_string( fmtW, V_BSTR( &v ) ); + VariantClear( &v ); + } + IWbemClassObject_Release( obj ); + } + output_string( newlineW ); + ret = 0; + +done: + if (result) IEnumWbemClassObject_Release( result ); + if (services) IWbemServices_Release( services ); + if (locator) IWbemLocator_Release( locator ); + SysFreeString( path ); + SysFreeString( query ); + SysFreeString( wql ); + HeapFree( GetProcessHeap(), 0, prop ); + CoUninitialize(); + return ret; +} + +int wmain(int argc, WCHAR *argv[]) +{ + static const WCHAR getW[] = {'g','e','t',0}; + + if (argc != 4 || strcmpiW( argv[2], getW )) + { + output_message( STRING_CMDLINE_NOT_SUPPORTED ); + return -1; + } + return query_prop( argv[1], argv[3] ); +} Propchange: trunk/reactos/base/applications/cmdutils/wmic/wmic.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/wmic/wmic.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wmic/wmic.h (added) +++ trunk/reactos/base/applications/cmdutils/wmic/wmic.h [iso-8859-1] Sat Oct 26 01:02:19 2013 @@ -0,0 +1,23 @@ +/* + * Copyright 2012 Hans Leidekker 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 <windef.h> + +#define STRING_CMDLINE_NOT_SUPPORTED 101 +#define STRING_ALIAS_NOT_FOUND 102 +#define STRING_INVALID_QUERY 103 Propchange: trunk/reactos/base/applications/cmdutils/wmic/wmic.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/wmic/wmic.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wmic/wmic.rc (added) +++ trunk/reactos/base/applications/cmdutils/wmic/wmic.rc [iso-8859-1] Sat Oct 26 01:02:19 2013 @@ -0,0 +1,28 @@ +/* + * Copyright 2012 Hans Leidekker 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 "wmic.h" + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_CMDLINE_NOT_SUPPORTED, "Error: Command line not supported\n" + STRING_ALIAS_NOT_FOUND, "Error: Alias not found\n" + STRING_INVALID_QUERY, "Error: Invalid query\n" +} Propchange: trunk/reactos/base/applications/cmdutils/wmic/wmic.rc ------------------------------------------------------------------------------ svn:eol-style = native 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] Sat Oct 26 01:02:19 2013 @@ -225,19 +225,21 @@ ReactOS shares the following programs with Winehq. -reactos/base/applications/cmdutils/xcopy # Synced to Wine-1.3.37 -reactos/base/applications/games/winmine # Forked at Wine-1_3_5 -reactos/base/applications/extrac32 # Autosync -reactos/base/applications/iexplore # Synced to Wine-1.5.26 -reactos/base/applications/notepad # Forked at Wine-20041201 -reactos/base/applications/reg # Autosync -reactos/base/applications/regedit # Out of sync -reactos/base/applications/winhlp32 # Synced to Wine-1.5.26 -reactos/base/applications/wordpad # Synced to Wine-1.5.26 -reactos/base/services/rpcss # Synced to Wine-1.7.1 -reactos/base/system/expand # Synced to Wine-1.5.26 -reactos/base/system/msiexec # Synced to Wine-1.5.26 -reactos/modules/rosapps/winfile # Autosync +reactos/base/applications/cmdutils/reg # Synced to Wine-1.1.40 +reactos/base/applications/cmdutils/taskkill # Synced to Wine-1.5.25 +reactos/base/applications/cmdutils/wmic # Synced to Wine-1.7.5 +reactos/base/applications/cmdutils/xcopy # Synced to Wine-1.3.37 +reactos/base/applications/games/winmine # Forked at Wine-1_3_5 +reactos/base/applications/extrac32 # Autosync +reactos/base/applications/iexplore # Synced to Wine-1.5.26 +reactos/base/applications/notepad # Forked at Wine-20041201 +reactos/base/applications/regedit # Out of sync +reactos/base/applications/winhlp32 # Synced to Wine-1.5.26 +reactos/base/applications/wordpad # Synced to Wine-1.5.26 +reactos/base/services/rpcss # Synced to Wine-1.7.1 +reactos/base/system/expand # Synced to Wine-1.5.26 +reactos/base/system/msiexec # Synced to Wine-1.5.26 +reactos/modules/rosapps/winfile # Autosync In addition the following libs, dlls and source files are mostly based on code ported from Winehq CVS. If you are looking to update something in these files

1 0

[aandrejevic] 60747: [FAST486] Implement the MOV instruction for control and debug registers. Remove definitions for non-existant registers CR1, CR4, CR5, CR6 and CR7. The standard 80486 doesn't ha...
by aandrejevic＠svn.reactos.org 26 Oct '13

26 Oct '13

Author: aandrejevic Date: Sat Oct 26 00:56:11 2013 New Revision: 60747 URL: http://svn.reactos.org/svn/reactos?rev=60747&view=rev Log: [FAST486] Implement the MOV instruction for control and debug registers. Remove definitions for non-existant registers CR1, CR4, CR5, CR6 and CR7. The standard 80486 doesn't have a CR4 register (although some implementations of the 80486 had large page support and CR4, it was not reliable). As for the debug registers, DR4 is the same as DR6, and DR5 is the same as DR7. Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h branches/ntvdm/lib/fast486/extraops.c branches/ntvdm/lib/fast486/extraops.h branches/ntvdm/lib/fast486/fast486.c Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/fast… ============================================================================== --- branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] Sat Oct 26 00:56:11 2013 @@ -26,8 +26,8 @@ #define FAST486_NUM_GEN_REGS 8 #define FAST486_NUM_SEG_REGS 6 -#define FAST486_NUM_CTRL_REGS 8 -#define FAST486_NUM_DBG_REGS 8 +#define FAST486_NUM_CTRL_REGS 3 +#define FAST486_NUM_DBG_REGS 6 #define FAST486_CR0_PE (1 << 0) #define FAST486_CR0_MP (1 << 1) @@ -41,6 +41,33 @@ #define FAST486_CR0_CD (1 << 30) #define FAST486_CR0_PG (1 << 31) +#define FAST486_DR4_B0 (1 << 0) +#define FAST486_DR4_B1 (1 << 1) +#define FAST486_DR4_B2 (1 << 2) +#define FAST486_DR4_B3 (1 << 3) +#define FAST486_DR4_BD (1 << 13) +#define FAST486_DR4_BS (1 << 14) +#define FAST486_DR4_BT (1 << 15) + +#define FAST486_DR5_L0 (1 << 0) +#define FAST486_DR5_G0 (1 << 1) +#define FAST486_DR5_L1 (1 << 2) +#define FAST486_DR5_G1 (1 << 3) +#define FAST486_DR5_L2 (1 << 4) +#define FAST486_DR5_G2 (1 << 5) +#define FAST486_DR5_L3 (1 << 6) +#define FAST486_DR5_G3 (1 << 7) +#define FAST486_DR5_LE (1 << 8) +#define FAST486_DR5_GE (1 << 9) +#define FAST486_DR5_GD (1 << 13) + +#define FAST486_DBG_BREAK_EXEC 0 +#define FAST486_DBG_BREAK_WRITE 1 +#define FAST486_DBG_BREAK_READWRITE 3 + +#define FAST486_DR4_RESERVED 0xFFFF1FF0 +#define FAST486_DR5_RESERVED 0x0000DC00 + #define FAST486_IDT_TASK_GATE 0x5 #define FAST486_IDT_INT_GATE 0x6 #define FAST486_IDT_TRAP_GATE 0x7 @@ -81,26 +108,21 @@ typedef enum _FAST486_CTRL_REGS { - FAST486_REG_CR0, - FAST486_REG_CR1, - FAST486_REG_CR2, - FAST486_REG_CR3, - FAST486_REG_CR4, - FAST486_REG_CR5, - FAST486_REG_CR6, - FAST486_REG_CR7 + FAST486_REG_CR0 = 0, + FAST486_REG_CR2 = 1, + FAST486_REG_CR3 = 2, } FAST486_CTRL_REGS, *PFAST486_CTRL_REGS; typedef enum _FAST486_DBG_REGS { - FAST486_REG_DR0, - FAST486_REG_DR1, - FAST486_REG_DR2, - FAST486_REG_DR3, - FAST486_REG_DR4, - FAST486_REG_DR5, - FAST486_REG_DR6, - FAST486_REG_DR7 + FAST486_REG_DR0 = 0, + FAST486_REG_DR1 = 1, + FAST486_REG_DR2 = 2, + FAST486_REG_DR3 = 3, + FAST486_REG_DR4 = 4, + FAST486_REG_DR5 = 5, + FAST486_REG_DR6 = 4, // alias to DR4 + FAST486_REG_DR7 = 5 // alias to DR5 } FAST486_DBG_REGS, *PFAST486_DBG_REGS; typedef enum _FAST486_EXCEPTIONS Modified: branches/ntvdm/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/extraops.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] Sat Oct 26 00:56:11 2013 @@ -71,10 +71,10 @@ NULL, // Invalid NULL, // Invalid NULL, // Invalid - NULL, // TODO: OPCODE 0x20 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x21 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x22 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0x23 NOT IMPLEMENTED + Fast486ExtOpcodeStoreControlReg, + Fast486ExtOpcodeStoreDebugReg, + Fast486ExtOpcodeLoadControlReg, + Fast486ExtOpcodeLoadDebugReg, NULL, // TODO: OPCODE 0x24 NOT IMPLEMENTED NULL, // Invalid NULL, // TODO: OPCODE 0x26 NOT IMPLEMENTED @@ -209,7 +209,7 @@ NULL, // Invalid Fast486ExtOpcodePushGs, Fast486ExtOpcodePopGs, - NULL, // TODO: OPCODE 0xAA NOT IMPLEMENTED + NULL, // Invalid Fast486ExtOpcodeBts, NULL, // TODO: OPCODE 0xAC NOT IMPLEMENTED NULL, // TODO: OPCODE 0xAD NOT IMPLEMENTED @@ -299,6 +299,202 @@ /* PUBLIC FUNCTIONS ***********************************************************/ +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeStoreControlReg) +{ + BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + FAST486_MOD_REG_RM ModRegRm; + + NO_LOCK_PREFIX(); + TOGGLE_ADSIZE(AddressSize); + + /* Get the operands */ + if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* The current privilege level must be zero */ + if (Fast486GetCurrentPrivLevel(State) != 0) + { + Fast486Exception(State, FAST486_EXCEPTION_GP); + return FALSE; + } + + if ((ModRegRm.Register == 1) || (ModRegRm.Register > 3)) + { + /* CR1, CR4, CR5, CR6 and CR7 don't exist */ + Fast486Exception(State, FAST486_EXCEPTION_UD); + return FALSE; + } + + if (ModRegRm.Register != 0) + { + /* CR2 and CR3 and are stored in array indexes 1 and 2 */ + ModRegRm.Register--; + } + + /* Store the value of the control register */ + State->GeneralRegs[ModRegRm.SecondRegister].Long = State->ControlRegisters[ModRegRm.Register]; + + /* Return success */ + return TRUE; +} + +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeStoreDebugReg) +{ + BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + FAST486_MOD_REG_RM ModRegRm; + + NO_LOCK_PREFIX(); + TOGGLE_ADSIZE(AddressSize); + + /* Get the operands */ + if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* The current privilege level must be zero */ + if (Fast486GetCurrentPrivLevel(State) != 0) + { + Fast486Exception(State, FAST486_EXCEPTION_GP); + return FALSE; + } + + if ((ModRegRm.Register == 6) || (ModRegRm.Register == 7)) + { + /* DR6 and DR7 are aliases to DR4 and DR5 */ + ModRegRm.Register -= 2; + } + + if (State->DebugRegisters[FAST486_REG_DR5] & FAST486_DR5_GD) + { + /* Disallow access to debug registers */ + Fast486Exception(State, FAST486_EXCEPTION_GP); + return FALSE; + } + + /* Store the value of the debug register */ + State->GeneralRegs[ModRegRm.SecondRegister].Long = State->DebugRegisters[ModRegRm.Register]; + + /* Return success */ + return TRUE; +} + +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeLoadControlReg) +{ + ULONG Value; + BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + FAST486_MOD_REG_RM ModRegRm; + + NO_LOCK_PREFIX(); + TOGGLE_ADSIZE(AddressSize); + + /* Get the operands */ + if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* The current privilege level must be zero */ + if (Fast486GetCurrentPrivLevel(State) != 0) + { + Fast486Exception(State, FAST486_EXCEPTION_GP); + return FALSE; + } + + if ((ModRegRm.Register == 1) || (ModRegRm.Register > 3)) + { + /* CR1, CR4, CR5, CR6 and CR7 don't exist */ + Fast486Exception(State, FAST486_EXCEPTION_UD); + return FALSE; + } + + if (ModRegRm.Register != 0) + { + /* CR2 and CR3 and are stored in array indexes 1 and 2 */ + ModRegRm.Register--; + } + + /* Get the value */ + Value = State->GeneralRegs[ModRegRm.SecondRegister].Long; + + if (ModRegRm.Register == (INT)FAST486_REG_CR0) + { + /* CR0 checks */ + + if (((Value & (FAST486_CR0_PG | FAST486_CR0_PE)) == FAST486_CR0_PG) + || ((Value & (FAST486_CR0_CD | FAST486_CR0_NW)) == FAST486_CR0_NW)) + { + /* Invalid value */ + Fast486Exception(State, FAST486_EXCEPTION_GP); + return FALSE; + } + } + + /* Load a value to the control register */ + State->ControlRegisters[ModRegRm.Register] = Value; + + /* Return success */ + return TRUE; +} + +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeLoadDebugReg) +{ + BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + FAST486_MOD_REG_RM ModRegRm; + + NO_LOCK_PREFIX(); + TOGGLE_ADSIZE(AddressSize); + + /* Get the operands */ + if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* The current privilege level must be zero */ + if (Fast486GetCurrentPrivLevel(State) != 0) + { + Fast486Exception(State, FAST486_EXCEPTION_GP); + return FALSE; + } + + if ((ModRegRm.Register == 6) || (ModRegRm.Register == 7)) + { + /* DR6 and DR7 are aliases to DR4 and DR5 */ + ModRegRm.Register -= 2; + } + + if (State->DebugRegisters[FAST486_REG_DR5] & FAST486_DR5_GD) + { + /* Disallow access to debug registers */ + Fast486Exception(State, FAST486_EXCEPTION_GP); + return FALSE; + } + + /* Load a value to the debug register */ + State->DebugRegisters[ModRegRm.Register] = State->GeneralRegs[ModRegRm.SecondRegister].Long; + + if (ModRegRm.Register == (INT)FAST486_REG_DR4) + { + /* The reserved bits are 1 */ + State->DebugRegisters[ModRegRm.Register] |= FAST486_DR4_RESERVED; + } + else if (ModRegRm.Register == (INT)FAST486_REG_DR5) + { + /* The reserved bits are 0 */ + State->DebugRegisters[ModRegRm.Register] &= ~FAST486_DR5_RESERVED; + } + + /* Return success */ + return TRUE; +} + FAST486_OPCODE_HANDLER(Fast486ExtOpcodePushFs) { /* Call the internal API */ @@ -1062,3 +1258,4 @@ return FALSE; } } + Modified: branches/ntvdm/lib/fast486/extraops.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/extraops.h?re… ============================================================================== --- branches/ntvdm/lib/fast486/extraops.h [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/extraops.h [iso-8859-1] Sat Oct 26 00:56:11 2013 @@ -23,6 +23,10 @@ #define _EXTRAOPS_H_ /* DEFINES ********************************************************************/ +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeStoreControlReg); +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeStoreDebugReg); +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeLoadControlReg); +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeLoadDebugReg); FAST486_OPCODE_HANDLER(Fast486ExtOpcodePushFs); FAST486_OPCODE_HANDLER(Fast486ExtOpcodePopFs); FAST486_OPCODE_HANDLER(Fast486ExtOpcodeBitTest); Modified: branches/ntvdm/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/fast486.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/fast486.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/fast486.c [iso-8859-1] Sat Oct 26 00:56:11 2013 @@ -217,27 +217,19 @@ State->Flags.Vip ? "VIP" : "vip", State->Flags.Iopl); DPRINT1("\nControl Registers:\n" - "CR0 = %08X\tCR1 = %08X\tCR2 = %08X\tCR3 = %08X\n" - "CR4 = %08X\tCR5 = %08X\tCR6 = %08X\tCR7 = %08X\n", + "CR0 = %08X\tCR2 = %08X\tCR3 = %08X\n", State->ControlRegisters[FAST486_REG_CR0], - State->ControlRegisters[FAST486_REG_CR1], State->ControlRegisters[FAST486_REG_CR2], - State->ControlRegisters[FAST486_REG_CR3], - State->ControlRegisters[FAST486_REG_CR4], - State->ControlRegisters[FAST486_REG_CR5], - State->ControlRegisters[FAST486_REG_CR6], - State->ControlRegisters[FAST486_REG_CR7]); + State->ControlRegisters[FAST486_REG_CR3]); DPRINT1("\nDebug Registers:\n" - "DR0 = %08X\tDR1 = %08X\tDR2 = %08X\tDR3 = %08X\n" - "DR4 = %08X\tDR5 = %08X\tDR6 = %08X\tDR7 = %08X\n", + "DR0 = %08X\tDR1 = %08X\tDR2 = %08X\n" + "DR3 = %08X\tDR4 = %08X\tDR5 = %08X\n", State->DebugRegisters[FAST486_REG_DR0], State->DebugRegisters[FAST486_REG_DR1], State->DebugRegisters[FAST486_REG_DR2], State->DebugRegisters[FAST486_REG_DR3], State->DebugRegisters[FAST486_REG_DR4], - State->DebugRegisters[FAST486_REG_DR5], - State->DebugRegisters[FAST486_REG_DR6], - State->DebugRegisters[FAST486_REG_DR7]); + State->DebugRegisters[FAST486_REG_DR5]); } VOID

1 0

[hbelusca] 60746: [USETUP] It appears that "Dhivehi" is the preferred scripture. CORE-7523 #resolve #comment Committed in revision 60746, cheers.
by hbelusca＠svn.reactos.org 25 Oct '13

25 Oct '13

Author: hbelusca Date: Fri Oct 25 20:52:33 2013 New Revision: 60746 URL: http://svn.reactos.org/svn/reactos?rev=60746&view=rev Log: [USETUP] It appears that "Dhivehi" is the preferred scripture. CORE-7523 #resolve #comment Committed in revision 60746, cheers. Modified: trunk/reactos/base/setup/usetup/muilanguages.h Modified: trunk/reactos/base/setup/usetup/muilanguages.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muilangu… ============================================================================== --- trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] Fri Oct 25 20:52:33 2013 @@ -511,7 +511,7 @@ {L"00000406", L"1252", L"850", L"10000", L"Danish", L"45", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, daDKLayouts }, #endif #ifdef LANGUAGE_DV_MV - {L"00000465", L"0", L"1", L"2", L"Divehi (Maldives)", L"960", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, dvMVLayouts }, + {L"00000465", L"0", L"1", L"2", L"Dhivehi (Maldives)", L"960", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, dvMVLayouts }, #endif #ifdef LANGUAGE_NL_NL {L"00000413", L"1252", L"850", L"10000", L"Dutch (Netherlands)", L"31", nlNLPages, nlNLErrorEntries, nlNLStrings, LatinFonts, nlNLLayouts },

1 0

[aandrejevic] 60745: [FAST486] Implement extended opcode groups 0xB9 (UD2) and 0xBA (BT/BTS/BTR/BTC).
by aandrejevic＠svn.reactos.org 25 Oct '13

25 Oct '13

Author: aandrejevic Date: Fri Oct 25 18:15:24 2013 New Revision: 60745 URL: http://svn.reactos.org/svn/reactos?rev=60745&view=rev Log: [FAST486] Implement extended opcode groups 0xB9 (UD2) and 0xBA (BT/BTS/BTR/BTC). Modified: branches/ntvdm/lib/fast486/extraops.c branches/ntvdm/lib/fast486/opgroups.c branches/ntvdm/lib/fast486/opgroups.h Modified: branches/ntvdm/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/extraops.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] Fri Oct 25 18:15:24 2013 @@ -31,6 +31,7 @@ #include <fast486.h> #include "opcodes.h" #include "common.h" +#include "opgroups.h" #include "extraops.h" /* PUBLIC VARIABLES ***********************************************************/ @@ -223,8 +224,8 @@ NULL, // TODO: OPCODE 0xB6 NOT IMPLEMENTED NULL, // TODO: OPCODE 0xB7 NOT IMPLEMENTED NULL, // TODO: OPCODE 0xB8 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xB9 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xBA NOT IMPLEMENTED + Fast486OpcodeGroup0FB9, + Fast486OpcodeGroup0FBA, Fast486ExtOpcodeBtc, NULL, // TODO: OPCODE 0xBC NOT IMPLEMENTED NULL, // TODO: OPCODE 0xBD NOT IMPLEMENTED Modified: branches/ntvdm/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] Fri Oct 25 18:15:24 2013 @@ -1659,5 +1659,158 @@ return TRUE; } +FAST486_OPCODE_HANDLER(Fast486OpcodeGroup0FB9) +{ + FAST486_MOD_REG_RM ModRegRm; + BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + + TOGGLE_ADSIZE(AddressSize); + + if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* All of them are reserved (UD2) */ + Fast486Exception(State, FAST486_EXCEPTION_UD); + return FALSE; +} + +FAST486_OPCODE_HANDLER(Fast486OpcodeGroup0FBA) +{ + FAST486_MOD_REG_RM ModRegRm; + BOOLEAN OperandSize, AddressSize; + UINT DataSize; + UCHAR BitNumber; + + OperandSize = AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + + TOGGLE_OPSIZE(OperandSize); + TOGGLE_ADSIZE(AddressSize); + + /* Get the number of bits */ + if (OperandSize) DataSize = 32; + else DataSize = 16; + + if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + if (ModRegRm.Register < 4) + { + /* Invalid */ + Fast486Exception(State, FAST486_EXCEPTION_UD); + return FALSE; + } + + /* Get the bit number */ + if (!Fast486FetchByte(State, &BitNumber)) + { + /* Exception occurred */ + return FALSE; + } + + if (ModRegRm.Memory) + { + /* + * For memory operands, add the bit offset divided by + * the data size to the address + */ + ModRegRm.MemoryAddress += BitNumber / DataSize; + } + + /* Normalize the bit number */ + BitNumber &= (1 << DataSize) - 1; + + if (OperandSize) + { + ULONG Dummy, Value; + + /* Read the value */ + if (!Fast486ReadModrmDwordOperands(State, &ModRegRm, &Dummy, &Value)) + { + /* Exception occurred */ + return FALSE; + } + + /* Set CF to the bit value */ + State->Flags.Cf = (Value >> BitNumber) & 1; + + if (ModRegRm.Register == 5) + { + /* BTS */ + Value |= 1 << BitNumber; + } + else if (ModRegRm.Register == 6) + { + /* BTR */ + Value &= ~(1 << BitNumber); + } + else if (ModRegRm.Register == 7) + { + /* BTC */ + Value ^= 1 << BitNumber; + } + + if (ModRegRm.Register >= 5) + { + /* Write back the result */ + if (!Fast486WriteModrmDwordOperands(State, &ModRegRm, FALSE, Value)) + { + /* Exception occurred */ + return FALSE; + } + } + } + else + { + USHORT Dummy, Value; + + /* Read the value */ + if (!Fast486ReadModrmWordOperands(State, &ModRegRm, &Dummy, &Value)) + { + /* Exception occurred */ + return FALSE; + } + + /* Set CF to the bit value */ + State->Flags.Cf = (Value >> BitNumber) & 1; + + if (ModRegRm.Register == 5) + { + /* BTS */ + Value |= 1 << BitNumber; + } + else if (ModRegRm.Register == 6) + { + /* BTR */ + Value &= ~(1 << BitNumber); + } + else if (ModRegRm.Register == 7) + { + /* BTC */ + Value ^= 1 << BitNumber; + } + + if (ModRegRm.Register >= 5) + { + /* Write back the result */ + if (!Fast486WriteModrmWordOperands(State, &ModRegRm, FALSE, Value)) + { + /* Exception occurred */ + return FALSE; + } + } + } + + /* Return success */ + return TRUE; + + return TRUE; +} + /* EOF */ Modified: branches/ntvdm/lib/fast486/opgroups.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opgroups.h?re… ============================================================================== --- branches/ntvdm/lib/fast486/opgroups.h [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opgroups.h [iso-8859-1] Fri Oct 25 18:15:24 2013 @@ -40,6 +40,8 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeGroupF7); FAST486_OPCODE_HANDLER(Fast486OpcodeGroupFE); FAST486_OPCODE_HANDLER(Fast486OpcodeGroupFF); +FAST486_OPCODE_HANDLER(Fast486OpcodeGroup0FB9); +FAST486_OPCODE_HANDLER(Fast486OpcodeGroup0FBA); #endif // _OPGROUPS_H_

1 0

[ekohl] 60744: [USERENV] Fix coding style and indentation. No code changes!
by ekohl＠svn.reactos.org 24 Oct '13

24 Oct '13

Author: ekohl Date: Thu Oct 24 20:16:20 2013 New Revision: 60744 URL: http://svn.reactos.org/svn/reactos?rev=60744&view=rev Log: [USERENV] Fix coding style and indentation. No code changes! Modified: trunk/reactos/dll/win32/userenv/desktop.c trunk/reactos/dll/win32/userenv/directory.c trunk/reactos/dll/win32/userenv/environment.c trunk/reactos/dll/win32/userenv/gpolicy.c trunk/reactos/dll/win32/userenv/internal.h trunk/reactos/dll/win32/userenv/misc.c trunk/reactos/dll/win32/userenv/profile.c trunk/reactos/dll/win32/userenv/registry.c trunk/reactos/dll/win32/userenv/resources.h trunk/reactos/dll/win32/userenv/setup.c trunk/reactos/dll/win32/userenv/userenv.c Modified: trunk/reactos/dll/win32/userenv/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/desktop.… ============================================================================== --- trunk/reactos/dll/win32/userenv/desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/desktop.c [iso-8859-1] Thu Oct 24 20:16:20 2013 @@ -19,7 +19,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/userenv/desktop.c + * FILE: dll/win32/userenv/desktop.c * PURPOSE: Desktop and start menu support functions. * PROGRAMMER: Eric Kohl */ @@ -32,867 +32,881 @@ /* FUNCTIONS ***************************************************************/ -static BOOL -GetDesktopPath (BOOL bCommonPath, - LPWSTR lpDesktopPath) -{ - WCHAR szPath[MAX_PATH]; - DWORD dwLength; - DWORD dwType; - HKEY hKey; - LONG Error; - - DPRINT ("GetDesktopPath() called\n"); - - Error = RegOpenKeyExW (HKEY_CURRENT_USER, - L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders", - 0, - KEY_QUERY_VALUE, - &hKey); - if (Error != ERROR_SUCCESS) - { - DPRINT1 ("RegOpenKeyExW() failed\n"); - SetLastError((DWORD)Error); - return FALSE; - } - - dwLength = MAX_PATH * sizeof(WCHAR); - Error = RegQueryValueExW (hKey, - bCommonPath ? L"Common Desktop" : L"Desktop", - 0, - &dwType, - (LPBYTE)szPath, - &dwLength); - if (Error != ERROR_SUCCESS) - { - DPRINT1 ("RegQueryValueExW() failed\n"); - RegCloseKey (hKey); - SetLastError((DWORD)Error); - return FALSE; - } - - RegCloseKey (hKey); - - if (dwType == REG_EXPAND_SZ) - { - ExpandEnvironmentStringsW (szPath, - lpDesktopPath, - MAX_PATH); - } - else - { - wcscpy (lpDesktopPath, szPath); - } - - DPRINT ("GetDesktopPath() done\n"); - - return TRUE; -} - - -static BOOL -GetProgramsPath (BOOL bCommonPath, - LPWSTR lpProgramsPath) -{ - WCHAR szPath[MAX_PATH]; - DWORD dwLength; - DWORD dwType; - HKEY hKey; - LONG Error; - - DPRINT ("GetProgramsPath() called\n"); - - Error = RegOpenKeyExW (HKEY_CURRENT_USER, - L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders", - 0, - KEY_QUERY_VALUE, - &hKey); - if (Error != ERROR_SUCCESS) - { - DPRINT1 ("RegOpenKeyExW() failed\n"); - SetLastError((DWORD)Error); - return FALSE; - } - - dwLength = MAX_PATH * sizeof(WCHAR); - Error = RegQueryValueExW (hKey, - bCommonPath ? L"Common Programs" : L"Programs", - 0, - &dwType, - (LPBYTE)szPath, - &dwLength); - if (Error != ERROR_SUCCESS) - { - DPRINT1 ("RegQueryValueExW() failed\n"); - RegCloseKey (hKey); - SetLastError((DWORD)Error); - return FALSE; - } - - RegCloseKey (hKey); - - if (dwType == REG_EXPAND_SZ) - { - ExpandEnvironmentStringsW (szPath, - lpProgramsPath, - MAX_PATH); - } - else - { - wcscpy (lpProgramsPath, - szPath); - } - - DPRINT ("GetProgramsPath() done\n"); - - return TRUE; -} - - -BOOL WINAPI -AddDesktopItemA (BOOL bCommonItem, - LPCSTR lpItemName, - LPCSTR lpArguments, - LPCSTR lpIconLocation, - INT iIcon, - LPCSTR lpWorkingDirectory, /* Optional */ - WORD wHotKey, - INT iShowCmd) -{ - UNICODE_STRING ItemName; - UNICODE_STRING Arguments; - UNICODE_STRING IconLocation; - UNICODE_STRING WorkingDirectory; - BOOL bResult; - - if (!RtlCreateUnicodeStringFromAsciiz(&ItemName, - (LPSTR)lpItemName)) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - if (!RtlCreateUnicodeStringFromAsciiz(&Arguments, - (LPSTR)lpArguments)) - { - RtlFreeUnicodeString(&ItemName); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - if (!RtlCreateUnicodeStringFromAsciiz(&IconLocation, - (LPSTR)lpIconLocation)) - { - RtlFreeUnicodeString(&Arguments); - RtlFreeUnicodeString(&ItemName); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - if (lpWorkingDirectory != NULL) - { - if (!RtlCreateUnicodeStringFromAsciiz(&WorkingDirectory, - (LPSTR)lpWorkingDirectory)) - { - RtlFreeUnicodeString(&IconLocation); - RtlFreeUnicodeString(&Arguments); - RtlFreeUnicodeString(&ItemName); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - } - - bResult = AddDesktopItemW(bCommonItem, - ItemName.Buffer, - Arguments.Buffer, - IconLocation.Buffer, - iIcon, - (lpWorkingDirectory != NULL) ? WorkingDirectory.Buffer : NULL, - wHotKey, - iShowCmd); - - if (lpWorkingDirectory != NULL) - { - RtlFreeUnicodeString(&WorkingDirectory); - } - - RtlFreeUnicodeString(&IconLocation); - RtlFreeUnicodeString(&Arguments); - RtlFreeUnicodeString(&ItemName); - - return bResult; -} - - -BOOL WINAPI -AddDesktopItemW (BOOL bCommonDesktop, - LPCWSTR lpItemName, - LPCWSTR lpArguments, - LPCWSTR lpIconLocation, - INT iIcon, - LPCWSTR lpWorkingDirectory, /* Optional */ - WORD wHotKey, - INT iShowCmd) -{ - DYN_FUNCS Ole32; - WCHAR szLinkPath[MAX_PATH]; - WCHAR szArguments[MAX_PATH]; - WCHAR szCommand[MAX_PATH]; - WIN32_FIND_DATAW FindData; - HANDLE hFind; - LPWSTR Ptr; - DWORD dwLength; - IShellLinkW* psl; - IPersistFile* ppf; - HRESULT hr; - BOOL bResult; - - DPRINT ("AddDesktopItemW() called\n"); - - bResult = FALSE; - - if (!GetDesktopPath (bCommonDesktop, szLinkPath)) - { - DPRINT1 ("GetDesktopPath() failed\n"); - return FALSE; - } - DPRINT ("Desktop path: '%S'\n", szLinkPath); - - /* Make sure the path exists */ - hFind = FindFirstFileW (szLinkPath, - &FindData); - if (hFind == INVALID_HANDLE_VALUE) - { - DPRINT ("'%S' does not exist\n", szLinkPath); - - /* Create directory path */ - if (!CreateDirectoryPath (szLinkPath, NULL)) - return FALSE; - } - else - { - DPRINT ("'%S' exists\n", szLinkPath); - FindClose (hFind); - } - - /* Append backslash, item name and ".lnk" extension */ - wcscat (szLinkPath, L"\\"); - wcscat (szLinkPath, lpItemName); - wcscat (szLinkPath, L".lnk"); - DPRINT ("Link path: '%S'\n", szLinkPath); - - /* Split 'lpArguments' string into command and arguments */ - Ptr = wcschr (lpArguments, L' '); - DPRINT ("Ptr %p lpArguments %p\n", Ptr, lpArguments); - if (Ptr != NULL) - { - dwLength = (DWORD)(Ptr - lpArguments); - DPRINT ("dwLength %lu\n", dwLength); - memcpy (szCommand, lpArguments, dwLength * sizeof(WCHAR)); - szCommand[dwLength] = 0; - Ptr++; - wcscpy (szArguments, Ptr); - } - else - { - wcscpy (szCommand, lpArguments); - szArguments[0] = 0; - } - DPRINT ("szCommand: '%S'\n", szCommand); - DPRINT ("szArguments: '%S'\n", szArguments); - - /* Dynamically load ole32.dll */ - if (!LoadDynamicImports(&DynOle32, &Ole32)) - { - DPRINT1("USERENV: Unable to load OLE32.DLL\n"); - return FALSE; - } - - Ole32.fn.CoInitialize(NULL); - - hr = Ole32.fn.CoCreateInstance(&CLSID_ShellLink, - NULL, - CLSCTX_INPROC_SERVER, - &IID_IShellLinkW, - (LPVOID*)&psl); - if (!SUCCEEDED(hr)) - { - Ole32.fn.CoUninitialize(); - UnloadDynamicImports(&Ole32); - return FALSE; - } - - hr = psl->lpVtbl->QueryInterface(psl, - &IID_IPersistFile, - (LPVOID*)&ppf); - if (SUCCEEDED(hr)) - { - psl->lpVtbl->SetDescription(psl, - lpItemName); - - psl->lpVtbl->SetPath(psl, - szCommand); - - psl->lpVtbl->SetArguments(psl, - szArguments); - - psl->lpVtbl->SetIconLocation(psl, - lpIconLocation, - iIcon); - - if (lpWorkingDirectory != NULL) - { - psl->lpVtbl->SetWorkingDirectory(psl, - lpWorkingDirectory); - } - else - { - psl->lpVtbl->SetWorkingDirectory(psl, - L"%HOMEDRIVE%%HOMEPATH%"); - } - - psl->lpVtbl->SetHotkey(psl, - wHotKey); - - psl->lpVtbl->SetShowCmd(psl, +static +BOOL +GetDesktopPath(BOOL bCommonPath, + LPWSTR lpDesktopPath) +{ + WCHAR szPath[MAX_PATH]; + DWORD dwLength; + DWORD dwType; + HKEY hKey; + LONG Error; + + DPRINT("GetDesktopPath() called\n"); + + Error = RegOpenKeyExW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders", + 0, + KEY_QUERY_VALUE, + &hKey); + if (Error != ERROR_SUCCESS) + { + DPRINT1("RegOpenKeyExW() failed\n"); + SetLastError((DWORD)Error); + return FALSE; + } + + dwLength = MAX_PATH * sizeof(WCHAR); + Error = RegQueryValueExW(hKey, + bCommonPath ? L"Common Desktop" : L"Desktop", + 0, + &dwType, + (LPBYTE)szPath, + &dwLength); + if (Error != ERROR_SUCCESS) + { + DPRINT1("RegQueryValueExW() failed\n"); + RegCloseKey(hKey); + SetLastError((DWORD)Error); + return FALSE; + } + + RegCloseKey(hKey); + + if (dwType == REG_EXPAND_SZ) + { + ExpandEnvironmentStringsW(szPath, + lpDesktopPath, + MAX_PATH); + } + else + { + wcscpy(lpDesktopPath, szPath); + } + + DPRINT("GetDesktopPath() done\n"); + + return TRUE; +} + + +static +BOOL +GetProgramsPath(BOOL bCommonPath, + LPWSTR lpProgramsPath) +{ + WCHAR szPath[MAX_PATH]; + DWORD dwLength; + DWORD dwType; + HKEY hKey; + LONG Error; + + DPRINT("GetProgramsPath() called\n"); + + Error = RegOpenKeyExW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders", + 0, + KEY_QUERY_VALUE, + &hKey); + if (Error != ERROR_SUCCESS) + { + DPRINT1("RegOpenKeyExW() failed\n"); + SetLastError((DWORD)Error); + return FALSE; + } + + dwLength = MAX_PATH * sizeof(WCHAR); + Error = RegQueryValueExW(hKey, + bCommonPath ? L"Common Programs" : L"Programs", + 0, + &dwType, + (LPBYTE)szPath, + &dwLength); + if (Error != ERROR_SUCCESS) + { + DPRINT1("RegQueryValueExW() failed\n"); + RegCloseKey(hKey); + SetLastError((DWORD)Error); + return FALSE; + } + + RegCloseKey(hKey); + + if (dwType == REG_EXPAND_SZ) + { + ExpandEnvironmentStringsW(szPath, + lpProgramsPath, + MAX_PATH); + } + else + { + wcscpy(lpProgramsPath, + szPath); + } + + DPRINT("GetProgramsPath() done\n"); + + return TRUE; +} + + +BOOL +WINAPI +AddDesktopItemA(BOOL bCommonItem, + LPCSTR lpItemName, + LPCSTR lpArguments, + LPCSTR lpIconLocation, + INT iIcon, + LPCSTR lpWorkingDirectory, /* Optional */ + WORD wHotKey, + INT iShowCmd) +{ + UNICODE_STRING ItemName; + UNICODE_STRING Arguments; + UNICODE_STRING IconLocation; + UNICODE_STRING WorkingDirectory; + BOOL bResult; + + if (!RtlCreateUnicodeStringFromAsciiz(&ItemName, + (LPSTR)lpItemName)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + if (!RtlCreateUnicodeStringFromAsciiz(&Arguments, + (LPSTR)lpArguments)) + { + RtlFreeUnicodeString(&ItemName); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + if (!RtlCreateUnicodeStringFromAsciiz(&IconLocation, + (LPSTR)lpIconLocation)) + { + RtlFreeUnicodeString(&Arguments); + RtlFreeUnicodeString(&ItemName); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + if (lpWorkingDirectory != NULL) + { + if (!RtlCreateUnicodeStringFromAsciiz(&WorkingDirectory, + (LPSTR)lpWorkingDirectory)) + { + RtlFreeUnicodeString(&IconLocation); + RtlFreeUnicodeString(&Arguments); + RtlFreeUnicodeString(&ItemName); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + } + + bResult = AddDesktopItemW(bCommonItem, + ItemName.Buffer, + Arguments.Buffer, + IconLocation.Buffer, + iIcon, + (lpWorkingDirectory != NULL) ? WorkingDirectory.Buffer : NULL, + wHotKey, iShowCmd); - hr = ppf->lpVtbl->Save(ppf, - szLinkPath, - TRUE); - if (SUCCEEDED(hr)) - bResult = TRUE; - - ppf->lpVtbl->Release(ppf); - } - - psl->lpVtbl->Release(psl); - - Ole32.fn.CoUninitialize(); - - UnloadDynamicImports(&Ole32); - - DPRINT ("AddDesktopItemW() done\n"); - - return bResult; -} - - -BOOL WINAPI -DeleteDesktopItemA (BOOL bCommonItem, - LPCSTR lpItemName) -{ - UNICODE_STRING ItemName; - BOOL bResult; - - if (!RtlCreateUnicodeStringFromAsciiz(&ItemName, - (LPSTR)lpItemName)) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - bResult = DeleteDesktopItemW(bCommonItem, - ItemName.Buffer); - - RtlFreeUnicodeString(&ItemName); - - return bResult; -} - - -BOOL WINAPI -DeleteDesktopItemW (BOOL bCommonItem, - LPCWSTR lpItemName) -{ - WCHAR szLinkPath[MAX_PATH]; - - DPRINT ("DeleteDesktopItemW() called\n"); - - if (!GetDesktopPath (bCommonItem, szLinkPath)) - { - DPRINT1 ("GetDesktopPath() failed\n"); - return FALSE; - } - - wcscat (szLinkPath, L"\\"); - wcscat (szLinkPath, lpItemName); - wcscat (szLinkPath, L".lnk"); - DPRINT ("Link path: '%S'\n", szLinkPath); - - return DeleteFileW (szLinkPath); -} - - -BOOL WINAPI -CreateGroupA (LPCSTR lpGroupName, - BOOL bCommonGroup) -{ - UNICODE_STRING GroupName; - BOOL bResult; - - if (!RtlCreateUnicodeStringFromAsciiz(&GroupName, - (LPSTR)lpGroupName)) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - bResult = CreateGroupW(GroupName.Buffer, bCommonGroup); - - RtlFreeUnicodeString(&GroupName); - - return bResult; -} - - -BOOL WINAPI -CreateGroupW (LPCWSTR lpGroupName, - BOOL bCommonGroup) -{ - WCHAR szGroupPath[MAX_PATH]; - - DPRINT1 ("CreateGroupW() called\n"); - - if (lpGroupName == NULL || *lpGroupName == 0) + if (lpWorkingDirectory != NULL) + { + RtlFreeUnicodeString(&WorkingDirectory); + } + + RtlFreeUnicodeString(&IconLocation); + RtlFreeUnicodeString(&Arguments); + RtlFreeUnicodeString(&ItemName); + + return bResult; +} + + +BOOL +WINAPI +AddDesktopItemW(BOOL bCommonDesktop, + LPCWSTR lpItemName, + LPCWSTR lpArguments, + LPCWSTR lpIconLocation, + INT iIcon, + LPCWSTR lpWorkingDirectory, /* Optional */ + WORD wHotKey, + INT iShowCmd) +{ + DYN_FUNCS Ole32; + WCHAR szLinkPath[MAX_PATH]; + WCHAR szArguments[MAX_PATH]; + WCHAR szCommand[MAX_PATH]; + WIN32_FIND_DATAW FindData; + HANDLE hFind; + LPWSTR Ptr; + DWORD dwLength; + IShellLinkW* psl; + IPersistFile* ppf; + HRESULT hr; + BOOL bResult; + + DPRINT("AddDesktopItemW() called\n"); + + bResult = FALSE; + + if (!GetDesktopPath(bCommonDesktop, szLinkPath)) + { + DPRINT1("GetDesktopPath() failed\n"); + return FALSE; + } + DPRINT("Desktop path: '%S'\n", szLinkPath); + + /* Make sure the path exists */ + hFind = FindFirstFileW(szLinkPath, + &FindData); + if (hFind == INVALID_HANDLE_VALUE) + { + DPRINT("'%S' does not exist\n", szLinkPath); + + /* Create directory path */ + if (!CreateDirectoryPath(szLinkPath, NULL)) + return FALSE; + } + else + { + DPRINT("'%S' exists\n", szLinkPath); + FindClose(hFind); + } + + /* Append backslash, item name and ".lnk" extension */ + wcscat(szLinkPath, L"\\"); + wcscat(szLinkPath, lpItemName); + wcscat(szLinkPath, L".lnk"); + DPRINT("Link path: '%S'\n", szLinkPath); + + /* Split 'lpArguments' string into command and arguments */ + Ptr = wcschr(lpArguments, L' '); + DPRINT("Ptr %p lpArguments %p\n", Ptr, lpArguments); + if (Ptr != NULL) + { + dwLength = (DWORD)(Ptr - lpArguments); + DPRINT("dwLength %lu\n", dwLength); + memcpy(szCommand, lpArguments, dwLength * sizeof(WCHAR)); + szCommand[dwLength] = 0; + Ptr++; + wcscpy(szArguments, Ptr); + } + else + { + wcscpy(szCommand, lpArguments); + szArguments[0] = 0; + } + DPRINT("szCommand: '%S'\n", szCommand); + DPRINT("szArguments: '%S'\n", szArguments); + + /* Dynamically load ole32.dll */ + if (!LoadDynamicImports(&DynOle32, &Ole32)) + { + DPRINT1("USERENV: Unable to load OLE32.DLL\n"); + return FALSE; + } + + Ole32.fn.CoInitialize(NULL); + + hr = Ole32.fn.CoCreateInstance(&CLSID_ShellLink, + NULL, + CLSCTX_INPROC_SERVER, + &IID_IShellLinkW, + (LPVOID*)&psl); + if (!SUCCEEDED(hr)) + { + Ole32.fn.CoUninitialize(); + UnloadDynamicImports(&Ole32); + return FALSE; + } + + hr = psl->lpVtbl->QueryInterface(psl, + &IID_IPersistFile, + (LPVOID*)&ppf); + if (SUCCEEDED(hr)) + { + psl->lpVtbl->SetDescription(psl, + lpItemName); + + psl->lpVtbl->SetPath(psl, + szCommand); + + psl->lpVtbl->SetArguments(psl, + szArguments); + + psl->lpVtbl->SetIconLocation(psl, + lpIconLocation, + iIcon); + + if (lpWorkingDirectory != NULL) + { + psl->lpVtbl->SetWorkingDirectory(psl, + lpWorkingDirectory); + } + else + { + psl->lpVtbl->SetWorkingDirectory(psl, + L"%HOMEDRIVE%%HOMEPATH%"); + } + + psl->lpVtbl->SetHotkey(psl, + wHotKey); + + psl->lpVtbl->SetShowCmd(psl, + iShowCmd); + + hr = ppf->lpVtbl->Save(ppf, + szLinkPath, + TRUE); + if (SUCCEEDED(hr)) + bResult = TRUE; + + ppf->lpVtbl->Release(ppf); + } + + psl->lpVtbl->Release(psl); + + Ole32.fn.CoUninitialize(); + + UnloadDynamicImports(&Ole32); + + DPRINT("AddDesktopItemW() done\n"); + + return bResult; +} + + +BOOL +WINAPI +DeleteDesktopItemA(BOOL bCommonItem, + LPCSTR lpItemName) +{ + UNICODE_STRING ItemName; + BOOL bResult; + + if (!RtlCreateUnicodeStringFromAsciiz(&ItemName, + (LPSTR)lpItemName)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + bResult = DeleteDesktopItemW(bCommonItem, + ItemName.Buffer); + + RtlFreeUnicodeString(&ItemName); + + return bResult; +} + + +BOOL +WINAPI +DeleteDesktopItemW(BOOL bCommonItem, + LPCWSTR lpItemName) +{ + WCHAR szLinkPath[MAX_PATH]; + + DPRINT("DeleteDesktopItemW() called\n"); + + if (!GetDesktopPath(bCommonItem, szLinkPath)) + { + DPRINT1("GetDesktopPath() failed\n"); + return FALSE; + } + + wcscat(szLinkPath, L"\\"); + wcscat(szLinkPath, lpItemName); + wcscat(szLinkPath, L".lnk"); + DPRINT("Link path: '%S'\n", szLinkPath); + + return DeleteFileW (szLinkPath); +} + + +BOOL +WINAPI +CreateGroupA(LPCSTR lpGroupName, + BOOL bCommonGroup) +{ + UNICODE_STRING GroupName; + BOOL bResult; + + if (!RtlCreateUnicodeStringFromAsciiz(&GroupName, + (LPSTR)lpGroupName)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + bResult = CreateGroupW(GroupName.Buffer, bCommonGroup); + + RtlFreeUnicodeString(&GroupName); + + return bResult; +} + + +BOOL +WINAPI +CreateGroupW(LPCWSTR lpGroupName, + BOOL bCommonGroup) +{ + WCHAR szGroupPath[MAX_PATH]; + + DPRINT1("CreateGroupW() called\n"); + + if (lpGroupName == NULL || *lpGroupName == 0) + return TRUE; + + if (!GetProgramsPath(bCommonGroup, szGroupPath)) + { + DPRINT1("GetProgramsPath() failed\n"); + return FALSE; + } + DPRINT1("Programs path: '%S'\n", szGroupPath); + + wcscat(szGroupPath, L"\\"); + wcscat(szGroupPath, lpGroupName); + DPRINT1("Group path: '%S'\n", szGroupPath); + + /* Create directory path */ + if (!CreateDirectoryPath (szGroupPath, NULL)) + return FALSE; + + /* FIXME: Notify the shell */ + + DPRINT1("CreateGroupW() done\n"); + return TRUE; - - if (!GetProgramsPath (bCommonGroup, szGroupPath)) - { - DPRINT1 ("GetProgramsPath() failed\n"); - return FALSE; - } - DPRINT1 ("Programs path: '%S'\n", szGroupPath); - - wcscat (szGroupPath, L"\\"); - wcscat (szGroupPath, lpGroupName); - DPRINT1 ("Group path: '%S'\n", szGroupPath); - - /* Create directory path */ - if (!CreateDirectoryPath (szGroupPath, NULL)) - return FALSE; - - /* FIXME: Notify the shell */ - - DPRINT1 ("CreateGroupW() done\n"); - - return TRUE; -} - - -BOOL WINAPI -DeleteGroupA (LPCSTR lpGroupName, - BOOL bCommonGroup) -{ - UNICODE_STRING GroupName; - BOOL bResult; - - if (!RtlCreateUnicodeStringFromAsciiz(&GroupName, - (LPSTR)lpGroupName)) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - bResult = DeleteGroupW(GroupName.Buffer, bCommonGroup); - - RtlFreeUnicodeString(&GroupName); - - return bResult; -} - - -BOOL WINAPI -DeleteGroupW (LPCWSTR lpGroupName, - BOOL bCommonGroup) -{ - WCHAR szGroupPath[MAX_PATH]; - - DPRINT ("DeleteGroupW() called\n"); - - if (lpGroupName == NULL || *lpGroupName == 0) +} + + +BOOL +WINAPI +DeleteGroupA(LPCSTR lpGroupName, + BOOL bCommonGroup) +{ + UNICODE_STRING GroupName; + BOOL bResult; + + if (!RtlCreateUnicodeStringFromAsciiz(&GroupName, + (LPSTR)lpGroupName)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + bResult = DeleteGroupW(GroupName.Buffer, bCommonGroup); + + RtlFreeUnicodeString(&GroupName); + + return bResult; +} + + +BOOL +WINAPI +DeleteGroupW(LPCWSTR lpGroupName, + BOOL bCommonGroup) +{ + WCHAR szGroupPath[MAX_PATH]; + + DPRINT("DeleteGroupW() called\n"); + + if (lpGroupName == NULL || *lpGroupName == 0) + return TRUE; + + if (!GetProgramsPath(bCommonGroup, szGroupPath)) + { + DPRINT1("GetProgramsPath() failed\n"); + return FALSE; + } + DPRINT("Programs path: '%S'\n", szGroupPath); + + wcscat(szGroupPath, L"\\"); + wcscat(szGroupPath, lpGroupName); + DPRINT("Group path: '%S'\n", szGroupPath); + + /* Remove directory path */ + if (!RemoveDirectoryPath (szGroupPath)) + return FALSE; + + /* FIXME: Notify the shell */ + + DPRINT("DeleteGroupW() done\n"); + return TRUE; - - if (!GetProgramsPath (bCommonGroup, szGroupPath)) - { - DPRINT1 ("GetProgramsPath() failed\n"); - return FALSE; - } - DPRINT ("Programs path: '%S'\n", szGroupPath); - - wcscat (szGroupPath, L"\\"); - wcscat (szGroupPath, lpGroupName); - DPRINT ("Group path: '%S'\n", szGroupPath); - - /* Remove directory path */ - if (!RemoveDirectoryPath (szGroupPath)) - return FALSE; - - /* FIXME: Notify the shell */ - - DPRINT ("DeleteGroupW() done\n"); - - return TRUE; -} - - -BOOL WINAPI -AddItemA (LPCSTR lpGroupName, /* Optional */ - BOOL bCommonGroup, - LPCSTR lpItemName, - LPCSTR lpArguments, - LPCSTR lpIconLocation, - INT iIcon, - LPCSTR lpWorkingDirectory, /* Optional */ - WORD wHotKey, - INT iShowCmd) -{ - UNICODE_STRING GroupName; - UNICODE_STRING ItemName; - UNICODE_STRING Arguments; - UNICODE_STRING IconLocation; - UNICODE_STRING WorkingDirectory; - BOOL bResult; - - if (!RtlCreateUnicodeStringFromAsciiz(&ItemName, - (LPSTR)lpItemName)) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - if (!RtlCreateUnicodeStringFromAsciiz(&Arguments, - (LPSTR)lpArguments)) - { - RtlFreeUnicodeString(&ItemName); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - if (!RtlCreateUnicodeStringFromAsciiz(&IconLocation, - (LPSTR)lpIconLocation)) - { - RtlFreeUnicodeString(&Arguments); - RtlFreeUnicodeString(&ItemName); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - if (lpGroupName != NULL) - { - if (!RtlCreateUnicodeStringFromAsciiz(&GroupName, - (LPSTR)lpGroupName)) - { - RtlFreeUnicodeString(&IconLocation); - RtlFreeUnicodeString(&Arguments); - RtlFreeUnicodeString(&ItemName); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - } - - if (lpWorkingDirectory != NULL) - { - if (!RtlCreateUnicodeStringFromAsciiz(&WorkingDirectory, - (LPSTR)lpWorkingDirectory)) - { - if (lpGroupName != NULL) - { - RtlFreeUnicodeString(&GroupName); - } - RtlFreeUnicodeString(&IconLocation); - RtlFreeUnicodeString(&Arguments); - RtlFreeUnicodeString(&ItemName); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - } - - bResult = AddItemW((lpGroupName != NULL) ? GroupName.Buffer : NULL, - bCommonGroup, - ItemName.Buffer, - Arguments.Buffer, - IconLocation.Buffer, - iIcon, - (lpWorkingDirectory != NULL) ? WorkingDirectory.Buffer : NULL, - wHotKey, - iShowCmd); - - if (lpGroupName != NULL) - { - RtlFreeUnicodeString(&GroupName); - } - - if (lpWorkingDirectory != NULL) - { - RtlFreeUnicodeString(&WorkingDirectory); - } - - RtlFreeUnicodeString(&IconLocation); - RtlFreeUnicodeString(&Arguments); - RtlFreeUnicodeString(&ItemName); - - return bResult; -} - - -BOOL WINAPI -AddItemW (LPCWSTR lpGroupName, /* Optional */ - BOOL bCommonGroup, - LPCWSTR lpItemName, - LPCWSTR lpArguments, - LPCWSTR lpIconLocation, - INT iIcon, - LPCWSTR lpWorkingDirectory, /* Optional */ - WORD wHotKey, - INT iShowCmd) -{ - DYN_FUNCS Ole32; - WCHAR szLinkPath[MAX_PATH]; - WCHAR szArguments[MAX_PATH]; - WCHAR szCommand[MAX_PATH]; - WIN32_FIND_DATAW FindData; - HANDLE hFind; - LPWSTR Ptr; - DWORD dwLength; - IShellLinkW* psl; - IPersistFile* ppf; - HRESULT hr; - BOOL bResult; - - DPRINT ("AddItemW() called\n"); - - bResult = FALSE; - - if (!GetProgramsPath (bCommonGroup, szLinkPath)) - { - DPRINT1 ("GetProgramsPath() failed\n"); - return FALSE; - } - - DPRINT ("Programs path: '%S'\n", szLinkPath); - - if (lpGroupName != NULL && *lpGroupName != 0) - { - wcscat (szLinkPath, L"\\"); - wcscat (szLinkPath, lpGroupName); - - /* Make sure the path exists */ - hFind = FindFirstFileW (szLinkPath, - &FindData); - if (hFind == INVALID_HANDLE_VALUE) - { - DPRINT ("'%S' does not exist\n", szLinkPath); - if (!CreateGroupW (lpGroupName, - bCommonGroup)) - return FALSE; - } - else - { - DPRINT ("'%S' exists\n", szLinkPath); - FindClose (hFind); - } - } - - wcscat (szLinkPath, L"\\"); - wcscat (szLinkPath, lpItemName); - wcscat (szLinkPath, L".lnk"); - DPRINT ("Link path: '%S'\n", szLinkPath); - - /* Split 'lpArguments' string into command and arguments */ - Ptr = wcschr (lpArguments, L' '); - DPRINT ("Ptr %p lpArguments %p\n", Ptr, lpArguments); - if (Ptr != NULL) - { - dwLength = (DWORD)(Ptr - lpArguments); - DPRINT ("dwLength %lu\n", dwLength); - memcpy (szCommand, lpArguments, dwLength * sizeof(WCHAR)); - szCommand[dwLength] = 0; - Ptr++; - wcscpy (szArguments, Ptr); - } - else - { - wcscpy (szCommand, lpArguments); - szArguments[0] = 0; - } - DPRINT ("szCommand: '%S'\n", szCommand); - DPRINT ("szArguments: '%S'\n", szArguments); - - /* Dynamically load ole32.dll */ - if (!LoadDynamicImports(&DynOle32, &Ole32)) - { - DPRINT1("USERENV: Unable to load OLE32.DLL\n"); - return FALSE; - } - - Ole32.fn.CoInitialize(NULL); - - hr = Ole32.fn.CoCreateInstance(&CLSID_ShellLink, - NULL, - CLSCTX_INPROC_SERVER, - &IID_IShellLinkW, - (LPVOID*)&psl); - if (!SUCCEEDED(hr)) - { - Ole32.fn.CoUninitialize(); - UnloadDynamicImports(&Ole32); - return FALSE; - } - - hr = psl->lpVtbl->QueryInterface(psl, - &IID_IPersistFile, - (LPVOID*)&ppf); - if (SUCCEEDED(hr)) - { - psl->lpVtbl->SetDescription(psl, - lpItemName); - - psl->lpVtbl->SetPath(psl, - szCommand); - - psl->lpVtbl->SetArguments(psl, - szArguments); - - psl->lpVtbl->SetIconLocation(psl, - lpIconLocation, - iIcon); - - if (lpWorkingDirectory != NULL) - { - psl->lpVtbl->SetWorkingDirectory(psl, - lpWorkingDirectory); - } - else - { - psl->lpVtbl->SetWorkingDirectory(psl, - L"%HOMEDRIVE%%HOMEPATH%"); - } - - psl->lpVtbl->SetHotkey(psl, - wHotKey); - - psl->lpVtbl->SetShowCmd(psl, - iShowCmd); - - hr = ppf->lpVtbl->Save(ppf, - szLinkPath, - TRUE); - if (SUCCEEDED(hr)) - bResult = TRUE; - - ppf->lpVtbl->Release(ppf); - } - - psl->lpVtbl->Release(psl); - - Ole32.fn.CoUninitialize(); - UnloadDynamicImports(&Ole32); - - DPRINT ("AddItemW() done\n"); - - return bResult; -} - - -BOOL WINAPI -DeleteItemA (LPCSTR lpGroupName, /* Optional */ - BOOL bCommonGroup, - LPCSTR lpItemName, - BOOL bDeleteGroup) -{ - UNICODE_STRING GroupName; - UNICODE_STRING ItemName; - BOOL bResult; - - if (lpGroupName != NULL) - { - if (!RtlCreateUnicodeStringFromAsciiz(&GroupName, - (LPSTR)lpGroupName)) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - } - - if (!RtlCreateUnicodeStringFromAsciiz(&ItemName, - (LPSTR)lpItemName)) - { - if (lpGroupName != NULL) - { - RtlFreeUnicodeString(&GroupName); - } - - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - bResult = DeleteItemW((lpGroupName != NULL) ? GroupName.Buffer : NULL, - bCommonGroup, - ItemName.Buffer, - bDeleteGroup); - - RtlFreeUnicodeString(&ItemName); - if (lpGroupName != NULL) - { - RtlFreeUnicodeString(&GroupName); - } - - return bResult; -} - - -BOOL WINAPI -DeleteItemW (LPCWSTR lpGroupName, /* Optional */ - BOOL bCommonGroup, - LPCWSTR lpItemName, - BOOL bDeleteGroup) -{ - WCHAR szItemPath[MAX_PATH]; - LPWSTR Ptr; - - DPRINT ("DeleteItemW() called\n"); - - if (!GetProgramsPath (bCommonGroup, szItemPath)) - { - DPRINT1 ("GetProgramsPath() failed\n"); - return FALSE; - } - DPRINT ("Programs path: '%S'\n", szItemPath); - - if (lpGroupName != NULL && *lpGroupName != 0) - { - wcscat (szItemPath, L"\\"); - wcscat (szItemPath, lpGroupName); - } - - wcscat (szItemPath, L"\\"); - wcscat (szItemPath, lpItemName); - wcscat (szItemPath, L".lnk"); - DPRINT ("Item path: '%S'\n", szItemPath); - - if (!DeleteFileW (szItemPath)) - return FALSE; - - /* FIXME: Notify the shell */ - - if (bDeleteGroup) - { - Ptr = wcsrchr (szItemPath, L'\\'); - if (Ptr == NULL) - return TRUE; - - *Ptr = 0; - DPRINT ("Item path: '%S'\n", szItemPath); - if (RemoveDirectoryW (szItemPath)) - { - /* FIXME: Notify the shell */ - } - } - - DPRINT ("DeleteItemW() done\n"); - - return TRUE; +} + + +BOOL +WINAPI +AddItemA(LPCSTR lpGroupName, /* Optional */ + BOOL bCommonGroup, + LPCSTR lpItemName, + LPCSTR lpArguments, + LPCSTR lpIconLocation, + INT iIcon, + LPCSTR lpWorkingDirectory, /* Optional */ + WORD wHotKey, + INT iShowCmd) +{ + UNICODE_STRING GroupName; + UNICODE_STRING ItemName; + UNICODE_STRING Arguments; + UNICODE_STRING IconLocation; + UNICODE_STRING WorkingDirectory; + BOOL bResult; + + if (!RtlCreateUnicodeStringFromAsciiz(&ItemName, + (LPSTR)lpItemName)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + if (!RtlCreateUnicodeStringFromAsciiz(&Arguments, + (LPSTR)lpArguments)) + { + RtlFreeUnicodeString(&ItemName); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + if (!RtlCreateUnicodeStringFromAsciiz(&IconLocation, + (LPSTR)lpIconLocation)) + { + RtlFreeUnicodeString(&Arguments); + RtlFreeUnicodeString(&ItemName); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + if (lpGroupName != NULL) + { + if (!RtlCreateUnicodeStringFromAsciiz(&GroupName, + (LPSTR)lpGroupName)) + { + RtlFreeUnicodeString(&IconLocation); + RtlFreeUnicodeString(&Arguments); + RtlFreeUnicodeString(&ItemName); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + } + + if (lpWorkingDirectory != NULL) + { + if (!RtlCreateUnicodeStringFromAsciiz(&WorkingDirectory, + (LPSTR)lpWorkingDirectory)) + { + if (lpGroupName != NULL) + { + RtlFreeUnicodeString(&GroupName); + } + RtlFreeUnicodeString(&IconLocation); + RtlFreeUnicodeString(&Arguments); + RtlFreeUnicodeString(&ItemName); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + } + + bResult = AddItemW((lpGroupName != NULL) ? GroupName.Buffer : NULL, + bCommonGroup, + ItemName.Buffer, + Arguments.Buffer, + IconLocation.Buffer, + iIcon, + (lpWorkingDirectory != NULL) ? WorkingDirectory.Buffer : NULL, + wHotKey, + iShowCmd); + + if (lpGroupName != NULL) + { + RtlFreeUnicodeString(&GroupName); + } + + if (lpWorkingDirectory != NULL) + { + RtlFreeUnicodeString(&WorkingDirectory); + } + + RtlFreeUnicodeString(&IconLocation); + RtlFreeUnicodeString(&Arguments); + RtlFreeUnicodeString(&ItemName); + + return bResult; +} + + +BOOL +WINAPI +AddItemW(LPCWSTR lpGroupName, /* Optional */ + BOOL bCommonGroup, + LPCWSTR lpItemName, + LPCWSTR lpArguments, + LPCWSTR lpIconLocation, + INT iIcon, + LPCWSTR lpWorkingDirectory, /* Optional */ + WORD wHotKey, + INT iShowCmd) +{ + DYN_FUNCS Ole32; + WCHAR szLinkPath[MAX_PATH]; + WCHAR szArguments[MAX_PATH]; + WCHAR szCommand[MAX_PATH]; + WIN32_FIND_DATAW FindData; + HANDLE hFind; + LPWSTR Ptr; + DWORD dwLength; + IShellLinkW* psl; + IPersistFile* ppf; + HRESULT hr; + BOOL bResult; + + DPRINT("AddItemW() called\n"); + + bResult = FALSE; + + if (!GetProgramsPath(bCommonGroup, szLinkPath)) + { + DPRINT1("GetProgramsPath() failed\n"); + return FALSE; + } + + DPRINT("Programs path: '%S'\n", szLinkPath); + + if (lpGroupName != NULL && *lpGroupName != 0) + { + wcscat(szLinkPath, L"\\"); + wcscat(szLinkPath, lpGroupName); + + /* Make sure the path exists */ + hFind = FindFirstFileW(szLinkPath, + &FindData); + if (hFind == INVALID_HANDLE_VALUE) + { + DPRINT("'%S' does not exist\n", szLinkPath); + if (!CreateGroupW(lpGroupName, + bCommonGroup)) + return FALSE; + } + else + { + DPRINT("'%S' exists\n", szLinkPath); + FindClose(hFind); + } + } + + wcscat(szLinkPath, L"\\"); + wcscat(szLinkPath, lpItemName); + wcscat(szLinkPath, L".lnk"); + DPRINT("Link path: '%S'\n", szLinkPath); + + /* Split 'lpArguments' string into command and arguments */ + Ptr = wcschr(lpArguments, L' '); + DPRINT("Ptr %p lpArguments %p\n", Ptr, lpArguments); + if (Ptr != NULL) + { + dwLength = (DWORD)(Ptr - lpArguments); + DPRINT("dwLength %lu\n", dwLength); + memcpy(szCommand, lpArguments, dwLength * sizeof(WCHAR)); + szCommand[dwLength] = 0; + Ptr++; + wcscpy(szArguments, Ptr); + } + else + { + wcscpy(szCommand, lpArguments); + szArguments[0] = 0; + } + DPRINT("szCommand: '%S'\n", szCommand); + DPRINT("szArguments: '%S'\n", szArguments); + + /* Dynamically load ole32.dll */ + if (!LoadDynamicImports(&DynOle32, &Ole32)) + { + DPRINT1("USERENV: Unable to load OLE32.DLL\n"); + return FALSE; + } + + Ole32.fn.CoInitialize(NULL); + + hr = Ole32.fn.CoCreateInstance(&CLSID_ShellLink, + NULL, + CLSCTX_INPROC_SERVER, + &IID_IShellLinkW, + (LPVOID*)&psl); + if (!SUCCEEDED(hr)) + { + Ole32.fn.CoUninitialize(); + UnloadDynamicImports(&Ole32); + return FALSE; + } + + hr = psl->lpVtbl->QueryInterface(psl, + &IID_IPersistFile, + (LPVOID*)&ppf); + if (SUCCEEDED(hr)) + { + psl->lpVtbl->SetDescription(psl, + lpItemName); + + psl->lpVtbl->SetPath(psl, + szCommand); + + psl->lpVtbl->SetArguments(psl, + szArguments); + + psl->lpVtbl->SetIconLocation(psl, + lpIconLocation, + iIcon); + + if (lpWorkingDirectory != NULL) + { + psl->lpVtbl->SetWorkingDirectory(psl, + lpWorkingDirectory); + } + else + { + psl->lpVtbl->SetWorkingDirectory(psl, + L"%HOMEDRIVE%%HOMEPATH%"); + } + + psl->lpVtbl->SetHotkey(psl, + wHotKey); + + psl->lpVtbl->SetShowCmd(psl, + iShowCmd); + + hr = ppf->lpVtbl->Save(ppf, + szLinkPath, + TRUE); + if (SUCCEEDED(hr)) + bResult = TRUE; + + ppf->lpVtbl->Release(ppf); + } + + psl->lpVtbl->Release(psl); + + Ole32.fn.CoUninitialize(); + UnloadDynamicImports(&Ole32); + + DPRINT("AddItemW() done\n"); + + return bResult; +} + + +BOOL +WINAPI +DeleteItemA(LPCSTR lpGroupName, /* Optional */ + BOOL bCommonGroup, + LPCSTR lpItemName, + BOOL bDeleteGroup) +{ + UNICODE_STRING GroupName; + UNICODE_STRING ItemName; + BOOL bResult; + + if (lpGroupName != NULL) + { + if (!RtlCreateUnicodeStringFromAsciiz(&GroupName, + (LPSTR)lpGroupName)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + } + + if (!RtlCreateUnicodeStringFromAsciiz(&ItemName, + (LPSTR)lpItemName)) + { + if (lpGroupName != NULL) + { + RtlFreeUnicodeString(&GroupName); + } + + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + bResult = DeleteItemW((lpGroupName != NULL) ? GroupName.Buffer : NULL, + bCommonGroup, + ItemName.Buffer, + bDeleteGroup); + + RtlFreeUnicodeString(&ItemName); + if (lpGroupName != NULL) + { + RtlFreeUnicodeString(&GroupName); + } + + return bResult; +} + + +BOOL +WINAPI +DeleteItemW(LPCWSTR lpGroupName, /* Optional */ + BOOL bCommonGroup, + LPCWSTR lpItemName, + BOOL bDeleteGroup) +{ + WCHAR szItemPath[MAX_PATH]; + LPWSTR Ptr; + + DPRINT("DeleteItemW() called\n"); + + if (!GetProgramsPath(bCommonGroup, szItemPath)) + { + DPRINT1("GetProgramsPath() failed\n"); + return FALSE; + } + DPRINT("Programs path: '%S'\n", szItemPath); + + if (lpGroupName != NULL && *lpGroupName != 0) + { + wcscat(szItemPath, L"\\"); + wcscat(szItemPath, lpGroupName); + } + + wcscat(szItemPath, L"\\"); + wcscat(szItemPath, lpItemName); + wcscat(szItemPath, L".lnk"); + DPRINT("Item path: '%S'\n", szItemPath); + + if (!DeleteFileW(szItemPath)) + return FALSE; + + /* FIXME: Notify the shell */ + + if (bDeleteGroup) + { + Ptr = wcsrchr(szItemPath, L'\\'); + if (Ptr == NULL) + return TRUE; + + *Ptr = 0; + DPRINT("Item path: '%S'\n", szItemPath); + if (RemoveDirectoryW(szItemPath)) + { + /* FIXME: Notify the shell */ + } + } + + DPRINT("DeleteItemW() done\n"); + + return TRUE; } /* EOF */ Modified: trunk/reactos/dll/win32/userenv/directory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/director… ============================================================================== --- trunk/reactos/dll/win32/userenv/directory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/directory.c [iso-8859-1] Thu Oct 24 20:16:20 2013 @@ -19,7 +19,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/userenv/directory.c + * FILE: dll/win32/userenv/directory.c * PURPOSE: User profile code * PROGRAMMER: Eric Kohl */ @@ -32,7 +32,8 @@ /* FUNCTIONS ***************************************************************/ -BOOL WINAPI +BOOL +WINAPI CopyProfileDirectoryA(LPCSTR lpSourcePath, LPCSTR lpDestinationPath, DWORD dwFlags) @@ -67,7 +68,8 @@ } -BOOL WINAPI +BOOL +WINAPI CopyProfileDirectoryW(LPCWSTR lpSourcePath, LPCWSTR lpDestinationPath, DWORD dwFlags) @@ -78,8 +80,8 @@ BOOL -CopyDirectory (LPCWSTR lpDestinationPath, - LPCWSTR lpSourcePath) +CopyDirectory(LPCWSTR lpDestinationPath, + LPCWSTR lpSourcePath) { WCHAR szFileName[MAX_PATH]; WCHAR szFullSrcName[MAX_PATH]; @@ -89,110 +91,110 @@ LPWSTR lpDstPtr; HANDLE hFind; - DPRINT ("CopyDirectory (%S, %S) called\n", + DPRINT("CopyDirectory (%S, %S) called\n", lpDestinationPath, lpSourcePath); - wcscpy (szFileName, lpSourcePath); - wcscat (szFileName, L"\\*.*"); - - hFind = FindFirstFileW (szFileName, - &FindFileData); + wcscpy(szFileName, lpSourcePath); + wcscat(szFileName, L"\\*.*"); + + hFind = FindFirstFileW(szFileName, + &FindFileData); if (hFind == INVALID_HANDLE_VALUE) { - DPRINT1 ("Error: %lu\n", GetLastError()); - return FALSE; - } - - wcscpy (szFullSrcName, lpSourcePath); - lpSrcPtr = AppendBackslash (szFullSrcName); - - wcscpy (szFullDstName, lpDestinationPath); - lpDstPtr = AppendBackslash (szFullDstName); + DPRINT1("Error: %lu\n", GetLastError()); + return FALSE; + } + + wcscpy(szFullSrcName, lpSourcePath); + lpSrcPtr = AppendBackslash(szFullSrcName); + + wcscpy(szFullDstName, lpDestinationPath); + lpDstPtr = AppendBackslash(szFullDstName); for (;;) { - if (wcscmp (FindFileData.cFileName, L".") && - wcscmp (FindFileData.cFileName, L"..")) - { - wcscpy (lpSrcPtr, FindFileData.cFileName); - wcscpy (lpDstPtr, FindFileData.cFileName); + if (wcscmp(FindFileData.cFileName, L".") && + wcscmp(FindFileData.cFileName, L"..")) + { + wcscpy(lpSrcPtr, FindFileData.cFileName); + wcscpy(lpDstPtr, FindFileData.cFileName); if (FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { - DPRINT ("Create directory: %S\n", szFullDstName); - if (!CreateDirectoryExW (szFullSrcName, szFullDstName, NULL)) - { - if (GetLastError () != ERROR_ALREADY_EXISTS) + DPRINT("Create directory: %S\n", szFullDstName); + if (!CreateDirectoryExW(szFullSrcName, szFullDstName, NULL)) + { + if (GetLastError() != ERROR_ALREADY_EXISTS) { - DPRINT1 ("Error: %lu\n", GetLastError()); - - FindClose (hFind); + DPRINT1("Error: %lu\n", GetLastError()); + + FindClose(hFind); return FALSE; } } - if (!CopyDirectory (szFullDstName, szFullSrcName)) - { - DPRINT1 ("Error: %lu\n", GetLastError()); - - FindClose (hFind); + if (!CopyDirectory(szFullDstName, szFullSrcName)) + { + DPRINT1("Error: %lu\n", GetLastError()); + + FindClose(hFind); return FALSE; } } else { - DPRINT ("Copy file: %S -> %S\n", szFullSrcName, szFullDstName); - if (!CopyFileW (szFullSrcName, szFullDstName, FALSE)) - { - DPRINT1 ("Error: %lu\n", GetLastError()); - - FindClose (hFind); + DPRINT("Copy file: %S -> %S\n", szFullSrcName, szFullDstName); + if (!CopyFileW(szFullSrcName, szFullDstName, FALSE)) + { + DPRINT1("Error: %lu\n", GetLastError()); + + FindClose(hFind); return FALSE; } } } - if (!FindNextFileW (hFind, &FindFileData)) - { - if (GetLastError () != ERROR_NO_MORE_FILES) - { - DPRINT1 ("Error: %lu\n", GetLastError()); + if (!FindNextFileW(hFind, &FindFileData)) + { + if (GetLastError() != ERROR_NO_MORE_FILES) + { + DPRINT1("Error: %lu\n", GetLastError()); } break; } } - FindClose (hFind); - - DPRINT ("CopyDirectory() done\n"); + FindClose(hFind); + + DPRINT("CopyDirectory() done\n"); return TRUE; } BOOL -CreateDirectoryPath (LPCWSTR lpPathName, - LPSECURITY_ATTRIBUTES lpSecurityAttributes) +CreateDirectoryPath(LPCWSTR lpPathName, + LPSECURITY_ATTRIBUTES lpSecurityAttributes) { WCHAR szPath[MAX_PATH]; LPWSTR Ptr; DWORD dwError; - DPRINT ("CreateDirectoryPath() called\n"); + DPRINT("CreateDirectoryPath() called\n"); if (lpPathName == NULL || *lpPathName == 0) return TRUE; - if (CreateDirectoryW (lpPathName, - lpSecurityAttributes)) + if (CreateDirectoryW(lpPathName, + lpSecurityAttributes)) return TRUE; - dwError = GetLastError (); + dwError = GetLastError(); if (dwError == ERROR_ALREADY_EXISTS) return TRUE; - wcscpy (szPath, lpPathName); + wcscpy(szPath, lpPathName); if (wcslen(szPath) > 3 && szPath[1] == ':' && szPath[2] == '\\') { @@ -205,15 +207,15 @@ while (Ptr != NULL) { - Ptr = wcschr (Ptr, L'\\'); + Ptr = wcschr(Ptr, L'\\'); if (Ptr != NULL) *Ptr = 0; - DPRINT ("CreateDirectory(%S)\n", szPath); - if (!CreateDirectoryW (szPath, - lpSecurityAttributes)) - { - dwError = GetLastError (); + DPRINT("CreateDirectory(%S)\n", szPath); + if (!CreateDirectoryW(szPath, + lpSecurityAttributes)) + { + dwError = GetLastError(); if (dwError != ERROR_ALREADY_EXISTS) return FALSE; } @@ -225,45 +227,46 @@ } } - DPRINT ("CreateDirectoryPath() done\n"); + DPRINT("CreateDirectoryPath() done\n"); return TRUE; } -static BOOL -RecursiveRemoveDir (LPCWSTR lpPath) +static +BOOL +RecursiveRemoveDir(LPCWSTR lpPath) { WCHAR szPath[MAX_PATH]; WIN32_FIND_DATAW FindData; HANDLE hFind; BOOL bResult; - wcscpy (szPath, lpPath); - wcscat (szPath, L"\\*.*"); - DPRINT ("Search path: '%S'\n", szPath); - - hFind = FindFirstFileW (szPath, - &FindData); + wcscpy(szPath, lpPath); + wcscat(szPath, L"\\*.*"); + DPRINT("Search path: '%S'\n", szPath); + + hFind = FindFirstFileW(szPath, + &FindData); if (hFind == INVALID_HANDLE_VALUE) return FALSE; bResult = TRUE; while (TRUE) { - if (wcscmp (FindData.cFileName, L".") && - wcscmp (FindData.cFileName, L"..")) - { - wcscpy (szPath, lpPath); - wcscat (szPath, L"\\"); - wcscat (szPath, FindData.cFileName); - DPRINT ("File name: '%S'\n", szPath); + if (wcscmp(FindData.cFileName, L".") && + wcscmp(FindData.cFileName, L"..")) + { + wcscpy(szPath, lpPath); + wcscat(szPath, L"\\"); + wcscat(szPath, FindData.cFileName); + DPRINT("File name: '%S'\n", szPath); if (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { - DPRINT ("Delete directory: '%S'\n", szPath); - - if (!RecursiveRemoveDir (szPath)) + DPRINT("Delete directory: '%S'\n", szPath); + + if (!RecursiveRemoveDir(szPath)) { bResult = FALSE; break; @@ -271,11 +274,11 @@ if (FindData.dwFileAttributes & FILE_ATTRIBUTE_READONLY) { - SetFileAttributesW (szPath, - FindData.dwFileAttributes & ~FILE_ATTRIBUTE_READONLY); - } - - if (!RemoveDirectoryW (szPath)) + SetFileAttributesW(szPath, + FindData.dwFileAttributes & ~FILE_ATTRIBUTE_READONLY); + } + + if (!RemoveDirectoryW(szPath)) { bResult = FALSE; break; @@ -283,15 +286,15 @@ } else { - DPRINT ("Delete file: '%S'\n", szPath); + DPRINT("Delete file: '%S'\n", szPath); if (FindData.dwFileAttributes & (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM)) { - SetFileAttributesW (szPath, - FILE_ATTRIBUTE_NORMAL); - } - - if (!DeleteFileW (szPath)) + SetFileAttributesW(szPath, + FILE_ATTRIBUTE_NORMAL); + } + + if (!DeleteFileW(szPath)) { bResult = FALSE; break; @@ -299,11 +302,11 @@ } } - if (!FindNextFileW (hFind, &FindData)) - { - if (GetLastError () != ERROR_NO_MORE_FILES) - { - DPRINT1 ("Error: %lu\n", GetLastError()); + if (!FindNextFileW(hFind, &FindData)) + { + if (GetLastError() != ERROR_NO_MORE_FILES) + { + DPRINT1("Error: %lu\n", GetLastError()); bResult = FALSE; break; } @@ -312,20 +315,20 @@ } } - FindClose (hFind); + FindClose(hFind); return bResult; } BOOL -RemoveDirectoryPath (LPCWSTR lpPathName) -{ - if (!RecursiveRemoveDir (lpPathName)) - return FALSE; - - DPRINT ("Delete directory: '%S'\n", lpPathName); - return RemoveDirectoryW (lpPathName); +RemoveDirectoryPath(LPCWSTR lpPathName) +{ + if (!RecursiveRemoveDir(lpPathName)) + return FALSE; + + DPRINT("Delete directory: '%S'\n", lpPathName); + return RemoveDirectoryW(lpPathName); } /* EOF */ Modified: trunk/reactos/dll/win32/userenv/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/environm… ============================================================================== --- trunk/reactos/dll/win32/userenv/environment.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/environment.c [iso-8859-1] Thu Oct 24 20:16:20 2013 @@ -19,7 +19,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/userenv/environment.c + * FILE: dll/win32/userenv/environment.c * PURPOSE: User environment functions * PROGRAMMER: Eric Kohl */ @@ -30,7 +30,8 @@ #include <debug.h> -static BOOL +static +BOOL SetUserEnvironmentVariable(LPVOID *Environment, LPWSTR lpName, LPWSTR lpValue, @@ -117,7 +118,8 @@ } -static BOOL +static +BOOL AppendUserEnvironmentVariable(LPVOID *Environment, LPWSTR lpName, LPWSTR lpValue) @@ -165,7 +167,8 @@ } -static HKEY +static +HKEY GetCurrentUserKey(HANDLE hToken) { UNICODE_STRING SidString; @@ -198,7 +201,8 @@ } -static BOOL +static +BOOL SetUserEnvironment(LPVOID *lpEnvironment, HKEY hKey, LPWSTR lpSubKeyName) @@ -310,7 +314,8 @@ } -BOOL WINAPI +BOOL +WINAPI CreateEnvironmentBlock(LPVOID *lpEnvironment, HANDLE hToken, BOOL bInherit) @@ -454,7 +459,8 @@ } -BOOL WINAPI +BOOL +WINAPI DestroyEnvironmentBlock(LPVOID lpEnvironment) { DPRINT("DestroyEnvironmentBlock() called\n"); @@ -471,7 +477,8 @@ } -BOOL WINAPI +BOOL +WINAPI ExpandEnvironmentStringsForUserW(IN HANDLE hToken, IN LPCWSTR lpSrc, OUT LPWSTR lpDest, @@ -522,7 +529,8 @@ } -BOOL WINAPI +BOOL +WINAPI ExpandEnvironmentStringsForUserA(IN HANDLE hToken, IN LPCSTR lpSrc, OUT LPSTR lpDest, Modified: trunk/reactos/dll/win32/userenv/gpolicy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/gpolicy.… ============================================================================== --- trunk/reactos/dll/win32/userenv/gpolicy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/gpolicy.c [iso-8859-1] Thu Oct 24 20:16:20 2013 @@ -19,7 +19,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/userenv/gpolicy.c + * FILE: dll/win32/userenv/gpolicy.c * PURPOSE: Group policy functions * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> */ @@ -110,7 +110,8 @@ DeleteCriticalSection(&GPNotifyLock); } -static VOID +static +VOID NotifyGPEvents(IN BOOL bMachine) { PGP_NOTIFY Notify = NotificationList; @@ -126,7 +127,9 @@ } } -static DWORD WINAPI +static +DWORD +WINAPI GPNotificationThreadProc(IN LPVOID lpParameter) { HMODULE hModule; @@ -255,7 +258,8 @@ return 1; } -static HANDLE +static +HANDLE CreateGPEvent(IN BOOL bMachine, IN PSECURITY_DESCRIPTOR lpSecurityDescriptor) { @@ -274,7 +278,8 @@ return hEvent; } -BOOL WINAPI +BOOL +WINAPI RegisterGPNotification(IN HANDLE hEvent, IN BOOL bMachine) { @@ -378,7 +383,8 @@ return Ret; } -BOOL WINAPI +BOOL +WINAPI UnregisterGPNotification(IN HANDLE hEvent) { PGP_NOTIFY Notify = NULL, *NotifyLink; @@ -418,7 +424,8 @@ return Ret; } -BOOL WINAPI +BOOL +WINAPI RefreshPolicy(IN BOOL bMachine) { HANDLE hEvent; @@ -437,7 +444,8 @@ return Ret; } -BOOL WINAPI +BOOL +WINAPI RefreshPolicyEx(IN BOOL bMachine, IN DWORD dwOptions) { @@ -470,7 +478,8 @@ } } -HANDLE WINAPI +HANDLE +WINAPI EnterCriticalPolicySection(IN BOOL bMachine) { SECURITY_ATTRIBUTES SecurityAttributes; @@ -507,7 +516,8 @@ return NULL; } -BOOL WINAPI +BOOL +WINAPI LeaveCriticalPolicySection(IN HANDLE hSection) { BOOL Ret; @@ -524,7 +534,8 @@ return Ret; } -BOOL WINAPI +BOOL +WINAPI WaitForUserPolicyForegroundProcessing(VOID) { HANDLE hEvent; @@ -543,7 +554,8 @@ return Ret; } -BOOL WINAPI +BOOL +WINAPI WaitForMachinePolicyForegroundProcessing(VOID) { HANDLE hEvent; Modified: trunk/reactos/dll/win32/userenv/internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/internal… ============================================================================== --- trunk/reactos/dll/win32/userenv/internal.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/internal.h [iso-8859-1] Thu Oct 24 20:16:20 2013 @@ -19,7 +19,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/userenv/internal.h + * FILE: dll/win32/userenv/internal.h * PURPOSE: internal stuff * PROGRAMMER: Eric Kohl */ @@ -29,15 +29,15 @@ /* directory.c */ BOOL -CopyDirectory (LPCWSTR lpDestinationPath, - LPCWSTR lpSourcePath); +CopyDirectory(LPCWSTR lpDestinationPath, + LPCWSTR lpSourcePath); BOOL -CreateDirectoryPath (LPCWSTR lpPathName, - LPSECURITY_ATTRIBUTES lpSecurityAttributes); +CreateDirectoryPath(LPCWSTR lpPathName, + LPSECURITY_ATTRIBUTES lpSecurityAttributes); BOOL -RemoveDirectoryPath (LPCWSTR lpPathName); +RemoveDirectoryPath(LPCWSTR lpPathName); /* misc.c */ typedef struct _DYN_FUNCS @@ -64,35 +64,36 @@ extern DYN_MODULE DynOle32; BOOL -LoadDynamicImports(PDYN_MODULE Module, PDYN_FUNCS DynFuncs); +LoadDynamicImports(PDYN_MODULE Module, + PDYN_FUNCS DynFuncs); VOID UnloadDynamicImports(PDYN_FUNCS DynFuncs); LPWSTR -AppendBackslash (LPWSTR String); +AppendBackslash(LPWSTR String); BOOL -GetUserSidFromToken (HANDLE hToken, - PUNICODE_STRING SidString); +GetUserSidFromToken(HANDLE hToken, + PUNICODE_STRING SidString); PSECURITY_DESCRIPTOR CreateDefaultSecurityDescriptor(VOID); /* profile.c */ BOOL -AppendSystemPostfix (LPWSTR lpName, - DWORD dwMaxLength); +AppendSystemPostfix(LPWSTR lpName, + DWORD dwMaxLength); /* registry.c */ BOOL -CreateUserHive (LPCWSTR lpKeyName, - LPCWSTR lpProfilePath); +CreateUserHive(LPCWSTR lpKeyName, + LPCWSTR lpProfilePath); /* setup.c */ BOOL UpdateUsersShellFolderSettings(LPCWSTR lpUserProfilePath, - HKEY hUserKey); + HKEY hUserKey); /* userenv.c */ extern HINSTANCE hInstance; Modified: trunk/reactos/dll/win32/userenv/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/misc.c?r… ============================================================================== --- trunk/reactos/dll/win32/userenv/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/misc.c [iso-8859-1] Thu Oct 24 20:16:20 2013 @@ -19,7 +19,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/userenv/misc.c + * FILE: dll/win32/userenv/misc.c * PURPOSE: User profile code * PROGRAMMER: Eric Kohl */ @@ -35,86 +35,86 @@ /* FUNCTIONS ***************************************************************/ LPWSTR -AppendBackslash (LPWSTR String) -{ - ULONG Length; - - Length = lstrlenW (String); - if (String[Length - 1] != L'\\') - { - String[Length] = L'\\'; - Length++; - String[Length] = (WCHAR)0; - } - - return &String[Length]; +AppendBackslash(LPWSTR String) +{ + ULONG Length; + + Length = lstrlenW(String); + if (String[Length - 1] != L'\\') + { + String[Length] = L'\\'; + Length++; + String[Length] = (WCHAR)0; + } + + return &String[Length]; } BOOL -GetUserSidFromToken (HANDLE hToken, - PUNICODE_STRING SidString) -{ - PSID_AND_ATTRIBUTES SidBuffer, nsb; - ULONG Length; - NTSTATUS Status; - - Length = 256; - SidBuffer = LocalAlloc (LMEM_FIXED, - Length); - if (SidBuffer == NULL) - return FALSE; - - Status = NtQueryInformationToken (hToken, - TokenUser, - (PVOID)SidBuffer, - Length, - &Length); - if (Status == STATUS_BUFFER_TOO_SMALL) - { - nsb = LocalReAlloc (SidBuffer, - Length, - LMEM_MOVEABLE); - if (nsb == NULL) +GetUserSidFromToken(HANDLE hToken, + PUNICODE_STRING SidString) +{ + PSID_AND_ATTRIBUTES SidBuffer, nsb; + ULONG Length; + NTSTATUS Status; + + Length = 256; + SidBuffer = LocalAlloc(LMEM_FIXED, + Length); + if (SidBuffer == NULL) + return FALSE; + + Status = NtQueryInformationToken(hToken, + TokenUser, + (PVOID)SidBuffer, + Length, + &Length); + if (Status == STATUS_BUFFER_TOO_SMALL) + { + nsb = LocalReAlloc(SidBuffer, + Length, + LMEM_MOVEABLE); + if (nsb == NULL) { - LocalFree((HLOCAL)SidBuffer); - return FALSE; + LocalFree((HLOCAL)SidBuffer); + return FALSE; } - SidBuffer = nsb; - Status = NtQueryInformationToken (hToken, - TokenUser, - (PVOID)SidBuffer, - Length, - &Length); - } - - if (!NT_SUCCESS (Status)) - { - LocalFree ((HLOCAL)SidBuffer); - SetLastError (RtlNtStatusToDosError (Status)); - return FALSE; - } - - DPRINT ("SidLength: %lu\n", RtlLengthSid (SidBuffer[0].Sid)); - - Status = RtlConvertSidToUnicodeString (SidString, - SidBuffer[0].Sid, - TRUE); - - LocalFree ((HLOCAL)SidBuffer); - - if (!NT_SUCCESS (Status)) - { - SetLastError (RtlNtStatusToDosError (Status)); - return FALSE; - } - - DPRINT ("SidString.Length: %lu\n", SidString->Length); - DPRINT ("SidString.MaximumLength: %lu\n", SidString->MaximumLength); - DPRINT ("SidString: '%wZ'\n", SidString); - - return TRUE; + SidBuffer = nsb; + Status = NtQueryInformationToken(hToken, + TokenUser, + (PVOID)SidBuffer, + Length, + &Length); + } + + if (!NT_SUCCESS (Status)) + { + LocalFree((HLOCAL)SidBuffer); + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + DPRINT("SidLength: %lu\n", RtlLengthSid (SidBuffer[0].Sid)); + + Status = RtlConvertSidToUnicodeString(SidString, + SidBuffer[0].Sid, + TRUE); + + LocalFree((HLOCAL)SidBuffer); + + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + DPRINT("SidString.Length: %lu\n", SidString->Length); + DPRINT("SidString.MaximumLength: %lu\n", SidString->MaximumLength); + DPRINT("SidString: '%wZ'\n", SidString); + + return TRUE; } PSECURITY_DESCRIPTOR @@ -284,47 +284,48 @@ * has been created! */ BOOL -LoadDynamicImports(PDYN_MODULE Module, PDYN_FUNCS DynFuncs) -{ - LPSTR *fname; - PVOID *fn; - - ZeroMemory(DynFuncs, sizeof(DYN_FUNCS)); - - DynFuncs->hModule = LoadLibraryW(Module->Library); - if (!DynFuncs->hModule) - { - return FALSE; - } - - fn = &DynFuncs->fn.foo; - - /* load the imports */ - for (fname = Module->Functions; *fname != NULL; fname++) - { - *fn = GetProcAddress(DynFuncs->hModule, *fname); - if (*fn == NULL) +LoadDynamicImports(PDYN_MODULE Module, + PDYN_FUNCS DynFuncs) +{ + LPSTR *fname; + PVOID *fn; + + ZeroMemory(DynFuncs, sizeof(DYN_FUNCS)); + + DynFuncs->hModule = LoadLibraryW(Module->Library); + if (!DynFuncs->hModule) + { + return FALSE; + } + + fn = &DynFuncs->fn.foo; + + /* load the imports */ + for (fname = Module->Functions; *fname != NULL; fname++) + { + *fn = GetProcAddress(DynFuncs->hModule, *fname); + if (*fn == NULL) { - FreeLibrary(DynFuncs->hModule); - DynFuncs->hModule = (HMODULE)0; - - return FALSE; + FreeLibrary(DynFuncs->hModule); + DynFuncs->hModule = (HMODULE)0; + + return FALSE; } - fn++; - } - - return TRUE; + fn++; + } + + return TRUE; } VOID UnloadDynamicImports(PDYN_FUNCS DynFuncs) { - if (DynFuncs->hModule) - { - FreeLibrary(DynFuncs->hModule); - DynFuncs->hModule = (HMODULE)0; + if (DynFuncs->hModule) + { + FreeLibrary(DynFuncs->hModule); + DynFuncs->hModule = (HMODULE)0; } } Modified: trunk/reactos/dll/win32/userenv/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/profile.… ============================================================================== --- trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] Thu Oct 24 20:16:20 2013 @@ -18,7 +18,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/userenv/profile.c + * FILE: dll/win32/userenv/profile.c * PURPOSE: User profile code * PROGRAMMERS: Eric Kohl * Hervé Poussineau Modified: trunk/reactos/dll/win32/userenv/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/registry… ============================================================================== --- trunk/reactos/dll/win32/userenv/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/registry.c [iso-8859-1] Thu Oct 24 20:16:20 2013 @@ -19,7 +19,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/userenv/registry.c + * FILE: dll/win32/userenv/registry.c * PURPOSE: User profile code * PROGRAMMER: Eric Kohl */ @@ -32,301 +32,302 @@ /* FUNCTIONS ***************************************************************/ -static BOOL -CopyKey (HKEY hDstKey, - HKEY hSrcKey) +static +BOOL +CopyKey(HKEY hDstKey, + HKEY hSrcKey) { - LONG Error; + LONG Error; #if (_WIN32_WINNT >= 0x0600) - Error = RegCopyTreeW(hSrcKey, - NULL, - hDstKey); - if (Error != ERROR_SUCCESS) - { - SetLastError((DWORD)Error); - return FALSE; - } - - return TRUE; + Error = RegCopyTreeW(hSrcKey, + NULL, + hDstKey); + if (Error != ERROR_SUCCESS) + { + SetLastError((DWORD)Error); + return FALSE; + } + + return TRUE; #else - FILETIME LastWrite; - DWORD dwSubKeys; - DWORD dwValues; - DWORD dwType; - DWORD dwMaxSubKeyNameLength; - DWORD dwSubKeyNameLength; - DWORD dwMaxValueNameLength; - DWORD dwValueNameLength; - DWORD dwMaxValueLength; - DWORD dwValueLength; - DWORD dwDisposition; - DWORD i; - LPWSTR lpNameBuffer; - LPBYTE lpDataBuffer; - HKEY hDstSubKey; - HKEY hSrcSubKey; - - DPRINT ("CopyKey() called \n"); - - Error = RegQueryInfoKey (hSrcKey, - NULL, - NULL, - NULL, - &dwSubKeys, - &dwMaxSubKeyNameLength, - NULL, - &dwValues, - &dwMaxValueNameLength, - &dwMaxValueLength, - NULL, - NULL); - if (Error != ERROR_SUCCESS) - { - DPRINT1 ("RegQueryInfoKey() failed (Error %lu)\n", Error); - SetLastError((DWORD)Error); - return FALSE; - } - - DPRINT ("dwSubKeys %lu\n", dwSubKeys); - DPRINT ("dwMaxSubKeyNameLength %lu\n", dwMaxSubKeyNameLength); - DPRINT ("dwValues %lu\n", dwValues); - DPRINT ("dwMaxValueNameLength %lu\n", dwMaxValueNameLength); - DPRINT ("dwMaxValueLength %lu\n", dwMaxValueLength); - - /* Copy subkeys */ - if (dwSubKeys != 0) - { - lpNameBuffer = HeapAlloc (GetProcessHeap (), - 0, - dwMaxSubKeyNameLength * sizeof(WCHAR)); - if (lpNameBuffer == NULL) - { - DPRINT1("Buffer allocation failed\n"); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - for (i = 0; i < dwSubKeys; i++) - { - dwSubKeyNameLength = dwMaxSubKeyNameLength; - Error = RegEnumKeyExW (hSrcKey, - i, - lpNameBuffer, - &dwSubKeyNameLength, - NULL, - NULL, - NULL, - &LastWrite); - if (Error != ERROR_SUCCESS) - { - DPRINT1 ("Subkey enumeration failed (Error %lu)\n", Error); - HeapFree (GetProcessHeap (), - 0, - lpNameBuffer); - SetLastError((DWORD)Error); - return FALSE; - } - - Error = RegCreateKeyExW (hDstKey, - lpNameBuffer, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_WRITE, - NULL, - &hDstSubKey, - &dwDisposition); - if (Error != ERROR_SUCCESS) - { - DPRINT1 ("Subkey creation failed (Error %lu)\n", Error); - HeapFree (GetProcessHeap (), - 0, - lpNameBuffer); - SetLastError((DWORD)Error); - return FALSE; - } - - Error = RegOpenKeyExW (hSrcKey, - lpNameBuffer, - 0, - KEY_READ, - &hSrcSubKey); - if (Error != ERROR_SUCCESS) - { - DPRINT1 ("Error: %lu\n", Error); - RegCloseKey (hDstSubKey); - HeapFree (GetProcessHeap (), - 0, - lpNameBuffer); - SetLastError((DWORD)Error); - return FALSE; - } - - if (!CopyKey (hDstSubKey, - hSrcSubKey)) - { - DPRINT1 ("Error: %lu\n", GetLastError()); - RegCloseKey (hSrcSubKey); - RegCloseKey (hDstSubKey); - HeapFree (GetProcessHeap (), - 0, - lpNameBuffer); - return FALSE; - } - - RegCloseKey (hSrcSubKey); - RegCloseKey (hDstSubKey); - } - - HeapFree (GetProcessHeap (), - 0, - lpNameBuffer); - } - - /* Copy values */ - if (dwValues != 0) - { - lpNameBuffer = HeapAlloc (GetProcessHeap (), - 0, - dwMaxValueNameLength * sizeof(WCHAR)); - if (lpNameBuffer == NULL) - { - DPRINT1 ("Buffer allocation failed\n"); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - lpDataBuffer = HeapAlloc (GetProcessHeap (), - 0, - dwMaxValueLength); - if (lpDataBuffer == NULL) - { - DPRINT1 ("Buffer allocation failed\n"); - HeapFree (GetProcessHeap (), - 0, - lpNameBuffer); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - for (i = 0; i < dwValues; i++) - { - dwValueNameLength = dwMaxValueNameLength; - dwValueLength = dwMaxValueLength; - Error = RegEnumValueW (hSrcKey, - i, - lpNameBuffer, - &dwValueNameLength, - NULL, - &dwType, - lpDataBuffer, - &dwValueLength); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - HeapFree (GetProcessHeap (), - 0, - lpDataBuffer); - HeapFree (GetProcessHeap (), - 0, - lpNameBuffer); - SetLastError((DWORD)Error); - return FALSE; - } - - Error = RegSetValueExW (hDstKey, - lpNameBuffer, - 0, - dwType, - lpDataBuffer, - dwValueLength); - if (Error != ERROR_SUCCESS) - { - DPRINT1("Error: %lu\n", Error); - HeapFree (GetProcessHeap (), - 0, - lpDataBuffer); - HeapFree (GetProcessHeap (), - 0, - lpNameBuffer); - SetLastError((DWORD)Error); - return FALSE; - } - } - - HeapFree (GetProcessHeap (), - 0, - lpDataBuffer); - - HeapFree (GetProcessHeap (), - 0, - lpNameBuffer); - } - - DPRINT ("CopyKey() done \n"); - - return TRUE; + FILETIME LastWrite; + DWORD dwSubKeys; + DWORD dwValues; + DWORD dwType; + DWORD dwMaxSubKeyNameLength; + DWORD dwSubKeyNameLength; + DWORD dwMaxValueNameLength; + DWORD dwValueNameLength; + DWORD dwMaxValueLength; + DWORD dwValueLength; + DWORD dwDisposition; + DWORD i; + LPWSTR lpNameBuffer; + LPBYTE lpDataBuffer; + HKEY hDstSubKey; + HKEY hSrcSubKey; + + DPRINT ("CopyKey() called \n"); + + Error = RegQueryInfoKey(hSrcKey, + NULL, + NULL, + NULL, + &dwSubKeys, + &dwMaxSubKeyNameLength, + NULL, + &dwValues, + &dwMaxValueNameLength, + &dwMaxValueLength, + NULL, + NULL); + if (Error != ERROR_SUCCESS) + { + DPRINT1("RegQueryInfoKey() failed (Error %lu)\n", Error); + SetLastError((DWORD)Error); + return FALSE; + } + + DPRINT("dwSubKeys %lu\n", dwSubKeys); + DPRINT("dwMaxSubKeyNameLength %lu\n", dwMaxSubKeyNameLength); + DPRINT("dwValues %lu\n", dwValues); + DPRINT("dwMaxValueNameLength %lu\n", dwMaxValueNameLength); + DPRINT("dwMaxValueLength %lu\n", dwMaxValueLength); + + /* Copy subkeys */ + if (dwSubKeys != 0) + { + lpNameBuffer = HeapAlloc(GetProcessHeap(), + 0, + dwMaxSubKeyNameLength * sizeof(WCHAR)); + if (lpNameBuffer == NULL) + { + DPRINT1("Buffer allocation failed\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + for (i = 0; i < dwSubKeys; i++) + { + dwSubKeyNameLength = dwMaxSubKeyNameLength; + Error = RegEnumKeyExW(hSrcKey, + i, + lpNameBuffer, + &dwSubKeyNameLength, + NULL, + NULL, + NULL, + &LastWrite); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Subkey enumeration failed (Error %lu)\n", Error); + HeapFree(GetProcessHeap(), + 0, + lpNameBuffer); + SetLastError((DWORD)Error); + return FALSE; + } + + Error = RegCreateKeyExW(hDstKey, + lpNameBuffer, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE, + NULL, + &hDstSubKey, + &dwDisposition); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Subkey creation failed (Error %lu)\n", Error); + HeapFree(GetProcessHeap(), + 0, + lpNameBuffer); + SetLastError((DWORD)Error); + return FALSE; + } + + Error = RegOpenKeyExW(hSrcKey, + lpNameBuffer, + 0, + KEY_READ, + &hSrcSubKey); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + RegCloseKey(hDstSubKey); + HeapFree(GetProcessHeap(), + 0, + lpNameBuffer); + SetLastError((DWORD)Error); + return FALSE; + } + + if (!CopyKey(hDstSubKey, + hSrcSubKey)) + { + DPRINT1("Error: %lu\n", GetLastError()); + RegCloseKey (hSrcSubKey); + RegCloseKey (hDstSubKey); + HeapFree(GetProcessHeap(), + 0, + lpNameBuffer); + return FALSE; + } + + RegCloseKey(hSrcSubKey); + RegCloseKey(hDstSubKey); + } + + HeapFree(GetProcessHeap(), + 0, + lpNameBuffer); + } + + /* Copy values */ + if (dwValues != 0) + { + lpNameBuffer = HeapAlloc(GetProcessHeap(), + 0, + dwMaxValueNameLength * sizeof(WCHAR)); + if (lpNameBuffer == NULL) + { + DPRINT1("Buffer allocation failed\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + lpDataBuffer = HeapAlloc(GetProcessHeap(), + 0, + dwMaxValueLength); + if (lpDataBuffer == NULL) + { + DPRINT1("Buffer allocation failed\n"); + HeapFree(GetProcessHeap(), + 0, + lpNameBuffer); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + for (i = 0; i < dwValues; i++) + { + dwValueNameLength = dwMaxValueNameLength; + dwValueLength = dwMaxValueLength; + Error = RegEnumValueW(hSrcKey, + i, + lpNameBuffer, + &dwValueNameLength, + NULL, + &dwType, + lpDataBuffer, + &dwValueLength); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + HeapFree(GetProcessHeap(), + 0, + lpDataBuffer); + HeapFree(GetProcessHeap(), + 0, + lpNameBuffer); + SetLastError((DWORD)Error); + return FALSE; + } + + Error = RegSetValueExW(hDstKey, + lpNameBuffer, + 0, + dwType, + lpDataBuffer, + dwValueLength); + if (Error != ERROR_SUCCESS) + { + DPRINT1("Error: %lu\n", Error); + HeapFree(GetProcessHeap(), + 0, + lpDataBuffer); + HeapFree(GetProcessHeap(), + 0, + lpNameBuffer); + SetLastError((DWORD)Error); + return FALSE; + } + } + + HeapFree(GetProcessHeap(), + 0, + lpDataBuffer); + + HeapFree(GetProcessHeap(), + 0, + lpNameBuffer); + } + + DPRINT("CopyKey() done \n"); + + return TRUE; #endif } BOOL -CreateUserHive (LPCWSTR lpKeyName, - LPCWSTR lpProfilePath) +CreateUserHive(LPCWSTR lpKeyName, + LPCWSTR lpProfilePath) { - HKEY hDefaultKey = NULL; - HKEY hUserKey = NULL; - LONG Error; - BOOL Ret = FALSE; - - DPRINT ("CreateUserHive(%S) called\n", lpKeyName); - - Error = RegOpenKeyExW (HKEY_USERS, - L".Default", - 0, - KEY_READ, - &hDefaultKey); - if (Error != ERROR_SUCCESS) - { - SetLastError((DWORD)Error); - goto Cleanup; - } - - Error = RegOpenKeyExW (HKEY_USERS, - lpKeyName, - 0, - KEY_ALL_ACCESS, - &hUserKey); - if (Error != ERROR_SUCCESS) - { - SetLastError((DWORD)Error); - goto Cleanup; - } - - if (!CopyKey(hUserKey, hDefaultKey)) - { - goto Cleanup; - } - - if (!UpdateUsersShellFolderSettings(lpProfilePath, - hUserKey)) - { - goto Cleanup; - } - - RegFlushKey (hUserKey); - Ret = TRUE; + HKEY hDefaultKey = NULL; + HKEY hUserKey = NULL; + LONG Error; + BOOL Ret = FALSE; + + DPRINT("CreateUserHive(%S) called\n", lpKeyName); + + Error = RegOpenKeyExW(HKEY_USERS, + L".Default", + 0, + KEY_READ, + &hDefaultKey); + if (Error != ERROR_SUCCESS) + { + SetLastError((DWORD)Error); + goto Cleanup; + } + + Error = RegOpenKeyExW(HKEY_USERS, + lpKeyName, + 0, + KEY_ALL_ACCESS, + &hUserKey); + if (Error != ERROR_SUCCESS) + { + SetLastError((DWORD)Error); + goto Cleanup; + } + + if (!CopyKey(hUserKey, hDefaultKey)) + { + goto Cleanup; + } + + if (!UpdateUsersShellFolderSettings(lpProfilePath, + hUserKey)) + { + goto Cleanup; + } + + RegFlushKey(hUserKey); + Ret = TRUE; Cleanup: - if (hUserKey != NULL) - RegCloseKey (hUserKey); - - if (hDefaultKey != NULL) - RegCloseKey (hDefaultKey); - - return Ret; + if (hUserKey != NULL) + RegCloseKey (hUserKey); + + if (hDefaultKey != NULL) + RegCloseKey (hDefaultKey); + + return Ret; } /* EOF */ Modified: trunk/reactos/dll/win32/userenv/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/resource… ============================================================================== --- trunk/reactos/dll/win32/userenv/resources.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/resources.h [iso-8859-1] Thu Oct 24 20:16:20 2013 @@ -19,7 +19,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/userenv/resource.h + * FILE: dll/win32/userenv/resource.h * PURPOSE: Resource IDs * PROGRAMMER: Eric Kohl */ Modified: trunk/reactos/dll/win32/userenv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/setup.c?… ============================================================================== --- trunk/reactos/dll/win32/userenv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/setup.c [iso-8859-1] Thu Oct 24 20:16:20 2013 @@ -19,7 +19,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/userenv/setup.c + * FILE: dll/win32/userenv/setup.c * PURPOSE: Profile setup functions * PROGRAMMER: Eric Kohl */ Modified: trunk/reactos/dll/win32/userenv/userenv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/userenv.… ============================================================================== --- trunk/reactos/dll/win32/userenv/userenv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/userenv.c [iso-8859-1] Thu Oct 24 20:16:20 2013 @@ -19,7 +19,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/userenv/userenv.c + * FILE: dll/win32/userenv/userenv.c * PURPOSE: DLL initialization code * PROGRAMMER: Eric Kohl */ @@ -31,20 +31,21 @@ HINSTANCE hInstance = NULL; -BOOL WINAPI -DllMain (HINSTANCE hinstDLL, - DWORD fdwReason, - LPVOID lpvReserved) +BOOL +WINAPI +DllMain(HINSTANCE hinstDLL, + DWORD fdwReason, + LPVOID lpvReserved) { - if (fdwReason == DLL_PROCESS_ATTACH) + if (fdwReason == DLL_PROCESS_ATTACH) { - hInstance = hinstDLL; - InitializeGPNotifications(); + hInstance = hinstDLL; + InitializeGPNotifications(); } - else if (fdwReason == DLL_PROCESS_DETACH) + else if (fdwReason == DLL_PROCESS_DETACH) { UninitializeGPNotifications(); } - return TRUE; + return TRUE; }

1 0

[tfaber] 60743: [KMTESTS:EX] - Fix incorrect sizeof usage. CID 1102449, 1102451
by tfaber＠svn.reactos.org 24 Oct '13

24 Oct '13

Author: tfaber Date: Thu Oct 24 19:33:17 2013 New Revision: 60743 URL: http://svn.reactos.org/svn/reactos?rev=60743&view=rev Log: [KMTESTS:EX] - Fix incorrect sizeof usage. CID 1102449, 1102451 Modified: trunk/rostests/kmtests/ntos_ex/ExPools.c trunk/rostests/kmtests/ntos_ex/ExSingleList.c Modified: trunk/rostests/kmtests/ntos_ex/ExPools.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ex/ExPools.c… ============================================================================== --- trunk/rostests/kmtests/ntos_ex/ExPools.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ex/ExPools.c [iso-8859-1] Thu Oct 24 19:33:17 2013 @@ -90,7 +90,7 @@ // now test allocating lots of small/medium blocks AllocNumber = 100000; - Allocs = ExAllocatePoolWithTag(PagedPool, sizeof(Allocs) * AllocNumber, TAG_POOLTEST); + Allocs = ExAllocatePoolWithTag(PagedPool, sizeof(*Allocs) * AllocNumber, TAG_POOLTEST); // alloc blocks for (i=0; i<AllocNumber; i++) Modified: trunk/rostests/kmtests/ntos_ex/ExSingleList.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ex/ExSingleL… ============================================================================== --- trunk/rostests/kmtests/ntos_ex/ExSingleList.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ex/ExSingleList.c [iso-8859-1] Thu Oct 24 19:33:17 2013 @@ -97,15 +97,15 @@ Entries = (PVOID)&ListHead[1]; KeRaiseIrql(HIGH_LEVEL, &Irql); - RtlFillMemory(Entries, sizeof Entries, 0x55); + RtlFillMemory(Entries, sizeof(*Entries), 0x55); ListHead->Next = NULL; TestListFunctional(ListHead, Entries, &SpinLock); - RtlFillMemory(Entries, sizeof Entries, 0x55); + RtlFillMemory(Entries, sizeof(*Entries), 0x55); ListHead->Next = NULL; TestListFunctionalExports(ListHead, Entries, &SpinLock); - RtlFillMemory(Entries, sizeof Entries, 0x55); + RtlFillMemory(Entries, sizeof(*Entries), 0x55); ListHead->Next = NULL; TestListFunctionalNoInterlocked(ListHead, Entries, &SpinLock);

1 0

[tfaber] 60742: [NPFS] - Fix IRP_MJ_SET_SECURITY. CID 1102517, 1106330 - Fix variable type in NpCommonQueryVolumeInformation. CID 1102210, 1102211
by tfaber＠svn.reactos.org 24 Oct '13

24 Oct '13

Author: tfaber Date: Thu Oct 24 19:11:04 2013 New Revision: 60742 URL: http://svn.reactos.org/svn/reactos?rev=60742&view=rev Log: [NPFS] - Fix IRP_MJ_SET_SECURITY. CID 1102517, 1106330 - Fix variable type in NpCommonQueryVolumeInformation. CID 1102210, 1102211 Modified: trunk/reactos/drivers/filesystems/npfs/seinfo.c trunk/reactos/drivers/filesystems/npfs/volinfo.c Modified: trunk/reactos/drivers/filesystems/npfs/seinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/s… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/seinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/seinfo.c [iso-8859-1] Thu Oct 24 19:11:04 2013 @@ -61,7 +61,9 @@ PNP_FCB Fcb; PNP_CCB Ccb; ULONG NamedPipeEnd; - PVOID CachedSecurityDescriptor, SecurityDescriptor; + PSECURITY_DESCRIPTOR OldSecurityDescriptor; + PSECURITY_DESCRIPTOR TempSecurityDescriptor; + PSECURITY_DESCRIPTOR NewSecurityDescriptor; PAGED_CODE(); IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -73,21 +75,22 @@ if (!NodeTypeCode) return STATUS_PIPE_DISCONNECTED; if (NodeTypeCode != NPFS_NTC_CCB) return STATUS_INVALID_PARAMETER; + OldSecurityDescriptor = TempSecurityDescriptor = Fcb->SecurityDescriptor; Status = SeSetSecurityDescriptorInfo(NULL, &IoStack->Parameters.SetSecurity.SecurityInformation, IoStack->Parameters.SetSecurity.SecurityDescriptor, - &SecurityDescriptor, + &TempSecurityDescriptor, TRUE, IoGetFileObjectGenericMapping()); if (!NT_SUCCESS(Status)) return Status; - Status = ObLogSecurityDescriptor(SecurityDescriptor, &CachedSecurityDescriptor, TRUE); - ExFreePool(SecurityDescriptor); + Status = ObLogSecurityDescriptor(TempSecurityDescriptor, &NewSecurityDescriptor, TRUE); + ExFreePool(TempSecurityDescriptor); if (!NT_SUCCESS(Status)) return Status; - Fcb->SecurityDescriptor = CachedSecurityDescriptor; - ObDereferenceSecurityDescriptor(SecurityDescriptor, 1); + Fcb->SecurityDescriptor = NewSecurityDescriptor; + ObDereferenceSecurityDescriptor(OldSecurityDescriptor, 1); return Status; } @@ -127,7 +130,7 @@ FsRtlEnterFileSystem(); NpAcquireExclusiveVcb(); - Status = NpCommonQuerySecurityInfo(DeviceObject, Irp); + Status = NpCommonSetSecurityInfo(DeviceObject, Irp); NpReleaseVcb(); FsRtlExitFileSystem(); Modified: trunk/reactos/drivers/filesystems/npfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/volinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/volinfo.c [iso-8859-1] Thu Oct 24 19:11:04 2013 @@ -140,7 +140,7 @@ IN PIRP Irp) { PIO_STACK_LOCATION IoStack; - FILE_INFORMATION_CLASS InfoClass; + FS_INFORMATION_CLASS InfoClass; ULONG Length; PVOID Buffer; NTSTATUS Status;

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
33
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2013