Ros-diffs February 2014

ros-diffs@reactos.org

17 participants
464 discussions

[tkreuzer] 62051: [NTOSKRNL] Implement MiLockVirtualMemory / MiUnlockVirtualMemory. Due to missing WS list support, hack the WS list entries into the PFN, until we support WS lists.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Feb 8 17:45:19 2014 New Revision: 62051 URL: http://svn.reactos.org/svn/reactos?rev=62051&view=rev Log: [NTOSKRNL] Implement MiLockVirtualMemory / MiUnlockVirtualMemory. Due to missing WS list support, hack the WS list entries into the PFN, until we support WS lists. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Sat Feb 8 17:45:19 2014 @@ -391,6 +391,9 @@ MI_PFN_USAGES PfnUsage; CHAR ProcessName[16]; #endif + + // HACK until WS lists are supported + MMWSLE Wsle; } MMPFN, *PMMPFN; extern PMMPFN MmPfnDatabase; Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sat Feb 8 17:45:19 2014 @@ -2859,6 +2859,258 @@ return Status; } +FORCEINLINE +BOOLEAN +MI_IS_LOCKED_VA( + PMMPFN Pfn1, + ULONG LockType) +{ + // HACK until we have proper WSLIST support + PMMWSLE Wsle = &Pfn1->Wsle; + + if ((LockType & MAP_PROCESS) && (Wsle->u1.e1.LockedInWs)) + return TRUE; + if ((LockType & MAP_SYSTEM) && (Wsle->u1.e1.LockedInMemory)) + return TRUE; + + return FALSE; +} + +FORCEINLINE +VOID +MI_LOCK_VA( + PMMPFN Pfn1, + ULONG LockType) +{ + // HACK until we have proper WSLIST support + PMMWSLE Wsle = &Pfn1->Wsle; + + if (!Wsle->u1.e1.LockedInWs && + !Wsle->u1.e1.LockedInMemory) + { + MiReferenceProbedPageAndBumpLockCount(Pfn1); + } + + if (LockType & MAP_PROCESS) + Wsle->u1.e1.LockedInWs = 1; + if (LockType & MAP_SYSTEM) + Wsle->u1.e1.LockedInMemory = 1; +} + +FORCEINLINE +VOID +MI_UNLOCK_VA( + PMMPFN Pfn1, + ULONG LockType) +{ + // HACK until we have proper WSLIST support + PMMWSLE Wsle = &Pfn1->Wsle; + + if (LockType & MAP_PROCESS) + Wsle->u1.e1.LockedInWs = 0; + if (LockType & MAP_SYSTEM) + Wsle->u1.e1.LockedInMemory = 0; + + if (!Wsle->u1.e1.LockedInWs && + !Wsle->u1.e1.LockedInMemory) + { + MiDereferencePfnAndDropLockCount(Pfn1); + } +} + +static +NTSTATUS +MiCheckVadsForLockOperation( + _Inout_ PVOID *BaseAddress, + _Inout_ PSIZE_T RegionSize, + _Inout_ PVOID *EndAddress) + +{ + PMMVAD Vad; + PVOID CurrentVa; + + /* Get the base address and align the start address */ + *EndAddress = (PUCHAR)*BaseAddress + *RegionSize; + *EndAddress = ALIGN_UP_POINTER_BY(*EndAddress, PAGE_SIZE); + *BaseAddress = ALIGN_DOWN_POINTER_BY(*BaseAddress, PAGE_SIZE); + + /* First loop and check all VADs */ + CurrentVa = *BaseAddress; + while (CurrentVa < *EndAddress) + { + /* Get VAD */ + Vad = MiLocateAddress(CurrentVa); + if (Vad == NULL) + { + /// FIXME: this might be a memory area for a section view... + return STATUS_ACCESS_VIOLATION; + } + + /* Check VAD type */ + if ((Vad->u.VadFlags.VadType != VadNone) && + (Vad->u.VadFlags.VadType != VadImageMap) && + (Vad->u.VadFlags.VadType != VadWriteWatch)) + { + *EndAddress = CurrentVa; + *RegionSize = (PUCHAR)*EndAddress - (PUCHAR)*BaseAddress; + return STATUS_INCOMPATIBLE_FILE_MAP; + } + + CurrentVa = (PVOID)((Vad->EndingVpn + 1) << PAGE_SHIFT); + } + + *RegionSize = (PUCHAR)*EndAddress - (PUCHAR)*BaseAddress; + return STATUS_SUCCESS; +} + +static +NTSTATUS +MiLockVirtualMemory( + IN OUT PVOID *BaseAddress, + IN OUT PSIZE_T RegionSize, + IN ULONG MapType) +{ + PEPROCESS CurrentProcess; + PMMSUPPORT AddressSpace; + PVOID CurrentVa, EndAddress; + PMMPTE PointerPte, LastPte; + PMMPDE PointerPde; +#if (_MI_PAGING_LEVELS >= 3) + PMMPDE PointerPpe; +#endif +#if (_MI_PAGING_LEVELS == 4) + PMMPDE PointerPxe; +#endif + PMMPFN Pfn1; + NTSTATUS Status, TempStatus; + + /* Lock the address space */ + AddressSpace = MmGetCurrentAddressSpace(); + MmLockAddressSpace(AddressSpace); + + /* Make sure we still have an address space */ + CurrentProcess = PsGetCurrentProcess(); + if (CurrentProcess->VmDeleted) + { + Status = STATUS_PROCESS_IS_TERMINATING; + goto Cleanup; + } + + /* Check the VADs in the requested range */ + Status = MiCheckVadsForLockOperation(BaseAddress, RegionSize, &EndAddress); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + /* Enter SEH for probing */ + _SEH2_TRY + { + /* Loop all pages and probe them */ + CurrentVa = *BaseAddress; + while (CurrentVa < EndAddress) + { + (void)(*(volatile CHAR*)CurrentVa); + CurrentVa = (PUCHAR)CurrentVa + PAGE_SIZE; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + goto Cleanup; + } + _SEH2_END; + + /* All pages were accessible, since we hold the address space lock, nothing + can be de-committed. Assume success for now. */ + Status = STATUS_SUCCESS; + + /* Get the PTE and PDE */ + PointerPte = MiAddressToPte(*BaseAddress); + PointerPde = MiAddressToPde(*BaseAddress); +#if (_MI_PAGING_LEVELS >= 3) + PointerPpe = MiAddressToPpe(*BaseAddress); +#endif +#if (_MI_PAGING_LEVELS == 4) + PointerPxe = MiAddressToPxe(*BaseAddress); +#endif + + /* Get the last PTE */ + LastPte = MiAddressToPte((PVOID)((ULONG_PTR)EndAddress - 1)); + + /* Lock the process working set */ + MiLockProcessWorkingSet(CurrentProcess, PsGetCurrentThread()); + + /* Loop the pages */ + do + { + /* Check for a page that is not accessible */ + while ( +#if (_MI_PAGING_LEVELS == 4) + (PointerPxe->u.Hard.Valid == 0) || +#endif +#if (_MI_PAGING_LEVELS >= 3) + (PointerPpe->u.Hard.Valid == 0) || +#endif + (PointerPde->u.Hard.Valid == 0) || + (PointerPte->u.Hard.Valid == 0)) + { + /* Release process working set */ + MiUnlockProcessWorkingSet(CurrentProcess, PsGetCurrentThread()); + + /* Access the page */ + CurrentVa = MiPteToAddress(PointerPte); + + //HACK: Pass a placeholder TrapInformation so the fault handler knows we're unlocked + TempStatus = MmAccessFault(TRUE, CurrentVa, KernelMode, (PVOID)0xBADBADA3); + if (!NT_SUCCESS(TempStatus)) + { + // This should only happen, when remote backing storage is not accessible + ASSERT(FALSE); + Status = TempStatus; + goto Cleanup; + } + + /* Lock the process working set */ + MiLockProcessWorkingSet(CurrentProcess, PsGetCurrentThread()); + } + + /* Get the PFN */ + Pfn1 = MiGetPfnEntry(PFN_FROM_PTE(PointerPte)); + ASSERT(Pfn1 != NULL); + + /* Check the previous lock status */ + if (MI_IS_LOCKED_VA(Pfn1, MapType)) + { + Status = STATUS_WAS_LOCKED; + } + + /* Lock it */ + MI_LOCK_VA(Pfn1, MapType); + + /* Go to the next PTE */ + PointerPte++; + + /* Check if we're on a PDE boundary */ + if (MiIsPteOnPdeBoundary(PointerPte)) PointerPde++; +#if (_MI_PAGING_LEVELS >= 3) + if (MiIsPteOnPpeBoundary(PointerPte)) PointerPpe++; +#endif +#if (_MI_PAGING_LEVELS == 4) + if (MiIsPteOnPxeBoundary(PointerPte)) PointerPxe++; +#endif + } while (PointerPte <= LastPte); + + /* Release process working set */ + MiUnlockProcessWorkingSet(CurrentProcess, PsGetCurrentThread()); + +Cleanup: + /* Unlock address space */ + MmUnlockAddressSpace(AddressSpace); + + return Status; +} + NTSTATUS NTAPI NtLockVirtualMemory(IN HANDLE ProcessHandle, @@ -2987,9 +3239,11 @@ } // - // Oops :( - // - UNIMPLEMENTED; + // Call the internal function + // + Status = MiLockVirtualMemory(&CapturedBaseAddress, + &CapturedBytesToLock, + MapType); // // Detach if needed @@ -3010,7 +3264,7 @@ // Return data to user // *BaseAddress = CapturedBaseAddress; - *NumberOfBytesToLock = 0; + *NumberOfBytesToLock = CapturedBytesToLock; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -3024,8 +3278,174 @@ // // Return status // - return STATUS_SUCCESS; + return Status; } + + +static +NTSTATUS +MiUnlockVirtualMemory( + IN OUT PVOID *BaseAddress, + IN OUT PSIZE_T RegionSize, + IN ULONG MapType) +{ + PEPROCESS CurrentProcess; + PMMSUPPORT AddressSpace; + PVOID EndAddress; + PMMPTE PointerPte, LastPte; + PMMPDE PointerPde; +#if (_MI_PAGING_LEVELS >= 3) + PMMPDE PointerPpe; +#endif +#if (_MI_PAGING_LEVELS == 4) + PMMPDE PointerPxe; +#endif + PMMPFN Pfn1; + NTSTATUS Status; + + /* Lock the address space */ + AddressSpace = MmGetCurrentAddressSpace(); + MmLockAddressSpace(AddressSpace); + + /* Make sure we still have an address space */ + CurrentProcess = PsGetCurrentProcess(); + if (CurrentProcess->VmDeleted) + { + Status = STATUS_PROCESS_IS_TERMINATING; + goto Cleanup; + } + + /* Check the VADs in the requested range */ + Status = MiCheckVadsForLockOperation(BaseAddress, RegionSize, &EndAddress); + + /* Note: only bail out, if we hit an area without a VAD. If we hit an + incompatible VAD we continue, like Windows does */ + if (Status == STATUS_ACCESS_VIOLATION) + { + Status = STATUS_NOT_LOCKED; + goto Cleanup; + } + + /* Get the PTE and PDE */ + PointerPte = MiAddressToPte(*BaseAddress); + PointerPde = MiAddressToPde(*BaseAddress); +#if (_MI_PAGING_LEVELS >= 3) + PointerPpe = MiAddressToPpe(*BaseAddress); +#endif +#if (_MI_PAGING_LEVELS == 4) + PointerPxe = MiAddressToPxe(*BaseAddress); +#endif + + /* Get the last PTE */ + LastPte = MiAddressToPte((PVOID)((ULONG_PTR)EndAddress - 1)); + + /* Lock the process working set */ + MiLockProcessWorkingSet(CurrentProcess, PsGetCurrentThread()); + + /* Loop the pages */ + do + { + /* Check for a page that is not present */ + if ( +#if (_MI_PAGING_LEVELS == 4) + (PointerPxe->u.Hard.Valid == 0) || +#endif +#if (_MI_PAGING_LEVELS >= 3) + (PointerPpe->u.Hard.Valid == 0) || +#endif + (PointerPde->u.Hard.Valid == 0) || + (PointerPte->u.Hard.Valid == 0)) + { + /* Remember it, but keep going */ + Status = STATUS_NOT_LOCKED; + } + else + { + /* Get the PFN */ + Pfn1 = MiGetPfnEntry(PFN_FROM_PTE(PointerPte)); + ASSERT(Pfn1 != NULL); + + /* Check if all of the requested locks are present */ + if (((MapType & MAP_SYSTEM) && !MI_IS_LOCKED_VA(Pfn1, MAP_SYSTEM)) || + ((MapType & MAP_PROCESS) && !MI_IS_LOCKED_VA(Pfn1, MAP_PROCESS))) + { + /* Remember it, but keep going */ + Status = STATUS_NOT_LOCKED; + + /* Check if no lock is present */ + if (!MI_IS_LOCKED_VA(Pfn1, MAP_PROCESS | MAP_SYSTEM)) + { + DPRINT1("FIXME: Should remove the page from WS\n"); + } + } + } + + /* Go to the next PTE */ + PointerPte++; + + /* Check if we're on a PDE boundary */ + if (MiIsPteOnPdeBoundary(PointerPte)) PointerPde++; +#if (_MI_PAGING_LEVELS >= 3) + if (MiIsPteOnPpeBoundary(PointerPte)) PointerPpe++; +#endif +#if (_MI_PAGING_LEVELS == 4) + if (MiIsPteOnPxeBoundary(PointerPte)) PointerPxe++; +#endif + } while (PointerPte <= LastPte); + + /* Check if we hit a page that was not locked */ + if (Status == STATUS_NOT_LOCKED) + { + goto CleanupWithWsLock; + } + + /* All pages in the region were locked, so unlock them all */ + + /* Get the PTE and PDE */ + PointerPte = MiAddressToPte(*BaseAddress); + PointerPde = MiAddressToPde(*BaseAddress); +#if (_MI_PAGING_LEVELS >= 3) + PointerPpe = MiAddressToPpe(*BaseAddress); +#endif +#if (_MI_PAGING_LEVELS == 4) + PointerPxe = MiAddressToPxe(*BaseAddress); +#endif + + /* Loop the pages */ + do + { + /* Unlock it */ + Pfn1 = MiGetPfnEntry(PFN_FROM_PTE(PointerPte)); + MI_UNLOCK_VA(Pfn1, MapType); + + /* Go to the next PTE */ + PointerPte++; + + /* Check if we're on a PDE boundary */ + if (MiIsPteOnPdeBoundary(PointerPte)) PointerPde++; +#if (_MI_PAGING_LEVELS >= 3) + if (MiIsPteOnPpeBoundary(PointerPte)) PointerPpe++; +#endif +#if (_MI_PAGING_LEVELS == 4) + if (MiIsPteOnPxeBoundary(PointerPte)) PointerPxe++; +#endif + } while (PointerPte <= LastPte); + + /* Everything is done */ + Status = STATUS_SUCCESS; + +CleanupWithWsLock: + + /* Release process working set */ + MiUnlockProcessWorkingSet(CurrentProcess, PsGetCurrentThread()); + +Cleanup: + /* Unlock address space */ + MmUnlockAddressSpace(AddressSpace); + + return Status; +} + NTSTATUS NTAPI @@ -3155,9 +3575,11 @@ } // - // Oops :( - // - UNIMPLEMENTED; + // Call the internal function + // + Status = MiUnlockVirtualMemory(&CapturedBaseAddress, + &CapturedBytesToUnlock, + MapType); // // Detach if needed @@ -3177,8 +3599,8 @@ // // Return data to user // - *BaseAddress = PAGE_ALIGN(CapturedBaseAddress); - *NumberOfBytesToUnlock = 0; + *BaseAddress = CapturedBaseAddress; + *NumberOfBytesToUnlock = CapturedBytesToUnlock; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -4414,7 +4836,7 @@ PMEMORY_AREA MemoryArea; SIZE_T PRegionSize; PVOID PBaseAddress; - ULONG_PTR CommitReduction = 0; + LONG_PTR CommitReduction = 0; ULONG_PTR StartingAddress, EndingAddress; PMMVAD Vad; NTSTATUS Status;

10 years, 7 months

[akhaldi] 62050: [SNDREC32] * Don't compile these two source files just yet, they're empty.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Feb 8 17:44:38 2014 New Revision: 62050 URL: http://svn.reactos.org/svn/reactos?rev=62050&view=rev Log: [SNDREC32] * Don't compile these two source files just yet, they're empty. Modified: trunk/reactos/base/applications/sndrec32/CMakeLists.txt Modified: trunk/reactos/base/applications/sndrec32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/CMakeLists.txt [iso-8859-1] Sat Feb 8 17:44:38 2014 @@ -4,8 +4,8 @@ add_executable(sndrec32 audio_format.cpp audio_membuffer.cpp - audio_producer.cpp - audio_receiver.cpp + #audio_producer.cpp + #audio_receiver.cpp audio_resampler_acm.cpp audio_wavein.cpp audio_waveout.cpp

10 years, 7 months

[akhaldi] 62049: [NETID] * Properly name the resource file. Fixes *nix build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Feb 8 17:40:22 2014 New Revision: 62049 URL: http://svn.reactos.org/svn/reactos?rev=62049&view=rev Log: [NETID] * Properly name the resource file. Fixes *nix build. Added: trunk/reactos/dll/win32/netid/lang/sq-AL.rc - copied unchanged from r62043, trunk/reactos/dll/win32/netid/lang/sq-Al.rc Removed: trunk/reactos/dll/win32/netid/lang/sq-Al.rc Removed: trunk/reactos/dll/win32/netid/lang/sq-Al.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/sq-Al… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/sq-Al.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/sq-Al.rc (removed) @@ -1,84 +0,0 @@ -/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) - * DATE OF TRANSLATION: 23-01-2014 -*/ - -LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL - -IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, 256, 218 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Emri Kompjuterit" -FONT 8, "MS Shell Dlg" -BEGIN - ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON - LTEXT "ReactOS pÃ«rdor informacionin e mÃ«poshtÃ«m pÃ«r tÃ« identifikuar kompjuterin tuaj nÃ« rrjet.", IDC_STATIC, 40, 5, 204, 20 - LTEXT "PÃ«rshkrimi Kompjuterit:", IDC_STATIC, 6, 40, 90, 9 - EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Emri plotÃ« kompjuterit:", IDC_STATIC, 6, 68, 85, 9 - EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "GrupPune:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 - EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "PÃ«r tÃ« pÃ«rdorur Magjistarin Rrjetit Identifikues pÃ«r t'u futur nÃ« njÃ« domain dhe pÃ«r tÃ« krijuar njÃ« pÃ«rdorues lokal, klikoni ""ID Rrjetit"".", IDC_STATIC, 6, 113, 172, 24 - PUSHBUTTON "&ID Rrjetit...", IDC_NETWORK_ID, 190, 114, 58, 15 - LTEXT "PÃ«r tÃ« riemÃ«rtuar kÃ«tÃ« kompjuter apo tÃ« bashkohet me njÃ« domain, klikoni ""Ndrysho"".", IDC_STATIC, 6, 149, 170, 17 - PUSHBUTTON "&Ndrysho...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15 - LTEXT "ShÃ«nim: VetÃ«m AdministratorÃ«t mund tÃ« ndryshojnÃ« identifikimin e kÃ«tij kompjuteri.", IDC_STATIC, 6, 179, 300, 9 -END - -IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Emri Kompjuterit Ndryshon" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "(mesazhi shkon kÃ«tu)", 1017, 7, 5, 218, 30 - LTEXT "&Emri kompjuterit:", -1, 7, 41, 219, 8 - EDITTEXT 1002, 7, 53, 218, 14, ES_AUTOHSCROLL | ES_OEMCONVERT - LTEXT "Emri plotÃ« kompjuterit:", 1016, 7, 72, 218, 10 - EDITTEXT 1001, 7, 82, 219, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - PUSHBUTTON "&M'shumÃ«...", 1003, 150, 102, 75, 14 - GROUPBOX "AnÃ«tarÃ« i", 1018, 7, 119, 219, 73 - AUTORADIOBUTTON "&Domain:", 1008, 17, 132, 192, 10, WS_GROUP - AUTORADIOBUTTON "&GrupPune:", 1004, 17, 161, 191, 10 - EDITTEXT 116, 28, 144, 181, 14, ES_AUTOHSCROLL | WS_GROUP - PUSHBUTTON "&Gjej domain tim", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED - EDITTEXT 1007, 28, 172, 181, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_OEMCONVERT - DEFPUSHBUTTON "OK", 1, 121, 203, 50, 14, WS_GROUP - PUSHBUTTON "Anulo", 2, 176, 203, 50, 14 -END - -IDD_PROPPAGEDNSANDNETBIOS DIALOGEX 0, 0, 266, 125 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION -CAPTION "DNS prapashtesÃ« dhe NetBIOS emri kompjuterit" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Prapashtesa priamre e DNS'sÃ« tÃ« kÃ«tij kompjuterit:", -1, 7, 5, 253, 8 - EDITTEXT 1011, 7, 17, 252, 14, ES_AUTOHSCROLL - AUTOCHECKBOX "&Ndrysho prapashtesÃ«m primare DNS'sÃ« kur antarÃ«simi i domain-it ndryshon", 115, 11, 39, 250, 10 - LTEXT "&NetBIOS emri kompjuterit:", -1, 7, 57, 148, 8 - EDITTEXT 1013, 7, 69, 150, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_READONLY - DEFPUSHBUTTON "OK", 1, 153, 104, 50, 14 - PUSHBUTTON "Anulo", 2, 209, 104, 50, 14 - LTEXT "Ky emÃ«r Ã«shtÃ« pÃ«rdorur pÃ«r ndÃ«rveprim me kompjutera tÃ« vjetÃ«r dhe shÃ«rbimet.", 13, 7, 88, 253, 8 -END - -STRINGTABLE -BEGIN - 1 "* panjohur *" - 2 "GRUPPUNE" - 3 "Gabimi nÃ« vijim ndodhi duke u pÃ«rpjekur pÃ«r tÃ« lexuar informacionin e anÃ«tarÃ«simit tÃ« domain-it:" - 4 "Emri Kompjuterit Ndryshon" - 5 "GrupPune:" - 6 "Domain:" - 22 "MirÃ«sivine tek %1 grupipunÃ«s." - 23 "MirÃ«sivine tek %1 domain." - 24 "Ju duhet tÃ« rinisni kÃ«tÃ« kompjuter qÃ« ndryshimet tÃ« hyjnÃ« nÃ« fuqi." - 25 "Ju mund tÃ« ndryshoni emrin dhe anÃ«tarÃ«simin e kÃ«tij kompjuteri. Ndryshimet mund tÃ« ndikojnÃ« nÃ« hyrjet e burimeve nÃ« rrjet." - 1021 "Shenime: VetÃ«m AdministratorÃ«t mund tÃ« ndryshojnÃ« identifikimin e kÃ«tij kompjuteri." - 1022 "Shenim: Identifikimi i kompjuterit nuk mund tÃ« ndryshohet sepse:" - 1030 "Emri i ri kompjuterik ""%s"" pÃ«rmban karaktere tÃ« cilat nuk janÃ« tÃ« lejuara. KarakterÃ«t tÃ« cilat nuk janÃ« tÃ« lejuar pÃ«rfshijnÃ« ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" - /* Windows allows using these characters, although it displays a warning message. - Forbidding the use of these characters means incompatibility with Windows. */ - 3210 "&Detaje >>" - 3220 "<< &Detaje" - 4000 "Informacion" - 4001 "Nuk mund tÃ« vihet njÃ« emÃ«r i ri kompjuterik!" -END

10 years, 7 months

[akhaldi] 62048: [CONSOLE] * Properly name the resource file. Fixes *nix build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Feb 8 17:34:10 2014 New Revision: 62048 URL: http://svn.reactos.org/svn/reactos?rev=62048&view=rev Log: [CONSOLE] * Properly name the resource file. Fixes *nix build. Added: trunk/reactos/dll/cpl/console/lang/sq-AL.rc - copied unchanged from r62043, trunk/reactos/dll/cpl/console/lang/sq-Al.rc Removed: trunk/reactos/dll/cpl/console/lang/sq-Al.rc Removed: trunk/reactos/dll/cpl/console/lang/sq-Al.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/sq-Al… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/sq-Al.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/sq-Al.rc (removed) @@ -1,158 +0,0 @@ -/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) - * DATE OF TR: 04-01-2014 -*/ - -LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL - -IDD_PROPPAGEOPTIONS DIALOGEX 0, 0, 253, 220 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "Opsione" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Masa Kursorit", -1, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "Vogel", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 20, 90, 10 - CONTROL "&Mesem", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 40, 90, 10 - CONTROL "Madhe", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 60, 90, 10 - GROUPBOX "Shfaq Opsione", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "Dritare", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 - CONTROL "Monitor Plote", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 - GROUPBOX "Historiku Komandave", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "&Buffer Masa:", -1, 14, 101, 70, 12 - EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | - UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15 - LTEXT "&Numri i Buffers:", -1, 14, 124, 70, 12 - EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | - UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 120, 12, 15 - CHECKBOX "Hiq Duplikimet e Vjetra", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15 - GROUPBOX "Modifiko Opsione", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP - CHECKBOX "MÃ«nyra e shpejt Modifikimi", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP - CHECKBOX "MÃ«nyr Futje", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END - -IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "Font" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Dritare Preview:", -1, 10, 10, 94, 10 - LTEXT "MasÃ«:", -1, 180, 10, 36, 10 - CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Statik", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 - LISTBOX IDC_LBOX_FONTS, 181, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL - LTEXT "&Font:", -1, 10, 105, 33, 10 - CHECKBOX "&Bold fonts", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 - LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 40, LBS_DISABLENOSCROLL | WS_VSCROLL - GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50 - CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Statik", SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35 - LTEXT "Ãdo krarakter Ã«shtÃ«:", -1, 124, 166, 75, 10 - LTEXT "pixeli ekranit i gjerÃ«\npixel ekranit i gjatÃ«", -1, 136, 180, 101, 20 - LTEXT "", IDC_FONT_SIZE_X, 120, 180, 10, 10 - LTEXT "", IDC_FONT_SIZE_Y, 120, 188, 10, 10 -END - -IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "Pamja" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Dritare Preview:", -1, 8, 6, 95, 10 - CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Statik", SS_SUNKEN | SS_OWNERDRAW, 8, 16, 115, 70 - GROUPBOX "Masa e Ekranit Buffer", -1, 130, 12, 115, 50 - LTEXT "GjerÃ«:", -1, 140, 28, 40, 10 - LTEXT "GjatÃ«:", -1, 140, 46, 39, 10 - EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | - UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 25, 13, 14 - EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | - UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 42, 13, 14 - GROUPBOX "Masa Dritares", -1, 130, 65, 115, 47 - LTEXT "&GjerÃ«:", -1, 140, 78, 39, 10 - LTEXT "&GjatÃ«:", -1, 140, 95, 37, 10 - EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | - UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 75, 13, 14 - EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | - UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 92, 13, 14 - GROUPBOX "Pozicioni Dritares", -1, 130, 116, 115, 64 - LTEXT "&Majtas:", -1, 140, 132, 38, 10 - LTEXT "&Lart:", -1, 140, 149, 40, 10 - EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS | - UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 128, 13, 14 - EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS | - UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 146, 13, 14 - CHECKBOX "Lejo sistemin e &pozicionimit dritares", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10 -END - -IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "Ngjyra" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "Monitori &Teksti", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | - WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 90, 10 - CONTROL "Monitori &Sfond", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | - WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 24, 90, 10 - CONTROL "&Popup Texkst", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | - WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 36, 90, 10 - CONTROL "Pop&up Sfondi", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | - WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 90, 10 - GROUPBOX "PÃ«rzgjidh ngjyrat e komponenteve", -1, 105, 6, 140, 60 - LTEXT "&Kuq:", -1, 135, 18, 30, 10 - EDITTEXT IDC_EDIT_COLOR_RED, 175, 16, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | - UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 16, 10, 14 - LTEXT "&Jeshil:", -1, 135, 34, 30, 10 - EDITTEXT IDC_EDIT_COLOR_GREEN, 175, 32, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | - UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 32, 10, 14 - LTEXT "&Blu:", -1, 135, 50, 30, 10 - EDITTEXT IDC_EDIT_COLOR_BLUE, 175, 48, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | - UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 48, 10, 14 - CONTROL "", IDC_STATIC_COLOR1, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 23, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR2, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 36, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR3, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 49, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR4, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 62, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR5, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 75, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR6, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 88, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR7, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 101, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR8, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 114, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR9, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 127, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR10, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 140, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR11, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 153, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR12, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 166, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR13, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 179, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR14, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 192, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR15, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 205, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR16, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 218, 80, 12, 12 - GROUPBOX "Preview (monitor)", -1, 8, 100, 237, 55 - CONTROL "", IDC_STATIC_SCREEN_COLOR, "Statik", SS_OWNERDRAW | SS_SUNKEN, 13, 110, 227, 40 - GROUPBOX "Preview (Popup)", -1, 8, 160, 237, 55 - CONTROL "", IDC_STATIC_POPUP_COLOR, "Statik", SS_OWNERDRAW | SS_SUNKEN, 13, 170, 227, 40 -END - -IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79 -STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "Apliko Konfigurimet" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "&Apliko Konfigurimet vetem tek dritarja aktuale", IDC_RADIO_APPLY_CURRENT, - "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 12, 207, 10 - CONTROL "&Ruaj Konfigurimet per dritaret e te ardhmes me te njejtin emer", IDC_RADIO_APPLY_ALL, - "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 31, 207, 10 - PUSHBUTTON "OK", IDOK, 58, 58, 50, 14, WS_VISIBLE - PUSHBUTTON "Anulo", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE -END - -STRINGTABLE -BEGIN - IDS_CPLNAME "Console" - IDS_CPLDESCRIPTION "Konfigurim i parametrave te konsole." - IDS_APPLY_SHORTCUT_ALL "Modifiko &shkurtimi qe filloj kete dritare" - IDS_RASTERFONTS "Raster Fonts" -END

10 years, 7 months

[akhaldi] 62047: [WINHLP32] * We don't need to allow warnings in GCC builds anymore.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Feb 8 17:26:49 2014 New Revision: 62047 URL: http://svn.reactos.org/svn/reactos?rev=62047&view=rev Log: [WINHLP32] * We don't need to allow warnings in GCC builds anymore. Modified: trunk/reactos/base/applications/winhlp32/CMakeLists.txt Modified: trunk/reactos/base/applications/winhlp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] Sat Feb 8 17:26:49 2014 @@ -20,9 +20,3 @@ target_link_libraries(winhlp32 wine) add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32 ntdll) add_cd_file(TARGET winhlp32 DESTINATION reactos FOR all) - -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(winhlp32) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") -endif()

10 years, 7 months

[akhaldi] 62046: [RAPPS] * We don't need to set these includes here.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Feb 8 17:18:23 2014 New Revision: 62046 URL: http://svn.reactos.org/svn/reactos?rev=62046&view=rev Log: [RAPPS] * We don't need to set these includes here. Modified: trunk/reactos/base/applications/rapps/CMakeLists.txt Modified: trunk/reactos/base/applications/rapps/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/CM… ============================================================================== --- trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] Sat Feb 8 17:18:23 2014 @@ -17,10 +17,6 @@ winmain.c rapps.rc) -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${REACTOS_BINARY_DIR}/include/reactos) - add_executable(rapps ${SOURCE}) add_pch(rapps rapps.h) set_module_type(rapps win32gui UNICODE)

10 years, 7 months

[tkreuzer] 62045: [NTOSKRNL] Fix LDR entry reference count. CORE-7862 #resolve

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Feb 8 16:28:14 2014 New Revision: 62045 URL: http://svn.reactos.org/svn/reactos?rev=62045&view=rev Log: [NTOSKRNL] Fix LDR entry reference count. CORE-7862 #resolve Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Sat Feb 8 16:28:14 2014 @@ -1896,8 +1896,8 @@ } else { - /* No referencing needed */ - LdrEntry->LoadCount = 0; + /* Add a reference for all other modules as well */ + LdrEntry->LoadCount = 1; } /* Remember this came from the loader */

10 years, 7 months

[akhaldi] 62044: [INETCOMM] * Add header guards to the main header. * Improve header inclusions. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Feb 8 16:22:49 2014 New Revision: 62044 URL: http://svn.reactos.org/svn/reactos?rev=62044&view=rev Log: [INETCOMM] * Add header guards to the main header. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/dll/win32/inetcomm/inetcomm_private.h Modified: trunk/reactos/dll/win32/inetcomm/inetcomm_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/inetcom… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/inetcomm_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/inetcomm_private.h [iso-8859-1] Sat Feb 8 16:22:49 2014 @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> +#ifndef _INETCOMM_PRIVATE_H_ +#define _INETCOMM_PRIVATE_H_ + #include <stdio.h> #define WIN32_NO_STATUS @@ -99,3 +101,5 @@ HRESULT SMTPTransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT IMAPTransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT POP3TransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; + +#endif /* _INETCOMM_PRIVATE_H_ */

10 years, 7 months

[ekohl] 62043: [MSGINA] - Update IDD_NOTICE_DLG and IDD_LOGGEDOUT_DLG to better match XP/2003. Patch by Lee Schroeder. Thanks a lot! - Fix dialogs that were not updated by Lee's patch. CORE-7604 #r...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Feb 8 15:59:54 2014 New Revision: 62043 URL: http://svn.reactos.org/svn/reactos?rev=62043&view=rev Log: [MSGINA] - Update IDD_NOTICE_DLG and IDD_LOGGEDOUT_DLG to better match XP/2003. Patch by Lee Schroeder. Thanks a lot! - Fix dialogs that were not updated by Lee's patch. CORE-7604 #resolve Modified: trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/lang/bg-BG.rc trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc trunk/reactos/dll/win32/msgina/lang/de-DE.rc trunk/reactos/dll/win32/msgina/lang/en-US.rc trunk/reactos/dll/win32/msgina/lang/es-ES.rc trunk/reactos/dll/win32/msgina/lang/fr-FR.rc trunk/reactos/dll/win32/msgina/lang/he-IL.rc trunk/reactos/dll/win32/msgina/lang/id-ID.rc trunk/reactos/dll/win32/msgina/lang/it-IT.rc trunk/reactos/dll/win32/msgina/lang/ja-JP.rc trunk/reactos/dll/win32/msgina/lang/no-NO.rc trunk/reactos/dll/win32/msgina/lang/pl-PL.rc trunk/reactos/dll/win32/msgina/lang/ro-RO.rc trunk/reactos/dll/win32/msgina/lang/ru-RU.rc trunk/reactos/dll/win32/msgina/lang/sk-SK.rc trunk/reactos/dll/win32/msgina/lang/sq-AL.rc trunk/reactos/dll/win32/msgina/lang/tr-TR.rc trunk/reactos/dll/win32/msgina/lang/uk-UA.rc trunk/reactos/dll/win32/msgina/msgina.spec trunk/reactos/dll/win32/msgina/resource.h trunk/reactos/dll/win32/msgina/stubs.c Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Sat Feb 8 15:59:54 2014 @@ -175,11 +175,34 @@ IN WPARAM wParam, IN LPARAM lParam) { - UNREFERENCED_PARAMETER(hwndDlg); - UNREFERENCED_PARAMETER(uMsg); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(lParam); - + PGINA_CONTEXT pgContext; + + pgContext = (PGINA_CONTEXT)GetWindowLongPtr(hwndDlg, GWL_USERDATA); + + switch (uMsg) + { + case WM_INITDIALOG: + { + pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + } + case WM_PAINT: + { + PAINTSTRUCT ps; + HDC hdc; + if (pgContext->hBitmap) + { + hdc = BeginPaint(hwndDlg, &ps); + DrawStateW(hdc, NULL, NULL, (LPARAM)pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP); + EndPaint(hwndDlg, &ps); + } + return TRUE; + } + case WM_DESTROY: + { + DeleteObject(pgContext->hBitmap); + return TRUE; + } + } return FALSE; } Modified: trunk/reactos/dll/win32/msgina/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/bg-B… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] Sat Feb 8 15:59:54 2014 @@ -9,13 +9,14 @@ LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 +IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Ð ÐµÐ°ÐºÑÐÐ¡ Ð²Ð¸ Ð¿ÑÐ¸Ð²ÐµÑÑÑÐ²Ð°" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 5, 32, 32 - LTEXT "ÐÐ°ÑÐ¸ÑÐ½ÐµÑÐµ ÐµÐ´Ð½Ð¾Ð²ÑÐµÐ¼ÐµÐ½Ð½Ð¾ Ctrl-Alt-Del", IDC_STATIC, 38, 10, 144, 14 + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + LTEXT "ÐÐ°ÑÐ¸ÑÐ½ÐµÑÐµ ÐµÐ´Ð½Ð¾Ð²ÑÐµÐ¼ÐµÐ½Ð½Ð¾ Ctrl-Alt-Del", IDC_STATIC, 38, 60, 144, 14 END IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 @@ -24,13 +25,15 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "ÐÐ¾ÑÑÐµÐ±Ð¸ÑÐµÐ»:", IDC_STATIC, 36, 75, 45, 8 - EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL - LTEXT "ÐÐ°ÑÐ¾Ð»Ð°:", IDC_STATIC, 36, 93, 42, 8 - EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD - PUSHBUTTON "ÐÐ¾Ð±ÑÐµ", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON - PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 115, 122, 50, 14 - PUSHBUTTON "ÐÐ·ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ", IDC_SHUTDOWN, 179, 122, 50, 14 + LTEXT "ÐÐ¾ÑÑÐµÐ±Ð¸ÑÐµÐ»:", IDC_STATIC, 6, 60, 52, 8 + EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL + LTEXT "ÐÐ°ÑÐ¾Ð»Ð°:", IDC_STATIC, 6, 78, 52, 8 + EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD + LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8 + COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL + PUSHBUTTON "ÐÐ¾Ð±ÑÐµ", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 160, 122, 50, 14 + PUSHBUTTON "ÐÐ·ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ", IDC_SHUTDOWN, 214, 122, 50, 14 END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 Modified: trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/cs-C… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] Sat Feb 8 15:59:54 2014 @@ -14,13 +14,14 @@ LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 +IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "VÃtejte v systÃ©mu ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 5, 32, 32 - LTEXT "StisknÄte klÃ¡vesy Ctrl-Alt-Delete", IDC_STATIC, 38, 10, 144, 14 + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + LTEXT "StisknÄte klÃ¡vesy Ctrl-Alt-Delete", IDC_STATIC, 38, 60, 144, 14 END IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 @@ -29,13 +30,15 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "JmÃ©no:", IDC_STATIC, 36, 75, 40, 8 - EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL - LTEXT "Heslo:", IDC_STATIC, 36, 93, 42, 8 - EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD - PUSHBUTTON "OK", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON - PUSHBUTTON "Storno", IDCANCEL, 115, 122, 50, 14 - PUSHBUTTON "Vypnout", IDC_SHUTDOWN, 179, 122, 50, 14 + LTEXT "JmÃ©no:", IDC_STATIC, 6, 60, 52, 8 + EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL + LTEXT "Heslo:", IDC_STATIC, 6, 78, 52, 8 + EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD + LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8 + COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL + PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "Storno", IDCANCEL, 160, 122, 50, 14 + PUSHBUTTON "Vypnout", IDC_SHUTDOWN, 214, 122, 50, 14 END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 Modified: trunk/reactos/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] Sat Feb 8 15:59:54 2014 @@ -9,13 +9,14 @@ LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 +IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Willkommen bei ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 5, 32, 32 - LTEXT "DrÃ¼cken Sie Strg+Alt+Entf", IDC_STATIC, 38, 10, 144, 14 + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + LTEXT "DrÃ¼cken Sie Strg+Alt+Entf",IDC_STATIC, 38, 60, 144, 14 END IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 @@ -24,13 +25,15 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "Benutzername:", IDC_STATIC, 36, 75, 54, 8 - EDITTEXT IDC_USERNAME, 92, 72, 119, 14, ES_AUTOHSCROLL - LTEXT "Passwort:", IDC_STATIC, 36, 93, 42, 8 - EDITTEXT IDC_PASSWORD, 92, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD - PUSHBUTTON "OK", IDOK, 41, 122, 50, 14, BS_DEFPUSHBUTTON - PUSHBUTTON "Abbrechen", IDCANCEL, 103, 122, 50, 14 - PUSHBUTTON "Herunterfahren", IDC_SHUTDOWN, 165, 122, 64, 14 + LTEXT "Benutzername:", IDC_STATIC, 6, 60, 52, 8 + EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL + LTEXT "Passwort:", IDC_STATIC, 6, 78, 52, 8 + EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD + LTEXT "Anmelden an:", IDC_STATIC, 6, 96, 52, 8 + COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL + PUSHBUTTON "OK", IDOK, 91, 122, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "Abbrechen", IDCANCEL, 145, 122, 50, 14 + PUSHBUTTON "Herunterfahren", IDC_SHUTDOWN, 199, 122, 65, 14 END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 Modified: trunk/reactos/dll/win32/msgina/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] Sat Feb 8 15:59:54 2014 @@ -9,13 +9,14 @@ LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 +IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Welcome to ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 5, 32, 32 - LTEXT "Press Ctrl-Alt-Del key combination", IDC_STATIC, 38, 10, 144, 14 + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + LTEXT "Press Ctrl-Alt-Delete to begin.",IDC_STATIC, 38, 60, 144, 14 END IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 @@ -24,13 +25,15 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "Username:", IDC_STATIC, 36, 75, 40, 8 - EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL - LTEXT "Password:", IDC_STATIC, 36, 93, 42, 8 - EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD - PUSHBUTTON "OK", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON - PUSHBUTTON "Cancel", IDCANCEL, 115, 122, 50, 14 - PUSHBUTTON "Shutdown", IDC_SHUTDOWN, 179, 122, 50, 14 + LTEXT "Username:", IDC_STATIC, 6, 60, 52, 8 + EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL + LTEXT "Password:", IDC_STATIC, 6, 78, 52, 8 + EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD + LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8 + COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL + PUSHBUTTON "OK",IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel", IDCANCEL, 160, 122, 50, 14 + PUSHBUTTON "Shutdown", IDC_SHUTDOWN, 214, 122, 50, 14 END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 Modified: trunk/reactos/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/es-E… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] Sat Feb 8 15:59:54 2014 @@ -11,13 +11,14 @@ LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 +IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Bienvenido a ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 5, 32, 32 - LTEXT "Presione la combinaciÃ³n Ctrl-Alt-Supr", IDC_STATIC, 38, 10, 144, 14 + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + LTEXT "Presione la combinaciÃ³n Ctrl-Alt-Supr",IDC_STATIC, 38, 60, 144, 14 END IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 @@ -26,13 +27,15 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "Usuario:", IDC_STATIC, 36, 75, 40, 8 - EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL - LTEXT "ContraseÃ±a:", IDC_STATIC, 36, 93, 42, 8 - EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD - PUSHBUTTON "Aceptar", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON - PUSHBUTTON "Cancelar", IDCANCEL, 115, 122, 50, 14 - PUSHBUTTON "Cerrar", IDC_SHUTDOWN, 179, 122, 50, 14 + LTEXT "Usuario:", IDC_STATIC, 6, 60, 52, 8 + EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL + LTEXT "ContraseÃ±a:", IDC_STATIC, 6, 78, 52, 8 + EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD + LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8 + COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL + PUSHBUTTON "Aceptar", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "Cancelar", IDCANCEL, 160, 122, 50, 14 + PUSHBUTTON "Cerrar", IDC_SHUTDOWN, 214, 122, 50, 14 END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 Modified: trunk/reactos/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] Sat Feb 8 15:59:54 2014 @@ -9,13 +9,14 @@ LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 +IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Bienvenue Ã ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 5, 32, 32 - LTEXT "Appuyer sur les touches Ctrl-Alt-Suppr", IDC_STATIC, 38, 10, 144, 14 + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + LTEXT "Appuyer sur les touches Ctrl-Alt-Suppr", IDC_STATIC, 38, 60, 144, 14 END IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 @@ -24,13 +25,15 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "Utilisateur :", IDC_STATIC, 36, 75, 40, 8 - EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL - LTEXT "Mot de passe :", IDC_STATIC, 36, 93, 42, 8 - EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD - PUSHBUTTON "OK", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON - PUSHBUTTON "Annuler", IDCANCEL, 115, 122, 50, 14 - PUSHBUTTON "Ãteindre", IDC_SHUTDOWN, 179, 122, 50, 14 + LTEXT "Utilisateur :", IDC_STATIC, 6, 60, 52, 8 + EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL + LTEXT "Mot de passe :", IDC_STATIC, 6, 78, 52, 8 + EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD + LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8 + COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL + PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "Annuler", IDCANCEL, 160, 122, 50, 14 + PUSHBUTTON "Ãteindre", IDC_SHUTDOWN, 214, 122, 50, 14 END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 Modified: trunk/reactos/dll/win32/msgina/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/he-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] Sat Feb 8 15:59:54 2014 @@ -9,13 +9,14 @@ LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 +IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "××¨×××× ××××× ×ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 5, 32, 32 - LTEXT "×××¥ ×¢× Ctrl-Alt-Del ×× ××× ××ª", IDC_STATIC, 38, 10, 144, 14 + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + LTEXT "×××¥ ×¢× Ctrl-Alt-Del ×× ××× ××ª", IDC_STATIC, 38, 60, 144, 14 END IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 @@ -24,13 +25,15 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "×©× ××©×ª××©:", IDC_STATIC, 36, 75, 40, 8 - EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL - LTEXT "×¡××¡××:", IDC_STATIC, 36, 93, 42, 8 - EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD - PUSHBUTTON "×××©××¨", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON - PUSHBUTTON "×××××", IDCANCEL, 115, 122, 50, 14 - PUSHBUTTON "×××××", IDC_SHUTDOWN, 179, 122, 50, 14 + LTEXT "×©× ××©×ª××©:", IDC_STATIC, 6, 60, 52, 8 + EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL + LTEXT "×¡××¡××:", IDC_STATIC, 6, 78, 52, 8 + EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD + LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8 + COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL + PUSHBUTTON "×××©××¨", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "×××××", IDCANCEL, 160, 122, 50, 14 + PUSHBUTTON "×××××", IDC_SHUTDOWN, 214, 122, 50, 14 END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 Modified: trunk/reactos/dll/win32/msgina/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/id-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] Sat Feb 8 15:59:54 2014 @@ -9,13 +9,14 @@ LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 +IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Selamat datang di ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 5, 32, 32 - LTEXT "Tekan kombinasi tombol Kontrol-Alt-Delete", IDC_STATIC, 38, 10, 144, 14 + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + LTEXT "Tekan kombinasi tombol Kontrol-Alt-Delete",IDC_STATIC, 38, 60, 144, 14 END IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 @@ -24,13 +25,15 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "Nama pengguna:", IDC_STATIC, 22, 75, 61, 8 - EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL - LTEXT "Kata sandi:", IDC_STATIC, 40, 93, 42, 8 - EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD - PUSHBUTTON "OK", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON - PUSHBUTTON "Batal", IDCANCEL, 115, 122, 50, 14 - PUSHBUTTON "Matikan", IDC_SHUTDOWN, 179, 122, 50, 14 + LTEXT "Nama pengguna:", IDC_STATIC, 6, 60, 52, 8 + EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL + LTEXT "Kata sandi:", IDC_STATIC, 6, 78, 42, 8 + EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD + LTEXT "Log on to:", IDC_STATIC, 6, 96, 42, 8 + COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL + PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "Batal", IDCANCEL, 160, 122, 50, 14 + PUSHBUTTON "Matikan", IDC_SHUTDOWN, 214, 122, 50, 14 END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 Modified: trunk/reactos/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/it-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] Sat Feb 8 15:59:54 2014 @@ -17,13 +17,14 @@ LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 +IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Benvenuti in ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 5, 32, 32 - LTEXT "Premere i tasti Ctrl-Alt-Canc ", IDC_STATIC, 38, 10, 144, 14 + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + LTEXT "Premere i tasti Ctrl-Alt-Canc ",IDC_STATIC, 38, 60, 144, 14 END IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 @@ -32,13 +33,15 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "Utente:", IDC_STATIC, 36, 75, 40, 8 - EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL - LTEXT "Password:", IDC_STATIC, 36, 93, 42, 8 - EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD - PUSHBUTTON "OK", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON - PUSHBUTTON "Annulla", IDCANCEL, 115, 122, 50, 14 - PUSHBUTTON "Spegnimento", IDC_SHUTDOWN, 179, 122, 50, 14 + LTEXT "Utente:", IDC_STATIC, 6, 60, 52, 8 + EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL + LTEXT "Password:", IDC_STATIC, 6, 78, 52, 8 + EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD + LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8 + COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL + PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "Annulla", IDCANCEL, 160, 122, 50, 14 + PUSHBUTTON "Spegnimento", IDC_SHUTDOWN, 214, 122, 50, 14 END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 Modified: trunk/reactos/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ja-J… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] Sat Feb 8 15:59:54 2014 @@ -9,13 +9,14 @@ LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 +IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ReactOS ã¸ãããã" FONT 9, "MS UI Gothic", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 5, 32, 32 - LTEXT "Ctrl-Alt-Del ãã¼ã®çµã¿åãããæ¼ãã¦ãã ãã", IDC_STATIC, 38, 10, 144, 14 + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + LTEXT "Ctrl-Alt-Del ãã¼ã®çµã¿åãããæ¼ãã¦ãã ãã", IDC_STATIC, 38, 60, 144, 14 END IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 @@ -24,13 +25,15 @@ FONT 9, "MS UI Gothic", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "ã¦ã¼ã¶ã¼å:", IDC_STATIC, 36, 75, 40, 8 - EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL - LTEXT "ãã¹ã¯ã¼ã:", IDC_STATIC, 36, 93, 42, 8 - EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD - PUSHBUTTON "OK", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON - PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 115, 122, 50, 14 - PUSHBUTTON "ã·ã£ãããã¦ã³", IDC_SHUTDOWN, 179, 122, 50, 14 + LTEXT "ã¦ã¼ã¶ã¼å:", IDC_STATIC, 6, 60, 52, 8 + EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL + LTEXT "ãã¹ã¯ã¼ã:", IDC_STATIC, 6, 78, 52, 8 + EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD + LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8 + COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL + PUSHBUTTON "OK",IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 160, 122, 50, 14 + PUSHBUTTON "ã·ã£ãããã¦ã³", IDC_SHUTDOWN, 214, 122, 50, 14 END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 Modified: trunk/reactos/dll/win32/msgina/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/no-N… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] Sat Feb 8 15:59:54 2014 @@ -9,13 +9,14 @@ LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 +IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Velkommen til ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 5, 32, 32 - LTEXT "Trykk Ctrl-Alt-Del knappene", IDC_STATIC, 38, 10, 144, 14 + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + LTEXT "Trykk Ctrl-Alt-Del knappene", IDC_STATIC, 38, 60, 144, 14 END IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 @@ -28,9 +29,11 @@ EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL LTEXT "Passord:", IDC_STATIC, 36, 93, 42, 8 EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD - PUSHBUTTON "OK", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON - PUSHBUTTON "Avbryt", IDCANCEL, 115, 122, 50, 14 - PUSHBUTTON "Avslutt", IDC_SHUTDOWN, 179, 122, 50, 14 + LTEXT "Log on to:", IDC_STATIC, 6, 96, 42, 8 + COMBOBOX IDC_LOGON_TO, 54, 95, 159, 14, CBS_DROPDOWNLIST | WS_VSCROLL + PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "Avbryt", IDCANCEL, 160, 122, 50, 14 + PUSHBUTTON "Avslutt", IDC_SHUTDOWN, 214, 122, 50, 14 END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 Modified: trunk/reactos/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/pl-P… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] Sat Feb 8 15:59:54 2014 @@ -18,13 +18,14 @@ LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 +IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Witamy w ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 5, 32, 32 - LTEXT "ProszÄ wcisnÄÄ kombinacjÄ klawiszy Ctrl-Alt-Del", IDC_STATIC, 37, 6, 144, 18 + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + LTEXT "ProszÄ wcisnÄÄ kombinacjÄ klawiszy Ctrl-Alt-Del", IDC_STATIC, 38, 60, 144, 14 END IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 @@ -33,13 +34,15 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "Nazwa uÅ¼ytkownika:", IDC_STATIC, 11, 75, 70, 8 - EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL - LTEXT "HasÅo:", IDC_STATIC, 56, 93, 27, 8 - EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD - PUSHBUTTON "OK", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON - PUSHBUTTON "Anuluj", IDCANCEL, 115, 122, 50, 14 - PUSHBUTTON "WyÅÄcz", IDC_SHUTDOWN, 179, 122, 50, 14 + LTEXT "Nazwa uÅ¼ytkownika:", IDC_STATIC, 6, 60, 70, 8 + EDITTEXT IDC_USERNAME, 73, 57, 142, 14, ES_AUTOHSCROLL + LTEXT "HasÅo:", IDC_STATIC, 6, 78, 52, 8 + EDITTEXT IDC_PASSWORD, 73, 76, 142, 14, ES_AUTOHSCROLL | ES_PASSWORD + LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8 + COMBOBOX IDC_LOGON_TO, 73, 95, 142, 14, CBS_DROPDOWNLIST | WS_VSCROLL + PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "Anuluj", IDCANCEL, 160, 122, 50, 14 + PUSHBUTTON "WyÅÄcz", IDC_SHUTDOWN, 214, 122, 50, 14 END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 Modified: trunk/reactos/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] Sat Feb 8 15:59:54 2014 @@ -11,13 +11,14 @@ LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 +IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Bun venit Ã®n ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 5, 32, 32 - LTEXT "ApasaÈi simultan Â«CtrlÂ»+Â«AltÂ»+Â«DelÂ»", IDC_STATIC, 38, 10, 144, 14 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + LTEXT "ApasaÈi simultan Â«CtrlÂ»+Â«AltÂ»+Â«DelÂ»", IDC_STATIC, 38, 60, 144, 14 END IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 @@ -26,13 +27,15 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "Nume utilizator:", IDC_STATIC, 36, 75, 40, 8 - EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL - LTEXT "Parola:", IDC_STATIC, 36, 93, 42, 8 - EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD - PUSHBUTTON "Con&firmÄ", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON - PUSHBUTTON "A&nuleazÄ", IDCANCEL, 115, 122, 50, 14 - PUSHBUTTON "&OpreÈte", IDC_SHUTDOWN, 179, 122, 50, 14 + LTEXT "Nume utilizator:", IDC_STATIC, 6, 60, 52, 8 + EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL + LTEXT "Parola:", IDC_STATIC, 6, 78, 52, 8 + EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD + LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8 + COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL + PUSHBUTTON "Con&firmÄ", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 160, 122, 50, 14 + PUSHBUTTON "&OpreÈte", IDC_SHUTDOWN, 214, 122, 50, 14 END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 @@ -42,8 +45,8 @@ BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 GROUPBOX "InformaÈii de autentificare", IDC_STATIC, 7, 61, 261, 52 - LTEXT "<Mesaj>", IDC_LOGONMSG, 15, 73, 245, 18 - LTEXT "<DatÄ de autentificare>", IDC_LOGONDATE, 15, 94, 245, 8 + LTEXT "<Message>", IDC_LOGONMSG, 15, 73, 245, 18 + LTEXT "<Logon date>", IDC_LOGONDATE, 15, 94, 245, 8 CTEXT "Ce acÈiune preferaÈi?", IDC_STATIC, 10, 119, 255, 8 PUSHBUTTON "&BlocheazÄ calculatorul", IDC_LOCK, 10, 135, 70, 14 PUSHBUTTON "&DeautentificÄ-mÄ", IDC_LOGOFF, 90, 135, 70, 14 Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] Sat Feb 8 15:59:54 2014 @@ -11,13 +11,14 @@ LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 +IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ÐÐ¾Ð±ÑÐ¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°ÑÑ Ð² ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 5, 32, 32 - LTEXT "ÐÐ°Ð¶Ð¼Ð¸ÑÐµ ÐºÐ»Ð°Ð²Ð¸ÑÐ¸ Ctrl-Alt-Del.", IDC_STATIC, 38, 10, 144, 14 + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + LTEXT "ÐÐ°Ð¶Ð¼Ð¸ÑÐµ ÐºÐ»Ð°Ð²Ð¸ÑÐ¸ Ctrl-Alt-Del.", IDC_STATIC, 38, 60, 144, 14 END IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 @@ -26,13 +27,15 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - RTEXT "ÐÐ¼Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ:", IDC_STATIC, 6, 75, 70, 8 - EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL - RTEXT "ÐÐ°ÑÐ¾Ð»Ñ:", IDC_STATIC, 6, 93, 70, 8 - EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD - PUSHBUTTON "OK", IDOK, 47, 122, 50, 14, BS_DEFPUSHBUTTON - PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 109, 122, 50, 14 - PUSHBUTTON "ÐÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ", IDC_SHUTDOWN, 171, 122, 58, 14 + LTEXT "ÐÐ¼Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ:", IDC_STATIC, 6, 60, 52, 8 + EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL + LTEXT "ÐÐ°ÑÐ¾Ð»Ñ:", IDC_STATIC, 6, 78, 52, 8 + EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD + LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8 + COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL + PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 160, 122, 50, 14 + PUSHBUTTON "ÐÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ", IDC_SHUTDOWN, 214, 122, 50, 14 END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 Modified: trunk/reactos/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/sk-S… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] Sat Feb 8 15:59:54 2014 @@ -14,13 +14,14 @@ LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 +IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Vitajte v systÃ©me ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 5, 32, 32 - LTEXT "StlaÄte kombinÃ¡ciu klÃ¡ves Ctrl-Alt-Del", IDC_STATIC, 38, 10, 144, 14 + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + LTEXT "StlaÄte kombinÃ¡ciu klÃ¡ves Ctrl-Alt-Del", IDC_STATIC, 38, 60, 144, 14 END IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 @@ -29,13 +30,15 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "Meno pouÅ¾ÃvateÄ¾a:", IDC_STATIC, 18, 75, 64, 8 - EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL - LTEXT "Heslo:", IDC_STATIC, 56, 93, 24, 8 - EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD - PUSHBUTTON "OK", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON - PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 115, 122, 50, 14 - PUSHBUTTON "VypnÃºÅ¥", IDC_SHUTDOWN, 179, 122, 50, 14 + LTEXT "Meno pouÅ¾ÃvateÄ¾a:", IDC_STATIC, 6, 60, 59, 8 + EDITTEXT IDC_USERNAME, 67, 57, 148, 14, ES_AUTOHSCROLL + LTEXT "Heslo:", IDC_STATIC, 6, 78, 59, 8 + EDITTEXT IDC_PASSWORD, 67, 76, 148, 14, ES_AUTOHSCROLL | ES_PASSWORD + LTEXT "Log on to:", IDC_STATIC, 6, 96, 59, 8 + COMBOBOX IDC_LOGON_TO, 67, 95, 148, 14, CBS_DROPDOWNLIST | WS_VSCROLL + PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL,160, 122, 50, 14 + PUSHBUTTON "VypnÃºÅ¥", IDC_SHUTDOWN, 214, 122, 50, 14 END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 Modified: trunk/reactos/dll/win32/msgina/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/sq-A… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/sq-AL.rc [iso-8859-1] Sat Feb 8 15:59:54 2014 @@ -28,13 +28,15 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "PÃ«rdoruesi:", IDC_STATIC, 36, 75, 40, 8 - EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL - LTEXT "FjalÃ«kalimi:", IDC_STATIC, 36, 93, 42, 8 - EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD - PUSHBUTTON "OK", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON - PUSHBUTTON "Anulo", IDCANCEL, 115, 122, 50, 14 - PUSHBUTTON "Fikje", IDC_SHUTDOWN, 179, 122, 50, 14 + LTEXT "PÃ«rdoruesi:", IDC_STATIC, 6, 60, 52, 8 + EDITTEXT IDC_USERNAME, 60, 57, 155, 14, ES_AUTOHSCROLL + LTEXT "FjalÃ«kalimi:", IDC_STATIC, 6, 78, 52, 8 + EDITTEXT IDC_PASSWORD, 60, 76, 155, 14, ES_AUTOHSCROLL | ES_PASSWORD + LTEXT "Log on to:", IDC_STATIC, 6, 96, 52, 8 + COMBOBOX IDC_LOGON_TO, 60, 95, 155, 14, CBS_DROPDOWNLIST | WS_VSCROLL + PUSHBUTTON "OK",IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "Anulo", IDCANCEL, 160, 122, 50, 14 + PUSHBUTTON "Fikje", IDC_SHUTDOWN, 214, 122, 50, 14 END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 @@ -44,8 +46,8 @@ BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 GROUPBOX "Informacionet Hzrese", IDC_STATIC, 7, 61, 261, 52 - LTEXT "<Mesazhi>", IDC_LOGONMSG, 15, 73, 245, 18 - LTEXT "<Data Hzrese>", IDC_LOGONDATE, 15, 94, 245, 8 + LTEXT "<Message>", IDC_LOGONMSG, 15, 73, 245, 18 + LTEXT "<Logon date>", IDC_LOGONDATE, 15, 94, 245, 8 CTEXT "ÃfarÃ« doni tÃ« bÃ«ni?", IDC_STATIC, 10, 119, 255, 8 PUSHBUTTON "KyÃ§ kompjuterin", IDC_LOCK, 10, 135, 76, 14 PUSHBUTTON "Dilni...", IDC_LOGOFF, 100, 135, 75, 14 Modified: trunk/reactos/dll/win32/msgina/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/tr-T… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] Sat Feb 8 15:59:54 2014 @@ -11,13 +11,14 @@ LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 +IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ReactOS'a HoÅgeldiniz" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 5, 32, 32 - LTEXT "Denetim, SeÃ§enek ve Silme dÃ¼Ämelerine birlikte basÄ±nÄ±z.", IDC_STATIC, 38, 10, 144, 14 + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + LTEXT "Denetim, SeÃ§enek ve Silme dÃ¼Ämelerine birlikte basÄ±nÄ±z.",IDC_STATIC, 38, 60, 144, 14 END IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 @@ -26,13 +27,15 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "KullanÄ±cÄ± AdÄ±:", IDC_STATIC, 36, 75, 40, 8 - EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL - LTEXT "Åifre:", IDC_STATIC, 36, 93, 42, 8 - EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD - PUSHBUTTON "Tamam", IDOK, 51, 122, 50, 14, BS_DEFPUSHBUTTON - PUSHBUTTON "Ä°ptal", IDCANCEL, 115, 122, 50, 14 - PUSHBUTTON "BilgisayarÄ± Kapat", IDC_SHUTDOWN, 179, 122, 50, 14 + LTEXT "KullanÄ±cÄ± AdÄ±:", IDC_STATIC, 6, 60, 59, 8 + EDITTEXT IDC_USERNAME, 67, 57, 148, 14, ES_AUTOHSCROLL + LTEXT "Åifre:", IDC_STATIC, 6, 78, 59, 8 + EDITTEXT IDC_PASSWORD, 67, 76, 148, 14, ES_AUTOHSCROLL | ES_PASSWORD + LTEXT "Olarak Oturum AÃ§:", IDC_STATIC, 6, 96, 59, 8 + COMBOBOX IDC_LOGON_TO, 67, 95, 148, 14, CBS_DROPDOWNLIST | WS_VSCROLL + PUSHBUTTON "Tamam", IDOK, 91, 122, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "Ä°ptal", IDCANCEL, 145, 122, 50, 14 + PUSHBUTTON "BilgisayarÄ± Kapat", IDC_SHUTDOWN, 199, 122, 65, 14 END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 @@ -42,8 +45,8 @@ BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 GROUPBOX "Oturum AÃ§ma Bilgisi", IDC_STATIC, 7, 61, 261, 52 - LTEXT "<Ä°leti>", IDC_LOGONMSG, 15, 73, 245, 18 - LTEXT "<Oturum AÃ§ma ZamÃ¢nÄ±>", IDC_LOGONDATE, 15, 94, 245, 8 + LTEXT "<Message>", IDC_LOGONMSG, 15, 73, 245, 18 + LTEXT "<Logon date>", IDC_LOGONDATE, 15, 94, 245, 8 CTEXT "Ne yapmak istersiniz?", IDC_STATIC, 10, 119, 255, 8 PUSHBUTTON "BilgisayarÄ± Kilitle", IDC_LOCK, 10, 135, 76, 14 PUSHBUTTON "Oturumu Kapat", IDC_LOGOFF, 100, 135, 75, 14 Modified: trunk/reactos/dll/win32/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] Sat Feb 8 15:59:54 2014 @@ -17,13 +17,14 @@ LTEXT "", IDC_STATUSLABEL, 7, 62, 261, 12, SS_WORDELLIPSIS END -IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 +IDD_NOTICE_DLG DIALOGEX 0, 0, 275, 80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ÐÐ°ÑÐºÐ°Ð²Ð¾ Ð¿ÑÐ¾ÑÐ¸Ð¼Ð¾ Ð´Ð¾ ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 5, 32, 32 - LTEXT "ÐÐ°ÑÐ¸ÑÐ½ÑÑÑ ÐºÐ»Ð°Ð²ÑÑÑ Ctrl+Alt+Del", IDC_STATIC, 38, 10, 144, 14 + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + LTEXT "ÐÐ°ÑÐ¸ÑÐ½ÑÑÑ ÐºÐ»Ð°Ð²ÑÑÑ Ctrl+Alt+Del", IDC_STATIC, 38, 60, 144, 14 END IDD_LOGGEDOUT_DLG DIALOGEX 0, 0, 275, 147 @@ -32,13 +33,15 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "ÐÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ñ:", IDC_STATIC, 33, 75, 48, 8 - EDITTEXT IDC_USERNAME, 84, 72, 119, 14, ES_AUTOHSCROLL - LTEXT "ÐÐ°ÑÐ¾Ð»Ñ:", IDC_STATIC, 48, 93, 34, 8 - EDITTEXT IDC_PASSWORD, 84, 91, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD - PUSHBUTTON "OK", IDOK, 37, 122, 50, 14, BS_DEFPUSHBUTTON - PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 93, 122, 50, 14 - PUSHBUTTON "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð½Ñ ÑÐ¾Ð±Ð¾ÑÐ¸...", IDC_SHUTDOWN, 148, 122, 86, 14 + LTEXT "ÐÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ñ:", IDC_STATIC, 6, 60, 40, 8 + EDITTEXT IDC_USERNAME, 54, 57, 159, 14, ES_AUTOHSCROLL + LTEXT "ÐÐ°ÑÐ¾Ð»Ñ:",IDC_STATIC, 6, 78, 42, 8 + EDITTEXT IDC_PASSWORD, 54, 76, 159, 14, ES_AUTOHSCROLL | ES_PASSWORD + LTEXT "Log on to:", IDC_STATIC, 6, 96, 42, 8 + COMBOBOX IDC_LOGON_TO, 54, 95, 159, 14, CBS_DROPDOWNLIST | WS_VSCROLL + PUSHBUTTON "OK", IDOK, 106, 122, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 160, 122, 50, 14 + PUSHBUTTON "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð½Ñ ÑÐ¾Ð±Ð¾ÑÐ¸...", IDC_SHUTDOWN, 214, 122, 50, 14 END IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 175 Modified: trunk/reactos/dll/win32/msgina/msgina.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.sp… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.spec [iso-8859-1] Sat Feb 8 15:59:54 2014 @@ -26,7 +26,7 @@ 26 stub -noname stub26 27 stub -noname stub27 28 stub -noname stub28 -@ stdcall ShellShutdownDialog(ptr long long) +@ stdcall ShellShutdownDialog(ptr wstr long) @ stdcall WlxActivateUserShell(ptr wstr wstr ptr) @ stdcall WlxDisconnectNotify(ptr) @ stdcall WlxDisplayLockedNotice(ptr) Modified: trunk/reactos/dll/win32/msgina/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resource.… ============================================================================== --- trunk/reactos/dll/win32/msgina/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/resource.h [iso-8859-1] Sat Feb 8 15:59:54 2014 @@ -20,6 +20,7 @@ #define IDC_LOGONMSG 1010 #define IDC_LOGONDATE 1011 #define IDC_CHANGEPWD 1012 +#define IDC_LOGON_TO 1013 #define IDD_CHANGE_PASSWORD 106 #define IDC_CHANGEPWD_USERNAME 1013 Modified: trunk/reactos/dll/win32/msgina/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/msgina/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/stubs.c [iso-8859-1] Sat Feb 8 15:59:54 2014 @@ -16,12 +16,12 @@ */ DWORD WINAPI ShellShutdownDialog( - HWND hParent, - DWORD Unknown, - BOOL bHideLogoff) + HWND hParent, + LPWSTR lpUsername, + BOOL bHideLogoff) { UNREFERENCED_PARAMETER(hParent); - UNREFERENCED_PARAMETER(Unknown); + UNREFERENCED_PARAMETER(lpUsername); UNREFERENCED_PARAMETER(bHideLogoff); /* Return values:

10 years, 7 months

[tkreuzer] 62042: [NTOSKRNL] Move the remaining 2 ROSPFN fields into the MMPFN structure instead of allocating ROSPFNs from non-paged pool.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Feb 8 15:54:38 2014 New Revision: 62042 URL: http://svn.reactos.org/svn/reactos?rev=62042&view=rev Log: [NTOSKRNL] Move the remaining 2 ROSPFN fields into the MMPFN structure instead of allocating ROSPFNs from non-paged pool. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Sat Feb 8 15:54:38 2014 @@ -339,10 +339,13 @@ union { PFN_NUMBER Flink; - ULONG WsIndex; // SavedSwapEntry + ULONG WsIndex; PKEVENT Event; NTSTATUS ReadStatus; SINGLE_LIST_ENTRY NextStackPfn; + + // HACK for ROSPFN + SWAPENTRY SwapEntry; } u1; PMMPTE PteAddress; union @@ -354,7 +357,7 @@ { struct { - USHORT ReferenceCount; // ReferenceCount + USHORT ReferenceCount; MMPFNENTRY e1; }; struct @@ -366,7 +369,10 @@ union { MMPTE OriginalPte; - LONG AweReferenceCount; // RmapListHead + LONG AweReferenceCount; + + // HACK for ROSPFN + PMM_RMAP_ENTRY RmapListHead; }; union { Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sat Feb 8 15:54:38 2014 @@ -1121,23 +1121,7 @@ return FALSE; } -#ifdef _WIN64 -// HACK ON TOP OF HACK ALERT!!! -#define MI_GET_ROS_DATA(x) \ - (((x)->RosMmData == 0) ? NULL : ((PMMROSPFN)((ULONG64)(ULONG)((x)->RosMmData) | \ - ((ULONG64)MmNonPagedPoolStart & 0xffffffff00000000ULL)))) -#else -#define MI_GET_ROS_DATA(x) ((PMMROSPFN)(x->RosMmData)) -#endif -#define MI_IS_ROS_PFN(x) (((x)->u4.AweAllocation == TRUE) && (MI_GET_ROS_DATA(x) != NULL)) -#define ASSERT_IS_ROS_PFN(x) ASSERT(MI_IS_ROS_PFN(x) == TRUE); -typedef struct _MMROSPFN -{ - PMM_RMAP_ENTRY RmapListHead; - SWAPENTRY SwapEntry; -} MMROSPFN, *PMMROSPFN; - -#define RosMmData AweReferenceCount +#define MI_IS_ROS_PFN(x) ((x)->u4.AweAllocation == TRUE) VOID NTAPI Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Sat Feb 8 15:54:38 2014 @@ -21,13 +21,11 @@ #define MODULE_INVOLVED_IN_ARM3 #include "ARM3/miarm.h" +#define ASSERT_IS_ROS_PFN(x) ASSERT(MI_IS_ROS_PFN(x) == TRUE); + /* GLOBALS ****************************************************************/ -// ReactOS to NT Physical Page Descriptor Entry Legacy Mapping Definitions -#define PHYSICAL_PAGE MMPFN -#define PPHYSICAL_PAGE PMMPFN - -PPHYSICAL_PAGE MmPfnDatabase; +PMMPFN MmPfnDatabase; PFN_NUMBER MmAvailablePages; PFN_NUMBER MmResidentAvailablePages; @@ -164,7 +162,7 @@ PFN_NUMBER PageCount, LowPage, HighPage, SkipPages, PagesFound = 0, Page; PPFN_NUMBER MdlPage, LastMdlPage; KIRQL OldIrql; - PPHYSICAL_PAGE Pfn1; + PMMPFN Pfn1; INT LookForZeroedPages; ASSERT(KeGetCurrentIrql() <= APC_LEVEL); DPRINT1("ARM3-DEBUG: Being called with %I64x %I64x %I64x %lx %d %lu\n", LowAddress, HighAddress, SkipBytes, TotalBytes, CacheAttribute, MdlFlags); @@ -407,7 +405,7 @@ ASSERT(MiIsPfnInUse(Pfn1) == TRUE); /* Set the list head address */ - MI_GET_ROS_DATA(Pfn1)->RmapListHead = ListHead; + Pfn1->RmapListHead = ListHead; } else { @@ -415,7 +413,7 @@ ASSERT(MiIsPfnInUse(Pfn1) == TRUE); /* In this case, the RMAP is actually being removed, so clear field */ - MI_GET_ROS_DATA(Pfn1)->RmapListHead = NULL; + Pfn1->RmapListHead = NULL; /* ReactOS semantics will now release the page, which will make it free and enter a colored list */ } @@ -440,7 +438,7 @@ ASSERT_IS_ROS_PFN(Pfn1); /* Get the list head */ - ListHead = MI_GET_ROS_DATA(Pfn1)->RmapListHead; + ListHead = Pfn1->RmapListHead; /* Should not have an RMAP for a non-active page */ ASSERT(MiIsPfnInUse(Pfn1) == TRUE); @@ -455,14 +453,14 @@ MmSetSavedSwapEntryPage(PFN_NUMBER Pfn, SWAPENTRY SwapEntry) { KIRQL oldIrql; - PPHYSICAL_PAGE Page; - - Page = MiGetPfnEntry(Pfn); - ASSERT(Page); - ASSERT_IS_ROS_PFN(Page); + PMMPFN Pfn1; + + Pfn1 = MiGetPfnEntry(Pfn); + ASSERT(Pfn1); + ASSERT_IS_ROS_PFN(Pfn1); oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - MI_GET_ROS_DATA(Page)->SwapEntry = SwapEntry; + Pfn1->u1.SwapEntry = SwapEntry; KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); } @@ -472,14 +470,14 @@ { SWAPENTRY SwapEntry; KIRQL oldIrql; - PPHYSICAL_PAGE Page; - - Page = MiGetPfnEntry(Pfn); - ASSERT(Page); - ASSERT_IS_ROS_PFN(Page); + PMMPFN Pfn1; + + Pfn1 = MiGetPfnEntry(Pfn); + ASSERT(Pfn1); + ASSERT_IS_ROS_PFN(Pfn1); oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - SwapEntry = MI_GET_ROS_DATA(Page)->SwapEntry; + SwapEntry = Pfn1->u1.SwapEntry; KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); return(SwapEntry); @@ -489,7 +487,7 @@ NTAPI MmReferencePage(PFN_NUMBER Pfn) { - PPHYSICAL_PAGE Page; + PMMPFN Pfn1; DPRINT("MmReferencePage(PysicalAddress %x)\n", Pfn << PAGE_SHIFT); @@ -497,12 +495,12 @@ ASSERT(Pfn != 0); ASSERT(Pfn <= MmHighestPhysicalPage); - Page = MiGetPfnEntry(Pfn); - ASSERT(Page); - ASSERT_IS_ROS_PFN(Page); - - ASSERT(Page->u3.e2.ReferenceCount != 0); - Page->u3.e2.ReferenceCount++; + Pfn1 = MiGetPfnEntry(Pfn); + ASSERT(Pfn1); + ASSERT_IS_ROS_PFN(Pfn1); + + ASSERT(Pfn1->u3.e2.ReferenceCount != 0); + Pfn1->u3.e2.ReferenceCount++; } ULONG @@ -511,16 +509,16 @@ { KIRQL oldIrql; ULONG RCount; - PPHYSICAL_PAGE Page; + PMMPFN Pfn1; DPRINT("MmGetReferenceCountPage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - Page = MiGetPfnEntry(Pfn); - ASSERT(Page); - ASSERT_IS_ROS_PFN(Page); - - RCount = Page->u3.e2.ReferenceCount; + Pfn1 = MiGetPfnEntry(Pfn); + ASSERT(Pfn1); + ASSERT_IS_ROS_PFN(Pfn1); + + RCount = Pfn1->u3.e2.ReferenceCount; KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); return(RCount); @@ -537,24 +535,22 @@ NTAPI MmDereferencePage(PFN_NUMBER Pfn) { - PPHYSICAL_PAGE Page; + PMMPFN Pfn1; DPRINT("MmDereferencePage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - Page = MiGetPfnEntry(Pfn); - ASSERT(Page); - ASSERT_IS_ROS_PFN(Page); - - ASSERT(Page->u3.e2.ReferenceCount != 0); - Page->u3.e2.ReferenceCount--; - if (Page->u3.e2.ReferenceCount == 0) + Pfn1 = MiGetPfnEntry(Pfn); + ASSERT(Pfn1); + ASSERT_IS_ROS_PFN(Pfn1); + + ASSERT(Pfn1->u3.e2.ReferenceCount != 0); + Pfn1->u3.e2.ReferenceCount--; + if (Pfn1->u3.e2.ReferenceCount == 0) { /* Mark the page temporarily as valid, we're going to make it free soon */ - Page->u3.e1.PageLocation = ActiveAndValid; + Pfn1->u3.e1.PageLocation = ActiveAndValid; /* It's not a ROS PFN anymore */ - Page->u4.AweAllocation = FALSE; - ExFreePoolWithTag(MI_GET_ROS_DATA(Page), 'RsPf'); - Page->RosMmData = 0; + Pfn1->u4.AweAllocation = FALSE; /* Bring it back into the free list */ DPRINT("Legacy free: %lx\n", Pfn); @@ -586,11 +582,8 @@ Pfn1->u4.AweAllocation = TRUE; /* Allocate the extra ReactOS Data and zero it out */ - Pfn1->RosMmData = (LONG)ExAllocatePoolWithTag(NonPagedPool, sizeof(MMROSPFN), 'RsPf'); - ASSERT(MI_GET_ROS_DATA(Pfn1) != NULL); - ASSERT_IS_ROS_PFN(Pfn1); - MI_GET_ROS_DATA(Pfn1)->SwapEntry = 0; - MI_GET_ROS_DATA(Pfn1)->RmapListHead = NULL; + Pfn1->u1.SwapEntry = 0; + Pfn1->RmapListHead = NULL; return PfnOffset; }

10 years, 7 months

← Newer
1
...
29
30
31
32
33
34
35
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2014