Ros-diffs September 2013

ros-diffs@reactos.org

16 participants
554 discussions

[akhaldi] 59946: [FRAMEDYN] * Fix the MSVC build for real now, so that we don't keep fixing it bit by bit until r60000.
by akhaldi＠svn.reactos.org 01 Sep '13

01 Sep '13

Author: akhaldi Date: Sun Sep 1 15:51:32 2013 New Revision: 59946 URL: http://svn.reactos.org/svn/reactos?rev=59946&view=rev Log: [FRAMEDYN] * Fix the MSVC build for real now, so that we don't keep fixing it bit by bit until r60000. Modified: trunk/reactos/dll/win32/framedyn/CMakeLists.txt trunk/reactos/dll/win32/framedyn/chstring.cpp Modified: trunk/reactos/dll/win32/framedyn/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/framedyn/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/CMakeLists.txt [iso-8859-1] Sun Sep 1 15:51:32 2013 @@ -1,31 +1,16 @@ + set_cpp(WITH_RUNTIME) - -if(NOT MSVC) -spec2def(framedyn.dll framedyn_gcc.spec ADD_IMPORTLIB) -else() -spec2def(framedyn.dll framedyn_msvc.spec ADD_IMPORTLIB) -endif() - -list(APPEND SOURCE - main.c - chstring.cpp - ${CMAKE_CURRENT_BINARY_DIR}/framedyn.def) - -add_library(framedyn SHARED - ${SOURCE}) - +list(APPEND SOURCE main.c chstring.cpp) +add_library(framedyn SHARED ${SOURCE}) set_module_type(framedyn win32dll UNICODE) - -add_importlibs(framedyn - msvcrt - kernel32 - oleaut32 - ntdll) +add_importlibs(framedyn oleaut32 msvcrt kernel32 ntdll) if(NOT MSVC) # FIXME: http://www.cmake.org/Bug/view.php?id=12998 #add_target_compile_flags(framedyn "-fexceptions -Wno-deprecated-declarations") set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fexceptions -Wno-deprecated-declarations") + spec2def(framedyn.dll framedyn_gcc.spec ADD_IMPORTLIB) + list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/framedyn.def) endif() add_cd_file(TARGET framedyn DESTINATION reactos/system32/wbem FOR all) Modified: trunk/reactos/dll/win32/framedyn/chstring.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/chstrin… ============================================================================== --- trunk/reactos/dll/win32/framedyn/chstring.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/chstring.cpp [iso-8859-1] Sun Sep 1 15:51:32 2013 @@ -844,7 +844,7 @@ CopyBeforeWrite(); // Let's use appropriate helper - wcslwr(m_pchData); + _wcslwr(m_pchData); } /* @@ -856,7 +856,7 @@ CopyBeforeWrite(); // Let's use appropriate helper - wcsrev(m_pchData); + _wcsrev(m_pchData); } /* @@ -868,7 +868,7 @@ CopyBeforeWrite(); // Let's use appropriate helper - wcsupr(m_pchData); + _wcsupr(m_pchData); } /*

1 0

[ekohl] 59945: [SAMSRV] - Improve SamRegCloseKey and fix all calls to it accordingly. Also replace all calls to NtClose by calls to SampRegCloseKey. - Add a resource to protect the Samr functions f...
by ekohl＠svn.reactos.org 01 Sep '13

01 Sep '13

Author: ekohl Date: Sun Sep 1 15:46:00 2013 New Revision: 59945 URL: http://svn.reactos.org/svn/reactos?rev=59945&view=rev Log: [SAMSRV] - Improve SamRegCloseKey and fix all calls to it accordingly. Also replace all calls to NtClose by calls to SampRegCloseKey. - Add a resource to protect the Samr functions from concurrent access. Modified: trunk/reactos/dll/win32/samsrv/alias.c trunk/reactos/dll/win32/samsrv/database.c trunk/reactos/dll/win32/samsrv/domain.c trunk/reactos/dll/win32/samsrv/registry.c trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.c trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/dll/win32/samsrv/setup.c Modified: trunk/reactos/dll/win32/samsrv/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/alias.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/alias.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/alias.c [iso-8859-1] Sun Sep 1 15:46:00 2013 @@ -101,11 +101,8 @@ } done: - if (MemberKeyHandle != NULL) - SampRegCloseKey(MemberKeyHandle); - - if (MembersKeyHandle != NULL) - SampRegCloseKey(MembersKeyHandle); + SampRegCloseKey(&MemberKeyHandle); + SampRegCloseKey(&MembersKeyHandle); if (MemberIdString != NULL) LocalFree(MemberIdString); @@ -160,8 +157,7 @@ if (ulValueCount == 0) { - SampRegCloseKey(MemberKeyHandle); - MemberKeyHandle = NULL; + SampRegCloseKey(&MemberKeyHandle); Status = SampRegDeleteKey(AliasObject->MembersKeyHandle, MemberIdString); @@ -201,8 +197,7 @@ if (ulValueCount == 0) { - SampRegCloseKey(MembersKeyHandle); - MembersKeyHandle = NULL; + SampRegCloseKey(&MembersKeyHandle); Status = SampRegDeleteKey(AliasObject->KeyHandle, L"Members"); @@ -214,11 +209,8 @@ } done: - if (MemberKeyHandle != NULL) - SampRegCloseKey(MemberKeyHandle); - - if (MembersKeyHandle != NULL) - SampRegCloseKey(MembersKeyHandle); + SampRegCloseKey(&MemberKeyHandle); + SampRegCloseKey(&MembersKeyHandle); if (MemberIdString != NULL) LocalFree(MemberIdString); Modified: trunk/reactos/dll/win32/samsrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/database.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] Sun Sep 1 15:46:00 2013 @@ -162,15 +162,11 @@ RtlFreeHeap(RtlGetProcessHeap(), 0, NewObject); } - if (MembersKeyHandle != NULL) - SampRegCloseKey(MembersKeyHandle); - - if (ObjectKeyHandle != NULL) - SampRegCloseKey(ObjectKeyHandle); - } - - if (ContainerKeyHandle != NULL) - SampRegCloseKey(ContainerKeyHandle); + SampRegCloseKey(&MembersKeyHandle); + SampRegCloseKey(&ObjectKeyHandle); + } + + SampRegCloseKey(&ContainerKeyHandle); return Status; } @@ -294,15 +290,11 @@ RtlFreeHeap(RtlGetProcessHeap(), 0, NewObject); } - if (MembersKeyHandle != NULL) - SampRegCloseKey(MembersKeyHandle); - - if (ObjectKeyHandle != NULL) - SampRegCloseKey(ObjectKeyHandle); - } - - if (ContainerKeyHandle != NULL) - SampRegCloseKey(ContainerKeyHandle); + SampRegCloseKey(&MembersKeyHandle); + SampRegCloseKey(&ObjectKeyHandle); + } + + SampRegCloseKey(&ContainerKeyHandle); return Status; } @@ -363,11 +355,8 @@ if (DbObject->RefCount > 0) return STATUS_SUCCESS; - if (DbObject->KeyHandle != NULL) - SampRegCloseKey(DbObject->KeyHandle); - - if (DbObject->MembersKeyHandle != NULL) - SampRegCloseKey(DbObject->MembersKeyHandle); + SampRegCloseKey(&DbObject->KeyHandle); + SampRegCloseKey(&DbObject->MembersKeyHandle); if (DbObject->Name != NULL) RtlFreeHeap(RtlGetProcessHeap(), 0, DbObject->Name); @@ -383,8 +372,8 @@ { LPCWSTR ContainerName; LPWSTR AccountName = NULL; - HKEY ContainerKey; - HKEY NamesKey; + HANDLE ContainerKey = NULL; + HANDLE NamesKey = NULL; ULONG Length = 0; NTSTATUS Status = STATUS_SUCCESS; @@ -441,13 +430,11 @@ goto done; } - if (DbObject->KeyHandle != NULL) - SampRegCloseKey(DbObject->KeyHandle); + SampRegCloseKey(&DbObject->KeyHandle); if (DbObject->ObjectType == SamDbAliasObject) { - if (DbObject->MembersKeyHandle != NULL) - SampRegCloseKey(DbObject->MembersKeyHandle); + SampRegCloseKey(&DbObject->MembersKeyHandle); SampRegDeleteKey(DbObject->KeyHandle, L"Members"); @@ -503,11 +490,8 @@ Status = STATUS_SUCCESS; done: - if (NamesKey != NULL) - SampRegCloseKey(NamesKey); - - if (ContainerKey != NULL) - SampRegCloseKey(ContainerKey); + SampRegCloseKey(&NamesKey); + SampRegCloseKey(&ContainerKey); if (AccountName != NULL) RtlFreeHeap(RtlGetProcessHeap(), 0, AccountName); 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] Sun Sep 1 15:46:00 2013 @@ -21,9 +21,6 @@ IN LPCWSTR lpAccountName, IN ULONG ulRelativeId) { - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - UNICODE_STRING ValueName; HANDLE ContainerKeyHandle = NULL; HANDLE NamesKeyHandle = NULL; NTSTATUS Status; @@ -31,51 +28,31 @@ TRACE("SampSetAccountNameInDomain()\n"); /* Open the container key */ - RtlInitUnicodeString(&KeyName, lpContainerName); - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - DomainObject->KeyHandle, - NULL); - - Status = NtOpenKey(&ContainerKeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes); + Status = SampRegOpenKey(DomainObject->KeyHandle, + lpContainerName, + KEY_ALL_ACCESS, + &ContainerKeyHandle); if (!NT_SUCCESS(Status)) return Status; /* Open the 'Names' key */ - RtlInitUnicodeString(&KeyName, L"Names"); - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - ContainerKeyHandle, - NULL); - - Status = NtOpenKey(&NamesKeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes); + Status = SampRegOpenKey(ContainerKeyHandle, + L"Names", + KEY_ALL_ACCESS, + &NamesKeyHandle); if (!NT_SUCCESS(Status)) goto done; /* Set the alias value */ - RtlInitUnicodeString(&ValueName, lpAccountName); - - Status = NtSetValueKey(NamesKeyHandle, - &ValueName, - 0, - REG_DWORD, - (LPVOID)&ulRelativeId, - sizeof(ULONG)); + Status = SampRegSetValue(NamesKeyHandle, + lpAccountName, + REG_DWORD, + (LPVOID)&ulRelativeId, + sizeof(ULONG)); done: - if (NamesKeyHandle) - NtClose(NamesKeyHandle); - - if (ContainerKeyHandle) - NtClose(ContainerKeyHandle); + SampRegCloseKey(&NamesKeyHandle); + SampRegCloseKey(&ContainerKeyHandle); return Status; } @@ -86,8 +63,6 @@ IN LPCWSTR lpContainerName, IN LPCWSTR lpAccountName) { - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; HANDLE ContainerKeyHandle = NULL; HANDLE NamesKeyHandle = NULL; NTSTATUS Status; @@ -95,32 +70,18 @@ TRACE("(%S %S)\n", lpContainerName, lpAccountName); /* Open the container key */ - RtlInitUnicodeString(&KeyName, lpContainerName); - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - DomainObject->KeyHandle, - NULL); - - Status = NtOpenKey(&ContainerKeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes); + Status = SampRegOpenKey(DomainObject->KeyHandle, + lpContainerName, + KEY_ALL_ACCESS, + &ContainerKeyHandle); if (!NT_SUCCESS(Status)) return Status; /* Open the 'Names' key */ - RtlInitUnicodeString(&KeyName, L"Names"); - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - ContainerKeyHandle, - NULL); - - Status = NtOpenKey(&NamesKeyHandle, - KEY_SET_VALUE, - &ObjectAttributes); + Status = SampRegOpenKey(ContainerKeyHandle, + L"Names", + KEY_SET_VALUE, + &NamesKeyHandle); if (!NT_SUCCESS(Status)) goto done; @@ -129,11 +90,8 @@ lpAccountName); done: - if (NamesKeyHandle) - NtClose(NamesKeyHandle); - - if (ContainerKeyHandle) - NtClose(ContainerKeyHandle); + SampRegCloseKey(&NamesKeyHandle); + SampRegCloseKey(&ContainerKeyHandle); return Status; } @@ -143,8 +101,8 @@ SampCheckAccountNameInDomain(IN PSAM_DB_OBJECT DomainObject, IN LPCWSTR lpAccountName) { - HANDLE AccountKey; - HANDLE NamesKey; + HANDLE AccountKey = NULL; + HANDLE NamesKey = NULL; NTSTATUS Status; TRACE("SampCheckAccountNameInDomain()\n"); @@ -168,14 +126,14 @@ NULL); if (Status == STATUS_SUCCESS) { - SampRegCloseKey(NamesKey); + SampRegCloseKey(&NamesKey); Status = STATUS_ALIAS_EXISTS; } else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) Status = STATUS_SUCCESS; } - SampRegCloseKey(AccountKey); + SampRegCloseKey(&AccountKey); } if (!NT_SUCCESS(Status)) @@ -203,14 +161,14 @@ NULL); if (Status == STATUS_SUCCESS) { - SampRegCloseKey(NamesKey); + SampRegCloseKey(&NamesKey); Status = STATUS_ALIAS_EXISTS; } else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) Status = STATUS_SUCCESS; } - SampRegCloseKey(AccountKey); + SampRegCloseKey(&AccountKey); } if (!NT_SUCCESS(Status)) @@ -238,14 +196,14 @@ NULL); if (Status == STATUS_SUCCESS) { - SampRegCloseKey(NamesKey); + SampRegCloseKey(&NamesKey); Status = STATUS_ALIAS_EXISTS; } else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) Status = STATUS_SUCCESS; } - SampRegCloseKey(AccountKey); + SampRegCloseKey(&AccountKey); } if (!NT_SUCCESS(Status)) @@ -263,9 +221,9 @@ { WCHAR AliasKeyName[64]; LPWSTR MemberSidString = NULL; - HANDLE AliasesKey; - HANDLE MembersKey; - HANDLE AliasKey; + HANDLE AliasesKey = NULL; + HANDLE MembersKey = NULL; + HANDLE AliasKey = NULL; ULONG Index; NTSTATUS Status; @@ -311,12 +269,12 @@ Status = SampRegDeleteValue(AliasKey, MemberSidString); - SampRegCloseKey(MembersKey); + SampRegCloseKey(&MembersKey); } else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) Status = STATUS_SUCCESS; - SampRegCloseKey(AliasKey); + SampRegCloseKey(&AliasKey); } Index++; @@ -333,10 +291,10 @@ if (Status == STATUS_OBJECT_NAME_NOT_FOUND) Status = STATUS_SUCCESS; - SampRegCloseKey(MembersKey); - } - - SampRegCloseKey(AliasesKey); + SampRegCloseKey(&MembersKey); + } + + SampRegCloseKey(&AliasesKey); } if (MemberSidString != NULL) Modified: trunk/reactos/dll/win32/samsrv/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/registry.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/registry.c [iso-8859-1] Sun Sep 1 15:46:00 2013 @@ -24,9 +24,18 @@ NTSTATUS -SampRegCloseKey(IN HANDLE KeyHandle) -{ - return NtClose(KeyHandle); +SampRegCloseKey(IN OUT PHANDLE KeyHandle) +{ + NTSTATUS Status; + + if (KeyHandle == NULL || *KeyHandle == NULL) + return STATUS_SUCCESS; + + Status = NtClose(*KeyHandle); + if (NT_SUCCESS(Status)) + *KeyHandle = NULL; + + return Status; } @@ -34,7 +43,7 @@ SampRegCreateKey(IN HANDLE ParentKeyHandle, IN LPCWSTR KeyName, IN ACCESS_MASK DesiredAccess, - OUT HANDLE KeyHandle) + OUT PHANDLE KeyHandle) { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING Name; @@ -150,7 +159,7 @@ SampRegOpenKey(IN HANDLE ParentKeyHandle, IN LPCWSTR KeyName, IN ACCESS_MASK DesiredAccess, - OUT HANDLE KeyHandle) + OUT PHANDLE KeyHandle) { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING Name; 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] Sun Sep 1 15:46:00 2013 @@ -144,6 +144,9 @@ TRACE("SamrConnect(%p %p %lx)\n", ServerName, ServerHandle, DesiredAccess); + + RtlAcquireResourceShared(&SampResource, + TRUE); /* Map generic access rights */ RtlMapGenericMask(&DesiredAccess, @@ -160,6 +163,8 @@ if (NT_SUCCESS(Status)) *ServerHandle = (SAMPR_HANDLE)ServerObject; + RtlReleaseResource(&SampResource); + TRACE("SamrConnect done (Status 0x%08lx)\n", Status); return Status; @@ -175,6 +180,9 @@ NTSTATUS Status = STATUS_SUCCESS; TRACE("SamrCloseHandle(%p)\n", SamHandle); + + RtlAcquireResourceShared(&SampResource, + TRUE); Status = SampValidateDbObject(*SamHandle, SamDbIgnoreObject, @@ -185,6 +193,8 @@ Status = SampCloseDbObject(DbObject); *SamHandle = NULL; } + + RtlReleaseResource(&SampResource); TRACE("SamrCloseHandle done (Status 0x%08lx)\n", Status); @@ -226,11 +236,17 @@ TRACE("(%p)\n", ServerHandle); + RtlAcquireResourceShared(&SampResource, + TRUE); + /* Validate the server handle */ Status = SampValidateDbObject(ServerHandle, SamDbServerObject, SAM_SERVER_SHUTDOWN, &ServerObject); + + RtlReleaseResource(&SampResource); + if (!NT_SUCCESS(Status)) return Status; @@ -262,13 +278,16 @@ TRACE("SamrLookupDomainInSamServer(%p %p %p)\n", ServerHandle, Name, DomainId); + RtlAcquireResourceShared(&SampResource, + TRUE); + /* Validate the server handle */ Status = SampValidateDbObject(ServerHandle, SamDbServerObject, SAM_SERVER_LOOKUP_DOMAIN, &ServerObject); if (!NT_SUCCESS(Status)) - return Status; + goto done; *DomainId = NULL; @@ -277,7 +296,7 @@ KEY_READ, &DomainsKeyHandle); if (!NT_SUCCESS(Status)) - return Status; + goto done; Index = 0; while (Found == FALSE) @@ -339,13 +358,17 @@ } } - NtClose(DomainKeyHandle); + SampRegCloseKey(&DomainKeyHandle); } Index++; } - NtClose(DomainsKeyHandle); +done: + SampRegCloseKey(&DomainKeyHandle); + SampRegCloseKey(&DomainsKeyHandle); + + RtlReleaseResource(&SampResource); return Status; } @@ -362,8 +385,8 @@ { PSAM_DB_OBJECT ServerObject; WCHAR DomainKeyName[64]; - HANDLE DomainsKeyHandle; - HANDLE DomainKeyHandle; + HANDLE DomainsKeyHandle = NULL; + HANDLE DomainKeyHandle = NULL; ULONG EnumIndex; ULONG EnumCount; ULONG RequiredLength; @@ -376,20 +399,23 @@ ServerHandle, EnumerationContext, Buffer, PreferedMaximumLength, CountReturned); + RtlAcquireResourceShared(&SampResource, + TRUE); + /* Validate the server handle */ Status = SampValidateDbObject(ServerHandle, SamDbServerObject, SAM_SERVER_ENUMERATE_DOMAINS, &ServerObject); if (!NT_SUCCESS(Status)) - return Status; + goto done; Status = SampRegOpenKey(ServerObject->KeyHandle, L"Domains", KEY_READ, &DomainsKeyHandle); if (!NT_SUCCESS(Status)) - return Status; + goto done; EnumIndex = *EnumerationContext; EnumCount = 0; @@ -432,7 +458,7 @@ EnumCount++; } - NtClose(DomainKeyHandle); + SampRegCloseKey(&DomainKeyHandle); } EnumIndex++; @@ -491,7 +517,7 @@ EnumBuffer->Buffer[i].Name.Buffer = midl_user_allocate(DataLength); if (EnumBuffer->Buffer[i].Name.Buffer == NULL) { - NtClose(DomainKeyHandle); + SampRegCloseKey(&DomainKeyHandle); Status = STATUS_INSUFFICIENT_RESOURCES; goto done; } @@ -508,7 +534,7 @@ } } - NtClose(DomainKeyHandle); + SampRegCloseKey(&DomainKeyHandle); if (!NT_SUCCESS(Status)) goto done; @@ -523,6 +549,9 @@ } done: + SampRegCloseKey(&DomainKeyHandle); + SampRegCloseKey(&DomainsKeyHandle); + if (!NT_SUCCESS(Status)) { *EnumerationContext = 0; @@ -549,7 +578,7 @@ } } - NtClose(DomainsKeyHandle); + RtlReleaseResource(&SampResource); return Status; } @@ -574,6 +603,9 @@ RtlMapGenericMask(&DesiredAccess, &DomainMapping); + RtlAcquireResourceShared(&SampResource, + TRUE); + /* Validate the server handle */ Status = SampValidateDbObject(ServerHandle, SamDbServerObject, @@ -628,6 +660,8 @@ if (NT_SUCCESS(Status)) *DomainHandle = (SAMPR_HANDLE)DomainObject; + RtlReleaseResource(&SampResource); + TRACE("SamrOpenDomain done (Status 0x%08lx)\n", Status); return Status; @@ -709,12 +743,10 @@ Status = SampRegQueryKeyInfo(NamesKeyHandle, NULL, Count); -done: - if (NamesKeyHandle != NULL) - SampRegCloseKey(NamesKeyHandle); - - if (AccountKeyHandle != NULL) - SampRegCloseKey(AccountKeyHandle); + +done: + SampRegCloseKey(&NamesKeyHandle); + SampRegCloseKey(&AccountKeyHandle); return Status; } @@ -1378,13 +1410,16 @@ return STATUS_INVALID_INFO_CLASS; } + RtlAcquireResourceShared(&SampResource, + TRUE); + /* Validate the server handle */ Status = SampValidateDbObject(DomainHandle, SamDbDomainObject, DesiredAccess, &DomainObject); if (!NT_SUCCESS(Status)) - return Status; + goto done; switch (DomainInformationClass) { @@ -1451,6 +1486,9 @@ default: Status = STATUS_NOT_IMPLEMENTED; } + +done: + RtlReleaseResource(&SampResource); return Status; } @@ -1652,13 +1690,16 @@ return STATUS_INVALID_INFO_CLASS; } + RtlAcquireResourceExclusive(&SampResource, + TRUE); + /* Validate the server handle */ Status = SampValidateDbObject(DomainHandle, SamDbDomainObject, DesiredAccess, &DomainObject); if (!NT_SUCCESS(Status)) - return Status; + goto done; switch (DomainInformationClass) { @@ -1714,6 +1755,9 @@ default: Status = STATUS_NOT_IMPLEMENTED; } + +done: + RtlReleaseResource(&SampResource); return Status; } @@ -1745,6 +1789,9 @@ RtlMapGenericMask(&DesiredAccess, &GroupMapping); + RtlAcquireResourceExclusive(&SampResource, + TRUE); + /* Validate the domain handle */ Status = SampValidateDbObject(DomainHandle, SamDbDomainObject, @@ -1753,7 +1800,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Check the group account name */ @@ -1761,7 +1808,7 @@ if (!NT_SUCCESS(Status)) { TRACE("SampCheckAccountName failed (Status 0x%08lx)\n", Status); - return Status; + goto done; } /* Check if the group name already exists in the domain */ @@ -1771,7 +1818,7 @@ { TRACE("Group name \'%S\' already exists in domain (Status 0x%08lx)\n", Name->Buffer, Status); - return Status; + goto done; } /* Get the fixed domain attributes */ @@ -1784,7 +1831,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Increment the NextRid attribute */ @@ -1800,7 +1847,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } TRACE("RID: %lx\n", ulRid); @@ -1819,7 +1866,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Add the account name of the user object */ @@ -1830,13 +1877,12 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Initialize fixed user data */ memset(&FixedGroupData, 0, sizeof(SAM_GROUP_FIXED_DATA)); FixedGroupData.Version = 1; - FixedGroupData.GroupId = ulRid; /* Set fixed user data attribute */ @@ -1848,7 +1894,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set the Name attribute */ @@ -1860,7 +1906,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set the AdminComment attribute */ @@ -1872,7 +1918,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } if (NT_SUCCESS(Status)) @@ -1880,6 +1926,9 @@ *GroupHandle = (SAMPR_HANDLE)GroupObject; *RelativeId = ulRid; } + +done: + RtlReleaseResource(&SampResource); TRACE("returns with status 0x%08lx\n", Status); @@ -1915,20 +1964,23 @@ DomainHandle, EnumerationContext, Buffer, PreferedMaximumLength, CountReturned); + RtlAcquireResourceShared(&SampResource, + TRUE); + /* Validate the domain handle */ Status = SampValidateDbObject(DomainHandle, SamDbDomainObject, DOMAIN_LIST_ACCOUNTS, &DomainObject); if (!NT_SUCCESS(Status)) - return Status; + goto done; Status = SampRegOpenKey(DomainObject->KeyHandle, L"Groups", KEY_READ, &GroupsKeyHandle); if (!NT_SUCCESS(Status)) - return Status; + goto done; Status = SampRegOpenKey(GroupsKeyHandle, L"Names", @@ -2077,14 +2129,13 @@ } } - if (NamesKeyHandle != NULL) - SampRegCloseKey(NamesKeyHandle); - - if (GroupsKeyHandle != NULL) - SampRegCloseKey(GroupsKeyHandle); + SampRegCloseKey(&NamesKeyHandle); + SampRegCloseKey(&GroupsKeyHandle); if ((Status == STATUS_SUCCESS) && (MoreEntries == TRUE)) Status = STATUS_MORE_ENTRIES; + + RtlReleaseResource(&SampResource); return Status; } @@ -2125,6 +2176,9 @@ RtlMapGenericMask(&DesiredAccess, &UserMapping); + RtlAcquireResourceExclusive(&SampResource, + TRUE); + /* Validate the domain handle */ Status = SampValidateDbObject(DomainHandle, SamDbDomainObject, @@ -2133,7 +2187,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Check the user account name */ @@ -2141,7 +2195,7 @@ if (!NT_SUCCESS(Status)) { TRACE("SampCheckAccountName failed (Status 0x%08lx)\n", Status); - return Status; + goto done; } /* Check if the user name already exists in the domain */ @@ -2151,7 +2205,7 @@ { TRACE("User name \'%S\' already exists in domain (Status 0x%08lx)\n", Name->Buffer, Status); - return Status; + goto done; } /* Get the fixed domain attributes */ @@ -2164,7 +2218,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Increment the NextRid attribute */ @@ -2180,7 +2234,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } TRACE("RID: %lx\n", ulRid); @@ -2199,7 +2253,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Add the account name for the user object */ @@ -2210,7 +2264,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Initialize fixed user data */ @@ -2244,7 +2298,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set the Name attribute */ @@ -2256,7 +2310,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set the FullName attribute */ @@ -2268,7 +2322,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set the HomeDirectory attribute */ @@ -2280,7 +2334,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set the HomeDirectoryDrive attribute */ @@ -2292,7 +2346,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set the ScriptPath attribute */ @@ -2304,7 +2358,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set the ProfilePath attribute */ @@ -2316,7 +2370,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set the AdminComment attribute */ @@ -2328,7 +2382,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set the UserComment attribute */ @@ -2340,7 +2394,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set the WorkStations attribute */ @@ -2352,7 +2406,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set the Parameters attribute */ @@ -2364,7 +2418,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set LogonHours attribute*/ @@ -2379,7 +2433,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set Groups attribute*/ @@ -2396,7 +2450,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set LMPwd attribute*/ @@ -2408,7 +2462,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set NTPwd attribute*/ @@ -2420,7 +2474,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set LMPwdHistory attribute*/ @@ -2432,7 +2486,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set NTPwdHistory attribute*/ @@ -2444,7 +2498,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* FIXME: Set SecDesc attribute*/ @@ -2454,6 +2508,9 @@ *UserHandle = (SAMPR_HANDLE)UserObject; *RelativeId = ulRid; } + +done: + RtlReleaseResource(&SampResource); TRACE("returns with status 0x%08lx\n", Status); @@ -2490,20 +2547,23 @@ DomainHandle, EnumerationContext, UserAccountControl, Buffer, PreferedMaximumLength, CountReturned); + RtlAcquireResourceShared(&SampResource, + TRUE); + /* Validate the domain handle */ Status = SampValidateDbObject(DomainHandle, SamDbDomainObject, DOMAIN_LIST_ACCOUNTS, &DomainObject); if (!NT_SUCCESS(Status)) - return Status; + goto done; Status = SampRegOpenKey(DomainObject->KeyHandle, L"Users", KEY_READ, &UsersKeyHandle); if (!NT_SUCCESS(Status)) - return Status; + goto done; Status = SampRegOpenKey(UsersKeyHandle, L"Names", @@ -2652,14 +2712,13 @@ } } - if (NamesKeyHandle != NULL) - SampRegCloseKey(NamesKeyHandle); - - if (UsersKeyHandle != NULL) - SampRegCloseKey(UsersKeyHandle); + SampRegCloseKey(&NamesKeyHandle); + SampRegCloseKey(&UsersKeyHandle); if ((Status == STATUS_SUCCESS) && (MoreEntries == TRUE)) Status = STATUS_MORE_ENTRIES; + + RtlReleaseResource(&SampResource); return Status; } @@ -2690,6 +2749,9 @@ RtlMapGenericMask(&DesiredAccess, &AliasMapping); + RtlAcquireResourceExclusive(&SampResource, + TRUE); + /* Validate the domain handle */ Status = SampValidateDbObject(DomainHandle, SamDbDomainObject, @@ -2698,7 +2760,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Check the alias acoount name */ @@ -2706,7 +2768,7 @@ if (!NT_SUCCESS(Status)) { TRACE("SampCheckAccountName failed (Status 0x%08lx)\n", Status); - return Status; + goto done; } /* Check if the alias name already exists in the domain */ @@ -2716,7 +2778,7 @@ { TRACE("Alias name \'%S\' already exists in domain (Status 0x%08lx)\n", AccountName->Buffer, Status); - return Status; + goto done; } /* Get the fixed domain attributes */ @@ -2729,7 +2791,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Increment the NextRid attribute */ @@ -2745,7 +2807,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } TRACE("RID: %lx\n", ulRid); @@ -2764,7 +2826,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Add the account name for the alias object */ @@ -2775,7 +2837,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set the Name attribute */ @@ -2787,7 +2849,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set the Description attribute */ @@ -2799,7 +2861,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } if (NT_SUCCESS(Status)) @@ -2807,6 +2869,9 @@ *AliasHandle = (SAMPR_HANDLE)AliasObject; *RelativeId = ulRid; } + +done: + RtlReleaseResource(&SampResource); TRACE("returns with status 0x%08lx\n", Status); @@ -2842,20 +2907,23 @@ DomainHandle, EnumerationContext, Buffer, PreferedMaximumLength, CountReturned); + RtlAcquireResourceShared(&SampResource, + TRUE); + /* Validate the domain handle */ Status = SampValidateDbObject(DomainHandle, SamDbDomainObject, DOMAIN_LIST_ACCOUNTS, &DomainObject); if (!NT_SUCCESS(Status)) - return Status; + goto done; Status = SampRegOpenKey(DomainObject->KeyHandle, L"Aliases", KEY_READ, &AliasesKeyHandle); if (!NT_SUCCESS(Status)) - return Status; + goto done; Status = SampRegOpenKey(AliasesKeyHandle, L"Names", @@ -3004,14 +3072,13 @@ } } - if (NamesKeyHandle != NULL) - SampRegCloseKey(NamesKeyHandle); - - if (AliasesKeyHandle != NULL) - SampRegCloseKey(AliasesKeyHandle); + SampRegCloseKey(&NamesKeyHandle); + SampRegCloseKey(&AliasesKeyHandle); if ((Status == STATUS_SUCCESS) && (MoreEntries == TRUE)) Status = STATUS_MORE_ENTRIES; + + RtlReleaseResource(&SampResource); return Status; } @@ -3040,13 +3107,16 @@ TRACE("SamrGetAliasMembership(%p %p %p)\n", DomainHandle, SidArray, Membership); + RtlAcquireResourceShared(&SampResource, + TRUE); + /* Validate the domain handle */ Status = SampValidateDbObject(DomainHandle, SamDbDomainObject, DOMAIN_GET_ALIAS_MEMBERSHIP, &DomainObject); if (!NT_SUCCESS(Status)) - return Status; + goto done; Status = SampRegOpenKey(DomainObject->KeyHandle, L"Aliases", @@ -3092,7 +3162,7 @@ MaxSidCount += ValueCount; } - NtClose(MemberKeyHandle); + SampRegCloseKey(&MemberKeyHandle); } if (Status == STATUS_OBJECT_NAME_NOT_FOUND) @@ -3151,13 +3221,17 @@ } } - NtClose(MemberKeyHandle); + SampRegCloseKey(&MemberKeyHandle); } LocalFree(MemberSidString); } done: + SampRegCloseKey(&MembersKeyHandle); + SampRegCloseKey(&MembersKeyHandle); + SampRegCloseKey(&AliasesKeyHandle); + if (NT_SUCCESS(Status)) { Membership->Count = MaxSidCount; @@ -3169,14 +3243,7 @@ midl_user_free(RidArray); } - if (MembersKeyHandle != NULL) - NtClose(MembersKeyHandle); - - if (MembersKeyHandle != NULL) - NtClose(MembersKeyHandle); - - if (AliasesKeyHandle != NULL) - NtClose(AliasesKeyHandle); + RtlReleaseResource(&SampResource); return Status; } @@ -3192,8 +3259,8 @@ OUT PSAMPR_ULONG_ARRAY Use) { PSAM_DB_OBJECT DomainObject; - HANDLE AccountsKeyHandle; - HANDLE NamesKeyHandle; + HANDLE AccountsKeyHandle = NULL; + HANDLE NamesKeyHandle = NULL; ULONG MappedCount = 0; ULONG DataLength; ULONG i; @@ -3202,6 +3269,9 @@ TRACE("SamrLookupNamesInDomain(%p %lu %p %p %p)\n", DomainHandle, Count, Names, RelativeIds, Use); + + RtlAcquireResourceShared(&SampResource, + TRUE); /* Validate the domain handle */ Status = SampValidateDbObject(DomainHandle, @@ -3211,14 +3281,17 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } RelativeIds->Count = 0; Use->Count = 0; if (Count == 0) - return STATUS_SUCCESS; + { + Status = STATUS_SUCCESS; + goto done; + } /* Allocate the relative IDs array */ RelativeIds->Element = midl_user_allocate(Count * sizeof(ULONG)); @@ -3265,10 +3338,10 @@ &RelativeId, &DataLength); - SampRegCloseKey(NamesKeyHandle); + SampRegCloseKey(&NamesKeyHandle); } - SampRegCloseKey(AccountsKeyHandle); + SampRegCloseKey(&AccountsKeyHandle); } if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND) @@ -3304,10 +3377,10 @@ &RelativeId, &DataLength); - SampRegCloseKey(NamesKeyHandle); + SampRegCloseKey(&NamesKeyHandle); } - SampRegCloseKey(AccountsKeyHandle); + SampRegCloseKey(&AccountsKeyHandle); } if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND) @@ -3343,10 +3416,10 @@ &RelativeId, &DataLength); - SampRegCloseKey(NamesKeyHandle); + SampRegCloseKey(&NamesKeyHandle); } - SampRegCloseKey(AccountsKeyHandle); + SampRegCloseKey(&AccountsKeyHandle); } if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND) @@ -3396,6 +3469,8 @@ Use->Count = 0; } + + RtlReleaseResource(&SampResource); TRACE("Returned Status %lx\n", Status); @@ -3414,8 +3489,8 @@ { PSAM_DB_OBJECT DomainObject; WCHAR RidString[9]; - HANDLE AccountsKeyHandle; - HANDLE AccountKeyHandle; + HANDLE AccountsKeyHandle = NULL; + HANDLE AccountKeyHandle = NULL; ULONG MappedCount = 0; ULONG DataLength; ULONG i; @@ -3423,6 +3498,9 @@ TRACE("SamrLookupIdsInDomain(%p %lu %p %p %p)\n", DomainHandle, Count, RelativeIds, Names, Use); + + RtlAcquireResourceShared(&SampResource, + TRUE); /* Validate the domain handle */ Status = SampValidateDbObject(DomainHandle, @@ -3432,14 +3510,17 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } Names->Count = 0; Use->Count = 0; if (Count == 0) - return STATUS_SUCCESS; + { + Status = STATUS_SUCCESS; + goto done; + } /* Allocate the names array */ Names->Element = midl_user_allocate(Count * sizeof(ULONG)); @@ -3504,10 +3585,10 @@ } } - SampRegCloseKey(AccountKeyHandle); + SampRegCloseKey(&AccountKeyHandle); } - SampRegCloseKey(AccountsKeyHandle); + SampRegCloseKey(&AccountsKeyHandle); } if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND) @@ -3560,10 +3641,10 @@ } } - SampRegCloseKey(AccountKeyHandle); + SampRegCloseKey(&AccountKeyHandle); } - SampRegCloseKey(AccountsKeyHandle); + SampRegCloseKey(&AccountsKeyHandle); } if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND) @@ -3618,10 +3699,10 @@ } } - SampRegCloseKey(AccountKeyHandle); + SampRegCloseKey(&AccountKeyHandle); } - SampRegCloseKey(AccountsKeyHandle); + SampRegCloseKey(&AccountsKeyHandle); } if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND) @@ -3675,6 +3756,8 @@ Use->Count = 0; } + + RtlReleaseResource(&SampResource); return Status; } @@ -3700,6 +3783,9 @@ RtlMapGenericMask(&DesiredAccess, &GroupMapping); + RtlAcquireResourceShared(&SampResource, + TRUE); + /* Validate the domain handle */ Status = SampValidateDbObject(DomainHandle, SamDbDomainObject, @@ -3708,7 +3794,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Convert the RID into a string (hex) */ @@ -3725,12 +3811,15 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } *GroupHandle = (SAMPR_HANDLE)GroupObject; - return STATUS_SUCCESS; +done: + RtlReleaseResource(&SampResource); + + return Status; } @@ -3947,13 +4036,16 @@ TRACE("SamrQueryInformationGroup(%p %lu %p)\n", GroupHandle, GroupInformationClass, Buffer); + RtlAcquireResourceShared(&SampResource, + TRUE); + /* Validate the group handle */ Status = SampValidateDbObject(GroupHandle, SamDbGroupObject, GROUP_READ_INFORMATION, &GroupObject); if (!NT_SUCCESS(Status)) - return Status; + goto done; switch (GroupInformationClass) { @@ -3981,6 +4073,9 @@ Status = STATUS_INVALID_INFO_CLASS; break; } + +done: + RtlReleaseResource(&SampResource); return Status; } @@ -4107,13 +4202,16 @@ TRACE("SamrSetInformationGroup(%p %lu %p)\n", GroupHandle, GroupInformationClass, Buffer); + RtlAcquireResourceExclusive(&SampResource, + TRUE); + /* Validate the group handle */ Status = SampValidateDbObject(GroupHandle, SamDbGroupObject, GROUP_WRITE_ACCOUNT, &GroupObject); if (!NT_SUCCESS(Status)) - return Status; + goto done; switch (GroupInformationClass) { @@ -4140,6 +4238,9 @@ break; } +done: + RtlReleaseResource(&SampResource); + return Status; } @@ -4158,13 +4259,16 @@ TRACE("(%p %lu %lx)\n", GroupHandle, MemberId, Attributes); + RtlAcquireResourceExclusive(&SampResource, + TRUE); + /* Validate the group handle */ Status = SampValidateDbObject(GroupHandle, SamDbGroupObject, GROUP_ADD_MEMBER, &GroupObject); if (!NT_SUCCESS(Status)) - return Status; + goto done; /* Open the user object in the same domain */ Status = SampOpenUserObject(GroupObject->ParentObject, @@ -4199,11 +4303,13 @@ if (UserObject) SampCloseDbObject(UserObject); - return Status; -} - - -/* Function 21 */ + RtlReleaseResource(&SampResource); + + return Status; +} + + +/* Function 23 */ NTSTATUS NTAPI SamrDeleteGroup(IN OUT SAMPR_HANDLE *GroupHandle) @@ -4213,6 +4319,9 @@ NTSTATUS Status; TRACE("(%p)\n", GroupHandle); + + RtlAcquireResourceExclusive(&SampResource, + TRUE); /* Validate the group handle */ Status = SampValidateDbObject(*GroupHandle, @@ -4222,14 +4331,15 @@ if (!NT_SUCCESS(Status)) { TRACE("SampValidateDbObject() failed (Status 0x%08lx)\n", Status); - return Status; + goto done; } /* Fail, if the group is built-in */ if (GroupObject->RelativeId < 1000) { TRACE("You can not delete a special account!\n"); - return STATUS_SPECIAL_ACCOUNT; + Status = STATUS_SPECIAL_ACCOUNT; + goto done; } /* Get the length of the Members attribute */ @@ -4243,7 +4353,8 @@ if (Length != 0) { TRACE("There are still members in the group!\n"); - return STATUS_MEMBER_IN_GROUP; + Status = STATUS_MEMBER_IN_GROUP; + goto done; } /* FIXME: Remove the group from all aliases */ @@ -4253,13 +4364,16 @@ if (!NT_SUCCESS(Status)) { TRACE("SampDeleteAccountDbObject() failed (Status 0x%08lx)\n", Status); - return Status; + goto done; } /* Invalidate the handle */ *GroupHandle = NULL; - return STATUS_SUCCESS; +done: + RtlReleaseResource(&SampResource); + + return Status; } @@ -4276,13 +4390,16 @@ TRACE("(%p %lu)\n", GroupHandle, MemberId); + RtlAcquireResourceExclusive(&SampResource, + TRUE); + /* Validate the group handle */ Status = SampValidateDbObject(GroupHandle, SamDbGroupObject, GROUP_REMOVE_MEMBER, &GroupObject); if (!NT_SUCCESS(Status)) - return Status; + goto done; /* Open the user object in the same domain */ Status = SampOpenUserObject(GroupObject->ParentObject, @@ -4316,6 +4433,8 @@ if (UserObject) SampCloseDbObject(UserObject); + RtlReleaseResource(&SampResource); + return Status; } @@ -4332,17 +4451,23 @@ ULONG i; NTSTATUS Status; + RtlAcquireResourceShared(&SampResource, + TRUE); + /* Validate the group handle */ Status = SampValidateDbObject(GroupHandle, SamDbGroupObject, GROUP_LIST_MEMBERS, &GroupObject); if (!NT_SUCCESS(Status)) - return Status; + goto done; MembersBuffer = midl_user_allocate(sizeof(SAMPR_GET_MEMBERS_BUFFER)); if (MembersBuffer == NULL) - return STATUS_INSUFFICIENT_RESOURCES; + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } SampGetObjectAttribute(GroupObject, L"Members", @@ -4358,7 +4483,8 @@ *Members = MembersBuffer; - return STATUS_SUCCESS; + Status = STATUS_SUCCESS; + goto done; } MembersBuffer->Members = midl_user_allocate(Length); @@ -4417,6 +4543,8 @@ midl_user_free(MembersBuffer); } } + + RtlReleaseResource(&SampResource); return Status; } @@ -4432,6 +4560,9 @@ PSAM_DB_OBJECT GroupObject; NTSTATUS Status; + RtlAcquireResourceExclusive(&SampResource, + TRUE); + /* Validate the group handle */ Status = SampValidateDbObject(GroupHandle, SamDbGroupObject, @@ -4440,7 +4571,7 @@ if (!NT_SUCCESS(Status)) { TRACE("SampValidateDbObject failed with status 0x%08lx\n", Status); - return Status; + goto done; } Status = SampSetUserGroupAttributes(GroupObject->ParentObject, @@ -4451,6 +4582,9 @@ { TRACE("SampSetUserGroupAttributes failed with status 0x%08lx\n", Status); } + +done: + RtlReleaseResource(&SampResource); return Status; } @@ -4476,6 +4610,9 @@ RtlMapGenericMask(&DesiredAccess, &AliasMapping); + RtlAcquireResourceShared(&SampResource, + TRUE); + /* Validate the domain handle */ Status = SampValidateDbObject(DomainHandle, SamDbDomainObject, @@ -4484,7 +4621,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Convert the RID into a string (hex) */ @@ -4501,12 +4638,15 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } *AliasHandle = (SAMPR_HANDLE)AliasObject; - return STATUS_SUCCESS; +done: + RtlReleaseResource(&SampResource); + + return Status; } @@ -4573,8 +4713,7 @@ *Buffer = InfoBuffer; done: - if (MembersKeyHandle != NULL) - SampRegCloseKey(MembersKeyHandle); + SampRegCloseKey(&MembersKeyHandle); if (!NT_SUCCESS(Status)) { @@ -4687,13 +4826,16 @@ TRACE("SamrQueryInformationAlias(%p %lu %p)\n", AliasHandle, AliasInformationClass, Buffer); + RtlAcquireResourceShared(&SampResource, + TRUE); + /* Validate the alias handle */ Status = SampValidateDbObject(AliasHandle, SamDbAliasObject, ALIAS_READ_INFORMATION, &AliasObject); if (!NT_SUCCESS(Status)) - return Status; + goto done; switch (AliasInformationClass) { @@ -4716,6 +4858,9 @@ Status = STATUS_INVALID_INFO_CLASS; break; } + +done: + RtlReleaseResource(&SampResource); return Status; } @@ -4812,13 +4957,16 @@ TRACE("SamrSetInformationAlias(%p %lu %p)\n", AliasHandle, AliasInformationClass, Buffer); + RtlAcquireResourceExclusive(&SampResource, + TRUE); + /* Validate the alias handle */ Status = SampValidateDbObject(AliasHandle, SamDbAliasObject, ALIAS_WRITE_ACCOUNT, &AliasObject); if (!NT_SUCCESS(Status)) - return Status; + goto done; switch (AliasInformationClass) { @@ -4840,6 +4988,9 @@ break; } +done: + RtlReleaseResource(&SampResource); + return Status; } @@ -4851,6 +5002,9 @@ { PSAM_DB_OBJECT AliasObject; NTSTATUS Status; + + RtlAcquireResourceExclusive(&SampResource, + TRUE); /* Validate the alias handle */ Status = SampValidateDbObject(*AliasHandle, @@ -4860,14 +5014,15 @@ if (!NT_SUCCESS(Status)) { TRACE("SampValidateDbObject failed (Status 0x%08lx)\n", Status); - return Status; + goto done; } /* Fail, if the alias is built-in */ if (AliasObject->RelativeId < 1000) { TRACE("You can not delete a special account!\n"); - return STATUS_SPECIAL_ACCOUNT; + Status = STATUS_SPECIAL_ACCOUNT; + goto done; } /* FIXME: Remove all members from the alias */ @@ -4877,11 +5032,14 @@ if (!NT_SUCCESS(Status)) { TRACE("SampDeleteAccountDbObject() failed (Status 0x%08lx)\n", Status); - return Status; + goto done; } /* Invalidate the handle */ *AliasHandle = NULL; + +done: + RtlReleaseResource(&SampResource); return Status; } @@ -4898,6 +5056,9 @@ TRACE("(%p %p)\n", AliasHandle, MemberId); + RtlAcquireResourceExclusive(&SampResource, + TRUE); + /* Validate the alias handle */ Status = SampValidateDbObject(AliasHandle, SamDbAliasObject, @@ -4906,7 +5067,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } Status = SampAddMemberToAlias(AliasObject, @@ -4915,6 +5076,9 @@ { TRACE("failed with status 0x%08lx\n", Status); } + +done: + RtlReleaseResource(&SampResource); return Status; } @@ -4931,6 +5095,9 @@ TRACE("(%p %p)\n", AliasHandle, MemberId); + RtlAcquireResourceExclusive(&SampResource, + TRUE); + /* Validate the alias handle */ Status = SampValidateDbObject(AliasHandle, SamDbAliasObject, @@ -4939,7 +5106,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } Status = SampRemoveMemberFromAlias(AliasObject, @@ -4948,6 +5115,9 @@ { TRACE("failed with status 0x%08lx\n", Status); } + +done: + RtlReleaseResource(&SampResource); return Status; } @@ -4970,6 +5140,9 @@ TRACE("SamrGetMembersInAlias(%p %p %p)\n", AliasHandle, Members); + RtlAcquireResourceShared(&SampResource, + TRUE); + /* Validate the alias handle */ Status = SampValidateDbObject(AliasHandle, SamDbAliasObject, @@ -4978,7 +5151,7 @@ if (!NT_SUCCESS(Status)) { ERR("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Open the members key of the alias objct */ @@ -4989,7 +5162,7 @@ if (!NT_SUCCESS(Status)) { ERR("SampRegOpenKey failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Get the number of members */ @@ -5078,8 +5251,9 @@ } /* Close the members key */ - if (MembersKeyHandle != NULL) - SampRegCloseKey(MembersKeyHandle); + SampRegCloseKey(&MembersKeyHandle); + + RtlReleaseResource(&SampResource); return Status; } @@ -5105,6 +5279,9 @@ RtlMapGenericMask(&DesiredAccess, &UserMapping); + RtlAcquireResourceShared(&SampResource, + TRUE); + /* Validate the domain handle */ Status = SampValidateDbObject(DomainHandle, SamDbDomainObject, @@ -5113,7 +5290,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Convert the RID into a string (hex) */ @@ -5130,12 +5307,15 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } *UserHandle = (SAMPR_HANDLE)UserObject; - return STATUS_SUCCESS; +done: + RtlReleaseResource(&SampResource); + + return Status; } @@ -5148,6 +5328,9 @@ NTSTATUS Status; TRACE("(%p)\n", UserHandle); + + RtlAcquireResourceExclusive(&SampResource, + TRUE); /* Validate the user handle */ Status = SampValidateDbObject(*UserHandle, @@ -5157,14 +5340,15 @@ if (!NT_SUCCESS(Status)) { TRACE("SampValidateDbObject() failed (Status 0x%08lx)\n", Status); - return Status; + goto done; } /* Fail, if the user is built-in */ if (UserObject->RelativeId < 1000) { TRACE("You can not delete a special account!\n"); - return STATUS_SPECIAL_ACCOUNT; + Status = STATUS_SPECIAL_ACCOUNT; + goto done; } /* FIXME: Remove the user from all groups */ @@ -5176,13 +5360,16 @@ if (!NT_SUCCESS(Status)) { TRACE("SampDeleteAccountDbObject() failed (Status 0x%08lx)\n", Status); - return Status; + goto done; } /* Invalidate the handle */ *UserHandle = NULL; - return STATUS_SUCCESS; +done: + RtlReleaseResource(&SampResource); + + return Status; } @@ -6671,6 +6858,9 @@ return STATUS_INVALID_INFO_CLASS; } + RtlAcquireResourceShared(&SampResource, + TRUE); + /* Validate the domain handle */ Status = SampValidateDbObject(UserHandle, SamDbUserObject, @@ -6679,7 +6869,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } switch (UserInformationClass) @@ -6786,6 +6976,9 @@ default: Status = STATUS_INVALID_INFO_CLASS; } + +done: + RtlReleaseResource(&SampResource); return Status; } @@ -7400,6 +7593,9 @@ return STATUS_INVALID_INFO_CLASS; } + RtlAcquireResourceExclusive(&SampResource, + TRUE); + /* Validate the domain handle */ Status = SampValidateDbObject(UserHandle, SamDbUserObject, @@ -7408,7 +7604,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } switch (UserInformationClass) @@ -7554,6 +7750,9 @@ default: Status = STATUS_INVALID_INFO_CLASS; } + +done: + RtlReleaseResource(&SampResource); return Status; } @@ -7596,6 +7795,9 @@ NtPresent, OldNtEncryptedWithNewNt, NewNtEncryptedWithOldNt, NtCrossEncryptionPresent, NewNtEncryptedWithNewLm, LmCrossEncryptionPresent, NewLmEncryptedWithNewNt); + RtlAcquireResourceExclusive(&SampResource, + TRUE); + /* Validate the user handle */ Status = SampValidateDbObject(UserHandle, SamDbUserObject, @@ -7604,7 +7806,7 @@ if (!NT_SUCCESS(Status)) { TRACE("SampValidateDbObject failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Get the current time */ @@ -7612,7 +7814,7 @@ if (!NT_SUCCESS(Status)) { TRACE("NtQuerySystemTime failed (Status 0x%08lx)\n", Status); - return Status; + goto done; } /* Retrieve the LM password */ @@ -7663,7 +7865,7 @@ if (!NT_SUCCESS(Status)) { TRACE("SampGetObjectAttribute failed to retrieve the fixed user data (Status 0x%08lx)\n", Status); - return Status; + goto done; } /* Check if we can change the password at this time */ @@ -7785,6 +7987,9 @@ Length); } +done: + RtlReleaseResource(&SampResource); + return Status; } @@ -7803,6 +8008,9 @@ TRACE("SamrGetGroupsForUser(%p %p)\n", UserHandle, Groups); + RtlAcquireResourceShared(&SampResource, + TRUE); + /* Validate the user handle */ Status = SampValidateDbObject(UserHandle, SamDbUserObject, @@ -7811,13 +8019,16 @@ if (!NT_SUCCESS(Status)) { TRACE("SampValidateDbObject failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Allocate the groups buffer */ GroupsBuffer = midl_user_allocate(sizeof(SAMPR_GET_GROUPS_BUFFER)); if (GroupsBuffer == NULL) - return STATUS_INSUFFICIENT_RESOURCES; + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } /* * Get the size of the Groups attribute. @@ -7838,7 +8049,8 @@ *Groups = GroupsBuffer; - return STATUS_SUCCESS; + Status = STATUS_SUCCESS; + goto done; } /* Allocate a buffer for the Groups attribute */ @@ -7878,6 +8090,8 @@ midl_user_free(GroupsBuffer); } } + + RtlReleaseResource(&SampResource); return Status; } @@ -7946,6 +8160,9 @@ TRACE("(%p %p)\n", UserHandle, PasswordInformation); + RtlAcquireResourceShared(&SampResource, + TRUE); + /* Validate the user handle */ Status = SampValidateDbObject(UserHandle, SamDbUserObject, @@ -7954,7 +8171,7 @@ if (!NT_SUCCESS(Status)) { TRACE("SampValidateDbObject failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Validate the domain object */ @@ -7965,7 +8182,7 @@ if (!NT_SUCCESS(Status)) { TRACE("SampValidateDbObject failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Get fixed user data */ @@ -7978,7 +8195,7 @@ if (!NT_SUCCESS(Status)) { TRACE("SampGetObjectAttribute failed with status 0x%08lx\n", Status); - return Status; + goto done; } if ((UserObject->RelativeId == DOMAIN_USER_RID_KRBTGT) || @@ -8001,12 +8218,15 @@ if (!NT_SUCCESS(Status)) { TRACE("SampGetObjectAttribute failed with status 0x%08lx\n", Status); - return Status; + goto done; } PasswordInformation->MinPasswordLength = DomainFixedData.MinPasswordLength; PasswordInformation->PasswordProperties = DomainFixedData.PasswordProperties; } + +done: + RtlReleaseResource(&SampResource); return STATUS_SUCCESS; } @@ -8025,6 +8245,9 @@ TRACE("(%p %p)\n", DomainHandle, MemberSid); + RtlAcquireResourceExclusive(&SampResource, + TRUE); + /* Validate the domain object */ Status = SampValidateDbObject(DomainHandle, SamDbDomainObject, @@ -8033,7 +8256,7 @@ if (!NT_SUCCESS(Status)) { TRACE("SampValidateDbObject failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Retrieve the RID from the MemberSID */ @@ -8042,14 +8265,15 @@ if (!NT_SUCCESS(Status)) { TRACE("SampGetRidFromSid failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Fail, if the RID represents a special account */ if (Rid < 1000) { TRACE("Cannot remove a special account (RID: %lu)\n", Rid); - return STATUS_SPECIAL_ACCOUNT; + Status = STATUS_SPECIAL_ACCOUNT; + goto done; } /* Remove the member from all aliases in the domain */ @@ -8059,6 +8283,9 @@ { TRACE("SampRemoveMemberFromAllAliases failed with status 0x%08lx\n", Status); } + +done: + RtlReleaseResource(&SampResource); return Status; } @@ -8185,6 +8412,9 @@ RtlMapGenericMask(&DesiredAccess, &UserMapping); + RtlAcquireResourceExclusive(&SampResource, + TRUE); + /* Validate the domain handle */ Status = SampValidateDbObject(DomainHandle, SamDbDomainObject, @@ -8193,7 +8423,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Check the user account name */ @@ -8201,7 +8431,7 @@ if (!NT_SUCCESS(Status)) { TRACE("SampCheckAccountName failed (Status 0x%08lx)\n", Status); - return Status; + goto done; } /* Check if the user name already exists in the domain */ @@ -8211,7 +8441,7 @@ { TRACE("User name \'%S\' already exists in domain (Status 0x%08lx)\n", Name->Buffer, Status); - return Status; + goto done; } /* Get the fixed domain attributes */ @@ -8224,7 +8454,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Increment the NextRid attribute */ @@ -8240,7 +8470,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } TRACE("RID: %lx\n", ulRid); @@ -8259,7 +8489,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Add the account name for the user object */ @@ -8270,7 +8500,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Initialize fixed user data */ @@ -8303,7 +8533,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set the Name attribute */ @@ -8315,7 +8545,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set the FullName attribute */ @@ -8327,7 +8557,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set the HomeDirectory attribute */ @@ -8339,7 +8569,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set the HomeDirectoryDrive attribute */ @@ -8351,7 +8581,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set the ScriptPath attribute */ @@ -8363,7 +8593,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set the ProfilePath attribute */ @@ -8375,7 +8605,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set the AdminComment attribute */ @@ -8387,7 +8617,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set the UserComment attribute */ @@ -8399,7 +8629,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set the WorkStations attribute */ @@ -8411,7 +8641,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set the Parameters attribute */ @@ -8423,7 +8653,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set LogonHours attribute*/ @@ -8438,7 +8668,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set Groups attribute*/ @@ -8455,7 +8685,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set LMPwd attribute*/ @@ -8467,7 +8697,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set NTPwd attribute*/ @@ -8479,7 +8709,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set LMPwdHistory attribute*/ @@ -8491,7 +8721,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* Set NTPwdHistory attribute*/ @@ -8503,7 +8733,7 @@ if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); - return Status; + goto done; } /* FIXME: Set SecDesc attribute*/ @@ -8514,6 +8744,9 @@ *RelativeId = ulRid; *GrantedAccess = UserObject->Access; } + +done: + RtlReleaseResource(&SampResource); TRACE("returns with status 0x%08lx\n", Status); Modified: trunk/reactos/dll/win32/samsrv/samsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] Sun Sep 1 15:46:00 2013 @@ -28,6 +28,7 @@ ENCRYPTED_NT_OWF_PASSWORD EmptyNtHash; ENCRYPTED_LM_OWF_PASSWORD EmptyLmHash; +RTL_RESOURCE SampResource; /* FUNCTIONS *****************************************************************/ @@ -117,6 +118,8 @@ return Status; } + RtlInitializeResource(&SampResource); + /* Initialize the SAM database */ Status = SampInitDatabase(); if (!NT_SUCCESS(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] Sun Sep 1 15:46:00 2013 @@ -121,6 +121,7 @@ extern PGENERIC_MAPPING pServerMapping; extern ENCRYPTED_NT_OWF_PASSWORD EmptyNtHash; extern ENCRYPTED_LM_OWF_PASSWORD EmptyLmHash; +extern RTL_RESOURCE SampResource; /* alias.c */ @@ -238,13 +239,13 @@ /* registry.h */ NTSTATUS -SampRegCloseKey(IN HANDLE KeyHandle); +SampRegCloseKey(IN OUT PHANDLE KeyHandle); NTSTATUS SampRegCreateKey(IN HANDLE ParentKeyHandle, IN LPCWSTR KeyName, IN ACCESS_MASK DesiredAccess, - OUT HANDLE KeyHandle); + OUT PHANDLE KeyHandle); NTSTATUS SampRegDeleteKey(IN HANDLE ParentKeyHandle, @@ -260,7 +261,7 @@ SampRegOpenKey(IN HANDLE ParentKeyHandle, IN LPCWSTR KeyName, IN ACCESS_MASK DesiredAccess, - OUT HANDLE KeyHandle); + OUT PHANDLE KeyHandle); NTSTATUS SampRegQueryKeyInfo(IN HANDLE KeyHandle, 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] Sun Sep 1 15:46:00 2013 @@ -140,12 +140,11 @@ sizeof(ULONG)); done: - if (hNamesKey != NULL) - SampRegCloseKey(hNamesKey); + SampRegCloseKey(&hNamesKey); if (hAccountKey != NULL) { - SampRegCloseKey(hAccountKey); + SampRegCloseKey(&hAccountKey); if (!NT_SUCCESS(Status)) SampRegDeleteKey(hDomainKey, @@ -229,8 +228,7 @@ if (MembersBuffer != NULL) midl_user_free(MembersBuffer); - if (hGroupKey != NULL) - SampRegCloseKey(hGroupKey); + SampRegCloseKey(&hGroupKey); return Status; } @@ -302,12 +300,11 @@ sizeof(ULONG)); done: - if (hNamesKey != NULL) - SampRegCloseKey(hNamesKey); + SampRegCloseKey(&hNamesKey); if (hAccountKey != NULL) { - SampRegCloseKey(hAccountKey); + SampRegCloseKey(&hAccountKey); if (!NT_SUCCESS(Status)) SampRegDeleteKey(hDomainKey, @@ -530,12 +527,11 @@ sizeof(ULONG)); done: - if (hNamesKey != NULL) - SampRegCloseKey(hNamesKey); + SampRegCloseKey(&hNamesKey); if (hAccountKey != NULL) { - SampRegCloseKey(hAccountKey); + SampRegCloseKey(&hAccountKey); if (!NT_SUCCESS(Status)) SampRegDeleteKey(hDomainKey, @@ -659,7 +655,7 @@ if (!NT_SUCCESS(Status)) goto done; - SampRegCloseKey(hNamesKey); + SampRegCloseKey(&hNamesKey); /* Create the Groups container */ Status = SampRegCreateKey(hDomainKey, @@ -676,7 +672,7 @@ if (!NT_SUCCESS(Status)) goto done; - SampRegCloseKey(hNamesKey); + SampRegCloseKey(&hNamesKey); /* Create the Users container */ Status = SampRegCreateKey(hDomainKey, @@ -713,7 +709,7 @@ if (!NT_SUCCESS(Status)) goto done; - SampRegCloseKey(hNamesKey); + SampRegCloseKey(&hNamesKey); if (lpDomainKey != NULL) *lpDomainKey = hDomainKey; @@ -722,20 +718,12 @@ if (Sd != NULL) RtlFreeHeap(RtlGetProcessHeap(), 0, Sd); - if (hAliasesKey != NULL) - SampRegCloseKey(hAliasesKey); - - if (hGroupsKey != NULL) - SampRegCloseKey(hGroupsKey); - - if (hUsersKey != NULL) - SampRegCloseKey(hUsersKey); - - if (!NT_SUCCESS(Status)) - { - if (hDomainKey != NULL) - SampRegCloseKey(hDomainKey); - } + SampRegCloseKey(&hAliasesKey); + SampRegCloseKey(&hGroupsKey); + SampRegCloseKey(&hUsersKey); + + if (!NT_SUCCESS(Status)) + SampRegCloseKey(&hDomainKey); return Status; } @@ -781,7 +769,7 @@ if (!NT_SUCCESS(Status)) goto done; - SampRegCloseKey(hDomainsKey); + SampRegCloseKey(&hDomainsKey); *lpServerKey = hServerKey; @@ -1012,17 +1000,10 @@ if (pBuiltinSid) RtlFreeHeap(RtlGetProcessHeap(), 0, pBuiltinSid); - if (hAccountDomainKey != NULL) - SampRegCloseKey(hAccountDomainKey); - - if (hBuiltinDomainKey != NULL) - SampRegCloseKey(hBuiltinDomainKey); - - if (hServerKey != NULL) - SampRegCloseKey(hServerKey); - - if (hSamKey != NULL) - SampRegCloseKey(hSamKey); + SampRegCloseKey(&hAccountDomainKey); + SampRegCloseKey(&hBuiltinDomainKey); + SampRegCloseKey(&hServerKey); + SampRegCloseKey(&hSamKey); TRACE("SampInitializeSAM() done\n");

1 0

[pschweitzer] 59944: [FRAMEDYN] Comment out exports that fail
by pschweitzer＠svn.reactos.org 01 Sep '13

01 Sep '13

Author: pschweitzer Date: Sun Sep 1 15:44:17 2013 New Revision: 59944 URL: http://svn.reactos.org/svn/reactos?rev=59944&view=rev Log: [FRAMEDYN] Comment out exports that fail Modified: trunk/reactos/dll/win32/framedyn/CMakeLists.txt trunk/reactos/dll/win32/framedyn/framedyn_msvc.spec Modified: trunk/reactos/dll/win32/framedyn/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/framedyn/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/CMakeLists.txt [iso-8859-1] Sun Sep 1 15:44:17 2013 @@ -3,7 +3,7 @@ if(NOT MSVC) spec2def(framedyn.dll framedyn_gcc.spec ADD_IMPORTLIB) else() -#spec2def(framedyn.dll framedyn_msvc.spec ADD_IMPORTLIB) +spec2def(framedyn.dll framedyn_msvc.spec ADD_IMPORTLIB) endif() list(APPEND SOURCE Modified: trunk/reactos/dll/win32/framedyn/framedyn_msvc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/framedy… ============================================================================== --- trunk/reactos/dll/win32/framedyn/framedyn_msvc.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/framedyn_msvc.spec [iso-8859-1] Sun Sep 1 15:44:17 2013 @@ -1,76 +1,76 @@ @ thiscall ?AllocBeforeWrite@CHString@@IAEXH@Z(long) @ thiscall ?AllocBuffer@CHString@@IAEXH@Z(long) @ thiscall ?AllocCopy@CHString@@IBEXAAV1@HHH@Z(ptr long long long) -@ thiscall ?AllocSysString@CHString@@QBEPAGXZ() -@ thiscall ?AssignCopy@CHString@@IAEXHPBG@Z(long wstr) +#@ thiscall ?AllocSysString@CHString@@QBEPAGXZ() +#@ thiscall ?AssignCopy@CHString@@IAEXHPBG@Z(long wstr) @ thiscall ??0CHString@@QAE@ABV0@@Z(ptr) @ thiscall ??0CHString@@QAE@PBD@Z(str) @ thiscall ??0CHString@@QAE@PBE@Z(str) -@ thiscall ??0CHString@@QAE@PBG@Z(wstr) -@ thiscall ??0CHString@@QAE@PBGH@Z(wstr long) -@ thiscall ??0CHString@@QAE@GH@Z(long long) +#@ thiscall ??0CHString@@QAE@PBG@Z(wstr) +#@ thiscall ??0CHString@@QAE@PBGH@Z(wstr long) +#@ thiscall ??0CHString@@QAE@GH@Z(long long) @ thiscall ??0CHString@@QAE@XZ() -@ thiscall ?Collate@CHString@@QBEHPBG@Z(wstr) -@ thiscall ?Compare@CHString@@QBEHPBG@Z(wstr) -@ thiscall ?CompareNoCase@CHString@@QBEHPBG@Z(wstr) -@ thiscall ?ConcatCopy@CHString@@IAEXHPBGH0@Z(long wstr long wstr) -@ thiscall ?ConcatInPlace@CHString@@IAEXHPBG@Z(long wstr) +#@ thiscall ?Collate@CHString@@QBEHPBG@Z(wstr) +#@ thiscall ?Compare@CHString@@QBEHPBG@Z(wstr) +#@ thiscall ?CompareNoCase@CHString@@QBEHPBG@Z(wstr) +#@ thiscall ?ConcatCopy@CHString@@IAEXHPBGH0@Z(long wstr long wstr) +#@ thiscall ?ConcatInPlace@CHString@@IAEXHPBG@Z(long wstr) @ thiscall ?CopyBeforeWrite@CHString@@IAEXXZ() @ thiscall ?Empty@CHString@@QAEXXZ() -@ thiscall ?Find@CHString@@QBEHPBG@Z(wstr) -@ thiscall ?Find@CHString@@QBEHG@Z(long) -@ thiscall ?FindOneOf@CHString@@QBEHPBG@Z(wstr) +#@ thiscall ?Find@CHString@@QBEHPBG@Z(wstr) +#@ thiscall ?Find@CHString@@QBEHG@Z(long) +#@ thiscall ?FindOneOf@CHString@@QBEHPBG@Z(wstr) @ thiscall ?Format@CHString@@QAAXIZZ(long long long) -@ thiscall ?Format@CHString@@QAAXPBGZZ(long wstr long) +#@ thiscall ?Format@CHString@@QAAXPBGZZ(long wstr long) @ thiscall ?FormatMessageW@CHString@@QAAXIZZ(long long long) -@ thiscall ?FormatMessageW@CHString@@QAAXPBGZZ(long ptr long) -@ thiscall ?FormatV@CHString@@QAEXPBGPAD@Z(wstr long) +#@ thiscall ?FormatMessageW@CHString@@QAAXPBGZZ(long ptr long) +#@ thiscall ?FormatV@CHString@@QAEXPBGPAD@Z(wstr long) @ thiscall ?FreeExtra@CHString@@QAEXXZ() @ thiscall ?GetAllocLength@CHString@@QBEHXZ() -@ thiscall ?GetAt@CHString@@QBEGH@Z(long) -@ thiscall ?GetBuffer@CHString@@QAEPAGH@Z(long) -@ thiscall ?GetBufferSetLength@CHString@@QAEPAGH@Z(long) +#@ thiscall ?GetAt@CHString@@QBEGH@Z(long) +#@ thiscall ?GetBuffer@CHString@@QAEPAGH@Z(long) +#@ thiscall ?GetBufferSetLength@CHString@@QAEPAGH@Z(long) @ thiscall ?GetData@CHString@@IBEPAUCHStringData@@XZ() @ thiscall ?GetLength@CHString@@QBEHXZ() @ thiscall ?Init@CHString@@IAEXXZ() @ thiscall ?IsEmpty@CHString@@QBEHXZ() @ thiscall ?Left@CHString@@QBE?AV1@H@Z(long) -@ thiscall ?LoadStringW@CHString@@QAEHI@Z(long) -@ thiscall ?LoadStringW@CHString@@IAEHIPAGI@Z(long wstr long) -@ thiscall ?LockBuffer@CHString@@QAEPAGXZ() +#@ thiscall ?LoadStringW@CHString@@QAEHI@Z(long) +#@ thiscall ?LoadStringW@CHString@@IAEHIPAGI@Z(long wstr long) +#@ thiscall ?LockBuffer@CHString@@QAEPAGXZ() @ thiscall ?MakeLower@CHString@@QAEXXZ() @ thiscall ?MakeReverse@CHString@@QAEXXZ() @ thiscall ?MakeUpper@CHString@@QAEXXZ() @ thiscall ?Mid@CHString@@QBE?AV1@H@Z(long) @ thiscall ?Mid@CHString@@QBE?AV1@HH@Z(long long) @ thiscall ?Release@CHString@@KGXPAUCHStringData@@@Z(ptr) -@ thiscall ?Release@CHString@@IAEXXZ() -@ thiscall ?ReleaseBuffer@CHString@@QAEXH@Z(long) -@ thiscall ?ReverseFind@CHString@@QBEHG@Z(long) +#@ thiscall ?Release@CHString@@IAEXXZ() +#@ thiscall ?ReleaseBuffer@CHString@@QAEXH@Z(long) +#@ thiscall ?ReverseFind@CHString@@QBEHG@Z(long) @ thiscall ?Right@CHString@@QBE?AV1@H@Z(long) -@ stdcall ?SafeStrlen@CHString@@KGHPBG@Z(wstr) -@ thiscall ?SetAt@CHString@@QAEXHG@Z(long long) -@ thiscall ?SpanExcluding@CHString@@QBE?AV1@PBG@Z(long wstr) -@ thiscall ?SpanIncluding@CHString@@QBE?AV1@PBG@Z(long wstr) +#@ stdcall ?SafeStrlen@CHString@@KGHPBG@Z(wstr) +#@ thiscall ?SetAt@CHString@@QAEXHG@Z(long long) +#@ thiscall ?SpanExcluding@CHString@@QBE?AV1@PBG@Z(long wstr) +#@ thiscall ?SpanIncluding@CHString@@QBE?AV1@PBG@Z(long wstr) @ thiscall ?TrimLeft@CHString@@QAEXXZ() @ thiscall ?TrimRight@CHString@@QAEXXZ() @ thiscall ?UnlockBuffer@CHString@@QAEXXZ() -@ thiscall ??BCHString@@QBEPBGXZ(ptr) +#@ thiscall ??BCHString@@QBEPBGXZ(ptr) @ thiscall ??YCHString@@QAEABV0@ABV0@@Z(ptr) @ thiscall ??YCHString@@QAEABV0@D@Z(long) -@ thiscall ??YCHString@@QAEABV0@PBG@Z(wstr) -@ thiscall ??YCHString@@QAEABV0@G@Z(long) +#@ thiscall ??YCHString@@QAEABV0@PBG@Z(wstr) +#@ thiscall ??YCHString@@QAEABV0@G@Z(long) @ thiscall ??4CHString@@QAEABV0@PAV0@@Z(ptr) @ thiscall ??4CHString@@QAEABV0@ABV0@@Z(ptr) @ thiscall ??4CHString@@QAEABV0@PBD@Z(str) @ thiscall ??4CHString@@QAEABV0@D@Z(long) @ thiscall ??4CHString@@QAEABV0@PBE@Z(str) -@ thiscall ??4CHString@@QAEABV0@PBG@Z(wstr) -@ thiscall ??4CHString@@QAEABV0@G@Z(long) +#@ thiscall ??4CHString@@QAEABV0@PBG@Z(wstr) +#@ thiscall ??4CHString@@QAEABV0@G@Z(long) @ thiscall ??ACHString@@QBEGH@Z(long) @ thiscall ??1CHString@@QAE@XZ() -@ stdcall ??H@YG?AVCHString@@GABV0@@Z(long ptr) -@ stdcall ??H@YG?AVCHString@@ABV0@G@Z(ptr long) -@ stdcall ??H@YG?AVCHString@@ABV0@PBG@Z(ptr wstr) -@ stdcall ??H@YG?AVCHString@@PBGABV0@@Z(wstr ptr) +#@ stdcall ??H@YG?AVCHString@@GABV0@@Z(long ptr) +#@ stdcall ??H@YG?AVCHString@@ABV0@G@Z(ptr long) +#@ stdcall ??H@YG?AVCHString@@ABV0@PBG@Z(ptr wstr) +#@ stdcall ??H@YG?AVCHString@@PBGABV0@@Z(wstr ptr) @ stdcall ??H@YG?AVCHString@@ABV0@0@Z(ptr ptr)

1 0

[pschweitzer] 59943: [FRAMEDYN] Don't export anything on MSVC yet. Some symbols are not found. Dunno why.
by pschweitzer＠svn.reactos.org 01 Sep '13

01 Sep '13

Author: pschweitzer Date: Sun Sep 1 15:34:38 2013 New Revision: 59943 URL: http://svn.reactos.org/svn/reactos?rev=59943&view=rev Log: [FRAMEDYN] Don't export anything on MSVC yet. Some symbols are not found. Dunno why. Modified: trunk/reactos/dll/win32/framedyn/CMakeLists.txt Modified: trunk/reactos/dll/win32/framedyn/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/framedyn/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/CMakeLists.txt [iso-8859-1] Sun Sep 1 15:34:38 2013 @@ -3,7 +3,7 @@ if(NOT MSVC) spec2def(framedyn.dll framedyn_gcc.spec ADD_IMPORTLIB) else() -spec2def(framedyn.dll framedyn_msvc.spec ADD_IMPORTLIB) +#spec2def(framedyn.dll framedyn_msvc.spec ADD_IMPORTLIB) endif() list(APPEND SOURCE

1 0

[pschweitzer] 59942: [FRAMEDYN] Fix typo
by pschweitzer＠svn.reactos.org 01 Sep '13

01 Sep '13

Author: pschweitzer Date: Sun Sep 1 15:04:21 2013 New Revision: 59942 URL: http://svn.reactos.org/svn/reactos?rev=59942&view=rev Log: [FRAMEDYN] Fix typo Modified: trunk/reactos/dll/win32/framedyn/framedyn_gcc.spec trunk/reactos/dll/win32/framedyn/framedyn_msvc.spec Modified: trunk/reactos/dll/win32/framedyn/framedyn_gcc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/framedy… ============================================================================== --- trunk/reactos/dll/win32/framedyn/framedyn_gcc.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/framedyn_gcc.spec [iso-8859-1] Sun Sep 1 15:04:21 2013 @@ -1,5 +1,5 @@ @ thiscall ?AllocBeforeWrite@CHString@@IAEXH@Z(long) _ZN8CHString16AllocBeforeWriteEi -@ thiscall ?AllocBuffer@CHString@@IAEXH@Zlong(long) _ZN8CHString11AllocBufferEi +@ thiscall ?AllocBuffer@CHString@@IAEXH@Z(long) _ZN8CHString11AllocBufferEi @ thiscall ?AllocCopy@CHString@@IBEXAAV1@HHH@Z(ptr long long long) _ZNK8CHString9AllocCopyERS_iii @ thiscall ?AllocSysString@CHString@@QBEPAGXZ() _ZNK8CHString14AllocSysStringEv @ thiscall ?AssignCopy@CHString@@IAEXHPBG@Z(long wstr) _ZN8CHString10AssignCopyEiPKw Modified: trunk/reactos/dll/win32/framedyn/framedyn_msvc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/framedy… ============================================================================== --- trunk/reactos/dll/win32/framedyn/framedyn_msvc.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/framedyn_msvc.spec [iso-8859-1] Sun Sep 1 15:04:21 2013 @@ -1,5 +1,5 @@ @ thiscall ?AllocBeforeWrite@CHString@@IAEXH@Z(long) -@ thiscall ?AllocBuffer@CHString@@IAEXH@Zlong(long) +@ thiscall ?AllocBuffer@CHString@@IAEXH@Z(long) @ thiscall ?AllocCopy@CHString@@IBEXAAV1@HHH@Z(ptr long long long) @ thiscall ?AllocSysString@CHString@@QBEPAGXZ() @ thiscall ?AssignCopy@CHString@@IAEXHPBG@Z(long wstr)

1 0

[pschweitzer] 59941: [FRAMEDYN] Fix a typo (and so a bug), spotted by MSVC. I don't thank you G++... Attempt to fix build with MSVC
by pschweitzer＠svn.reactos.org 01 Sep '13

01 Sep '13

Author: pschweitzer Date: Sun Sep 1 14:54:33 2013 New Revision: 59941 URL: http://svn.reactos.org/svn/reactos?rev=59941&view=rev Log: [FRAMEDYN] Fix a typo (and so a bug), spotted by MSVC. I don't thank you G++... Attempt to fix build with MSVC Modified: trunk/reactos/dll/win32/framedyn/chstring.cpp Modified: trunk/reactos/dll/win32/framedyn/chstring.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/chstrin… ============================================================================== --- trunk/reactos/dll/win32/framedyn/chstring.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/chstring.cpp [iso-8859-1] Sun Sep 1 14:54:33 2013 @@ -771,7 +771,7 @@ */ void CHString::Init() { - m_pchData == afxPchNil; + m_pchData = afxPchNil; } /* @@ -1336,7 +1336,7 @@ /* * @implemented */ -CHString operator+(WCHAR ch, const CHString& string) throw (CHeap_Exception) +CHString WINAPI operator+(WCHAR ch, const CHString& string) throw (CHeap_Exception) { CHString NewString; @@ -1349,7 +1349,7 @@ /* * @implemented */ -CHString operator+(const CHString& string, WCHAR ch) throw (CHeap_Exception) +CHString WINAPI operator+(const CHString& string, WCHAR ch) throw (CHeap_Exception) { CHString NewString; @@ -1362,7 +1362,7 @@ /* * @implemented */ -CHString operator+(const CHString& string, LPCWSTR lpsz) throw (CHeap_Exception) +CHString WINAPI operator+(const CHString& string, LPCWSTR lpsz) throw (CHeap_Exception) { int Len; CHString NewString; @@ -1378,7 +1378,7 @@ /* * @implemented */ -CHString operator+(LPCWSTR lpsz, const CHString& string) throw (CHeap_Exception) +CHString WINAPI operator+(LPCWSTR lpsz, const CHString& string) throw (CHeap_Exception) { int Len; CHString NewString; @@ -1394,7 +1394,7 @@ /* * @implemented */ -CHString operator+(const CHString& string1, const CHString& string2) throw (CHeap_Exception) +CHString WINAPI operator+(const CHString& string1, const CHString& string2) throw (CHeap_Exception) { CHString NewString;

1 0

[pschweitzer] 59940: [FRAMEDYN] Partplement framedyn.dll So far, only CHString class is implemented in it Regarding CHString class implementation: It has been implemented matching Windows behavior ...
by pschweitzer＠svn.reactos.org 01 Sep '13

01 Sep '13

Author: pschweitzer Date: Sun Sep 1 14:48:09 2013 New Revision: 59940 URL: http://svn.reactos.org/svn/reactos?rev=59940&view=rev Log: [FRAMEDYN] Partplement framedyn.dll So far, only CHString class is implemented in it Regarding CHString class implementation: It has been implemented matching Windows behavior and bugs It might not be really nice at some points but this ensures compatibility with applications relying on it. As a side note: this might explain why this API was abandonned after w2k3... Regarding the DLL itself: Its implementation into ReactOS allows systeminfo.exe application from w2k3 to load and start initialization into ReactOS. It stops working later on with some IDispatch error. The DLL cannot be used to build any application against framedyn.dll with our "default" BE (read with G++). Only MSVC mangled name are exported so far (as on Windows ;-)) thanks to aliasing. This is why there are two spec files. This makes G++ unable to link with it though. This is the reason why there are no framedyn_apitests so far. Furthermore, the DLL only have exports for x86 and none for x64 for the moment. Any help is welcome for having exports for x64 target and to be able to have aliasing for G++ (from its mangled names to MSVC ones). Added: trunk/reactos/dll/win32/framedyn/ trunk/reactos/dll/win32/framedyn/CMakeLists.txt (with props) trunk/reactos/dll/win32/framedyn/chstring.cpp (with props) trunk/reactos/dll/win32/framedyn/framedyn_gcc.spec (with props) trunk/reactos/dll/win32/framedyn/framedyn_msvc.spec (with props) trunk/reactos/dll/win32/framedyn/main.c (with props) Modified: trunk/reactos/dll/win32/CMakeLists.txt Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Sun Sep 1 14:48:09 2013 @@ -39,6 +39,7 @@ add_subdirectory(dwmapi) add_subdirectory(faultrep) add_subdirectory(fmifs) +add_subdirectory(framedyn) add_subdirectory(fusion) add_subdirectory(gdiplus) add_subdirectory(getuname) Added: trunk/reactos/dll/win32/framedyn/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/framedyn/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/framedyn/CMakeLists.txt [iso-8859-1] Sun Sep 1 14:48:09 2013 @@ -0,0 +1,31 @@ +set_cpp(WITH_RUNTIME) + +if(NOT MSVC) +spec2def(framedyn.dll framedyn_gcc.spec ADD_IMPORTLIB) +else() +spec2def(framedyn.dll framedyn_msvc.spec ADD_IMPORTLIB) +endif() + +list(APPEND SOURCE + main.c + chstring.cpp + ${CMAKE_CURRENT_BINARY_DIR}/framedyn.def) + +add_library(framedyn SHARED + ${SOURCE}) + +set_module_type(framedyn win32dll UNICODE) + +add_importlibs(framedyn + msvcrt + kernel32 + oleaut32 + ntdll) + +if(NOT MSVC) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #add_target_compile_flags(framedyn "-fexceptions -Wno-deprecated-declarations") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fexceptions -Wno-deprecated-declarations") +endif() + +add_cd_file(TARGET framedyn DESTINATION reactos/system32/wbem FOR all) Propchange: trunk/reactos/dll/win32/framedyn/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/framedyn/chstring.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/chstrin… ============================================================================== --- trunk/reactos/dll/win32/framedyn/chstring.cpp (added) +++ trunk/reactos/dll/win32/framedyn/chstring.cpp [iso-8859-1] Sun Sep 1 14:48:09 2013 @@ -0,0 +1,1406 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: dll/win32/framedyn/chstring.cpp + * PURPOSE: CHString class implementation + * PROGRAMMERS: Pierre Schweitzer (pierre(a)reactos.org) + * + * NOTE: This implementation is BROKEN on PURPOSE + * The CHString is a mix between std::string and + * UNICODE_STRING. It appears that basically it takes only + * the worse from both approaches. + * I've copied the behavior and implementation of Windows 2k3 even if + * it implies unsafe, wrong or unefficient methods. + * Note that the string at m_pchData might not be null terminated! + * Also, important note, two (or even more) CHString instances might + * have the same m_pchData object! Never forget that while modifying + * a string. You might be modifying the string for everyone. + * This is why a protected method is being used in the code: CopyBeforeWrite + * It copies source first, to ensure we only modify current string + * Side note, all the sizes are actually a number of chars. Only the size + * for implementation is the number of bytes + * Now, you know why this class is deprecated and shouldn't be used + */ + +/* INCLUDES ******************************************************************/ + +#include <chstring.h> +#define NDEBUG +#include <debug.h> + +/* PRIVATE FUNCTIONS *********************************************************/ + +// This is the empty string that defaults strings without text +// This is unsafe. This string show be LPCWSTR +// However we have to assign it to LPWSTR var. So, let's ignore about const, +// as MS does. Normally we check in our code that we don't overwrite this string. +LPWSTR afxPchNil = (LPWSTR)L"\0"; +// This is the data that are matching the null string upper +CHStringData afxNullData = {0, 0, 0}; +// Exception we may throw in case of allocation failure +CHeap_Exception HeapException(CHeap_Exception::E_ALLOCATION_ERROR); + +// Our own delete operator +// It is here basically because MS guys don't known about set_new_handler() +// See operator new +void operator delete(void* ptr) +{ + // In Windows 2k3, they check for ptr being null. + // ISO, POSIX and even MSDN explains that it is allowed + // to call free with NULL pointer... + if (ptr) + { + free(ptr); + } +} + +// Implement our own new operator so that we can throw our own exception in case +// of allocation failure. +// It could have been done using set_new_handler(), but well. MS guys didn't do it +// that way. So, let's mimic. +void* operator new(size_t uSize) +{ + void* Buffer; + + Buffer = malloc(uSize); + if (!Buffer) + { + throw HeapException; + } + + return Buffer; +} + +// This is a char to wchar string conversion helper +int mbstowcsz(LPWSTR lpDest, LPCSTR lpSrc, int nLen) +{ + int Conv; + + // If we have nothing to convert or if output doesn't exist, return + if (nLen == 0 || lpDest == 0) + { + return 0; + } + + // Then, simply convert + Conv = MultiByteToWideChar(CP_ACP, 0, lpSrc, -1, lpDest, nLen); + // In case of conversion success, null terminate the string + if (Conv != 0) + { + lpDest[nLen] = 0; + } + + return Conv; +} + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +CHString::CHString() +{ + // Set to empty string + m_pchData = afxPchNil; +} + +/* + * @implemented + */ +CHString::CHString(WCHAR ch, int nRepeat) throw (CHeap_Exception) +{ + // Allow null initialize, in case something goes wrong + m_pchData = afxPchNil; + + // If we have a char to insert + if (nRepeat >= 1) + { + // Allocate a buffer big enough + AllocBuffer(nRepeat); + // And if possible, repeat char + if (m_pchData) + { + for (int i = 0; i < nRepeat; ++i) + { + m_pchData[i] = ch; + } + } + } +} + +/* + * @implemented + */ +CHString::CHString(LPCWSTR lpsz) throw (CHeap_Exception) +{ + int Len; + // Allow null initialize, in case something goes wrong + m_pchData = afxPchNil; + + // If we have an input string + if (lpsz != 0) + { + // Get its length + Len = SafeStrlen(lpsz); + // Then, allocate a big enough buffer and copy string + // Note that here, we don't null terminate the string... + if (Len) + { + AllocBuffer(Len); + wcsncpy(m_pchData, lpsz, Len); + } + } +} + +/* + * @implemented + */ +CHString::CHString(LPCWSTR lpch, int nLength) throw (CHeap_Exception) +{ + // Allow null initialize, in case something goes wrong + m_pchData = afxPchNil; + + // In case we have a string with a len + if (lpch != 0 && nLength != 0) + { + // Just copy the string + AllocBuffer(nLength); + wcsncpy(m_pchData, lpch, nLength); + } +} + +/* + * @implemented + */ +CHString::CHString(LPCSTR lpsz) throw (CHeap_Exception) +{ + int Len; + // Allow null initialize, in case something goes wrong + m_pchData = afxPchNil; + + // If we have input string + if (lpsz != 0) + { + // Get its length + Len = strlen(lpsz); + if (Len) + { + // Allocate and convert the string + AllocBuffer(Len); + mbstowcsz(m_pchData, lpsz, Len + 1); + // Releasing buffer here is to allow to + // update the buffer size. We notify we're + // done with changing the string: recompute its + // length, please + ReleaseBuffer(); + } + } +} + +/* + * @implemented + */ +CHString::CHString(const unsigned char* lpsz) +{ + // Null init + Init(); + // And call operator= with const char*, easier + *this = (LPCSTR)lpsz; +} + +/* + * @implemented + */ +CHString::CHString(const CHString& stringSrc) +{ + // If we have currently no referenced string + if (stringSrc.GetData()->nRefs < 0) + { + // Ensure we have the null string + m_pchData = afxPchNil; + // And then call, the copy operator with input string + *this = stringSrc.m_pchData; + } + else + { + // Otherwise, just copy the input string + m_pchData = stringSrc.m_pchData; + // And increment the number of references + InterlockedIncrement(&GetData()->nRefs); + // The whole point here is: Am I forget to release the old + // data?! MS doesn't release it, but I guess we should... + } +} + +/* + * @implemented + */ +CHString::~CHString() +{ + // If we have a string + if (GetData() != &afxNullData) + { + // Check whether it's still in use after we release it + if (InterlockedDecrement(&GetData()->nRefs) == 0) + { + // If so, delete it + delete GetData(); + } + } +} + +/* + * @implemented + */ +void CHString::AllocBeforeWrite(int nLen) throw (CHeap_Exception) +{ + // In case we have several strings pointing to our memory zone + // Or we need bigger buffer than actual + if (GetData()->nRefs > 1 || nLen > GetData()->nAllocLength) + { + // Just drop current + // And allocate a new one which is big enough + Release(); + AllocBuffer(nLen); + } +} + +/* + * @implemented + */ +void CHString::AllocBuffer(int nSize) throw (CHeap_Exception) +{ + // Here we have to allocate a buffer for the string + // It actually consists in: CHStringData structure + // with a buffer big enough at its end to store the + // string. + CHStringData* Data; + + // Null size is easy allocation + if (nSize == 0) + { + m_pchData = afxPchNil; + return; + } + + // We cannot allow negative sizes + if (nSize < 0) + { + RaiseException(ERROR_INVALID_PARAMETER, EXCEPTION_NONCONTINUABLE, 0, 0); + } + + // Nor too big + if (nSize > INT_MAX) + { + RaiseException(STATUS_INTEGER_OVERFLOW, EXCEPTION_NONCONTINUABLE, 0, 0); + } + + // Just allocate big enough buffer, using our own operator new + Data = (CHStringData *)operator new(nSize * sizeof(WCHAR) + sizeof(CHStringData)); + // In case Data is null, throw an exception + // Yes, this is stupid! Our operator new is already supposed to through an exception... + // Thanks MS + if (!Data) + { + throw HeapException; + } + + Data->nRefs = 1; + Data->nDataLength = nSize; + Data->nAllocLength = nSize; + Data->data()[0] = 0; + + // We only return the string + // We can find back data with some mathematics + m_pchData = Data->data(); +} + +/* + * @implemented + */ +void CHString::AllocCopy(CHString& dest, int nCopyLen, int nCopyIndex, int nExtraLen) const throw (CHeap_Exception) +{ + // Once again, we cannot deal with negative lens + if (nCopyLen < 0) + { + RaiseException(ERROR_INVALID_PARAMETER, EXCEPTION_NONCONTINUABLE, 0, 0); + } + + if (nCopyIndex < 0) + { + RaiseException(ERROR_INVALID_PARAMETER, EXCEPTION_NONCONTINUABLE, 0, 0); + } + + if (nExtraLen < 0) + { + RaiseException(ERROR_INVALID_PARAMETER, EXCEPTION_NONCONTINUABLE, 0, 0); + } + + // In case what we have to copy is null-sized, just set empty string + if (nCopyLen + nExtraLen == 0) + { + dest.m_pchData = afxPchNil; + return; + } + + // Otherwise, allocate a buffer in new string which is big enough + // You can note that we absolutely don't check about any existing + // (referenced) buffer in dest. Actually, dest is to be EMPTY string. + // The whole point of this function is to initialize a virgin string by + // copying data from another. This is needed by Left/Mid/Right + dest.AllocBuffer(nCopyLen + nExtraLen); + // And copy our stuff in + wcsncpy(dest.m_pchData, m_pchData + nCopyIndex, nCopyLen); +} + +/* + * @implemented + */ +BSTR CHString::AllocSysString() const throw (CHeap_Exception) +{ + BSTR SysString; + + // Just allocate the string + SysString = SysAllocStringLen(m_pchData, GetData()->nDataLength); + if (!SysString) + { + throw HeapException; + } + + return SysString; +} + +/* + * @implemented + */ +void CHString::AssignCopy(int nSrcLen, LPCWSTR lpszSrcData) throw (CHeap_Exception) +{ + // Don't allow negative len + if (nSrcLen < 0) + { + RaiseException(ERROR_INVALID_PARAMETER, EXCEPTION_NONCONTINUABLE, 0, 0); + } + + // We will have to modify a string that might be shared, so duplicate it + // Ensuring it's big enough to contain our new stuff + AllocBeforeWrite(nSrcLen); + if (nSrcLen == 0) + { + Release(); + return; + } + + // Just copy, write down new size, and ensure it's null terminated + wcsncpy(m_pchData, lpszSrcData, nSrcLen); + GetData()->nDataLength = nSrcLen; + m_pchData[nSrcLen] = 0; +} + +/* + * @implemented + */ +int CHString::Collate(LPCWSTR lpsz) const +{ + // Just call the deprecated function here - no matter we are null terminated + // Did you read my statement about how safe is this implementation? + return wcscoll(m_pchData, lpsz); +} + +/* + * @implemented + */ +int CHString::Compare(LPCWSTR lpsz) const +{ + // Just call the deprecated function here - no matter we are null terminated + // Did you read my statement about how safe is this implementation? + return wcscmp(m_pchData, lpsz); +} + +/* + * @implemented + */ +int CHString::CompareNoCase(LPCWSTR lpsz) const +{ + // Just call the deprecated function here - no matter we are null terminated + // Did you read my statement about how safe is this implementation? + return wcsicmp(m_pchData, lpsz); +} + +/* + * @implemented + */ +void CHString::ConcatInPlace(int nSrcLen, LPCWSTR lpszSrcData) +{ + // With null length, there's not that much to concat... + if (nSrcLen == 0) + { + return; + } + + // Still no negative length + if (nSrcLen < 0) + { + RaiseException(ERROR_INVALID_PARAMETER, EXCEPTION_NONCONTINUABLE, 0, 0); + } + + // Ensure we wouldn't overflow with the concat + if (GetData()->nDataLength + nSrcLen > INT_MAX) + { + RaiseException(STATUS_INTEGER_OVERFLOW, EXCEPTION_NONCONTINUABLE, 0, 0); + } + + // In case we have to modify a shared string OR if it can't fit into current buffer... + if (GetData()->nRefs > 1 || GetData()->nDataLength + nSrcLen > GetData()->nAllocLength) + { + // Allocate a new buffer! (without forgetting to release old one) + CHStringData* OldData = GetData(); + + // You remember about "InPlace" in the function's name? + // The cake is a lie + ConcatCopy(GetData()->nDataLength, m_pchData, nSrcLen, lpszSrcData); + Release(OldData); + } + else + { + // Ensure we don't overflow + if (nSrcLen > INT_MAX) + { + RaiseException(STATUS_INTEGER_OVERFLOW, EXCEPTION_NONCONTINUABLE, 0, 0); + } + + // Then, just copy and null terminate + wcsncpy(m_pchData + GetData()->nDataLength, lpszSrcData, nSrcLen); + GetData()->nDataLength += nSrcLen; + m_pchData[GetData()->nDataLength] = 0; + } +} + +/* + * @implemented + */ +void CHString::ConcatCopy(int nSrc1Len, LPCWSTR lpszSrc1Data, int nSrc2Len, LPCWSTR lpszSrc2Data) throw (CHeap_Exception) +{ + int TotalLen; + + if (nSrc1Len < 0 || nSrc2Len < 0) + { + RaiseException(ERROR_INVALID_PARAMETER, EXCEPTION_NONCONTINUABLE, 0, 0); + } + + // If both len are null, do nothing + TotalLen = nSrc1Len + nSrc2Len; + if (TotalLen == 0) + { + return; + } + + // Otherwise, allocate a new buffer to hold everything (caller will release previous buffer) + AllocBuffer(TotalLen); + // And concat stuff + wcsncpy(m_pchData, lpszSrc1Data, nSrc1Len); + wcsncpy(m_pchData + nSrc1Len, lpszSrc2Data, nSrc2Len); +} + +/* + * @implemented + */ +void CHString::CopyBeforeWrite() throw (CHeap_Exception) +{ + CHStringData* Data; + + // First, we need to get reference count + // And we also need to save Data for later copy + Data = GetData(); + + if (Data->nRefs <= 1) + { + // If its not used, don't waste time to realloc, it will do the job + return; + } + + // Release current data - we are sure it won't be freed upon that point + // Thanks to the reference count check previously done + Release(); + // Alloc new buffer and copy old data in it + AllocBuffer(Data->nDataLength); + wcsncpy(m_pchData, Data->data(), Data->nDataLength); +} + +/* + * @implemented + */ +void CHString::Empty() +{ + // Already empty + if (GetData()->nDataLength == 0) + { + return; + } + + // Empty it easily given it's reference count + if (GetData()->nRefs < 0) + { + *this = afxPchNil; + } + else + { + // Otherwise, just release it + // It will set back this instance to afxPchNil + // while decreasing reference count + Release(); + } +} + +/* + * @implemented + */ +int CHString::Find(WCHAR ch) const +{ + WCHAR *Found; + + // Let's use appropriate helper + Found = wcschr(m_pchData, ch); + // We have to return a position, so compute it + if (Found) + { + return (Found - m_pchData); + } + + // Otherwise, return no position + return -1; +} + +/* + * @implemented + */ +int CHString::Find(LPCWSTR lpszSub) const +{ + WCHAR *Found; + + // Let's use appropriate helper + Found = wcsstr(m_pchData, lpszSub); + // We have to return a position, so compute it + if (Found) + { + return (Found - m_pchData); + } + + // Otherwise, return no position + return -1; +} + +/* + * @implemented + */ +int CHString::FindOneOf(LPCWSTR lpszCharSet) const +{ + WCHAR *Found; + + // Let's use appropriate helper + Found = wcspbrk(m_pchData, lpszCharSet); + // We have to return a position, so compute it + if (Found) + { + return (Found - m_pchData); + } + + // Otherwise, return no position + return -1; +} + +/* + * @implemented + */ +void CHString::Format(UINT nFormatID, ...) throw (CHeap_Exception) +{ + // Deprecated and not implemented any longer - well, this is its implementation + return; +} + +/* + * @implemented + */ +void CHString::Format(LPCWSTR lpszFormat, ...) throw (CHeap_Exception) +{ + // Forward to FormatV + va_list ArgsList; + + va_start(ArgsList, lpszFormat); + FormatV(lpszFormat, ArgsList); + va_end(ArgsList); +} + +/* + * @implemented + */ +void CHString::FormatMessageW(UINT nFormatID, ...) throw (CHeap_Exception) +{ + // Deprecated and not implemented any longer - well, this is its implementation + return; +} + +/* + * @unimplemented + */ +void CHString::FormatMessageW(LPCWSTR lpszFormat, ...) throw (CHeap_Exception) +{ + UNIMPLEMENTED; +} + +/* + * @unimplemented + */ +void CHString::FormatV(LPCWSTR lpszFormat, va_list argList) +{ + UNIMPLEMENTED; +} + +/* + * @implemented + */ +void CHString::FreeExtra() throw (CHeap_Exception) +{ + CHStringData* OldData; + + // No extra? Do nothing + if (GetData()->nDataLength == GetData()->nAllocLength) + { + return; + } + + // Get old buffer + OldData = GetData(); + // Allocate a new one, at the right size (with no place for \0 :-)) + AllocBuffer(GetData()->nDataLength); + // Copy old and release it + wcsncpy(m_pchData, OldData->data(), OldData->nDataLength); + Release(OldData); +} + +/* + * @implemented + */ +int CHString::GetAllocLength() const +{ + return GetData()->nAllocLength; +} + +/* + * @implemented + */ +WCHAR CHString::GetAt(int nIndex) const +{ + // It's up to you to check the index! + return m_pchData[nIndex]; +} + +/* + * @implemented + */ +LPWSTR CHString::GetBuffer(int nMinBufLength) throw (CHeap_Exception) +{ + LPWSTR OldBuffer = m_pchData; + + // We'll have to allocate a new buffer if it's not big enough + // or if it's shared by several strings + if (GetData()->nRefs > 1 || GetData()->nAllocLength < nMinBufLength) + { + CHStringData* OldData = GetData(); + int OldLen = GetData()->nDataLength; + + // Ensure we can hold enough + if (OldLen > nMinBufLength) + { + nMinBufLength = OldLen; + } + + // Allocate new buffer + AllocBuffer(nMinBufLength); + // Copy contents + wcsncpy(m_pchData, OldBuffer, OldLen); + GetData()->nDataLength = OldLen; + + // Release old + Release(OldData); + } + + // Weirdly, here Windows always returns the old buffer + // Which basically exposes a wrong buffer + return OldBuffer; +} + +/* + * @implemented + */ +LPWSTR CHString::GetBufferSetLength(int nNewLength) throw (CHeap_Exception) +{ + // Get a buffer big enough + // We don't care about the return, it will be set in the string + (void)GetBuffer(nNewLength); + // Set length, null-terminate and return + GetData()->nDataLength = nNewLength; + m_pchData[nNewLength] = 0; + return m_pchData; +} + +/* + * @implemented + */ +CHStringData* CHString::GetData() const +{ + // In case of empty string, return empty data + if (m_pchData == afxPchNil) + { + return &afxNullData; + } + + // Otherwise, do maths + return (CHStringData*)((ULONG_PTR)m_pchData - sizeof(CHStringData)); +} + +/* + * @implemented + */ +int CHString::GetLength() const +{ + return GetData()->nDataLength; +} + +/* + * @implemented + */ +void CHString::Init() +{ + m_pchData == afxPchNil; +} + +/* + * @implemented + */ +BOOL CHString::IsEmpty() const +{ + return (GetData()->nDataLength == 0); +} + +/* + * @implemented + */ +CHString CHString::Left(int nCount) const throw (CHeap_Exception) +{ + CHString NewString; + + // Validate input (we can't get more than what we have ;-)) + if (nCount) + { + if (nCount > GetData()->nDataLength) + { + nCount = GetData()->nDataLength; + } + } + + AllocCopy(NewString, nCount, 0, 0); + + return NewString; +} + +/* + * @implemented + */ +int CHString::LoadStringW(UINT nID) throw (CHeap_Exception) +{ + // Deprecated and not implemented any longer - well, this is its implementation + return 0; +} + +/* + * @implemented + */ +int CHString::LoadStringW(UINT nID, LPWSTR lpszBuf, UINT nMaxBuf) throw (CHeap_Exception) +{ + // Deprecated and not implemented any longer - well, this is its implementation + return 0; +} + +/* + * @implemented + */ +LPWSTR CHString::LockBuffer() +{ + LPWSTR LockedBuffer; + + // The purpose here is basically to set the nRefs to max int + LockedBuffer = GetBuffer(0); + GetData()->nRefs = INT_MAX; + + return LockedBuffer; +} + +/* + * @implemented + */ +void CHString::MakeLower() throw (CHeap_Exception) +{ + // We'll modify string, duplicate it first if needed + CopyBeforeWrite(); + + // Let's use appropriate helper + wcslwr(m_pchData); +} + +/* + * @implemented + */ +void CHString::MakeReverse() throw (CHeap_Exception) +{ + // We'll modify string, duplicate it first if needed + CopyBeforeWrite(); + + // Let's use appropriate helper + wcsrev(m_pchData); +} + +/* + * @implemented + */ +void CHString::MakeUpper() throw (CHeap_Exception) +{ + // We'll modify string, duplicate it first if needed + CopyBeforeWrite(); + + // Let's use appropriate helper + wcsupr(m_pchData); +} + +/* + * @implemented + */ +CHString CHString::Mid(int nFirst) const throw (CHeap_Exception) +{ + // Take string from nFirst up to the end + return Mid(nFirst, GetData()->nDataLength - nFirst); +} + +/* + * @implemented + */ +CHString CHString::Mid(int nFirst, int nCount) const throw (CHeap_Exception) +{ + CHString NewString; + + // Validate sizes first + if (nFirst < 0) + { + nFirst = 0; + } + + if (nCount < 0) + { + nCount = 0; + } + + // Ensure we don't go beyond the string + if (nFirst + nCount > GetData()->nDataLength) + { + nCount = GetData()->nDataLength - nFirst; + } + + // Also ensure we don't read beyond + // Yes, this should have been done before previous check + // MS does it that way + if (nFirst > GetData()->nDataLength) + { + nCount = 0; + } + + AllocCopy(NewString, nCount, nFirst, 0); + + return NewString; +} + +/* + * @implemented + */ +void CHString::Release() +{ + // If null string, nothing to do + if (GetData() == &afxNullData) + { + return; + } + + // Otherwise, decrement ref count and release if required + if (InterlockedDecrement(&GetData()->nRefs) == 0) + { + delete GetData(); + } + + // In all cases, caller doesn't want string anymore + // So, switch back to empty string + m_pchData = afxPchNil; +} + +/* + * @implemented + */ +void CHString::Release(CHStringData* pData) +{ + // If empty string, ignore + if (pData == &afxNullData) + { + return; + } + + // Otherwise, simply and free if needed + if (InterlockedDecrement(&pData->nRefs) == 0) + { + delete pData; + } +} + +/* + * @implemented + */ +void CHString::ReleaseBuffer(int nNewLength) throw (CHeap_Exception) +{ + CHStringData* Data; + + // We'll modify buffer, so duplicate + CopyBeforeWrite(); + + // If no len provided, get one + if (nNewLength == -1) + { + nNewLength = wcslen(m_pchData); + } + + // Set appropriate size and null-terminate + Data = GetData(); + Data->nDataLength = nNewLength; + Data->data()[nNewLength] = 0; +} + +/* + * @implemented + */ +int CHString::ReverseFind(WCHAR ch) const +{ + WCHAR *Last; + + // Let's use appropriate helper + Last = wcsrchr(m_pchData, ch); + // We have to return a position, so compute it + if (Last) + { + return (Last - m_pchData); + } + + // Otherwise, return no position + return -1; +} + +/* + * @implemented + */ +CHString CHString::Right(int nCount) const throw (CHeap_Exception) +{ + CHString NewString; + + // Validate input (we can't get more than what we have ;-)) + if (nCount >= 0) + { + if (nCount > GetData()->nDataLength) + { + nCount = GetData()->nDataLength; + } + } + + AllocCopy(NewString, nCount, GetData()->nDataLength - nCount, 0); + + return NewString; +} + +/* + * @implemented + */ +int CHString::SafeStrlen(LPCWSTR lpsz) +{ + // Check we have a string and then get its length + if (lpsz == 0) + { + return 0; + } + + // Of course, it's not safe at all in case string is not null-terminated. + // Things that may happen given strings are not to be null-terminated + // in this class... + return (int)wcslen(lpsz); +} + +/* + * @implemented + */ +void CHString::SetAt(int nIndex, WCHAR ch) throw (CHeap_Exception) +{ + CopyBeforeWrite(); + + m_pchData[nIndex] = ch; +} + +/* + * @implemented + */ +CHString CHString::SpanExcluding(LPCWSTR lpszCharSet) const throw (CHeap_Exception) +{ + int Count; + + // Get position and then, extract + Count = wcscspn(m_pchData, lpszCharSet); + return Left(Count); +} + +/* + * @implemented + */ +CHString CHString::SpanIncluding(LPCWSTR lpszCharSet) const throw (CHeap_Exception) +{ + int Count; + + // Get position and then, extract + Count = wcsspn(m_pchData, lpszCharSet); + return Left(Count); +} + +/* + * @implemented + */ +void CHString::TrimLeft() throw (CHeap_Exception) +{ + int NewBegin; + int NewLength; + WCHAR *CurrentChar; + + // We'll modify, so copy first + CopyBeforeWrite(); + + // Start at the begin of the string + CurrentChar = m_pchData; + while (*CurrentChar != 0) + { + // Browse string till we find something which is not a space + if (!iswspace(*CurrentChar)) + { + break; + } + + CurrentChar++; + } + + // Then, calculate new begin (easy) and new length + // And move memory + NewBegin = (CurrentChar - m_pchData); + NewLength = GetData()->nDataLength - NewBegin; + memmove(m_pchData, CurrentChar, NewLength * sizeof(WCHAR)); + GetData()->nDataLength = NewLength; +} + +/* + * @implemented + */ +void CHString::TrimRight() throw (CHeap_Exception) +{ + WCHAR *CurrentChar; + WCHAR *CanBeEaten; + + // We'll modify, so copy first + CopyBeforeWrite(); + + // Start at the begin of the string -- WHAT?! + // Yes, this algorithm is the same that MS is + // using for its TrimRight. + // It is highly unefficient. It would have been + // easier to start at nDataLength and to get back to + // the begin. Note that it would have been safer as + // well, in case the caller is using non-null-terminated + // strings. But, well... + CurrentChar = m_pchData; + CanBeEaten = 0; + while (*CurrentChar != 0) + { + // If not a space, reset what we can trim + if (!iswspace(*CurrentChar)) + { + CanBeEaten = 0; + } + // If it is one, and the first of the spaces serie + // Keep its position + else if (CanBeEaten == 0) + { + CanBeEaten = CurrentChar; + } + + CurrentChar++; + } + + // If nothing to trim, quit + if (CanBeEaten == 0) + { + return; + } + + // Otherwise, shorten the string + GetData()->nDataLength = (CanBeEaten - m_pchData); +} + +/* + * @implemented + */ +void CHString::UnlockBuffer() +{ + // Unlock means just put ref back to 1 + // It was previously set to MAX_INT + if (GetData() != &afxNullData) + { + GetData()->nRefs = 1; + } +} + +/* + * @implemented + */ +const CHString& CHString::operator=(char ch) throw (CHeap_Exception) +{ + *this = (WCHAR)ch; + return *this; +} + +/* + * @implemented + */ +const CHString& CHString::operator=(WCHAR ch) throw (CHeap_Exception) +{ + AssignCopy(1, &ch); + return *this; +} + +/* + * @implemented + */ +const CHString& CHString::operator=(CHString *p) throw (CHeap_Exception) +{ + *this = *p; + return *this; +} + +/* + * @implemented + */ +const CHString& CHString::operator=(LPCSTR lpsz) throw (CHeap_Exception) +{ + int Len; + + // If we have string, get its len + if (lpsz != 0) + { + Len = strlen(lpsz); + } + else + { + Len = 0; + } + + // Do this call, even with null len, just to get empty string + AllocBeforeWrite(Len); + if (Len == 0) + { + Release(); + return *this; + } + + // Convert and copy + mbstowcsz(m_pchData, lpsz, Len + 1); + // Get new size and so on + ReleaseBuffer(); + + return *this; +} + +/* + * @implemented + */ +const CHString& CHString::operator=(LPCWSTR lpsz) throw (CHeap_Exception) +{ + int Len; + + Len = SafeStrlen(lpsz); + AssignCopy(Len, lpsz); + + return *this; +} + +/* + * @implemented + */ +const CHString& CHString::operator=(const CHString& stringSrc) throw (CHeap_Exception) +{ + // Don't copy string on itself + if (&stringSrc == this) + { + return *this; + } + + // In case we don't have a referenced string here, + // or if the other is not referenced, just copy here + if ((GetData()->nRefs < 0 && GetData() != &afxNullData) || + stringSrc.GetData()->nRefs < 0) + { + AssignCopy(stringSrc.GetData()->nDataLength, stringSrc.m_pchData); + return *this; + } + + // Otherwise, release current buffer + Release(); + // And set buffer as stringSrc buffer + // And increase its reference count + m_pchData = stringSrc.m_pchData; + InterlockedIncrement(&GetData()->nRefs); + + return *this; +} + +/* + * @implemented + */ +const CHString& CHString::operator=(const unsigned char* lpsz) throw (CHeap_Exception) +{ + *this = (LPCSTR)lpsz; + return *this; +} + +/* + * @implemented + */ +const CHString& CHString::operator+=(char ch) throw (CHeap_Exception) +{ + *this += (WCHAR)ch; + return *this; +} + +/* + * @implemented + */ +const CHString& CHString::operator+=(WCHAR ch) throw (CHeap_Exception) +{ + ConcatInPlace(1, &ch); + return *this; +} + +/* + * @implemented + */ +const CHString& CHString::operator+=(LPCWSTR lpsz) throw (CHeap_Exception) +{ + int Len; + + Len = SafeStrlen(lpsz); + ConcatInPlace(Len, lpsz); + + return *this; +} + +/* + * @implemented + */ +const CHString& CHString::operator+=(const CHString& string) throw (CHeap_Exception) +{ + ConcatInPlace(string.GetData()->nDataLength, string.m_pchData); + + return *this; +} + +/* + * @implemented + */ +WCHAR CHString::operator[](int nIndex) const +{ + return m_pchData[nIndex]; +} + +/* + * @implemented + */ +CHString::operator LPWSTR() +{ + return m_pchData; +} + +/* + * @implemented + */ +CHString operator+(WCHAR ch, const CHString& string) throw (CHeap_Exception) +{ + CHString NewString; + + // Basically concat in a new string + NewString.ConcatCopy(1, &ch, string.GetData()->nDataLength, string.m_pchData); + + return NewString; +} + +/* + * @implemented + */ +CHString operator+(const CHString& string, WCHAR ch) throw (CHeap_Exception) +{ + CHString NewString; + + // Basically concat in a new string + NewString.ConcatCopy(string.GetData()->nDataLength, string.m_pchData, 1, &ch); + + return NewString; +} + +/* + * @implemented + */ +CHString operator+(const CHString& string, LPCWSTR lpsz) throw (CHeap_Exception) +{ + int Len; + CHString NewString; + + // Get string length + Len = CHString::SafeStrlen(lpsz); + // And concat in new string + NewString.ConcatCopy(string.GetData()->nDataLength, string.m_pchData, Len, lpsz); + + return NewString; +} + +/* + * @implemented + */ +CHString operator+(LPCWSTR lpsz, const CHString& string) throw (CHeap_Exception) +{ + int Len; + CHString NewString; + + // Get string length + Len = CHString::SafeStrlen(lpsz); + // And concat in new string + NewString.ConcatCopy(Len, lpsz, string.GetData()->nDataLength, string.m_pchData); + + return NewString; +} + +/* + * @implemented + */ +CHString operator+(const CHString& string1, const CHString& string2) throw (CHeap_Exception) +{ + CHString NewString; + + // Basically concat in a new string + NewString.ConcatCopy(string1.GetData()->nDataLength, string1.m_pchData, + string2.GetData()->nDataLength, string2.m_pchData); + + return NewString; +} Propchange: trunk/reactos/dll/win32/framedyn/chstring.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/framedyn/framedyn_gcc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/framedy… ============================================================================== --- trunk/reactos/dll/win32/framedyn/framedyn_gcc.spec (added) +++ trunk/reactos/dll/win32/framedyn/framedyn_gcc.spec [iso-8859-1] Sun Sep 1 14:48:09 2013 @@ -0,0 +1,76 @@ +@ thiscall ?AllocBeforeWrite@CHString@@IAEXH@Z(long) _ZN8CHString16AllocBeforeWriteEi +@ thiscall ?AllocBuffer@CHString@@IAEXH@Zlong(long) _ZN8CHString11AllocBufferEi +@ thiscall ?AllocCopy@CHString@@IBEXAAV1@HHH@Z(ptr long long long) _ZNK8CHString9AllocCopyERS_iii +@ thiscall ?AllocSysString@CHString@@QBEPAGXZ() _ZNK8CHString14AllocSysStringEv +@ thiscall ?AssignCopy@CHString@@IAEXHPBG@Z(long wstr) _ZN8CHString10AssignCopyEiPKw +@ thiscall ??0CHString@@QAE@ABV0@@Z(ptr) _ZN8CHStringC2ERKS_ +@ thiscall ??0CHString@@QAE@PBD@Z(str) _ZN8CHStringC2EPKc +@ thiscall ??0CHString@@QAE@PBE@Z(str) _ZN8CHStringC2EPKh +@ thiscall ??0CHString@@QAE@PBG@Z(wstr) _ZN8CHStringC2EPKw +@ thiscall ??0CHString@@QAE@PBGH@Z(wstr long) _ZN8CHStringC2EPKwi +@ thiscall ??0CHString@@QAE@GH@Z(long long) _ZN8CHStringC2Ewi +@ thiscall ??0CHString@@QAE@XZ() _ZN8CHStringC2Ev +@ thiscall ?Collate@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString7CollateEPKw +@ thiscall ?Compare@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString7CompareEPKw +@ thiscall ?CompareNoCase@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString13CompareNoCaseEPKw +@ thiscall ?ConcatCopy@CHString@@IAEXHPBGH0@Z(long wstr long wstr) _ZN8CHString10ConcatCopyEiPKwiS1_ +@ thiscall ?ConcatInPlace@CHString@@IAEXHPBG@Z(long wstr) _ZN8CHString13ConcatInPlaceEiPKw +@ thiscall ?CopyBeforeWrite@CHString@@IAEXXZ() _ZN8CHString15CopyBeforeWriteEv +@ thiscall ?Empty@CHString@@QAEXXZ() _ZN8CHString5EmptyEv +@ thiscall ?Find@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString4FindEPKw +@ thiscall ?Find@CHString@@QBEHG@Z(long) _ZNK8CHString4FindEw +@ thiscall ?FindOneOf@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString9FindOneOfEPKw +@ thiscall ?Format@CHString@@QAAXIZZ(long long long) _ZN8CHString6FormatEjz +@ thiscall ?Format@CHString@@QAAXPBGZZ(long wstr long) _ZN8CHString6FormatEPKwz +@ thiscall ?FormatMessageW@CHString@@QAAXIZZ(long long long) _ZN8CHString14FormatMessageWEjz +@ thiscall ?FormatMessageW@CHString@@QAAXPBGZZ(long ptr long) _ZN8CHString14FormatMessageWEPKwz +@ thiscall ?FormatV@CHString@@QAEXPBGPAD@Z(wstr long) _ZN8CHString7FormatVEPKwPc +@ thiscall ?FreeExtra@CHString@@QAEXXZ() _ZN8CHString9FreeExtraEv +@ thiscall ?GetAllocLength@CHString@@QBEHXZ() _ZNK8CHString14GetAllocLengthEv +@ thiscall ?GetAt@CHString@@QBEGH@Z(long) _ZNK8CHString5GetAtEi +@ thiscall ?GetBuffer@CHString@@QAEPAGH@Z(long) _ZN8CHString9GetBufferEi +@ thiscall ?GetBufferSetLength@CHString@@QAEPAGH@Z(long) _ZN8CHString18GetBufferSetLengthEi +@ thiscall ?GetData@CHString@@IBEPAUCHStringData@@XZ() _ZNK8CHString7GetDataEv +@ thiscall ?GetLength@CHString@@QBEHXZ() _ZNK8CHString9GetLengthEv +@ thiscall ?Init@CHString@@IAEXXZ() _ZN8CHString4InitEv +@ thiscall ?IsEmpty@CHString@@QBEHXZ() _ZNK8CHString7IsEmptyEv +@ thiscall ?Left@CHString@@QBE?AV1@H@Z(long) _ZNK8CHString4LeftEi +@ thiscall ?LoadStringW@CHString@@QAEHI@Z(long) _ZN8CHString11LoadStringWEj +@ thiscall ?LoadStringW@CHString@@IAEHIPAGI@Z(long wstr long) _ZN8CHString11LoadStringWEjPwj +@ thiscall ?LockBuffer@CHString@@QAEPAGXZ() _ZN8CHString10LockBufferEv +@ thiscall ?MakeLower@CHString@@QAEXXZ() _ZN8CHString9MakeLowerEv +@ thiscall ?MakeReverse@CHString@@QAEXXZ() _ZN8CHString11MakeReverseEv +@ thiscall ?MakeUpper@CHString@@QAEXXZ() _ZN8CHString9MakeUpperEv +@ thiscall ?Mid@CHString@@QBE?AV1@H@Z(long) _ZNK8CHString3MidEi +@ thiscall ?Mid@CHString@@QBE?AV1@HH@Z(long long) _ZNK8CHString3MidEii +@ thiscall ?Release@CHString@@KGXPAUCHStringData@@@Z(ptr) _ZN8CHString7ReleaseEP12CHStringData +@ thiscall ?Release@CHString@@IAEXXZ() _ZN8CHString7ReleaseEv +@ thiscall ?ReleaseBuffer@CHString@@QAEXH@Z(long) _ZN8CHString13ReleaseBufferEi +@ thiscall ?ReverseFind@CHString@@QBEHG@Z(long) _ZNK8CHString11ReverseFindEw +@ thiscall ?Right@CHString@@QBE?AV1@H@Z(long) _ZNK8CHString5RightEi +@ stdcall ?SafeStrlen@CHString@@KGHPBG@Z(wstr) _ZN8CHString10SafeStrlenEPKw +@ thiscall ?SetAt@CHString@@QAEXHG@Z(long long) _ZN8CHString5SetAtEiw +@ thiscall ?SpanExcluding@CHString@@QBE?AV1@PBG@Z(long wstr) _ZNK8CHString13SpanExcludingEPKw +@ thiscall ?SpanIncluding@CHString@@QBE?AV1@PBG@Z(long wstr) _ZNK8CHString13SpanIncludingEPKw +@ thiscall ?TrimLeft@CHString@@QAEXXZ() _ZN8CHString8TrimLeftEv +@ thiscall ?TrimRight@CHString@@QAEXXZ() _ZN8CHString9TrimRightEv +@ thiscall ?UnlockBuffer@CHString@@QAEXXZ() _ZN8CHString12UnlockBufferEv +@ thiscall ??BCHString@@QBEPBGXZ(ptr) _ZN8CHStringcvPwEv +@ thiscall ??YCHString@@QAEABV0@ABV0@@Z(ptr) _ZN8CHStringpLERKS_ +@ thiscall ??YCHString@@QAEABV0@D@Z(long) _ZN8CHStringpLEc +@ thiscall ??YCHString@@QAEABV0@PBG@Z(wstr) _ZN8CHStringpLEPKw +@ thiscall ??YCHString@@QAEABV0@G@Z(long) _ZN8CHStringpLEw +@ thiscall ??4CHString@@QAEABV0@PAV0@@Z(ptr) _ZN8CHStringaSEPS_ +@ thiscall ??4CHString@@QAEABV0@ABV0@@Z(ptr) _ZN8CHStringaSERKS_ +@ thiscall ??4CHString@@QAEABV0@PBD@Z(str) _ZN8CHStringaSEPKc +@ thiscall ??4CHString@@QAEABV0@D@Z(long) _ZN8CHStringaSEc +@ thiscall ??4CHString@@QAEABV0@PBE@Z(str) _ZN8CHStringaSEPKh +@ thiscall ??4CHString@@QAEABV0@PBG@Z(wstr) _ZN8CHStringaSEPKw +@ thiscall ??4CHString@@QAEABV0@G@Z(long) _ZN8CHStringaSEw +@ thiscall ??ACHString@@QBEGH@Z(long) _ZNK8CHStringixEi +@ thiscall ??1CHString@@QAE@XZ() _ZN8CHStringD2Ev +@ stdcall ??H@YG?AVCHString@@GABV0@@Z(long ptr) _ZplwRK8CHString +@ stdcall ??H@YG?AVCHString@@ABV0@G@Z(ptr long) _ZplRK8CHStringw +@ stdcall ??H@YG?AVCHString@@ABV0@PBG@Z(ptr wstr) _ZplRK8CHStringPKw +@ stdcall ??H@YG?AVCHString@@PBGABV0@@Z(wstr ptr) _ZplPKwRK8CHString +@ stdcall ??H@YG?AVCHString@@ABV0@0@Z(ptr ptr) _ZplRK8CHStringS1_ Propchange: trunk/reactos/dll/win32/framedyn/framedyn_gcc.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/framedyn/framedyn_msvc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/framedy… ============================================================================== --- trunk/reactos/dll/win32/framedyn/framedyn_msvc.spec (added) +++ trunk/reactos/dll/win32/framedyn/framedyn_msvc.spec [iso-8859-1] Sun Sep 1 14:48:09 2013 @@ -0,0 +1,76 @@ +@ thiscall ?AllocBeforeWrite@CHString@@IAEXH@Z(long) +@ thiscall ?AllocBuffer@CHString@@IAEXH@Zlong(long) +@ thiscall ?AllocCopy@CHString@@IBEXAAV1@HHH@Z(ptr long long long) +@ thiscall ?AllocSysString@CHString@@QBEPAGXZ() +@ thiscall ?AssignCopy@CHString@@IAEXHPBG@Z(long wstr) +@ thiscall ??0CHString@@QAE@ABV0@@Z(ptr) +@ thiscall ??0CHString@@QAE@PBD@Z(str) +@ thiscall ??0CHString@@QAE@PBE@Z(str) +@ thiscall ??0CHString@@QAE@PBG@Z(wstr) +@ thiscall ??0CHString@@QAE@PBGH@Z(wstr long) +@ thiscall ??0CHString@@QAE@GH@Z(long long) +@ thiscall ??0CHString@@QAE@XZ() +@ thiscall ?Collate@CHString@@QBEHPBG@Z(wstr) +@ thiscall ?Compare@CHString@@QBEHPBG@Z(wstr) +@ thiscall ?CompareNoCase@CHString@@QBEHPBG@Z(wstr) +@ thiscall ?ConcatCopy@CHString@@IAEXHPBGH0@Z(long wstr long wstr) +@ thiscall ?ConcatInPlace@CHString@@IAEXHPBG@Z(long wstr) +@ thiscall ?CopyBeforeWrite@CHString@@IAEXXZ() +@ thiscall ?Empty@CHString@@QAEXXZ() +@ thiscall ?Find@CHString@@QBEHPBG@Z(wstr) +@ thiscall ?Find@CHString@@QBEHG@Z(long) +@ thiscall ?FindOneOf@CHString@@QBEHPBG@Z(wstr) +@ thiscall ?Format@CHString@@QAAXIZZ(long long long) +@ thiscall ?Format@CHString@@QAAXPBGZZ(long wstr long) +@ thiscall ?FormatMessageW@CHString@@QAAXIZZ(long long long) +@ thiscall ?FormatMessageW@CHString@@QAAXPBGZZ(long ptr long) +@ thiscall ?FormatV@CHString@@QAEXPBGPAD@Z(wstr long) +@ thiscall ?FreeExtra@CHString@@QAEXXZ() +@ thiscall ?GetAllocLength@CHString@@QBEHXZ() +@ thiscall ?GetAt@CHString@@QBEGH@Z(long) +@ thiscall ?GetBuffer@CHString@@QAEPAGH@Z(long) +@ thiscall ?GetBufferSetLength@CHString@@QAEPAGH@Z(long) +@ thiscall ?GetData@CHString@@IBEPAUCHStringData@@XZ() +@ thiscall ?GetLength@CHString@@QBEHXZ() +@ thiscall ?Init@CHString@@IAEXXZ() +@ thiscall ?IsEmpty@CHString@@QBEHXZ() +@ thiscall ?Left@CHString@@QBE?AV1@H@Z(long) +@ thiscall ?LoadStringW@CHString@@QAEHI@Z(long) +@ thiscall ?LoadStringW@CHString@@IAEHIPAGI@Z(long wstr long) +@ thiscall ?LockBuffer@CHString@@QAEPAGXZ() +@ thiscall ?MakeLower@CHString@@QAEXXZ() +@ thiscall ?MakeReverse@CHString@@QAEXXZ() +@ thiscall ?MakeUpper@CHString@@QAEXXZ() +@ thiscall ?Mid@CHString@@QBE?AV1@H@Z(long) +@ thiscall ?Mid@CHString@@QBE?AV1@HH@Z(long long) +@ thiscall ?Release@CHString@@KGXPAUCHStringData@@@Z(ptr) +@ thiscall ?Release@CHString@@IAEXXZ() +@ thiscall ?ReleaseBuffer@CHString@@QAEXH@Z(long) +@ thiscall ?ReverseFind@CHString@@QBEHG@Z(long) +@ thiscall ?Right@CHString@@QBE?AV1@H@Z(long) +@ stdcall ?SafeStrlen@CHString@@KGHPBG@Z(wstr) +@ thiscall ?SetAt@CHString@@QAEXHG@Z(long long) +@ thiscall ?SpanExcluding@CHString@@QBE?AV1@PBG@Z(long wstr) +@ thiscall ?SpanIncluding@CHString@@QBE?AV1@PBG@Z(long wstr) +@ thiscall ?TrimLeft@CHString@@QAEXXZ() +@ thiscall ?TrimRight@CHString@@QAEXXZ() +@ thiscall ?UnlockBuffer@CHString@@QAEXXZ() +@ thiscall ??BCHString@@QBEPBGXZ(ptr) +@ thiscall ??YCHString@@QAEABV0@ABV0@@Z(ptr) +@ thiscall ??YCHString@@QAEABV0@D@Z(long) +@ thiscall ??YCHString@@QAEABV0@PBG@Z(wstr) +@ thiscall ??YCHString@@QAEABV0@G@Z(long) +@ thiscall ??4CHString@@QAEABV0@PAV0@@Z(ptr) +@ thiscall ??4CHString@@QAEABV0@ABV0@@Z(ptr) +@ thiscall ??4CHString@@QAEABV0@PBD@Z(str) +@ thiscall ??4CHString@@QAEABV0@D@Z(long) +@ thiscall ??4CHString@@QAEABV0@PBE@Z(str) +@ thiscall ??4CHString@@QAEABV0@PBG@Z(wstr) +@ thiscall ??4CHString@@QAEABV0@G@Z(long) +@ thiscall ??ACHString@@QBEGH@Z(long) +@ thiscall ??1CHString@@QAE@XZ() +@ stdcall ??H@YG?AVCHString@@GABV0@@Z(long ptr) +@ stdcall ??H@YG?AVCHString@@ABV0@G@Z(ptr long) +@ stdcall ??H@YG?AVCHString@@ABV0@PBG@Z(ptr wstr) +@ stdcall ??H@YG?AVCHString@@PBGABV0@@Z(wstr ptr) +@ stdcall ??H@YG?AVCHString@@ABV0@0@Z(ptr ptr) Propchange: trunk/reactos/dll/win32/framedyn/framedyn_msvc.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/framedyn/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/main.c?… ============================================================================== --- trunk/reactos/dll/win32/framedyn/main.c (added) +++ trunk/reactos/dll/win32/framedyn/main.c [iso-8859-1] Sun Sep 1 14:48:09 2013 @@ -0,0 +1,27 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: dll/win32/framedyn/main.c + * PURPOSE: framedyn entry point + * PROGRAMMERS: Pierre Schweitzer (pierre(a)reactos.org) + * + */ + +/* INCLUDES ******************************************************************/ + +#include <windows.h> + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} Propchange: trunk/reactos/dll/win32/framedyn/main.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[pschweitzer] 59939: [PDSK] Add two headers: chstring.h and provexce.h They are used for framedyn.dll stuff, for instance So far, the CHString class is not fully populated. It is only populated wit...
by pschweitzer＠svn.reactos.org 01 Sep '13

01 Sep '13

Author: pschweitzer Date: Sun Sep 1 14:30:28 2013 New Revision: 59939 URL: http://svn.reactos.org/svn/reactos?rev=59939&view=rev Log: [PDSK] Add two headers: chstring.h and provexce.h They are used for framedyn.dll stuff, for instance So far, the CHString class is not fully populated. It is only populated with exported stuff from framedyn.dll Added: trunk/reactos/include/psdk/chstring.h (with props) trunk/reactos/include/psdk/provexce.h (with props) Added: trunk/reactos/include/psdk/chstring.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/chstring.h?re… ============================================================================== --- trunk/reactos/include/psdk/chstring.h (added) +++ trunk/reactos/include/psdk/chstring.h [iso-8859-1] Sun Sep 1 14:30:28 2013 @@ -0,0 +1,112 @@ +#pragma once + +#ifndef _CHSTRING_H +#define _CHSTRING_H + +#include <windows.h> +#include <provexce.h> + +struct CHStringData +{ + long nRefs; + int nDataLength; + int nAllocLength; + + WCHAR* data() + { + return (WCHAR*)(this+1); + } +}; + +class CHString +{ +public: + CHString(); + CHString(WCHAR ch, int nRepeat = 1) throw (CHeap_Exception); + CHString(LPCWSTR lpsz) throw (CHeap_Exception); + CHString(LPCWSTR lpch, int nLength) throw (CHeap_Exception); + CHString(LPCSTR lpsz) throw (CHeap_Exception); + CHString(const CHString& stringSrc); + CHString(const unsigned char* lpsz); + ~CHString(); + + BSTR AllocSysString() const throw (CHeap_Exception); + int Collate(LPCWSTR lpsz) const; + int Compare(LPCWSTR lpsz) const; + int CompareNoCase(LPCWSTR lpsz) const; + void Empty(); + int Find(WCHAR ch) const; + int Find(LPCWSTR lpszSub) const; + int FindOneOf(LPCWSTR lpszCharSet) const; + void Format(UINT nFormatID, ...) throw (CHeap_Exception); + void Format(LPCWSTR lpszFormat, ...) throw (CHeap_Exception); + void FormatMessageW(UINT nFormatID, ...) throw (CHeap_Exception); + void FormatMessageW(LPCWSTR lpszFormat, ...) throw (CHeap_Exception); + void FormatV(LPCWSTR lpszFormat, va_list argList); + void FreeExtra() throw (CHeap_Exception); + int GetAllocLength() const; + WCHAR GetAt(int nIndex) const; + LPWSTR GetBuffer(int nMinBufLength) throw (CHeap_Exception); + LPWSTR GetBufferSetLength(int nNewLength) throw (CHeap_Exception); + int GetLength() const; + BOOL IsEmpty() const; + CHString Left(int nCount) const throw (CHeap_Exception); + LPWSTR LockBuffer(); + void MakeLower() throw (CHeap_Exception); + void MakeReverse() throw (CHeap_Exception); + void MakeUpper() throw (CHeap_Exception); + CHString Mid(int nFirst) const throw (CHeap_Exception); + CHString Mid(int nFirst, int nCount) const throw (CHeap_Exception); + void Release(); + void Release(CHStringData* pData); + void ReleaseBuffer(int nNewLength = -1) throw (CHeap_Exception); + int ReverseFind(WCHAR ch) const; + CHString Right(int nCount) const throw (CHeap_Exception); + void SetAt(int nIndex, WCHAR ch) throw (CHeap_Exception); + CHString SpanExcluding(LPCWSTR lpszCharSet) const throw (CHeap_Exception); + CHString SpanIncluding(LPCWSTR lpszCharSet) const throw (CHeap_Exception); + void TrimLeft() throw (CHeap_Exception); + void TrimRight() throw (CHeap_Exception); + void UnlockBuffer(); + + const CHString& operator=(char ch) throw (CHeap_Exception); + const CHString& operator=(WCHAR ch) throw (CHeap_Exception); + const CHString& operator=(CHString *p) throw (CHeap_Exception); + const CHString& operator=(LPCSTR lpsz) throw (CHeap_Exception); + const CHString& operator=(LPCWSTR lpsz) throw (CHeap_Exception); + const CHString& operator=(const CHString& stringSrc) throw (CHeap_Exception); + const CHString& operator=(const unsigned char* lpsz) throw (CHeap_Exception); + + const CHString& operator+=(char ch) throw (CHeap_Exception); + const CHString& operator+=(WCHAR ch) throw (CHeap_Exception); + const CHString& operator+=(LPCWSTR lpsz) throw (CHeap_Exception); + const CHString& operator+=(const CHString& string) throw (CHeap_Exception); + + WCHAR operator[](int nIndex) const; + + operator LPWSTR(); + + friend CHString WINAPI operator+(WCHAR ch, const CHString& string) throw (CHeap_Exception); + friend CHString WINAPI operator+(const CHString& string, WCHAR ch) throw (CHeap_Exception); + friend CHString WINAPI operator+(const CHString& string, LPCWSTR lpsz) throw (CHeap_Exception); + friend CHString WINAPI operator+(LPCWSTR lpsz, const CHString& string) throw (CHeap_Exception); + friend CHString WINAPI operator+(const CHString& string1, const CHString& string2) throw (CHeap_Exception); + +protected: + LPWSTR m_pchData; + + void AllocBeforeWrite(int nLen) throw (CHeap_Exception); + void AllocBuffer(int nLen) throw (CHeap_Exception); + void AllocCopy(CHString& dest, int nCopyLen, int nCopyIndex, int nExtraLen) const throw (CHeap_Exception); + void AssignCopy(int nSrcLen, LPCWSTR lpszSrcData) throw (CHeap_Exception); + void ConcatCopy(int nSrc1Len, LPCWSTR lpszSrc1Data, int nSrc2Len, LPCWSTR lpszSrc2Data) throw (CHeap_Exception); + void ConcatInPlace(int nSrcLen, LPCWSTR lpszSrcData); + void CopyBeforeWrite() throw (CHeap_Exception); + CHStringData* GetData() const; + void Init(); + int LoadStringW(UINT nID) throw (CHeap_Exception); + int LoadStringW(UINT nID, LPWSTR lpszBuf, UINT nMaxBuf) throw (CHeap_Exception); + static int WINAPI SafeStrlen(LPCWSTR lpsz); +}; + +#endif Propchange: trunk/reactos/include/psdk/chstring.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/provexce.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/provexce.h?re… ============================================================================== --- trunk/reactos/include/psdk/provexce.h (added) +++ trunk/reactos/include/psdk/provexce.h [iso-8859-1] Sun Sep 1 14:30:28 2013 @@ -0,0 +1,23 @@ +#pragma once + +#ifndef _PROVIDER_EXCEPT_H +#define _PROVIDER_EXCEPT_H + +class CHeap_Exception +{ +public: + enum HEAP_ERROR + { + E_ALLOCATION_ERROR = 0 , + E_FREE_ERROR + }; + + CHeap_Exception(HEAP_ERROR e) : m_Error(e) {} + ~CHeap_Exception() {} + + HEAP_ERROR GetError() { return m_Error ; } +private: + HEAP_ERROR m_Error; +}; + +#endif Propchange: trunk/reactos/include/psdk/provexce.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 59938: [RSYM] * Don't overwrite the MZ header when there are no long section names. * Correct an error including 4 more bytes than needed in the coff strings. * Brought to you by Arty.
by akhaldi＠svn.reactos.org 01 Sep '13

01 Sep '13

Author: akhaldi Date: Sun Sep 1 13:23:54 2013 New Revision: 59938 URL: http://svn.reactos.org/svn/reactos?rev=59938&view=rev Log: [RSYM] * Don't overwrite the MZ header when there are no long section names. * Correct an error including 4 more bytes than needed in the coff strings. * Brought to you by Arty. Modified: trunk/reactos/tools/rsym/rsym.c Modified: trunk/reactos/tools/rsym/rsym.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/rsym.c?rev=5993… ============================================================================== --- trunk/reactos/tools/rsym/rsym.c [iso-8859-1] (original) +++ trunk/reactos/tools/rsym/rsym.c [iso-8859-1] Sun Sep 1 13:23:54 2013 @@ -1161,13 +1161,18 @@ } } - fseek(OutFile, OutFileHeader->PointerToSymbolTable, 0); - /* COFF string section is preceeded by a length */ - fwrite((char*)&StringTableLength, 1, sizeof(StringTableLength), OutFile); - /* We just copy enough of the string table to contain the strings we want - The string table length technically counts as part of the string table - space itself. */ - fwrite(StringTable+4, 1, StringTableLength, OutFile); + if (OutFileHeader->PointerToSymbolTable) + { + fseek(OutFile, OutFileHeader->PointerToSymbolTable, 0); + + /* COFF string section is preceeded by a length */ + assert(sizeof(StringTableLength) == 4); + fwrite((char*)&StringTableLength, 1, sizeof(StringTableLength), OutFile); + /* We just copy enough of the string table to contain the strings we want + The string table length technically counts as part of the string table + space itself. */ + fwrite(StringTable + 4, 1, StringTableLength - 4, OutFile); + } if (PaddedRosSym) {

1 0

[hbelusca] 59937: [APPWIZ] - Convert some language resource files into UTF-8 without BOM (aka. ANSI as UTF-8 with Notepad++). - Improve some French translation. - Fix Czech translation, thanks Rade...
by hbelusca＠svn.reactos.org 01 Sep '13

01 Sep '13

Author: hbelusca Date: Sun Sep 1 12:41:58 2013 New Revision: 59937 URL: http://svn.reactos.org/svn/reactos?rev=59937&view=rev Log: [APPWIZ] - Convert some language resource files into UTF-8 without BOM (aka. ANSI as UTF-8 with Notepad++). - Improve some French translation. - Fix Czech translation, thanks Radek :) (Addendum to r59924 and r59925) Modified: trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc trunk/reactos/dll/cpl/appwiz/lang/en-US.rc trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc trunk/reactos/dll/cpl/appwiz/lang/he-IL.rc trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc trunk/reactos/dll/cpl/appwiz/lang/pt-BR.rc trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc trunk/reactos/dll/cpl/appwiz/rsrc.rc Modified: trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc [iso-8859-1] Sun Sep 1 12:41:58 2013 @@ -10,8 +10,8 @@ CAPTION "Create link" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1", -1, 115, 15, 160, 24 - LTEXT "Text2", -1, 115, 35, 160, 17 + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 END IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -19,9 +19,9 @@ CAPTION "Create link" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1",-1,10,0,225,40 - LTEXT "Text2",-1,10,40,120,20 - LTEXT "Text3",-1,10,55,120,20 + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 END IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 @@ -29,11 +29,11 @@ CAPTION "VytvoÅit zÃ¡stupce" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Tento prÅ¯vodce pomÅ¯Å¾e s vytvoÅenÃm zÃ¡stupcÅ¯ na mÃstnÃ\nnebo sÃÅ¥ovÃ© programy, soubory, sloÅ¾ky, poÄÃtaÄe nebo\ninternetovÃ© adresy.", -1, 120, 15, 200, 30 - LTEXT "Zadejte umÃstÄnÃ poloÅ¾ky:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT - PUSHBUTTON "ProchÃ¡zet...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT - LTEXT "PokraÄujte kliknutÃm na DalÅ¡Ã.", -1, 120, 97, 162, 10 + LTEXT "Tento prÅ¯vodce pomÅ¯Å¾e s vytvoÅenÃm zÃ¡stupcÅ¯ na mÃstnÃ\nnebo sÃÅ¥ovÃ© programy, soubory, sloÅ¾ky, poÄÃtaÄe nebo\ninternetovÃ© adresy.", -1, 120, 15, 200, 30 + LTEXT "Zadejte umÃstÄnÃ poloÅ¾ky:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "ProchÃ¡zet...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT + LTEXT "PokraÄujte kliknutÃm na DalÅ¡Ã.", -1, 120, 97, 162, 10 END IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 @@ -41,15 +41,15 @@ CAPTION "Zvolte nÃ¡zev programu" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Zadejte nÃ¡zev tohoto zÃ¡stupce:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT - LTEXT "KliknutÃm na DokonÄit vytvoÅÃte zÃ¡stupce.", -1, 118, 97, 178, 17 + LTEXT "&Zadejte nÃ¡zev tohoto zÃ¡stupce:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "KliknutÃm na DokonÄit vytvoÅÃte zÃ¡stupce.", -1, 118, 97, 178, 17 END STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "PÅidat a odebrat programy" - IDS_CPLSYSTEMDESCRIPTION "Nastavuje programy a vytvÃ¡ÅÃ zÃ¡stupce." + IDS_CPLSYSTEMNAME "PÅidat a odebrat programy" + IDS_CPLSYSTEMDESCRIPTION "Nastavuje programy a vytvÃ¡ÅÃ zÃ¡stupce." IDS_CREATE_SHORTCUT "VytvoÅit zÃ¡stupce" IDS_ERROR_NOT_FOUND "Soubor %s nebyl nalezen." END @@ -66,7 +66,7 @@ CAPTION "Wine Gecko InstalÃ¡tor" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ReactOS nenalezlo balÃÄek Wine Gecko nutnÃ½ k tomu, aby aplikace zapouzdÅujÃcÃ HTML fungovaly sprÃ¡vnÄ. ReactOS jej mÅ¯Å¾e automaticky stÃ¡hnout a nainstalovat.", + CONTROL "ReactOS nenalezl balÃÄek Wine Gecko nutnÃ½ k tomu, aby aplikace zapouzdÅujÃcÃ HTML fungovaly sprÃ¡vnÄ. ReactOS jej mÅ¯Å¾e automaticky stÃ¡hnout a nainstalovat.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "&Instalovat", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/cpl/appwiz/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/en-US.rc [iso-8859-1] Sun Sep 1 12:41:58 2013 @@ -5,8 +5,8 @@ CAPTION "Create link" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1", -1, 115, 15, 160, 24 - LTEXT "Text2", -1, 115, 35, 160, 17 + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 END IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -14,9 +14,9 @@ CAPTION "Create link" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1",-1,10,0,225,40 - LTEXT "Text2",-1,10,40,120,20 - LTEXT "Text3",-1,10,55,120,20 + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 END IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 @@ -24,11 +24,11 @@ CAPTION "Create Shortcut" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 - LTEXT "Type the location of the item:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT - PUSHBUTTON "Browse...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT - LTEXT "Click Next to continue.", -1, 120, 97, 162, 10 + LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 + LTEXT "Type the location of the item:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "Browse...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT + LTEXT "Click Next to continue.", -1, 120, 97, 162, 10 END IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 @@ -36,15 +36,15 @@ CAPTION "Select a Title for the Program" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Type a name for this shortcut:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT - LTEXT "Click Finish to create the shortcut.", -1, 118, 97, 178, 17 + LTEXT "&Type a name for this shortcut:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Click Finish to create the shortcut.", -1, 118, 97, 178, 17 END STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Add/Remove Programs" - IDS_CPLSYSTEMDESCRIPTION "Sets up programs and creates shortcuts." + IDS_CPLSYSTEMNAME "Add/Remove Programs" + IDS_CPLSYSTEMDESCRIPTION "Sets up programs and creates shortcuts." IDS_CREATE_SHORTCUT "Create Shortcut" IDS_ERROR_NOT_FOUND "The file %s was not found." END Modified: trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc [iso-8859-1] Sun Sep 1 12:41:58 2013 @@ -2,68 +2,68 @@ IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Créer un lien" +CAPTION "CrÃ©er un lien" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Texte1", -1, 115, 15, 160, 24 - LTEXT "Texte2", -1, 115, 35, 160, 17 + LTEXT "Texte1", -1, 115, 15, 160, 24 + LTEXT "Texte2", -1, 115, 35, 160, 17 END IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Créer un lien" +CAPTION "CrÃ©er un lien" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Texte1",-1,10,0,225,40 - LTEXT "Texte2",-1,10,40,120,20 - LTEXT "Texte3",-1,10,55,120,20 + LTEXT "Texte1",-1,10,0,225,40 + LTEXT "Texte2",-1,10,40,120,20 + LTEXT "Texte3",-1,10,55,120,20 END IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Créer un raccourci" +CAPTION "CrÃ©er un raccourci" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Cet assistant vous aider à créer des raccourcis vers des programmes, des fichiers, des dossiers, des ordinateurs,\nou des adresses Internet locaux ou sur le réseau.", -1, 120, 15, 200, 30 - LTEXT "Entrez la localisation de l'élément :", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT - PUSHBUTTON "Parcourir...", IDC_SHORTCUT_BROWSE, 272, 65, 60, 15, ES_LEFT - LTEXT "Cliquez sur Suivant pour continuer.", -1, 120, 97, 162, 10 + LTEXT "Cet assistant vous aide Ã crÃ©er des raccourcis vers des programmes, des fichiers, des dossiers, des ordinateurs,\nou des adresses Internet locaux ou sur le rÃ©seau.", -1, 120, 15, 200, 30 + LTEXT "Entrez la localisation de l'Ã©lÃ©ment :", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "Parcourir...", IDC_SHORTCUT_BROWSE, 272, 65, 60, 15, ES_LEFT + LTEXT "Cliquez sur Suivant pour continuer.", -1, 120, 97, 162, 10 END IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Sélectionnez un titre pour le programme" +CAPTION "SÃ©lectionnez un titre pour le programme" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "En&trez un nom pour ce raccourci :", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT - LTEXT "Cliquez sur Terminer pour créer le raccourci.", -1, 118, 97, 178, 17 + LTEXT "En&trez un nom pour ce raccourci :", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Cliquez sur Terminer pour crÃ©er le raccourci.", -1, 118, 97, 178, 17 END STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Ajouter/Supprimer des Programmes" - IDS_CPLSYSTEMDESCRIPTION "Installe des programmes et créé des raccourcis." - IDS_CREATE_SHORTCUT "Créer un raccourci" - IDS_ERROR_NOT_FOUND "Le fichier %s n'a pas été trouvé." + IDS_CPLSYSTEMNAME "Ajouter/Supprimer des Programmes" + IDS_CPLSYSTEMDESCRIPTION "Installe des programmes et crÃ©e des raccourcis." + IDS_CREATE_SHORTCUT "CrÃ©er un raccourci" + IDS_ERROR_NOT_FOUND "Le fichier %s n'a pas Ã©tÃ© trouvÃ©." END STRINGTABLE BEGIN - IDS_DOWNLOADING "Downloading..." - IDS_INSTALLING "Installing..." - IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." + IDS_DOWNLOADING "TÃ©lÃ©chargement..." + IDS_INSTALLING "Installation..." + IDS_INVALID_SHA "La somme de contrÃ´le du fichier tÃ©lÃ©chargÃ© est erronÃ©e. Abandon de l'installation du fichier corrompu." END ID_DWL_GECKO_DIALOG DIALOG 0, 0, 260, 95 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Wine Gecko Installer" +CAPTION "Installation du package Wine Gecko" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ReactOS could not find a Wine Gecko package which is needed for applications embedding HTML to work correctly. ReactOS can automatically download and install it for you.", + CONTROL "ReactOS n'a trouvÃ© aucun package Wine Gecko nÃ©cessaire pour pouvoir exÃ©cuter correctement les applications incluant du code HTML. ReactOS est capable de tÃ©lÃ©charger et d'installer automatiquement le package pour vous.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 - DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Installer", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annuler", IDCANCEL, 144, 76, 50, 14, WS_GROUP | WS_TABSTOP END Modified: trunk/reactos/dll/cpl/appwiz/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/he-IL.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/he-IL.rc [iso-8859-1] Sun Sep 1 12:41:58 2013 @@ -6,8 +6,8 @@ CAPTION "×¦××¨ ×§××©××¨" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1", -1, 115, 15, 160, 24 - LTEXT "Text2", -1, 115, 35, 160, 17 + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 END IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -15,9 +15,9 @@ CAPTION "×¦××¨ ×§××©××¨" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1",-1,10,0,225,40 - LTEXT "Text2",-1,10,40,120,20 - LTEXT "Text3",-1,10,55,120,20 + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 END IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 @@ -25,11 +25,11 @@ CAPTION "×¦××¨ ×§××¦××¨ ××¨×" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 - LTEXT "××§×× ××ª ×××§×× ××¤×¨××:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT - PUSHBUTTON "×¡×××¨...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT - LTEXT "×××¥ ××× ××× ××××©××.", -1, 120, 97, 162, 10 + LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 + LTEXT "××§×× ××ª ×××§×× ××¤×¨××:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "×¡×××¨...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT + LTEXT "×××¥ ××× ××× ××××©××.", -1, 120, 97, 162, 10 END IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 @@ -37,15 +37,15 @@ CAPTION "××××¨×ª ×©× ××ª×× ××ª" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "××§×× ×©× ×¢×××¨ ×§××¦××¨ ××¨× ××:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT - LTEXT "×××¥ ×¢× ×¡××× ××× ×××¦××¨ ××ª ×§××¦××¨ ×××¨×.", -1, 118, 97, 178, 17 + LTEXT "××§×× ×©× ×¢×××¨ ×§××¦××¨ ××¨× ××:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "×××¥ ×¢× ×¡××× ××× ×××¦××¨ ××ª ×§××¦××¨ ×××¨×.", -1, 118, 97, 178, 17 END STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "×××¡×¤×ª/××¡×¨×ª ×ª×× ×××ª" - IDS_CPLSYSTEMDESCRIPTION "×××××¨ ×ª×× ×××ª ××××¦×¨ ×§××©××¨× ××¨×." + IDS_CPLSYSTEMNAME "×××¡×¤×ª/××¡×¨×ª ×ª×× ×××ª" + IDS_CPLSYSTEMDESCRIPTION "×××××¨ ×ª×× ×××ª ××××¦×¨ ×§××©××¨× ××¨×." IDS_CREATE_SHORTCUT "×¦××¨ ×§××¦××¨ ××¨×" IDS_ERROR_NOT_FOUND "××§×××¥ %s ×× × ××¦×." END Modified: trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc [iso-8859-1] Sun Sep 1 12:41:58 2013 @@ -13,8 +13,8 @@ CAPTION "UtwÃ³rz ÅÄcze" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1", -1, 115, 15, 160, 24 - LTEXT "Text2", -1, 115, 35, 160, 17 + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 END IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -22,9 +22,9 @@ CAPTION "UtwÃ³rz ÅÄcze" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1",-1,10,0,225,40 - LTEXT "Text2",-1,10,40,120,20 - LTEXT "Text3",-1,10,55,120,20 + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 END IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 @@ -32,11 +32,11 @@ CAPTION "UtwÃ³rz skrÃ³t" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Ten program konfiguracyjny pomoÅ¼e ci stworzyÄ skrÃ³ty do lokalnych lub\nsieciowych programÃ³w, plikÃ³w, katalogÃ³w, komputerÃ³w, bÄdÅº addresÃ³w\nInternetowych.", -1, 120, 15, 200, 30 - LTEXT "Wpisz ÅcieÅ¼kÄ dostÄpu do obiektu:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT - PUSHBUTTON "PrzeglÄdaj...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT - LTEXT "NaciÅnij Dalej aby kontynuowaÄ.", -1, 120, 97, 162, 10 + LTEXT "Ten program konfiguracyjny pomoÅ¼e ci stworzyÄ skrÃ³ty do lokalnych lub\nsieciowych programÃ³w, plikÃ³w, katalogÃ³w, komputerÃ³w, bÄdÅº addresÃ³w\nInternetowych.", -1, 120, 15, 200, 30 + LTEXT "Wpisz ÅcieÅ¼kÄ dostÄpu do obiektu:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "PrzeglÄdaj...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT + LTEXT "NaciÅnij Dalej aby kontynuowaÄ.", -1, 120, 97, 162, 10 END IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 @@ -44,15 +44,15 @@ CAPTION "Wybierz nazwÄ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Wpisz nazwÄ dla tego skrÃ³tu:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT - LTEXT "NaciÅnij ZakoÅcz by utworzyÄ skrÃ³t.", -1, 118, 97, 178, 17 + LTEXT "&Wpisz nazwÄ dla tego skrÃ³tu:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "NaciÅnij ZakoÅcz by utworzyÄ skrÃ³t.", -1, 118, 97, 178, 17 END STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Dodaj/UsuÅ Programy" - IDS_CPLSYSTEMDESCRIPTION "Instaluje bÄdÅº usuwa programy oraz tworzy skrÃ³ty." + IDS_CPLSYSTEMNAME "Dodaj/UsuÅ Programy" + IDS_CPLSYSTEMDESCRIPTION "Instaluje bÄdÅº usuwa programy oraz tworzy skrÃ³ty." IDS_CREATE_SHORTCUT "UtwÃ³rz skrÃ³t" IDS_ERROR_NOT_FOUND "Plik %s nie zostaÅ znaleziony." END Modified: trunk/reactos/dll/cpl/appwiz/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/pt-BR.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/pt-BR.rc [iso-8859-1] Sun Sep 1 12:41:58 2013 @@ -7,8 +7,8 @@ CAPTION "Criar link" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1", -1, 115, 15, 160, 24 - LTEXT "Text2", -1, 115, 35, 160, 17 + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 END IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -16,9 +16,9 @@ CAPTION "Criar link" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1",-1,10,0,225,40 - LTEXT "Text2",-1,10,40,120,20 - LTEXT "Text3",-1,10,55,120,20 + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 END IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 @@ -26,11 +26,11 @@ CAPTION "Criar Atalho" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Este assitente irÃ¡ ajudÃ¡-lo a criar atalhos para\nprogramas, arquivos, pastas, computadores ou endereÃ§os\nde Internet, ambos locais ou de rede.", -1, 120, 15, 200, 30 - LTEXT "Digite a localizaÃ§Ã£o do item:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT - PUSHBUTTON "Procurar...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT - LTEXT "Pressione PrÃ³ximo para prosseguir.", -1, 120, 97, 162, 10 + LTEXT "Este assitente irÃ¡ ajudÃ¡-lo a criar atalhos para\nprogramas, arquivos, pastas, computadores ou endereÃ§os\nde Internet, ambos locais ou de rede.", -1, 120, 15, 200, 30 + LTEXT "Digite a localizaÃ§Ã£o do item:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "Procurar...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT + LTEXT "Pressione PrÃ³ximo para prosseguir.", -1, 120, 97, 162, 10 END IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 @@ -38,15 +38,15 @@ CAPTION "Selecione um TÃtulo para o Programa" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Digite um nome para este atalho:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT - LTEXT "Pressione Terminar para criar o atalho.", -1, 118, 97, 178, 17 + LTEXT "&Digite um nome para este atalho:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Pressione Terminar para criar o atalho.", -1, 118, 97, 178, 17 END STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Adicionar/Remover Programas" - IDS_CPLSYSTEMDESCRIPTION "Configura programas e cria atalhos." + IDS_CPLSYSTEMNAME "Adicionar/Remover Programas" + IDS_CPLSYSTEMDESCRIPTION "Configura programas e cria atalhos." IDS_CREATE_SHORTCUT "Criar Atalho" IDS_ERROR_NOT_FOUND "O arquivo %s nÃ£o foi encontrado." END Modified: trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ro-RO.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc [iso-8859-1] Sun Sep 1 12:41:58 2013 @@ -12,8 +12,8 @@ CAPTION "Creare legÄturÄ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1", -1, 115, 15, 160, 24 - LTEXT "Text2", -1, 115, 35, 160, 17 + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 END IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -21,9 +21,9 @@ CAPTION "Creare legÄturÄ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1",-1,10,0,225,40 - LTEXT "Text2",-1,10,40,120,20 - LTEXT "Text3",-1,10,55,120,20 + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 END IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 @@ -31,11 +31,11 @@ CAPTION "Creare scurtÄturÄ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Acest expert vÄ va asista Ã®n crearea unei scurtÄturi\ncÄtre adrese din Internet, calculatoare, dosare, fiÈiere\nlocale sau din reÈea.", -1, 120, 15, 200, 30 - LTEXT "ScrieÈi adresa elementului:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT - PUSHBUTTON "&RÄsfoireâ¦", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT - LTEXT "ApÄsaÈi âÃnainteâ pentru a continua.", -1, 120, 97, 162, 10 + LTEXT "Acest expert vÄ va asista Ã®n crearea unei scurtÄturi\ncÄtre adrese din Internet, calculatoare, dosare, fiÈiere\nlocale sau din reÈea.", -1, 120, 15, 200, 30 + LTEXT "ScrieÈi adresa elementului:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "&RÄsfoireâ¦", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT + LTEXT "ApÄsaÈi âÃnainteâ pentru a continua.", -1, 120, 97, 162, 10 END IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 @@ -43,15 +43,15 @@ CAPTION "Titlul scurtÄturii" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "ScrieÈi un &nume pentru scurtÄturÄ:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT - LTEXT "ApÄsaÈi âTerminÄâ pentru a crea scurtÄtura.", -1, 118, 97, 178, 17 + LTEXT "ScrieÈi un &nume pentru scurtÄturÄ:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "ApÄsaÈi âTerminÄâ pentru a crea scurtÄtura.", -1, 118, 97, 178, 17 END STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Gestionar de aplicaÈii" - IDS_CPLSYSTEMDESCRIPTION "InstaleazÄ programe Èi creazÄ scurtÄturi." + IDS_CPLSYSTEMNAME "Gestionar de aplicaÈii" + IDS_CPLSYSTEMDESCRIPTION "InstaleazÄ programe Èi creazÄ scurtÄturi." IDS_CREATE_SHORTCUT "Creare scurtÄturÄ" IDS_ERROR_NOT_FOUND "Elementul â%sâ nu poate fi localizat." END Modified: trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc [iso-8859-1] Sun Sep 1 12:41:58 2013 @@ -5,8 +5,8 @@ CAPTION "Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ñ ÑÑÐ»ÑÐºÐ°" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1", -1, 115, 15, 160, 24 - LTEXT "Text2", -1, 115, 35, 160, 17 + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 END IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -14,9 +14,9 @@ CAPTION "Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ ÑÑÐ»ÑÐºÐ°" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1",-1,10,0,225,40 - LTEXT "Text2",-1,10,40,120,20 - LTEXT "Text3",-1,10,55,120,20 + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 END IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 @@ -24,11 +24,11 @@ CAPTION "Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ ÑÑÐ»ÑÐºÐ°" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "ÐÑÐ¾Ñ Ð¼Ð°ÑÑÐµÑ Ð¿Ð¾Ð¼Ð¾Ð¶ÐµÑ ÑÐ¾Ð·Ð´Ð°ÑÑ ÑÑÐ»ÑÐº Ð´Ð»Ñ Ð»Ð¾ÐºÐ°Ð»ÑÐ½ÑÑ Ð¸Ð»Ð¸\nÑÐµÑÐµÐ²ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼, ÑÐ°Ð¹Ð»Ð¾Ð², Ð¿Ð°Ð¿Ð¾Ðº, ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ¾Ð² Ð¸Ð»Ð¸\nÐÐ½ÑÐµÑÐ½ÐµÑ-Ð°Ð´ÑÐµÑÐ¾Ð².", -1, 120, 15, 200, 30 - LTEXT "ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð¼ÐµÑÑÐ¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ ÑÐ»ÐµÐ¼ÐµÐ½ÑÐ°:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT - PUSHBUTTON "ÐÐ±Ð·Ð¾Ñ...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT - LTEXT "Ð©ÐµÐ»ÐºÐ½Ð¸ÑÐµ ""ÐÐ°Ð»ÐµÐµ"" Ð´Ð»Ñ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ.", -1, 120, 97, 162, 10 + LTEXT "ÐÑÐ¾Ñ Ð¼Ð°ÑÑÐµÑ Ð¿Ð¾Ð¼Ð¾Ð¶ÐµÑ ÑÐ¾Ð·Ð´Ð°ÑÑ ÑÑÐ»ÑÐº Ð´Ð»Ñ Ð»Ð¾ÐºÐ°Ð»ÑÐ½ÑÑ Ð¸Ð»Ð¸\nÑÐµÑÐµÐ²ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼, ÑÐ°Ð¹Ð»Ð¾Ð², Ð¿Ð°Ð¿Ð¾Ðº, ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ¾Ð² Ð¸Ð»Ð¸\nÐÐ½ÑÐµÑÐ½ÐµÑ-Ð°Ð´ÑÐµÑÐ¾Ð².", -1, 120, 15, 200, 30 + LTEXT "ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð¼ÐµÑÑÐ¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ ÑÐ»ÐµÐ¼ÐµÐ½ÑÐ°:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "ÐÐ±Ð·Ð¾Ñ...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT + LTEXT "Ð©ÐµÐ»ÐºÐ½Ð¸ÑÐµ ""ÐÐ°Ð»ÐµÐµ"" Ð´Ð»Ñ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ.", -1, 120, 97, 162, 10 END IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 @@ -36,15 +36,15 @@ CAPTION "ÐÑÐ±Ð¾Ñ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ° Ð´Ð»Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº ÑÑÐ»ÑÐºÐ°:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT - LTEXT "Ð©ÐµÐ»ÐºÐ½Ð¸ÑÐµ ""ÐÐ°Ð²ÐµÑÑÐ¸ÑÑ"" Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÑÑÐ»ÑÐºÐ°.", -1, 118, 97, 178, 17 + LTEXT "&ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº ÑÑÐ»ÑÐºÐ°:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Ð©ÐµÐ»ÐºÐ½Ð¸ÑÐµ ""ÐÐ°Ð²ÐµÑÑÐ¸ÑÑ"" Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÑÑÐ»ÑÐºÐ°.", -1, 118, 97, 178, 17 END STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° Ð¸ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼" - IDS_CPLSYSTEMDESCRIPTION "Ð Ð°Ð±Ð¾ÑÐ° Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð°Ð¼Ð¸, Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸ÑÐ¼Ð¸ Ð¸ ÑÑÐ»ÑÐºÐ°Ð¼Ð¸." + IDS_CPLSYSTEMNAME "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° Ð¸ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼" + IDS_CPLSYSTEMDESCRIPTION "Ð Ð°Ð±Ð¾ÑÐ° Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð°Ð¼Ð¸, Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸ÑÐ¼Ð¸ Ð¸ ÑÑÐ»ÑÐºÐ°Ð¼Ð¸." IDS_CREATE_SHORTCUT "Ð¡Ð¾Ð·Ð´Ð°ÑÑ ÑÑÐ»ÑÐº" IDS_ERROR_NOT_FOUND "Ð¤Ð°Ð¹Ð» %s Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½." END Modified: trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/uk-UA.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc [iso-8859-1] Sun Sep 1 12:41:58 2013 @@ -13,8 +13,8 @@ CAPTION "Ð¡ÑÐ²Ð¾ÑÐµÐ½Ð½Ñ ÑÑÐ»Ð¸ÐºÐ°" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1", -1, 115, 15, 160, 24 - LTEXT "Text2", -1, 115, 35, 160, 17 + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 END IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -22,9 +22,9 @@ CAPTION "Ð¡ÑÐ²Ð¾ÑÐµÐ½Ð½Ñ ÑÑÐ»Ð¸ÐºÐ°" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Text1",-1,10,0,225,40 - LTEXT "Text2",-1,10,40,120,20 - LTEXT "Text3",-1,10,55,120,20 + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 END IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 @@ -32,11 +32,11 @@ CAPTION "Ð¡ÑÐ²Ð¾ÑÐµÐ½Ð½Ñ ÑÑÐ»Ð¸ÐºÐ°" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Ð¦ÐµÐ¹ Ð¼Ð°Ð¹ÑÑÐµÑ Ð´Ð¾Ð¿Ð¾Ð¼Ð°Ð³Ð°Ñ ÑÑÐ²Ð¾ÑÐ¸ÑÐ¸ ÑÑÐ»Ð¸Ðº, ÑÐºÐ¸Ð¹ ÑÐºÐ°Ð·ÑÑ Ð½Ð°\nÐ»Ð¾ÐºÐ°Ð»ÑÐ½Ñ Ð°Ð±Ð¾ Ð¼ÐµÑÐµÐ¶Ð½Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¸, ÑÐ°Ð¹Ð»Ð¸, Ð¿Ð°Ð¿ÐºÐ¸, ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑÐ¸\nÐ°Ð±Ð¾ Ð°Ð´ÑÐµÑÐ¸ Ð² ÐÐ½ÑÐµÑÐ½ÐµÑÑ.", -1, 120, 15, 200, 30 - LTEXT "Ð£ÐºÐ°Ð¶ÑÑÑ ÑÐ¾Ð·ÑÐ°ÑÑÐ²Ð°Ð½Ð½Ñ Ð¾Ð±'ÑÐºÑÐ°:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT - PUSHBUTTON "ÐÐ³Ð»ÑÐ´...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT - LTEXT "Ð©Ð¾Ð± Ð¿ÑÐ¾Ð´Ð¾Ð²Ð¶Ð¸ÑÐ¸ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÑ, Ð½Ð°ÑÐ¸ÑÐ½ÑÑÑ ÐºÐ½Ð¾Ð¿ÐºÑ ""ÐÐ°Ð»Ñ"".", -1, 120, 97, 162, 10 + LTEXT "Ð¦ÐµÐ¹ Ð¼Ð°Ð¹ÑÑÐµÑ Ð´Ð¾Ð¿Ð¾Ð¼Ð°Ð³Ð°Ñ ÑÑÐ²Ð¾ÑÐ¸ÑÐ¸ ÑÑÐ»Ð¸Ðº, ÑÐºÐ¸Ð¹ ÑÐºÐ°Ð·ÑÑ Ð½Ð°\nÐ»Ð¾ÐºÐ°Ð»ÑÐ½Ñ Ð°Ð±Ð¾ Ð¼ÐµÑÐµÐ¶Ð½Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¸, ÑÐ°Ð¹Ð»Ð¸, Ð¿Ð°Ð¿ÐºÐ¸, ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑÐ¸\nÐ°Ð±Ð¾ Ð°Ð´ÑÐµÑÐ¸ Ð² ÐÐ½ÑÐµÑÐ½ÐµÑÑ.", -1, 120, 15, 200, 30 + LTEXT "Ð£ÐºÐ°Ð¶ÑÑÑ ÑÐ¾Ð·ÑÐ°ÑÑÐ²Ð°Ð½Ð½Ñ Ð¾Ð±'ÑÐºÑÐ°:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "ÐÐ³Ð»ÑÐ´...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT + LTEXT "Ð©Ð¾Ð± Ð¿ÑÐ¾Ð´Ð¾Ð²Ð¶Ð¸ÑÐ¸ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÑ, Ð½Ð°ÑÐ¸ÑÐ½ÑÑÑ ÐºÐ½Ð¾Ð¿ÐºÑ ""ÐÐ°Ð»Ñ"".", -1, 120, 97, 162, 10 END IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 @@ -44,15 +44,15 @@ CAPTION "ÐÐ¸Ð±ÑÑ Ð½Ð°Ð·Ð²Ð¸ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¸" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&ÐÐ²ÐµÐ´ÑÑÑ ÑÐ¼'Ñ ÑÑÐ»Ð¸ÐºÐ°:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT - LTEXT "Ð©Ð¾Ð± ÑÑÐ²Ð¾ÑÐ¸ÑÐ¸ ÑÑÐ»Ð¸Ðº, Ð½Ð°ÑÐ¸ÑÐ½ÑÑÑ ÐºÐ½Ð¾Ð¿ÐºÑ ""ÐÐ¾ÑÐ¾Ð²Ð¾"".", -1, 118, 97, 178, 17 + LTEXT "&ÐÐ²ÐµÐ´ÑÑÑ ÑÐ¼'Ñ ÑÑÐ»Ð¸ÐºÐ°:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Ð©Ð¾Ð± ÑÑÐ²Ð¾ÑÐ¸ÑÐ¸ ÑÑÐ»Ð¸Ðº, Ð½Ð°ÑÐ¸ÑÐ½ÑÑÑ ÐºÐ½Ð¾Ð¿ÐºÑ ""ÐÐ¾ÑÐ¾Ð²Ð¾"".", -1, 118, 97, 178, 17 END STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° Ð¹ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼" - IDS_CPLSYSTEMDESCRIPTION "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼ Ñ ÑÑÐ²Ð¾ÑÐµÐ½Ð½Ñ ÑÑÐ»Ð¸ÐºÑÐ²." + IDS_CPLSYSTEMNAME "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° Ð¹ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼" + IDS_CPLSYSTEMDESCRIPTION "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼ Ñ ÑÑÐ²Ð¾ÑÐµÐ½Ð½Ñ ÑÑÐ»Ð¸ÐºÑÐ²." IDS_CREATE_SHORTCUT "Ð¡ÑÐ²Ð¾ÑÐ¸ÑÐ¸ ÑÑÐ»Ð¸Ðº" IDS_ERROR_NOT_FOUND "Ð¤Ð°Ð¹Ð» %s Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¸Ð¹." END Modified: trunk/reactos/dll/cpl/appwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/rsrc.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/rsrc.rc [iso-8859-1] Sun Sep 1 12:41:58 2013 @@ -7,14 +7,8 @@ #ifdef LANGUAGE_EL_GR #include "lang/el-GR.rc" #endif -#ifdef LANGUAGE_EN_US - #include "lang/en-US.rc" -#endif #ifdef LANGUAGE_ES_ES #include "lang/es-ES.rc" -#endif -#ifdef LANGUAGE_FR_FR - #include "lang/fr-FR.rc" #endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" @@ -34,6 +28,12 @@ #ifdef LANGUAGE_CS_CZ #include "lang/cs-CZ.rc" #endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif #ifdef LANGUAGE_HE_IL #include "lang/he-IL.rc" #endif

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2013