Ros-diffs March 2011

ros-diffs@reactos.org

21 participants
276 discussions

[gadamopoulos] 51086: [win32k] - SetThreadDesktop: Actually set hdesk in PTHREADINFO Now GetThreadDesktop doesn't return 0

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Mar 17 20:32:24 2011 New Revision: 51086 URL: http://svn.reactos.org/svn/reactos?rev=51086&view=rev Log: [win32k] - SetThreadDesktop: Actually set hdesk in PTHREADINFO Now GetThreadDesktop doesn't return 0 Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] Thu Mar 17 20:32:24 2011 @@ -102,7 +102,7 @@ HDESK FASTCALL IntGetDesktopObjectHandle(PDESKTOP DesktopObject); -BOOL IntSetThreadDesktop(IN PDESKTOP DesktopObject, +BOOL IntSetThreadDesktop(IN HDESK hDesktop, IN BOOL FreeOnFailure); NTSTATUS FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Thu Mar 17 20:32:24 2011 @@ -237,26 +237,11 @@ if (hDesk != NULL) { - PDESKTOP DesktopObject; Win32Thread->rpdesk = NULL; - Status = ObReferenceObjectByHandle(hDesk, - 0, - ExDesktopObjectType, - KernelMode, - (PVOID*)&DesktopObject, - NULL); - NtClose(hDesk); - if(NT_SUCCESS(Status)) + Win32Thread->hdesk = NULL; + if (!IntSetThreadDesktop(hDesk, FALSE)) { - if (!IntSetThreadDesktop(DesktopObject, - FALSE)) - { DPRINT1("Unable to set thread desktop\n"); - } - } - else - { - DPRINT1("Unable to reference thread desktop handle 0x%x\n", hDesk); } } } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Thu Mar 17 20:32:24 2011 @@ -1055,7 +1055,7 @@ } #endif - if (!ptiCurrent->rpdesk) IntSetThreadDesktop(DesktopObject,FALSE); + if (!ptiCurrent->rpdesk) IntSetThreadDesktop(Desktop,FALSE); /* Based on wine/server/window.c in get_desktop_window. @@ -1795,105 +1795,131 @@ } BOOL -IntSetThreadDesktop(IN PDESKTOP DesktopObject, +IntSetThreadDesktop(IN HDESK hDesktop, IN BOOL FreeOnFailure) { - PDESKTOP OldDesktop; + PDESKTOP DesktopObject, OldDesktop; + HDESK hOldDesktop; PTHREADINFO W32Thread; NTSTATUS Status; BOOL MapHeap; CLIENTTHREADINFO ctiSave; - DPRINT("IntSetThreadDesktop() DO=%p, FOF=%d\n", DesktopObject, FreeOnFailure); + DPRINT("IntSetThreadDesktop() , FOF=%d\n", FreeOnFailure); MapHeap = (PsGetCurrentProcess() != PsInitialSystemProcess); W32Thread = PsGetCurrentThreadWin32Thread(); - - if (W32Thread->rpdesk != DesktopObject) + + /* Validate the new desktop. */ + Status = IntValidateDesktopHandle( + hDesktop, + UserMode, + 0, + &DesktopObject); + + if (!NT_SUCCESS(Status)) { - OldDesktop = W32Thread->rpdesk; - - if (!IsListEmpty(&W32Thread->WindowListHead)) + DPRINT("Validation of desktop handle (0x%X) failed\n", hDesktop); + return FALSE; + } + + if (W32Thread->rpdesk == DesktopObject) + { + /* Nothing to do */ + ObDereferenceObject(DesktopObject); + return TRUE; + } + + if (!IsListEmpty(&W32Thread->WindowListHead)) + { + DPRINT1("Attempted to change thread desktop although the thread has windows!\n"); + EngSetLastError(ERROR_BUSY); + return FALSE; + } + + OldDesktop = W32Thread->rpdesk; + hOldDesktop = W32Thread->hdesk; + + W32Thread->rpdesk = DesktopObject; + W32Thread->hdesk = hDesktop; + + if (MapHeap && DesktopObject != NULL) + { + Status = IntMapDesktopView(DesktopObject); + if (!NT_SUCCESS(Status)) { - DPRINT1("Attempted to change thread desktop although the thread has windows!\n"); - EngSetLastError(ERROR_BUSY); + SetLastNtError(Status); return FALSE; } - - W32Thread->rpdesk = DesktopObject; - + W32Thread->pDeskInfo = DesktopObject->pDeskInfo; + } + + RtlZeroMemory(&ctiSave, sizeof(CLIENTTHREADINFO)); + + if (W32Thread->pcti && OldDesktop && NtCurrentTeb()) + { + RtlCopyMemory(&ctiSave, W32Thread->pcti, sizeof(CLIENTTHREADINFO)); + DPRINT("Free ClientThreadInfo\n"); + DesktopHeapFree(OldDesktop, W32Thread->pcti); + W32Thread->pcti = NULL; + } + + if (!W32Thread->pcti && DesktopObject && NtCurrentTeb()) + { + DPRINT("Allocate ClientThreadInfo\n"); + W32Thread->pcti = DesktopHeapAlloc( DesktopObject, + sizeof(CLIENTTHREADINFO)); + RtlCopyMemory(W32Thread->pcti, &ctiSave, sizeof(CLIENTTHREADINFO)); + } + + if (NtCurrentTeb()) + { + PCLIENTINFO pci = GetWin32ClientInfo(); + pci->ulClientDelta = DesktopHeapGetUserDelta(); + if (DesktopObject) + { + pci->pDeskInfo = (PVOID)((ULONG_PTR)DesktopObject->pDeskInfo - pci->ulClientDelta); + if (W32Thread->pcti) pci->pClientThreadInfo = (PVOID)((ULONG_PTR)W32Thread->pcti - pci->ulClientDelta); + } + } + + if (OldDesktop != NULL && + !IntCheckProcessDesktopClasses(OldDesktop, + FreeOnFailure)) + { + DPRINT1("Failed to move process classes to shared heap!\n"); + + /* failed to move desktop classes to the shared heap, + unmap the view and return the error */ if (MapHeap && DesktopObject != NULL) + IntUnmapDesktopView(DesktopObject); + + return FALSE; + } + + /* Remove the thread from the old desktop's list */ + RemoveEntryList(&W32Thread->PtiLink); + + if (DesktopObject != NULL) + { + ObReferenceObject(DesktopObject); + /* Insert into new desktop's list */ + InsertTailList(&DesktopObject->PtiList, &W32Thread->PtiLink); + } + + /* Close the old desktop */ + if (OldDesktop != NULL) + { + if (MapHeap) { - Status = IntMapDesktopView(DesktopObject); - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return FALSE; - } - W32Thread->pDeskInfo = DesktopObject->pDeskInfo; + IntUnmapDesktopView(OldDesktop); } - RtlZeroMemory(&ctiSave, sizeof(CLIENTTHREADINFO)); - - if (W32Thread->pcti && OldDesktop && NtCurrentTeb()) - { - RtlCopyMemory(&ctiSave, W32Thread->pcti, sizeof(CLIENTTHREADINFO)); - DPRINT("Free ClientThreadInfo\n"); - DesktopHeapFree(OldDesktop, W32Thread->pcti); - W32Thread->pcti = NULL; - } - - if (!W32Thread->pcti && DesktopObject && NtCurrentTeb()) - { - DPRINT("Allocate ClientThreadInfo\n"); - W32Thread->pcti = DesktopHeapAlloc( DesktopObject, - sizeof(CLIENTTHREADINFO)); - RtlCopyMemory(W32Thread->pcti, &ctiSave, sizeof(CLIENTTHREADINFO)); - } - - if (NtCurrentTeb()) - { - PCLIENTINFO pci = GetWin32ClientInfo(); - pci->ulClientDelta = DesktopHeapGetUserDelta(); - if (DesktopObject) - { - pci->pDeskInfo = (PVOID)((ULONG_PTR)DesktopObject->pDeskInfo - pci->ulClientDelta); - if (W32Thread->pcti) pci->pClientThreadInfo = (PVOID)((ULONG_PTR)W32Thread->pcti - pci->ulClientDelta); - } - } - - if (OldDesktop != NULL && - !IntCheckProcessDesktopClasses(OldDesktop, - FreeOnFailure)) - { - DPRINT1("Failed to move process classes to shared heap!\n"); - - /* failed to move desktop classes to the shared heap, - unmap the view and return the error */ - if (MapHeap && DesktopObject != NULL) - IntUnmapDesktopView(DesktopObject); - - return FALSE; - } - - /* Remove the thread from the old desktop's list */ - RemoveEntryList(&W32Thread->PtiLink); - - if (DesktopObject != NULL) - { - ObReferenceObject(DesktopObject); - /* Insert into new desktop's list */ - InsertTailList(&DesktopObject->PtiList, &W32Thread->PtiLink); - } - - if (OldDesktop != NULL) - { - if (MapHeap) - { - IntUnmapDesktopView(OldDesktop); - } - - ObDereferenceObject(OldDesktop); - } + ObDereferenceObject(OldDesktop); + } + + if (hOldDesktop != NULL) + { + ZwClose(hOldDesktop); } return TRUE; @@ -1909,40 +1935,15 @@ BOOL APIENTRY NtUserSetThreadDesktop(HDESK hDesktop) { - PDESKTOP DesktopObject; - NTSTATUS Status; - DECLARE_RETURN(BOOL); + BOOL ret; UserEnterExclusive(); - DPRINT("Enter NtUserSetThreadDesktop\n"); - - /* Validate the new desktop. */ - Status = IntValidateDesktopHandle( - hDesktop, - UserMode, - 0, - &DesktopObject); - - if (!NT_SUCCESS(Status)) - { - DPRINT("Validation of desktop handle (0x%X) failed\n", hDesktop); - RETURN(FALSE); - } - - /* FIXME: Should check here to see if the thread has any windows. */ - - if (!IntSetThreadDesktop(DesktopObject, - FALSE)) - { - RETURN(FALSE); - } - - RETURN(TRUE); - -CLEANUP: - DPRINT("Leave NtUserSetThreadDesktop, ret=%i\n",_ret_); + + ret = IntSetThreadDesktop(hDesktop, FALSE); + UserLeave(); - END_CLEANUP; + + return ret; } /* EOF */

13 years, 9 months

[fireball] 51085: [NTDLL/LDR] - Use LdrpRunInitializeRoutines() instead of the old LdrpAttachThread(). This adds calls to unimplemented context functions, but since they were not called at all by t...

by fireball＠svn.reactos.org

Author: fireball Date: Thu Mar 17 17:47:42 2011 New Revision: 51085 URL: http://svn.reactos.org/svn/reactos?rev=51085&view=rev Log: [NTDLL/LDR] - Use LdrpRunInitializeRoutines() instead of the old LdrpAttachThread(). This adds calls to unimplemented context functions, but since they were not called at all by the old code it shouldn't change the behaviour significantly. Besides of that, it's start of significant changes in the "mainstream" codepaths, so regressions might occur. Modified: trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Thu Mar 17 17:47:42 2011 @@ -47,7 +47,6 @@ IN PUNICODE_STRING Name, OUT PLDR_DATA_TABLE_ENTRY *Module, OUT PVOID *BaseAddress OPTIONAL); -static NTSTATUS LdrpAttachProcess(VOID); static VOID LdrpDetachProcess(BOOLEAN UnloadAll); static NTSTATUS LdrpUnloadModule(PLDR_DATA_TABLE_ENTRY Module, BOOLEAN Unload); @@ -745,7 +744,7 @@ if (!(Module->Flags & LDRP_PROCESS_ATTACH_CALLED)) { RtlEnterCriticalSection(Peb->LoaderLock); - Status = LdrpAttachProcess(); + Status = LdrpRunInitializeRoutines(NULL); RtlLeaveCriticalSection(Peb->LoaderLock); } if (Module->EntryPointActivationContext) RtlDeactivateActivationContext(0, cookie); @@ -2036,7 +2035,7 @@ Status = LdrpInitializeTls(); if (NT_SUCCESS(Status)) { - Status = LdrpAttachProcess(); + Status = LdrpRunInitializeRoutines(NULL); } if (NT_SUCCESS(Status)) { @@ -2643,83 +2642,6 @@ DPRINT("LdrpDetachProcess() done\n"); } -/********************************************************************** - * NAME LOCAL - * LdrpAttachProcess - * - * DESCRIPTION - * Initialize all dll's which are prepered for loading - * - * ARGUMENTS - * none - * - * RETURN VALUE - * status - * - * REVISIONS - * - * NOTE - * The loader lock must be held on entry. - * - */ -static NTSTATUS -LdrpAttachProcess(VOID) -{ - PLIST_ENTRY ModuleListHead; - PLIST_ENTRY Entry; - PLDR_DATA_TABLE_ENTRY Module; - BOOLEAN Result; - NTSTATUS Status = STATUS_SUCCESS; - - DPRINT("LdrpAttachProcess() called for %wZ\n", - &LdrpImageEntry->BaseDllName); - - ModuleListHead = &NtCurrentPeb()->Ldr->InInitializationOrderModuleList; - Entry = ModuleListHead->Flink; - while (Entry != ModuleListHead) - { - Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); - if (!(Module->Flags & (LDRP_LOAD_IN_PROGRESS|LDRP_UNLOAD_IN_PROGRESS|LDRP_ENTRY_PROCESSED))) - { - Module->Flags |= LDRP_LOAD_IN_PROGRESS; - TRACE_LDR("%wZ loaded - Calling init routine at %x for process attaching\n", - &Module->BaseDllName, Module->EntryPoint); - - /* Check if it has TLS */ - if (Module->TlsIndex && FALSE/*Context*/) - { - /* Call TLS */ - LdrpTlsCallback(Module->DllBase, DLL_PROCESS_ATTACH); - } - - if ((Module->Flags & LDRP_IMAGE_DLL) && Module->EntryPoint) - Result = LdrpCallDllEntry(Module->EntryPoint, Module->DllBase, DLL_PROCESS_ATTACH, (PVOID)(Module->LoadCount == LDRP_PROCESS_CREATION_TIME ? 1 : 0)); - else - Result = TRUE; - - if (!Result) - { - Status = STATUS_DLL_INIT_FAILED; - break; - } - if (Module->Flags & LDRP_IMAGE_DLL && Module->EntryPoint != 0) - { - Module->Flags |= LDRP_PROCESS_ATTACH_CALLED|LDRP_ENTRY_PROCESSED; - } - else - { - Module->Flags |= LDRP_ENTRY_PROCESSED; - } - Module->Flags &= ~LDRP_LOAD_IN_PROGRESS; - } - Entry = Entry->Flink; - } - - DPRINT("LdrpAttachProcess() done\n"); - - return Status; -} - /* * @implemented */

13 years, 9 months

[fireball] 51084: [NTDLL] - Implement fetching address of a security cookie in an image. Still not used even if it's present there. - Silence some debug prints.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Mar 17 14:25:59 2011 New Revision: 51084 URL: http://svn.reactos.org/svn/reactos?rev=51084&view=rev Log: [NTDLL] - Implement fetching address of a security cookie in an image. Still not used even if it's present there. - Silence some debug prints. Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Thu Mar 17 14:25:59 2011 @@ -343,6 +343,62 @@ // Ignored atm } +PVOID +NTAPI +LdrpFetchAddressOfSecurityCookie(PVOID BaseAddress, ULONG SizeOfImage) +{ + PIMAGE_LOAD_CONFIG_DIRECTORY ConfigDir; + ULONG DirSize; + PVOID Cookie = NULL; + + /* Check NT header first */ + if (!RtlImageNtHeader(BaseAddress)) return NULL; + + /* Get the pointer to the config directory */ + ConfigDir = RtlImageDirectoryEntryToData(BaseAddress, + TRUE, + IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, + &DirSize); + + /* Check for sanity */ + if (!ConfigDir || + (DirSize != 64 && ConfigDir->Size != DirSize) || + (ConfigDir->Size < 0x48)) + return NULL; + + /* Now get the cookie */ + Cookie = (PVOID)ConfigDir->SecurityCookie; + + /* Check this cookie */ + if (Cookie == NULL || + (PCHAR)Cookie <= (PCHAR)BaseAddress || + (PCHAR)Cookie >= (PCHAR)BaseAddress + SizeOfImage) + { + Cookie = NULL; + } + + /* Return validated security cookie */ + return Cookie; +} + +PVOID +NTAPI +LdrpInitSecurityCookie(PLDR_DATA_TABLE_ENTRY LdrEntry) +{ + PVOID Cookie; + + /* Fetch address of the cookie */ + Cookie = LdrpFetchAddressOfSecurityCookie(LdrEntry->DllBase, LdrEntry->SizeOfImage); + + if (Cookie) + { + UNIMPLEMENTED; + Cookie = NULL; + } + + return Cookie; +} + NTSTATUS NTAPI LdrpRunInitializeRoutines(IN PCONTEXT Context OPTIONAL) @@ -361,7 +417,7 @@ PTEB OldTldTeb; BOOLEAN DllStatus; - DPRINT1("LdrpRunInitializeRoutines() called for %wZ\n", &LdrpImageEntry->BaseDllName); + DPRINT("LdrpRunInitializeRoutines() called for %wZ\n", &LdrpImageEntry->BaseDllName); /* Check the Loader Lock */ LdrpEnsureLoaderLockIsHeld(); @@ -417,8 +473,7 @@ if (!(LdrEntry->Flags & LDRP_ENTRY_PROCESSED)) { /* Setup the Cookie for the DLL */ - //LdrpInitSecurityCookie(LdrEntry); - UNIMPLEMENTED; + LdrpInitSecurityCookie(LdrEntry); /* Check for valid entrypoint */ if (LdrEntry->EntryPoint) @@ -474,7 +529,7 @@ /* Get an entry */ LdrEntry = LdrRootEntry[i]; - /* FIXME: Verifiy NX Compat */ + /* FIXME: Verify NX Compat */ /* Move to next entry */ i++; @@ -534,8 +589,11 @@ } /* Call the Entrypoint */ - DPRINT1("%wZ - Calling entry point at %x for thread attaching\n", - &LdrEntry->BaseDllName, EntryPoint); + if (ShowSnaps) + { + DPRINT1("%wZ - Calling entry point at %p for DLL_PROCESS_ATTACH\n", + &LdrEntry->BaseDllName, EntryPoint); + } DllStatus = LdrpCallDllEntry(EntryPoint, LdrEntry->DllBase, DLL_PROCESS_ATTACH,

13 years, 9 months

[fireball] 51083: [RTL] - Limit unimplemented warnings about RtlActivateActivationContextUnsafeFast calls for now so that they don't flood the log too much.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Mar 17 14:24:34 2011 New Revision: 51083 URL: http://svn.reactos.org/svn/reactos?rev=51083&view=rev Log: [RTL] - Limit unimplemented warnings about RtlActivateActivationContextUnsafeFast calls for now so that they don't flood the log too much. Modified: trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=51083… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Thu Mar 17 14:24:34 2011 @@ -2735,7 +2735,12 @@ RtlActivateActivationContextUnsafeFast(IN PRTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED Frame, IN PVOID Context) { - UNIMPLEMENTED; + static int i; + + if (i == 0) + UNIMPLEMENTED; + i++; + return STATUS_NOT_IMPLEMENTED; } @@ -2743,7 +2748,12 @@ NTAPI RtlDeactivateActivationContextUnsafeFast(IN PRTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED Frame) { - UNIMPLEMENTED; + static int i; + + if (i == 0) + UNIMPLEMENTED; + i++; + return STATUS_NOT_IMPLEMENTED; }

13 years, 9 months

[gadamopoulos] 51082: [win32k] - Improve the definition and simplify NtUserCreateDesktop, NtUserOpenDesktop, NtUserCreateWindowStation, NtUserOpenWindowStation

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Mar 17 13:19:18 2011 New Revision: 51082 URL: http://svn.reactos.org/svn/reactos?rev=51082&view=rev Log: [win32k] - Improve the definition and simplify NtUserCreateDesktop, NtUserOpenDesktop, NtUserCreateWindowStation, NtUserOpenWindowStation Modified: trunk/reactos/dll/win32/user32/misc/desktop.c trunk/reactos/dll/win32/user32/misc/winsta.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/dll/win32/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/desk… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] Thu Mar 17 13:19:18 2011 @@ -564,13 +564,22 @@ ACCESS_MASK dwDesiredAccess) { UNICODE_STRING DesktopName; + OBJECT_ATTRIBUTES ObjectAttributes; RtlInitUnicodeString(&DesktopName, lpszDesktop); - return NtUserOpenDesktop( - &DesktopName, - dwFlags, - dwDesiredAccess); + InitializeObjectAttributes(&ObjectAttributes, + &DesktopName, + OBJ_CASE_INSENSITIVE, + GetProcessWindowStation(), + 0); + + if( fInherit == TRUE ) + { + ObjectAttributes.Attributes |= OBJ_INHERIT; + } + + return NtUserOpenDesktop(&ObjectAttributes, dwFlags, dwDesiredAccess); } Modified: trunk/reactos/dll/win32/user32/misc/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/wins… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/winsta.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/winsta.c [iso-8859-1] Thu Mar 17 13:19:18 2011 @@ -12,6 +12,7 @@ #include <user32.h> #include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(winsta); /* @@ -58,12 +59,50 @@ LPSECURITY_ATTRIBUTES lpsa) { UNICODE_STRING WindowStationName; + UNICODE_STRING WindowStationsDir = RTL_CONSTANT_STRING(L"\\Windows\\WindowStations"); + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE hWindowStationsDir; + NTSTATUS Status; + HWINSTA hwinsta; + + /* Open WindowStations directory */ + InitializeObjectAttributes(&ObjectAttributes, + &WindowStationsDir, + OBJ_CASE_INSENSITIVE, + 0, + 0); + + Status = NtOpenDirectoryObject(&hWindowStationsDir, + DIRECTORY_CREATE_OBJECT, + &ObjectAttributes); + if(!NT_SUCCESS(Status)) + { + ERR("Failed to open WindowStations directory\n"); + return NULL; + } RtlInitUnicodeString(&WindowStationName, lpwinsta); - return NtUserCreateWindowStation(&WindowStationName, - dwDesiredAccess, - lpsa, 0, 0, 0, 0); + /* Create the window station object */ + InitializeObjectAttributes(&ObjectAttributes, + &WindowStationName, + OBJ_CASE_INSENSITIVE, + hWindowStationsDir, + 0); + + /* Check if the handle should be inheritable */ + if (lpsa && lpsa->bInheritHandle) + { + ObjectAttributes.Attributes |= OBJ_INHERIT; + } + + hwinsta = NtUserCreateWindowStation(&ObjectAttributes, + dwDesiredAccess, + 0, 0, 0, 0, 0); + + NtClose(hWindowStationsDir); + + return hwinsta; } /* @@ -299,14 +338,51 @@ */ HWINSTA WINAPI OpenWindowStationW(LPCWSTR lpszWinSta, - BOOL fInherit, - ACCESS_MASK dwDesiredAccess) + BOOL fInherit, + ACCESS_MASK dwDesiredAccess) { UNICODE_STRING WindowStationName; - + UNICODE_STRING WindowStationsDir = RTL_CONSTANT_STRING(L"\\Windows\\WindowStations"); + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE hWindowStationsDir; + NTSTATUS Status; + HWINSTA hwinsta; + + /* Open WindowStations directory */ + InitializeObjectAttributes(&ObjectAttributes, + &WindowStationsDir, + OBJ_CASE_INSENSITIVE, + 0, + 0); + + Status = NtOpenDirectoryObject(&hWindowStationsDir, + DIRECTORY_TRAVERSE, + &ObjectAttributes); + if(!NT_SUCCESS(Status)) + { + ERR("Failed to open WindowStations directory\n"); + return NULL; + } + + /* Open the window station object */ RtlInitUnicodeString(&WindowStationName, lpszWinSta); - return NtUserOpenWindowStation(&WindowStationName, dwDesiredAccess); + InitializeObjectAttributes(&ObjectAttributes, + &WindowStationName, + OBJ_CASE_INSENSITIVE, + hWindowStationsDir, + 0); + + if( fInherit == TRUE ) + { + ObjectAttributes.Attributes |= OBJ_INHERIT; + } + + hwinsta = NtUserOpenWindowStation(&ObjectAttributes, dwDesiredAccess); + + NtClose(hWindowStationsDir); + + return hwinsta; } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Thu Mar 17 13:19:18 2011 @@ -1462,7 +1462,7 @@ HWND NTAPI NtUserCreateWindowEx( - DWORD dwExStyle, // |= 0x80000000 == Ansi used to set WNDS_ANSICREATOR + DWORD dwExStyle, PLARGE_STRING plstrClassName, PLARGE_STRING plstrClsVersion, PLARGE_STRING plstrWindowName, @@ -1481,9 +1481,9 @@ HWINSTA NTAPI NtUserCreateWindowStation( - PUNICODE_STRING lpszWindowStationName, + POBJECT_ATTRIBUTES ObjectAttributes, ACCESS_MASK dwDesiredAccess, - LPSECURITY_ATTRIBUTES lpSecurity, + DWORD Unknown2, DWORD Unknown3, DWORD Unknown4, DWORD Unknown5, @@ -2301,9 +2301,9 @@ HDESK NTAPI NtUserOpenDesktop( - PUNICODE_STRING lpszDesktopName, - DWORD dwFlags, - ACCESS_MASK dwDesiredAccess); + POBJECT_ATTRIBUTES ObjectAttributes, + DWORD dwFlags, + ACCESS_MASK dwDesiredAccess); HDESK NTAPI @@ -2315,7 +2315,7 @@ HWINSTA NTAPI NtUserOpenWindowStation( - PUNICODE_STRING lpszWindowStationName, + POBJECT_ATTRIBUTES ObjectAttributes, ACCESS_MASK dwDesiredAccess); BOOL Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Thu Mar 17 13:19:18 2011 @@ -859,15 +859,12 @@ HDESK APIENTRY NtUserCreateDesktop( - POBJECT_ATTRIBUTES poa, + POBJECT_ATTRIBUTES ObjectAttributes, PUNICODE_STRING lpszDesktopDevice, LPDEVMODEW lpdmw, DWORD dwFlags, ACCESS_MASK dwDesiredAccess) { - OBJECT_ATTRIBUTES ObjectAttributes; - PTHREADINFO W32Thread; - PWINSTATION_OBJECT WinStaObject; PDESKTOP DesktopObject; UNICODE_STRING DesktopName; NTSTATUS Status = STATUS_SUCCESS; @@ -875,12 +872,9 @@ CSR_API_MESSAGE Request; PVOID DesktopHeapSystemBase = NULL; SIZE_T DesktopInfoSize; - UNICODE_STRING SafeDesktopName; ULONG DummyContext; ULONG_PTR HeapSize = 4 * 1024 * 1024; /* FIXME */ - HWINSTA hWindowStation = NULL ; - PUNICODE_STRING lpszDesktopName = NULL; - UNICODE_STRING ClassName, MenuName; + UNICODE_STRING ClassName; LARGE_STRING WindowName; BOOL NoHooks = FALSE; PWND pWnd = NULL; @@ -889,7 +883,7 @@ PTHREADINFO ptiCurrent; DECLARE_RETURN(HDESK); - DPRINT("Enter NtUserCreateDesktop: %wZ\n", lpszDesktopName); + DPRINT("Enter NtUserCreateDesktop\n"); UserEnterExclusive(); ptiCurrent = PsGetCurrentThreadWin32Thread(); @@ -899,68 +893,7 @@ NoHooks = (ptiCurrent->TIF_flags & TIF_DISABLEHOOKS); ptiCurrent->TIF_flags |= TIF_DISABLEHOOKS; } - - _SEH2_TRY - { - ProbeForRead( poa, - sizeof(OBJECT_ATTRIBUTES), - 1); - - hWindowStation = poa->RootDirectory; - lpszDesktopName = poa->ObjectName; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status =_SEH2_GetExceptionCode(); - } - _SEH2_END - - if (! NT_SUCCESS(Status)) - { - DPRINT1("Failed reading Object Attributes from user space.\n"); - SetLastNtError(Status); - RETURN( NULL); - } - - Status = IntValidateWindowStationHandle( - hWindowStation, - KernelMode, - 0, /* FIXME - WINSTA_CREATEDESKTOP */ - &WinStaObject); - - if (! NT_SUCCESS(Status)) - { - DPRINT1("Failed validation of window station handle (0x%X), cannot create desktop %wZ\n", - hWindowStation, lpszDesktopName); - SetLastNtError(Status); - RETURN( NULL); - } - if(lpszDesktopName != NULL) - { - Status = IntSafeCopyUnicodeString(&SafeDesktopName, lpszDesktopName); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( NULL); - } - } - else - { - RtlInitUnicodeString(&SafeDesktopName, NULL); - } - - if (! IntGetFullWindowStationName(&DesktopName, &WinStaObject->Name, - &SafeDesktopName)) - { - SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); - ObDereferenceObject(WinStaObject); - if (lpszDesktopName) - ExFreePoolWithTag(SafeDesktopName.Buffer, TAG_STRING); - RETURN( NULL); - } - if (lpszDesktopName) - ExFreePoolWithTag(SafeDesktopName.Buffer, TAG_STRING); - ObDereferenceObject(WinStaObject); + DesktopName.Buffer = NULL; /* * Try to open already existing desktop @@ -968,18 +901,10 @@ DPRINT("Trying to open desktop (%wZ)\n", &DesktopName); - /* Initialize ObjectAttributes for the desktop object */ - InitializeObjectAttributes( - &ObjectAttributes, - &DesktopName, - 0, - NULL, - NULL); - Status = ObOpenObjectByName( - &ObjectAttributes, + ObjectAttributes, ExDesktopObjectType, - KernelMode, + UserMode, NULL, dwDesiredAccess, (PVOID)&DummyContext, @@ -987,8 +912,27 @@ if (!NT_SUCCESS(Status)) RETURN(NULL); if (Status == STATUS_OBJECT_NAME_EXISTS) { - ExFreePoolWithTag(DesktopName.Buffer, TAG_STRING); RETURN( Desktop); + } + + /* Capture desktop name */ + _SEH2_TRY + { + ProbeForRead( ObjectAttributes, sizeof(OBJECT_ATTRIBUTES), 1); + + Status = IntSafeCopyUnicodeString(&DesktopName, ObjectAttributes->ObjectName); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + + if (! NT_SUCCESS(Status)) + { + DPRINT1("Failed reading Object Attributes from user space.\n"); + SetLastNtError(Status); + RETURN( NULL); } /* Reference the desktop */ @@ -1011,12 +955,11 @@ RETURN(NULL); } - DesktopInfoSize = FIELD_OFFSET(DESKTOPINFO, - szDesktopName[(lpszDesktopName->Length / sizeof(WCHAR)) + 1]); + DesktopInfoSize = sizeof(DESKTOPINFO) + DesktopName.Length; DesktopObject->pDeskInfo = RtlAllocateHeap(DesktopObject->pheapDesktop, - HEAP_NO_SERIALIZE, - DesktopInfoSize); + HEAP_NO_SERIALIZE, + DesktopInfoSize); if (DesktopObject->pDeskInfo == NULL) { @@ -1031,8 +974,8 @@ DesktopObject->pDeskInfo->pvDesktopBase = DesktopHeapSystemBase; DesktopObject->pDeskInfo->pvDesktopLimit = (PVOID)((ULONG_PTR)DesktopHeapSystemBase + HeapSize); RtlCopyMemory(DesktopObject->pDeskInfo->szDesktopName, - lpszDesktopName->Buffer, - lpszDesktopName->Length); + DesktopName.Buffer, + DesktopName.Length); /* Initialize some local (to win32k) desktop state. */ InitializeListHead(&DesktopObject->PtiList); @@ -1042,7 +985,6 @@ { InitializeListHead(&DesktopObject->pDeskInfo->aphkStart[i]); } - ExFreePoolWithTag(DesktopName.Buffer, TAG_STRING); //// why is this here? #if 0 @@ -1090,7 +1032,6 @@ // ClassName.Buffer = ((PWSTR)((ULONG_PTR)(WORD)(gpsi->atomSysClass[ICLS_DESKTOP]))); ClassName.Length = 0; - RtlZeroMemory(&MenuName, sizeof(MenuName)); RtlZeroMemory(&WindowName, sizeof(WindowName)); RtlZeroMemory(&Cs, sizeof(Cs)); @@ -1113,9 +1054,8 @@ DesktopObject->pDeskInfo->spwnd = pWndDesktop; } #endif - W32Thread = PsGetCurrentThreadWin32Thread(); - - if (!W32Thread->rpdesk) IntSetThreadDesktop(DesktopObject,FALSE); + + if (!ptiCurrent->rpdesk) IntSetThreadDesktop(DesktopObject,FALSE); /* Based on wine/server/window.c in get_desktop_window. @@ -1123,7 +1063,6 @@ ClassName.Buffer = ((PWSTR)((ULONG_PTR)(WORD)(gpsi->atomSysClass[ICLS_HWNDMESSAGE]))); ClassName.Length = 0; - RtlZeroMemory(&MenuName, sizeof(MenuName)); RtlZeroMemory(&WindowName, sizeof(WindowName)); RtlZeroMemory(&Cs, sizeof(Cs)); @@ -1154,6 +1093,10 @@ RETURN( Desktop); CLEANUP: + if(DesktopName.Buffer != NULL) + { + ExFreePoolWithTag(DesktopName.Buffer, TAG_STRING); + } if (!NoHooks && ptiCurrent) ptiCurrent->TIF_flags &= ~TIF_DISABLEHOOKS; DPRINT("Leave NtUserCreateDesktop, ret=%i\n",_ret_); UserLeave(); @@ -1184,85 +1127,17 @@ HDESK APIENTRY NtUserOpenDesktop( - PUNICODE_STRING lpszDesktopName, + POBJECT_ATTRIBUTES ObjectAttributes, DWORD dwFlags, ACCESS_MASK dwDesiredAccess) { - OBJECT_ATTRIBUTES ObjectAttributes; - HWINSTA WinSta; - PWINSTATION_OBJECT WinStaObject; - UNICODE_STRING DesktopName; - UNICODE_STRING SafeDesktopName; NTSTATUS Status; HDESK Desktop; - BOOL Result; - DECLARE_RETURN(HDESK); - - DPRINT("Enter NtUserOpenDesktop: %wZ\n", lpszDesktopName); - UserEnterExclusive(); - - /* - * Validate the window station handle and compose the fully - * qualified desktop name - */ - - WinSta = UserGetProcessWindowStation(); - Status = IntValidateWindowStationHandle( - WinSta, - KernelMode, - 0, - &WinStaObject); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed validation of window station handle (0x%X)\n", WinSta); - SetLastNtError(Status); - RETURN( 0); - } - - if(lpszDesktopName != NULL) - { - Status = IntSafeCopyUnicodeString(&SafeDesktopName, lpszDesktopName); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( NULL); - } - } - else - { - RtlInitUnicodeString(&SafeDesktopName, NULL); - } - - Result = IntGetFullWindowStationName(&DesktopName, &WinStaObject->Name, - &SafeDesktopName); - - if (lpszDesktopName) - ExFreePoolWithTag(SafeDesktopName.Buffer, TAG_STRING); - ObDereferenceObject(WinStaObject); - - - if (!Result) - { - SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); - RETURN( 0); - } - - - DPRINT("Trying to open desktop (%wZ)\n", &DesktopName); - - /* Initialize ObjectAttributes for the desktop object */ - InitializeObjectAttributes( - &ObjectAttributes, - &DesktopName, - 0, - NULL, - NULL); Status = ObOpenObjectByName( - &ObjectAttributes, + ObjectAttributes, ExDesktopObjectType, - KernelMode, + UserMode, NULL, dwDesiredAccess, NULL, @@ -1271,19 +1146,10 @@ if (!NT_SUCCESS(Status)) { SetLastNtError(Status); - ExFreePool(DesktopName.Buffer); - RETURN( 0); - } - - DPRINT("Successfully opened desktop (%wZ)\n", &DesktopName); - ExFreePool(DesktopName.Buffer); - - RETURN( Desktop); - -CLEANUP: - DPRINT("Leave NtUserOpenDesktop, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; + return 0; + } + + return Desktop; } /* Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Thu Mar 17 13:19:18 2011 @@ -392,61 +392,23 @@ HWINSTA APIENTRY NtUserCreateWindowStation( - PUNICODE_STRING lpszWindowStationName, + POBJECT_ATTRIBUTES ObjectAttributes, ACCESS_MASK dwDesiredAccess, - LPSECURITY_ATTRIBUTES lpSecurity, + DWORD Unknown2, DWORD Unknown3, DWORD Unknown4, DWORD Unknown5, DWORD Unknown6) { UNICODE_STRING WindowStationName; - UNICODE_STRING FullWindowStationName; PWINSTATION_OBJECT WindowStationObject; HWINSTA WindowStation; - OBJECT_ATTRIBUTES ObjectAttributes; NTSTATUS Status; - /* - * Generate full window station name - */ - Status = ProbeAndCaptureUnicodeString(&WindowStationName, - UserMode, - lpszWindowStationName); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to capture window station name (status 0x%08x)\n", - Status); - SetLastNtError(Status); - return 0; - } - if (!IntGetFullWindowStationName(&FullWindowStationName, - &WindowStationName, - NULL)) - { - ReleaseCapturedUnicodeString(&WindowStationName, UserMode); - SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); - return 0; - } - - /* - * Try to open already existing window station - */ - - DPRINT("Trying to open window station (%wZ)\n", &FullWindowStationName); - - /* Initialize ObjectAttributes for the window station object */ - InitializeObjectAttributes( - &ObjectAttributes, - &FullWindowStationName, - 0, - NULL, - NULL); - Status = ObOpenObjectByName( - &ObjectAttributes, + ObjectAttributes, ExWindowStationObjectType, - KernelMode, + UserMode, NULL, dwDesiredAccess, NULL, @@ -454,24 +416,39 @@ if (NT_SUCCESS(Status)) { - DPRINT("Successfully opened window station (%wZ)\n", - FullWindowStationName); - ExFreePool(FullWindowStationName.Buffer); - ReleaseCapturedUnicodeString(&WindowStationName, UserMode); return (HWINSTA)WindowStation; } + /* * No existing window station found, try to create new one */ - - DPRINT("Creating window station (%wZ)\n", &FullWindowStationName); - + + /* Capture window station name */ + _SEH2_TRY + { + ProbeForRead( ObjectAttributes, sizeof(OBJECT_ATTRIBUTES), 1); + Status = IntSafeCopyUnicodeString(&WindowStationName, ObjectAttributes->ObjectName); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status =_SEH2_GetExceptionCode(); + } + _SEH2_END + + if (! NT_SUCCESS(Status)) + { + DPRINT1("Failed reading capturing window station name\n"); + SetLastNtError(Status); + return NULL; + } + + /* Create the window station object */ Status = ObCreateObject( - KernelMode, + UserMode, ExWindowStationObjectType, - &ObjectAttributes, - ExGetPreviousMode(), + ObjectAttributes, + UserMode, NULL, sizeof(WINSTATION_OBJECT), 0, @@ -480,25 +457,10 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("Failed creating window station (%wZ)\n", &FullWindowStationName); - ExFreePool(FullWindowStationName.Buffer); - ReleaseCapturedUnicodeString(&WindowStationName, UserMode); + ExFreePoolWithTag(WindowStationName.Buffer, TAG_STRING); SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); return 0; } - - /* Zero out the buffer */ - RtlZeroMemory(WindowStationObject, sizeof(WINSTATION_OBJECT)); - - KeInitializeSpinLock(&WindowStationObject->Lock); - - InitializeListHead(&WindowStationObject->DesktopListHead); - - WindowStationObject->AtomTable = NULL; - Status = RtlCreateAtomTable(37, &WindowStationObject->AtomTable); - WindowStationObject->SystemMenuTemplate = (HANDLE)0; - - WindowStationObject->Name = WindowStationName; Status = ObInsertObject( (PVOID)WindowStationObject, @@ -510,20 +472,21 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("Failed creating window station (%wZ)\n", &FullWindowStationName); - ExFreePool(FullWindowStationName.Buffer); - ExFreePool(WindowStationName.Buffer); + ExFreePoolWithTag(WindowStationName.Buffer, TAG_STRING); SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); ObDereferenceObject(WindowStationObject); return 0; } - /* - * Initialize the new window station object - */ - + /* Initialize the window station */ + RtlZeroMemory(WindowStationObject, sizeof(WINSTATION_OBJECT)); + + KeInitializeSpinLock(&WindowStationObject->Lock); + InitializeListHead(&WindowStationObject->DesktopListHead); + Status = RtlCreateAtomTable(37, &WindowStationObject->AtomTable); + WindowStationObject->SystemMenuTemplate = (HANDLE)0; + WindowStationObject->Name = WindowStationName; WindowStationObject->ScreenSaverRunning = FALSE; - WindowStationObject->FlatMenu = FALSE; if (!IntSetupClipboard(WindowStationObject)) @@ -538,8 +501,6 @@ InitCursorImpl(); } - DPRINT("Window station successfully created (%wZ)\n", &FullWindowStationName); - ExFreePool(FullWindowStationName.Buffer); return WindowStation; } @@ -569,39 +530,16 @@ HWINSTA APIENTRY NtUserOpenWindowStation( - PUNICODE_STRING lpszWindowStationName, + POBJECT_ATTRIBUTES ObjectAttributes, ACCESS_MASK dwDesiredAccess) { - UNICODE_STRING WindowStationName; HWINSTA WindowStation; - OBJECT_ATTRIBUTES ObjectAttributes; NTSTATUS Status; - /* - * Generate full window station name - */ - - if (!IntGetFullWindowStationName(&WindowStationName, lpszWindowStationName, - NULL)) - { - SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); - return 0; - } - - DPRINT("Trying to open window station (%wZ)\n", &WindowStationName); - - /* Initialize ObjectAttributes for the window station object */ - InitializeObjectAttributes( - &ObjectAttributes, - &WindowStationName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ObOpenObjectByName( - &ObjectAttributes, + ObjectAttributes, ExWindowStationObjectType, - KernelMode, + UserMode, NULL, dwDesiredAccess, NULL, @@ -610,12 +548,8 @@ if (!NT_SUCCESS(Status)) { SetLastNtError(Status); - ExFreePool(WindowStationName.Buffer); return 0; } - - DPRINT("Successfully opened window station (%wZ)\n", &WindowStationName); - ExFreePool(WindowStationName.Buffer); return WindowStation; }

13 years, 9 months

[cfinck] 51081: Victory!

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Mar 17 12:44:03 2011 New Revision: 51081 URL: http://svn.reactos.org/svn/reactos?rev=51081&view=rev Log: Victory! Added: tags/ReactOS-0.3.13-CLT2011/ - copied from r51080, branches/ros-branch-0_3_13-clt2011/ Removed: branches/ros-branch-0_3_13-clt2011/

13 years, 9 months

[fireball] 51080: - Fix build.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Mar 17 11:20:16 2011 New Revision: 51080 URL: http://svn.reactos.org/svn/reactos?rev=51080&view=rev Log: - Fix build. Modified: trunk/reactos/dll/ntdll/include/ntdllp.h Modified: trunk/reactos/dll/ntdll/include/ntdllp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/include/ntdllp.h… ============================================================================== --- trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] Thu Mar 17 11:20:16 2011 @@ -60,6 +60,9 @@ OUT PVOID *BaseAddress, IN BOOLEAN CallInit); +ULONG NTAPI +LdrpClearLoadInProgress(); + /* FIXME: Cleanup this mess */ typedef NTSTATUS (NTAPI *PEPFUNC)(PPEB); NTSTATUS LdrMapSections(HANDLE ProcessHandle,

13 years, 9 months

[fireball] 51079: [NTDLL/LDR] - Fix a typo in LdrQueryProcessModuleInformationEx(). - Stub LdrpEnsureLoaderLockIsHeld() for now. - Improve LdrpRunInitializeRoutines() and enable it (just compiling, ...

by fireball＠svn.reactos.org

Author: fireball Date: Thu Mar 17 10:59:54 2011 New Revision: 51079 URL: http://svn.reactos.org/svn/reactos?rev=51079&view=rev Log: [NTDLL/LDR] - Fix a typo in LdrQueryProcessModuleInformationEx(). - Stub LdrpEnsureLoaderLockIsHeld() for now. - Improve LdrpRunInitializeRoutines() and enable it (just compiling, it's not in the running path of the code yet). - Fix an uninit var warning in ldrpe.c - Implement LdrpClearLoadInProgress(). - Rename "ExeModule" to a more consistent LdrpImageEntry. Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c trunk/reactos/dll/ntdll/ldr/ldrinit.c trunk/reactos/dll/ntdll/ldr/ldrpe.c trunk/reactos/dll/ntdll/ldr/ldrutils.c trunk/reactos/dll/ntdll/ldr/startup.c trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Thu Mar 17 10:59:54 2011 @@ -461,7 +461,7 @@ while (InitEntry != InitListHead) { - InitModule = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); + InitModule = CONTAINING_RECORD(InitEntry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); /* Increase the index */ ModulePtr->InitOrderIndex++; Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Thu Mar 17 10:59:54 2011 @@ -23,6 +23,9 @@ BOOLEAN LdrpInLdrInit; PLDR_DATA_TABLE_ENTRY LdrpImageEntry; +PUNICODE_STRING LdrpTopLevelDllBeingLoaded; +extern PTEB LdrpTopLevelDllBeingLoadedTeb; // defined in rtlsupp.c! +PLDR_DATA_TABLE_ENTRY LdrpCurrentDllInitializer; //RTL_BITMAP TlsBitMap; //RTL_BITMAP TlsExpansionBitMap; @@ -333,11 +336,17 @@ FALSE); } +VOID +NTAPI +LdrpEnsureLoaderLockIsHeld() +{ + // Ignored atm +} + NTSTATUS NTAPI LdrpRunInitializeRoutines(IN PCONTEXT Context OPTIONAL) { -#if 0 PLDR_DATA_TABLE_ENTRY LocalArray[16]; PLIST_ENTRY ListHead; PLIST_ENTRY NextEntry; @@ -350,6 +359,7 @@ RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED ActCtx; ULONG BreakOnDllLoad; PTEB OldTldTeb; + BOOLEAN DllStatus; DPRINT1("LdrpRunInitializeRoutines() called for %wZ\n", &LdrpImageEntry->BaseDllName); @@ -493,7 +503,7 @@ if (ShowSnaps) { DPRINT1("LDR: %wZ loaded.", &LdrEntry->BaseDllName); - DPRINT1(" - About to call init routine at %lx\n", EntryPoint); + DPRINT1(" - About to call init routine at %p\n", EntryPoint); } /* Break in debugger */ @@ -526,10 +536,10 @@ /* Call the Entrypoint */ DPRINT1("%wZ - Calling entry point at %x for thread attaching\n", &LdrEntry->BaseDllName, EntryPoint); - LdrpCallDllEntry(EntryPoint, - LdrEntry->DllBase, - DLL_PROCESS_ATTACH, - Context); + DllStatus = LdrpCallDllEntry(EntryPoint, + LdrEntry->DllBase, + DLL_PROCESS_ATTACH, + Context); /* Deactivate the ActCtx */ RtlDeactivateActivationContextUnsafeFast(&ActCtx); @@ -539,6 +549,16 @@ /* Mark the entry as processed */ LdrEntry->Flags |= LDRP_PROCESS_ATTACH_CALLED; + + /* Fail if DLL init failed */ + if (!DllStatus) + { + DPRINT1("LDR: DLL_PROCESS_ATTACH for dll \"%wZ\" (InitRoutine: %p) failed\n", + &LdrEntry->BaseDllName, EntryPoint); + + Status = STATUS_DLL_INIT_FAILED; + goto Quickie; + } } } @@ -551,6 +571,7 @@ LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); /* FIXME: Verify NX Compat */ + // LdrpCheckNXCompatibility() /* Next entry */ NextEntry = NextEntry->Flink; @@ -569,12 +590,13 @@ LdrpImageEntry->EntryPointActivationContext); /* Do TLS callbacks */ - LdrpTlsCallback(Peb->ImageBaseAddress, DLL_PROCESS_DETACH); + LdrpTlsCallback(Peb->ImageBaseAddress, DLL_PROCESS_ATTACH); /* Deactivate the ActCtx */ RtlDeactivateActivationContextUnsafeFast(&ActCtx); } +Quickie: /* Restore old TEB */ LdrpTopLevelDllBeingLoadedTeb = OldTldTeb; @@ -586,12 +608,8 @@ } /* Return to caller */ - DPRINT("LdrpAttachProcess() done\n"); + DPRINT("LdrpRunInitializeRoutines() done\n"); return Status; -#else - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -#endif } NTSTATUS Modified: trunk/reactos/dll/ntdll/ldr/ldrpe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrpe.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrpe.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrpe.c [iso-8859-1] Thu Mar 17 10:59:54 2011 @@ -59,7 +59,7 @@ PIMAGE_IMPORT_BY_NAME AddressOfData; PULONG NameTable; PUSHORT OrdinalTable; - LPSTR ImportName; + LPSTR ImportName = NULL; USHORT Hint; NTSTATUS Status; ULONG_PTR HardErrorParameters[3]; Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Thu Mar 17 10:59:54 2011 @@ -326,4 +326,35 @@ return STATUS_NOT_IMPLEMENTED; } +ULONG +NTAPI +LdrpClearLoadInProgress() +{ + PLIST_ENTRY ListHead; + PLIST_ENTRY Entry; + PLDR_DATA_TABLE_ENTRY Module; + ULONG ModulesCount = 0; + + /* Traverse the init list */ + ListHead = &NtCurrentPeb()->Ldr->InInitializationOrderModuleList; + Entry = ListHead->Flink; + + while (Entry != ListHead) + { + Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); + + /* Clear load in progress flag */ + Module->Flags &= ~LDRP_LOAD_IN_PROGRESS; + + /* Increase counter for modules with entry point count but not processed yet */ + if (Module->EntryPoint && + !(Module->Flags & LDRP_ENTRY_PROCESSED)) ModulesCount++; + + /* Advance to the next entry */ + Entry = Entry->Flink; + } + + return ModulesCount; +} + /* EOF */ Modified: trunk/reactos/dll/ntdll/ldr/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/startup.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Thu Mar 17 10:59:54 2011 @@ -23,7 +23,7 @@ /* GLOBALS *******************************************************************/ -PLDR_DATA_TABLE_ENTRY ExeModule; +extern PLDR_DATA_TABLE_ENTRY LdrpImageEntry; static RTL_CRITICAL_SECTION PebLock; static RTL_BITMAP TlsBitMap; static RTL_BITMAP TlsExpansionBitMap; @@ -526,17 +526,17 @@ &NtModule->InInitializationOrderModuleList); /* add entry for executable (becomes first list entry) */ - ExeModule = (PLDR_DATA_TABLE_ENTRY) + LdrpImageEntry = (PLDR_DATA_TABLE_ENTRY) RtlAllocateHeap(Peb->ProcessHeap, HEAP_ZERO_MEMORY, sizeof(LDR_DATA_TABLE_ENTRY)); - if (ExeModule == NULL) + if (LdrpImageEntry == NULL) { DPRINT1("Failed to create loader module infomation\n"); ZwTerminateProcess(NtCurrentProcess(), STATUS_INSUFFICIENT_RESOURCES); } - ExeModule->DllBase = Peb->ImageBaseAddress; + LdrpImageEntry->DllBase = Peb->ImageBaseAddress; if ((Peb->ProcessParameters == NULL) || (Peb->ProcessParameters->ImagePathName.Length == 0)) @@ -545,32 +545,32 @@ ZwTerminateProcess(NtCurrentProcess(), STATUS_UNSUCCESSFUL); } - RtlCreateUnicodeString(&ExeModule->FullDllName, + RtlCreateUnicodeString(&LdrpImageEntry->FullDllName, Peb->ProcessParameters->ImagePathName.Buffer); - RtlCreateUnicodeString(&ExeModule->BaseDllName, - wcsrchr(ExeModule->FullDllName.Buffer, L'\\') + 1); - - DPRINT("BaseDllName '%wZ' FullDllName '%wZ'\n", &ExeModule->BaseDllName, &ExeModule->FullDllName); - - ExeModule->Flags = LDRP_ENTRY_PROCESSED; - ExeModule->LoadCount = -1; /* don't unload */ - ExeModule->TlsIndex = -1; - ExeModule->SectionPointer = NULL; - ExeModule->CheckSum = 0; - - NTHeaders = RtlImageNtHeader(ExeModule->DllBase); - ExeModule->SizeOfImage = LdrpGetResidentSize(NTHeaders); - ExeModule->TimeDateStamp = NTHeaders->FileHeader.TimeDateStamp; + RtlCreateUnicodeString(&LdrpImageEntry->BaseDllName, + wcsrchr(LdrpImageEntry->FullDllName.Buffer, L'\\') + 1); + + DPRINT("BaseDllName '%wZ' FullDllName '%wZ'\n", &LdrpImageEntry->BaseDllName, &LdrpImageEntry->FullDllName); + + LdrpImageEntry->Flags = LDRP_ENTRY_PROCESSED; + LdrpImageEntry->LoadCount = -1; /* don't unload */ + LdrpImageEntry->TlsIndex = -1; + LdrpImageEntry->SectionPointer = NULL; + LdrpImageEntry->CheckSum = 0; + + NTHeaders = RtlImageNtHeader(LdrpImageEntry->DllBase); + LdrpImageEntry->SizeOfImage = LdrpGetResidentSize(NTHeaders); + LdrpImageEntry->TimeDateStamp = NTHeaders->FileHeader.TimeDateStamp; LdrpTopLevelDllBeingLoadedTeb = NtCurrentTeb(); InsertHeadList(&Peb->Ldr->InLoadOrderModuleList, - &ExeModule->InLoadOrderLinks); + &LdrpImageEntry->InLoadOrderLinks); LdrpInitLoader(); EntryPoint = LdrPEStartup((PVOID)ImageBase, NULL, NULL, NULL); - ExeModule->EntryPoint = EntryPoint; + LdrpImageEntry->EntryPoint = EntryPoint; /* all required dlls are loaded now */ Peb->Ldr->Initialized = TRUE; Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Thu Mar 17 10:59:54 2011 @@ -35,7 +35,7 @@ static HANDLE LdrpKnownDllsDirHandle = NULL; static UNICODE_STRING LdrpKnownDllPath = {0, 0, NULL}; static PLDR_DATA_TABLE_ENTRY LdrpLastModule = NULL; -extern PLDR_DATA_TABLE_ENTRY ExeModule; +extern PLDR_DATA_TABLE_ENTRY LdrpImageEntry; /* PROTOTYPES ****************************************************************/ @@ -222,7 +222,7 @@ ULONG Length; NTSTATUS Status; - DPRINT("LdrpInitLoader() called for %wZ\n", &ExeModule->BaseDllName); + DPRINT("LdrpInitLoader() called for %wZ\n", &LdrpImageEntry->BaseDllName); /* Get handle to the 'KnownDlls' directory */ RtlInitUnicodeString(&Name, @@ -865,7 +865,7 @@ // NULL is the current process if (Name == NULL) { - *Module = ExeModule; + *Module = LdrpImageEntry; RtlLeaveCriticalSection(NtCurrentPeb()->LoaderLock); return(STATUS_SUCCESS); } @@ -2416,7 +2416,7 @@ /* NULL is the current executable */ if (DllName == NULL) { - *DllHandle = ExeModule->DllBase; + *DllHandle = LdrpImageEntry->DllBase; DPRINT("BaseAddress 0x%lx\n", *DllHandle); return STATUS_SUCCESS; } @@ -2560,7 +2560,7 @@ static ULONG CallingCount = 0; DPRINT("LdrpDetachProcess() called for %wZ\n", - &ExeModule->BaseDllName); + &LdrpImageEntry->BaseDllName); if (UnloadAll) LdrpDllShutdownInProgress = TRUE; @@ -2672,7 +2672,7 @@ NTSTATUS Status = STATUS_SUCCESS; DPRINT("LdrpAttachProcess() called for %wZ\n", - &ExeModule->BaseDllName); + &LdrpImageEntry->BaseDllName); ModuleListHead = &NtCurrentPeb()->Ldr->InInitializationOrderModuleList; Entry = ModuleListHead->Flink; @@ -2752,7 +2752,7 @@ NTSTATUS Status; DPRINT("LdrpAttachThread() called for %wZ\n", - &ExeModule->BaseDllName); + &LdrpImageEntry->BaseDllName); RtlEnterCriticalSection (NtCurrentPeb()->LoaderLock); @@ -2810,7 +2810,7 @@ PLDR_DATA_TABLE_ENTRY Module; DPRINT("LdrShutdownThread() called for %wZ\n", - &ExeModule->BaseDllName); + &LdrpImageEntry->BaseDllName); RtlEnterCriticalSection (NtCurrentPeb()->LoaderLock);

13 years, 9 months

[cfinck] 51078: - Change the root "readme.txt" file to have a CLT2011 text. - Add all CD options to "welcome.exe", modify its code a bit to support this. This is all stuff which has already been do...

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Mar 16 23:19:36 2011 New Revision: 51078 URL: http://svn.reactos.org/svn/reactos?rev=51078&view=rev Log: - Change the root "readme.txt" file to have a CLT2011 text. - Add all CD options to "welcome.exe", modify its code a bit to support this. This is all stuff which has already been done last year, see r46065. Removed: branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/bg-BG.rc branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/cs-CZ.rc branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/da-DK.rc branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/el-GR.rc branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/en-US.rc branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/es-ES.rc branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/et-EE.rc branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/fr-FR.rc branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/hu-HU.rc branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/id-ID.rc branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/it-IT.rc branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/ja-JP.rc branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/lt-LT.rc branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/nl-NL.rc branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/no-NO.rc branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/pl-PL.rc branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/pt-BR.rc branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/ru-RU.rc branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/sk-SK.rc branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/sv-SE.rc branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/th-TH.rc branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/uk-UA.rc branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/zh-CN.rc Modified: branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/de-DE.rc branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/rsrc.rc branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/welcome.c branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/welcome.rbuild branches/ros-branch-0_3_13-clt2011/reactos/boot/bootdata/readme.txt Removed: branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13-clt2011/react… ============================================================================== --- branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/bg-BG.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/bg-BG.rc (removed) @@ -1,82 +1,0 @@ -/* - * Bulgarian(BG) resources - * - * Copyright (C) 2005 Violin Iliev - * www.violin-bg.com - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - - -LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Äîáðå äîøëè" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Äîáðå äîøëè â îïåðàöèîííà ñèñòåìà React.\n\nÈçáåðåòå ñè îò òåìèòå â ëÿâî." -// IDS_CHECKTEXT "Ïîêàçâàé îòíîâî òîçè ïðîçîðåö" -// IDS_CLOSETEXT "Èçõîä" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Èíñòàëèðàíå íà ReactOS" - IDS_TOPICBUTTON1 "Ðàçãëåäàé òîâà CD" - IDS_TOPICBUTTON2 "Èçõîä" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Èíñòàëèðàíå íà ReactOSS" - IDS_TOPICTITLE1 "Ðàçãëåäàé òîâà CD" - IDS_TOPICTITLE2 "Èçõîä" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Ñúçäàâàíå íà íîâà èíñòàëàöèÿ íÿ ReactOS èëè îáíîâÿâàíå íà ñúùåñòâóâàùà òàêàâà." - IDS_TOPICDESC1 "Ðàçãëåæäàíå íà CD-òî." - IDS_TOPICDESC2 "Íàòèñíåòå çà èçõîä îò ïðîãðàìàòà." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13-clt2011/react… ============================================================================== --- branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/cs-CZ.rc (removed) @@ -1,62 +1,0 @@ -/* $Id$ */ - -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Vítejte" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Vítejte v operaèním systému ReactOS.\n\nKlepnìte na tlaèítko v levém sloupci." -// IDS_CHECKTEXT "Zobrazit dialog znovu" -// IDS_CLOSETEXT "Konec" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Instalovat ReactOS" - IDS_TOPICBUTTON1 "Prohlíet toto CD" - IDS_TOPICBUTTON2 "Konec" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Instalovat ReactOS" - IDS_TOPICTITLE1 "Prohlíet toto CD" - IDS_TOPICTITLE2 "Konec" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Nainstaluje ReactOS na Vá poèítaè nebo zaktualizuje existující systém." - IDS_TOPICDESC1 "Prohlíet toto CD." - IDS_TOPICDESC2 "Klepnìte pro ukonèení tohoto programu." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13-clt2011/react… ============================================================================== --- branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/da-DK.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/da-DK.rc (removed) @@ -1,62 +1,0 @@ -/* $Id$ */ - -LANGUAGE LANG_DANISH, SUBLANG_DEFAULT - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Velkommen" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Velkommen til ReactOs operativ System.\n\nKlik på et emne til venstre." -// IDS_CHECKTEXT "Vis denne dialog igen ved opstart" -// IDS_CLOSETEXT "Afslut" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Installer ReactOS" - IDS_TOPICBUTTON1 "Gennemse Cdrom" - IDS_TOPICBUTTON2 "Afslut" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Installer ReactOS" - IDS_TOPICTITLE1 "Gennemse Cdrom" - IDS_TOPICTITLE2 "Afslut" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Opret en ny ReactOS installation på din computer eller opgradere en eksisterende installation." - IDS_TOPICDESC1 "Gennemse Reactos Installations Cdrom" - IDS_TOPICDESC2 "Klik på Afslut for at lukke." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Modified: branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13-clt2011/react… ============================================================================== --- branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/de-DE.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/de-DE.rc [iso-8859-1] Wed Mar 16 23:19:36 2011 @@ -11,57 +11,57 @@ /* Default settings */ STRINGTABLE DISCARDABLE BEGIN - IDS_APPTITLE "ReactOS - Willkommen" + IDS_APPTITLE "ReactOS 0.3.13 - CLT 2011" IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Willkommen in ReactOS.\n\nKlicken Sie auf ein Thema auf der linken Seite." -// IDS_CHECKTEXT "Dialog beim nächsen Start wieder anzeigen" -// IDS_CLOSETEXT "Beenden" + IDS_DEFAULTTOPICDESC "ReactOS ist ein modernes Open-Source-Betriebssystem, welches auf dem Design von Windows® XP/2003 basiert. Dazu gehört sowohl die volle Kompatibilität mit Windows-Anwendungen und -Treibern als auch eine ähnliche Benutzeroberfläche, damit sich die meisten Anwender sofort zurechtfinden. Der Quellcode des gesamten Systems ist frei verfügbar und steht größtenteils unter der GNU General Public License." END /* Topic buttons */ STRINGTABLE DISCARDABLE BEGIN IDS_TOPICBUTTON0 "ReactOS installieren" - IDS_TOPICBUTTON1 "CD durchsuchen" - IDS_TOPICBUTTON2 "Beenden" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" + IDS_TOPICBUTTON1 "ReactOS in QEMU ausprobieren" + IDS_TOPICBUTTON2 "ReactOS Build Environment installieren" + IDS_TOPICBUTTON3 "ReactOS-Quellcodepaket öffnen" + IDS_TOPICBUTTON4 "Die ReactOS-Website besuchen" + IDS_TOPICBUTTON5 "Die CD durchsuchen" + IDS_TOPICBUTTON6 "Beenden" END /* Topic titles */ STRINGTABLE DISCARDABLE BEGIN IDS_TOPICTITLE0 "ReactOS installieren" - IDS_TOPICTITLE1 "CD durchsuchen" - IDS_TOPICTITLE2 "Beenden" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" + IDS_TOPICTITLE1 "ReactOS in QEMU ausprobieren" + IDS_TOPICTITLE2 "ReactOS Build Environment installieren" + IDS_TOPICTITLE3 "ReactOS-Quellcodepaket öffnen" + IDS_TOPICTITLE4 "Die ReactOS-Website besuchen" + IDS_TOPICTITLE5 "Die CD durchsuchen" + IDS_TOPICTITLE6 "Beenden" END /* Topic descriptions */ STRINGTABLE DISCARDABLE BEGIN - IDS_TOPICDESC0 "Installiert ReactOS auf ihrem Computer oder aktualisiert eine bestehende Installation." - IDS_TOPICDESC1 "Die ReactOS-CD durchsuchen." - IDS_TOPICDESC2 "Klicken Sie, um dieses Programm zu beenden." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." + IDS_TOPICDESC0 "Installiert ReactOS auf ihrem Computer.\n\nBitte beachten Sie, dass Sie zur Zeit Ihren Computer mit der ReactOS-CD im Laufwerk neu starten müssen, um die Installation zu starten.\n\nAlternativ können Sie ReactOS problemlos in einer virtuellen QEMU-Maschine ausprobieren, wenn Sie den entsprechenden Menüpunkt auf der linken Seite wählen." + IDS_TOPICDESC1 "Möglicherweise möchten Sie ein Betriebssystem im Alpha-Stadium nicht auf Ihrem eigenen Computer testen oder es gibt Probleme bei der Installation. Daher haben wir ReactOS auf einer virtuellen QEMU-Maschine vorinstalliert, mit der Sie das Betriebssystem problemlos testen können, ohne dass es direkt auf Ihrem Computer installiert werden muss.\n\nEin Klick auf diesen Menüpunkt öffnet das QEMU-Paket in Ihrem ZIP-Archivprogramm." + IDS_TOPICDESC2 "Damit ReactOS so einfach wie möglich kompiliert werden kann, wurde das ReactOS Build Environment geschaffen. Dieses enthält die passenden Compiler-Versionen und alle nötigen Tools, um den gesamten ReactOS-Quellcode zu kompilieren.\n\nDie Windows-Version des Build Environments ist kompatibel mit Windows 2000, XP oder neueren Versionen. Sie wird über diesen Menüpunkt installiert.\nDie CD enthält auch das Build Environment für Unix-ähnliche Betriebssysteme, wie z.B. Linux oder Mac OS X.\n\nZusätzlich befindet sich auf dieser CD der Quellcode dieser ReactOS-Version in einer ZIP-Datei." + IDS_TOPICDESC3 "Die CD enthält auch den gesamten Quellcode dieser ReactOS-Version, welcher mit dem ReactOS Build Environment kompiliert werden kann.\nEin Klick auf diesen Menüpunkt öffnet ihn in Ihrem ZIP-Archivprogramm." + IDS_TOPICDESC4 "Die ReactOS-Website liefert viele weitere Informationen über das Projekt. Hier finden Sie die neusten ReactOS-Versionen und Neuigkeiten bezüglich der Entwicklung." + IDS_TOPICDESC5 "Durchsuchen Sie den Inhalt dieser CD." + IDS_TOPICDESC6 "Beendet das AutoRun-Programm." +END + +/* Topic actions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICACTION0 "<msg>Zur Zeit müssen Sie Ihren Computer mit der ReactOS-CD im Laufwerk neu starten, um die Installation zu starten.\n\nBITTE BEACHTEN SIE: Es wird dringend davon abgeraten, ReactOS auf einem Computer zu installieren, welcher wichtige Daten enthält!" + IDS_TOPICACTION1 "..\\ReactOS in QEMU\\ReactOS-0.3.13-CLT2011-QEMU.zip" + IDS_TOPICACTION2 "..\\ReactOS Build Environment\\RosBE-1.5.1.1.exe" + IDS_TOPICACTION3 "..\\ReactOS-Quellcode\\ReactOS-0.3.13-CLT2011-Quellcode.zip" + IDS_TOPICACTION4 "http://www.reactos.org/" + IDS_TOPICACTION5 "explorer.exe" + IDS_TOPICACTION6 "<exit>" END /* EOF */ - Removed: branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13-clt2011/react… ============================================================================== --- branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/el-GR.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/el-GR.rc (removed) @@ -1,62 +1,0 @@ -/* $Id$ */ - -LANGUAGE LANG_GREEK, SUBLANG_DEFAULT - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Êáëþò ¹ëèáôå" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Êáëþò Þëèáôå óôï React Ëåéôïõñãéêü Óýóôçìá.\n\nÅðéëÝîôå Ýíá èÝìá áðü ôï ìåíïý óôá áñéóôåñÜ." -// IDS_CHECKTEXT "Show this dialog again" -// IDS_CLOSETEXT "Exit" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "ÅãêáôÜóôáóç ôïõ ReactOS" - IDS_TOPICBUTTON1 "Åîåñåýíçóç áõôïý ôïõ CD" - IDS_TOPICBUTTON2 "¸îïäïò" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "ÅãêáôÜóôáóç ôïõ ReactOS" - IDS_TOPICTITLE1 "Åîåñåýíçóç áõôïý ôïõ CD" - IDS_TOPICTITLE2 "¸îïäïò" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Äçìéïõñãßá íÝáò åãêáôÜóôáóçò ôïõ ReactOS óôïí õðïëïãéóôÞ Þ áíáâÜèìéóç ìéáò Þäç õðÜñ÷ïõóáò åãêáôÜóôáóçò." - IDS_TOPICDESC1 "Åîåñåýíçóç áõôïý ôïõ CD." - IDS_TOPICDESC2 "ÐáôÞóôå ãéá íá ôåñìáôßóåôå ôçí åöáñìïãÞ áõôÞ." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13-clt2011/react… ============================================================================== --- branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/en-US.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/en-US.rc (removed) @@ -1,62 +1,0 @@ -/* $Id$ */ - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Welcome" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Welcome to React Operating System.\n\nClick a topic on the left." -// IDS_CHECKTEXT "Show this dialog again" -// IDS_CLOSETEXT "Exit" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Install ReactOS" - IDS_TOPICBUTTON1 "Browse this CD" - IDS_TOPICBUTTON2 "Exit" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Install ReactOS" - IDS_TOPICTITLE1 "Browse this CD" - IDS_TOPICTITLE2 "Exit" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Create a new ReactOS installation on your computer or upgrade an existing installation." - IDS_TOPICDESC1 "Browse the CD." - IDS_TOPICDESC2 "Click to exit this application." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13-clt2011/react… ============================================================================== --- branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/es-ES.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/es-ES.rc (removed) @@ -1,63 +1,0 @@ -/* $Id$ */ - -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Bienvenido" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Bienvenido al Sistema Operativo React.\n\nHaz Click en una opción a la izquierda." -// IDS_CHECKTEXT "Mostrar este dialogo otra vez" -// IDS_CLOSETEXT "Salir" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Instalar ReactOS" - IDS_TOPICBUTTON1 "Explorar este CD" - IDS_TOPICBUTTON2 "Salir" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Instalar ReactOS" - IDS_TOPICTITLE1 "Explorar este CD" - IDS_TOPICTITLE2 "Salir" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Crear una nueva instalación de ReactOS en su PC o actualizar una instalación existente." - IDS_TOPICDESC1 "Explorar este CD." - IDS_TOPICDESC2 "Haz Click para salir de esta aplicación." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ - Removed: branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13-clt2011/react… ============================================================================== --- branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/et-EE.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/et-EE.rc (removed) @@ -1,60 +1,0 @@ -LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Tere tulemast" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Tere tulemast operatsioonisüsteemi ReactOS.\n\nVali teema vasakult." -// IDS_CHECKTEXT "Näita seda dialoogi veel" -// IDS_CLOSETEXT "Välju" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Paigalda ReactOS" - IDS_TOPICBUTTON1 "Sirvi CD sisu" - IDS_TOPICBUTTON2 "Välju" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Paigalda ReactOS" - IDS_TOPICTITLE1 "Sirvi CD sisu" - IDS_TOPICTITLE2 "Välju" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Paigalda ReactOS oma arvutisse või uuenda olemasolevat installatsiooni." - IDS_TOPICDESC1 "Sirvi CD sisu." - IDS_TOPICDESC2 "Vajuta, et väljuda." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13-clt2011/react… ============================================================================== --- branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/fr-FR.rc (removed) @@ -1,81 +1,0 @@ -/* - * FRENCH(FR) resources - * - * Copyright (C) 2005 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - - -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Bienvenue" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Bienvenue sur le système d'exploitation ReactOS.\n\nCliquez sur une section à gauche." -// IDS_CHECKTEXT "Afficher cette boîte de dialogue de nouveau." -// IDS_CLOSETEXT "Quitter" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Installer ReactOS" - IDS_TOPICBUTTON1 "Naviguer dans ce CD" - IDS_TOPICBUTTON2 "Quitter" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Installer ReactOS" - IDS_TOPICTITLE1 "Naviguer dans ce CD" - IDS_TOPICTITLE2 "Quitter" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Crée une nouvelle installation de ReactOS sur votre ordinateur ou met à jour votre installation actuelle." - IDS_TOPICDESC1 "Explore le CD." - IDS_TOPICDESC2 "Cliquez pour quitter l'installation." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13-clt2011/react… ============================================================================== --- branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/hu-HU.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/hu-HU.rc (removed) @@ -1,64 +1,0 @@ -/* $Id: En.rc 12852 2005-01-06 13:58:04Z mf $ */ -/* -* Copyright 2005 Robert Horvath - Hungarian trasnlation - talley at cubeclub.hu -*/ -LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Üdvözlünk" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Üdvözlünk a React Operációs Rendszerben.\n\n" -// IDS_CHECKTEXT "Show this dialog again" -// IDS_CLOSETEXT "Kilépés" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "ReactOS telepítése" - IDS_TOPICBUTTON1 "A CD böngészése" - IDS_TOPICBUTTON2 "Kilépés" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "ReactOS telepítése" - IDS_TOPICTITLE1 "A CD böngészése" - IDS_TOPICTITLE2 "Kilépés" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "A ReactOS telepítése vagy frissítése." - IDS_TOPICDESC1 "A CD böngészése" - IDS_TOPICDESC2 "Kilépés" -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13-clt2011/react… ============================================================================== --- branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/id-ID.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/id-ID.rc (removed) @@ -1,64 +1,0 @@ -/* - * Indonesian resources by Zaenal Mutaqin (ade999 at gmail dot com) - */ - -LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Selamat Datang" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Selamat datang di React Operating System.\n\nKlik topik di sisi kiri." -// IDS_CHECKTEXT "Show this dialog again" -// IDS_CLOSETEXT "Exit" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Instalasi ReactOS" - IDS_TOPICBUTTON1 "Lihat CD ini" - IDS_TOPICBUTTON2 "Keluar" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Instalasi ReactOS" - IDS_TOPICTITLE1 "Lihat CD ini" - IDS_TOPICTITLE2 "Keluar" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Buat instalasi baru ReactOS pada komputer anda atau tingkatkan instalasi yang sudah ada." - IDS_TOPICDESC1 "Lihat CD." - IDS_TOPICDESC2 "Klik untuk keluar aplikasi ini." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13-clt2011/react… ============================================================================== --- branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/it-IT.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/it-IT.rc (removed) @@ -1,62 +1,0 @@ -/* It.rc by Roberto 'Speekix' Pellegrino */ - -LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Benvenuto" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Benvenuto nel React Operating System.\n\nClicca su un argomento a sinistra." -// IDS_CHECKTEXT "Mostra ancora questa finestra" -// IDS_CLOSETEXT "Esci" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Installa ReactOS" - IDS_TOPICBUTTON1 "Esplora il CD" - IDS_TOPICBUTTON2 "Esci" -// IDS_TOPICBUTTON3 "Argomento Vuoto 3" -// IDS_TOPICBUTTON4 "Argomento Vuoto 4" -// IDS_TOPICBUTTON5 "Argomento Vuoto 5" -// IDS_TOPICBUTTON6 "Argomento Vuoto 6" -// IDS_TOPICBUTTON7 "Argomento Vuoto 7" -// IDS_TOPICBUTTON8 "Argomento Vuoto 8" -// IDS_TOPICBUTTON9 "Argomento Vuoto 9" -END - -/* Topic Titolos */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Installa ReactOS" - IDS_TOPICTITLE1 "Esplora il CD" - IDS_TOPICTITLE2 "Esci" -// IDS_TOPICTITLE3 "Argomento Vuoto Titolo 3" -// IDS_TOPICTITLE4 "Argomento Vuoto Titolo 4" -// IDS_TOPICTITLE5 "Argomento Vuoto Titolo 5" -// IDS_TOPICTITLE6 "Argomento Vuoto Titolo 6" -// IDS_TOPICTITLE7 "Argomento Vuoto Titolo 7" -// IDS_TOPICTITLE8 "Argomento Vuoto Titolo 8" -// IDS_TOPICTITLE9 "Argomento Vuoto Titolo 9" -END - -/* Descrizione argomentos */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Crea una nuova installazione di ReactOS sul tuo computer o aggiorna l'installazione esistente." - IDS_TOPICDESC1 "Esplora il CD." - IDS_TOPICDESC2 "Clicca per uscire dall'applicazione." -// IDS_TOPICDESC3 "Descrizione argomento 3.\n\nDescrivi l'argomento 3 qui." -// IDS_TOPICDESC4 "Descrizione argomento 4.\n\nDescrivi l'argomento 4 qui." -// IDS_TOPICDESC5 "Descrizione argomento 5.\n\nDescrivi l'argomento 5 qui." -// IDS_TOPICDESC6 "Descrizione argomento 6.\n\nDescrivi l'argomento 6 qui." -// IDS_TOPICDESC7 "Descrizione argomento 7.\n\nDescrivi l'argomento 7 qui." -// IDS_TOPICDESC8 "Descrizione argomento 8.\n\nDescrivi l'argomento 8 qui." -// IDS_TOPICDESC9 "Descrizione argomento 9.\n\nDescrivi l'argomento 9 qui." -END - -/* EOF */ Removed: branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13-clt2011/react… ============================================================================== --- branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/ja-JP.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/ja-JP.rc (removed) @@ -1,60 +1,0 @@ -LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Welcome" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "React Öæ¤±»B\n\n¶¤ÌgsbNðNbNµÄ¾³¢B" -// IDS_CHECKTEXT "Show this dialog again" -// IDS_CLOSETEXT "Exit" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "ReactOS ðCXg[·é" - IDS_TOPICBUTTON1 "±Ì CD ðJ" - IDS_TOPICBUTTON2 "I¹" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "ReactOS ðCXg[·é" - IDS_TOPICTITLE1 "±Ì CD ðJ" - IDS_TOPICTITLE2 "I¹" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Rs[^ÉVµ ReactOS ðCXg[µ½èAù¶Ì ReactOS ðAbvO[hµÜ·B" - IDS_TOPICDESC1 "CD ÌàeðQÆµÜ·B" - IDS_TOPICDESC2 "NbN·éÆ±ÌAvP[VðI¹µÜ·B" -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13-clt2011/react… ============================================================================== --- branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/lt-LT.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/lt-LT.rc (removed) @@ -1,62 +1,0 @@ -// Translation by Vytis 'CMan' Girdþijauskas cman(a)cman.us - -LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Sveiki" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Sveiki, èia React Operacinë Sistema.\n\nPasirinkite punktà kairëje." -// IDS_CHECKTEXT "Rodyti ðá langà vël" -// IDS_CLOSETEXT "Iðeiti" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Ádiegti ReactOS" - IDS_TOPICBUTTON1 "Perþiûrëti ðá CD" - IDS_TOPICBUTTON2 "Iðeiti" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Ádiegti ReactOS" - IDS_TOPICTITLE1 "Perþiûrëti ðá CD" - IDS_TOPICTITLE2 "Iðeiti" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Ádiekite arba atnaujinkite ReactOS." - IDS_TOPICDESC1 "Perþiûrëti ðá CD." - IDS_TOPICDESC2 "Paspauskite, kad iðeitumëte ið programos." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13-clt2011/react… ============================================================================== --- branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/nl-NL.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/nl-NL.rc (removed) @@ -1,60 +1,0 @@ -LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Welkom" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Welkom bij het React Operation System.\n\nKlik links op een onderwerp." -// IDS_CHECKTEXT "Ga terug naar dit scherm" -// IDS_CLOSETEXT "Afsluiten" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Installeer ReactOS" - IDS_TOPICBUTTON1 "Deze CD Verkennen" - IDS_TOPICBUTTON2 "Afsluiten" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Installeer ReactOS" - IDS_TOPICTITLE1 "Deze CD Verkennen" - IDS_TOPICTITLE2 "Afsluiten" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Maak een nieuwe ReactOS installatie of upgrade een bestaande installatie." - IDS_TOPICDESC1 "Deze CD Verkennen." - IDS_TOPICDESC2 "Klik om dit programma af te sluiten." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13-clt2011/react… ============================================================================== --- branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/no-NO.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/no-NO.rc (removed) @@ -1,62 +1,0 @@ -/* $Id: En.rc 21325 2006-03-17 22:07:04Z fireball $ */ - -LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Velkommen" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Velkommen til React Operativsystem.\n\nTrykk et emne til venstre." -// IDS_CHECKTEXT "Vis denne dialoget igjen" -// IDS_CLOSETEXT "Avslutt" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Innstaller ReactOS" - IDS_TOPICBUTTON1 "Utforsk denne CD" - IDS_TOPICBUTTON2 "Avslutt" -// IDS_TOPICBUTTON3 "Tomt emne 3" -// IDS_TOPICBUTTON4 "Tomt emne 4" -// IDS_TOPICBUTTON5 "Tomt emne 5" -// IDS_TOPICBUTTON6 "Tomt emne 6" -// IDS_TOPICBUTTON7 "Tomt emne 7" -// IDS_TOPICBUTTON8 "Tomt emne 8" -// IDS_TOPICBUTTON9 "Tomt emne 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Innstaller ReactOS" - IDS_TOPICTITLE1 "Utforsk denne CD" - IDS_TOPICTITLE2 "Avslutt" -// IDS_TOPICTITLE3 "Tomt emne tittel 3" -// IDS_TOPICTITLE4 "Tomt emne tittel 4" -// IDS_TOPICTITLE5 "Tomt emne tittel 5" -// IDS_TOPICTITLE6 "Tomt emne tittel 6" -// IDS_TOPICTITLE7 "Tomt emne tittel 7" -// IDS_TOPICTITLE8 "Tomt emne tittel 8" -// IDS_TOPICTITLE9 "Tomt emne tittel 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Opprett en ny ReactOS innstallasjon på din datamaskin eller oppgrader eksisterende innstallasjon." - IDS_TOPICDESC1 "Utforsk CDen." - IDS_TOPICDESC2 "Trykk avslutt for å avslutte denne applikasjonen." -// IDS_TOPICDESC3 "Emner beskrivelse 3.\n\nBeskriv emner 3 her." -// IDS_TOPICDESC4 "Emner beskrivelse 4.\n\nBeskriv emner 4 her." -// IDS_TOPICDESC5 "Emner beskrivelse 5.\n\nBeskriv emner 5 her." -// IDS_TOPICDESC6 "Emner beskrivelse 6.\n\nBeskriv emner 6 her." -// IDS_TOPICDESC7 "Emner beskrivelse 7.\n\nBeskriv emner 7 her." -// IDS_TOPICDESC8 "Emner beskrivelse 8.\n\nBeskriv emner 8 her." -// IDS_TOPICDESC9 "Emner beskrivelse 9.\n\nBeskriv emner 9 her." -END - -/* EOF */ Removed: branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13-clt2011/react… ============================================================================== --- branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/pl-PL.rc (removed) @@ -1,62 +1,0 @@ -/* $Id: en-US.rc 24952 2006-11-28 21:44:53Z janderwald $ */ - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Zapraszamy" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Witaj w systemie operacyjnym ReactOS.\n\nWybierz temat po lewej." -// IDS_CHECKTEXT "Poka¿ ten dialog ponownie" -// IDS_CLOSETEXT "Wyjcie" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Zainstaluj ReactOS" - IDS_TOPICBUTTON1 "Przegl¹daj CD" - IDS_TOPICBUTTON2 "Wyjcie" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Zainstaluj ReactOS" - IDS_TOPICTITLE1 "Przegl¹daj CD" - IDS_TOPICTITLE2 "Wyjcie" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Utwórz now¹ instalacjê ReactOS na komputerze lub aktualizuj istniej¹c¹." - IDS_TOPICDESC1 "Przegl¹daj CD." - IDS_TOPICDESC2 "Kliknij, aby zakoñczyæ aplikacjê." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13-clt2011/react… ============================================================================== --- branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/pt-BR.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/pt-BR.rc (removed) @@ -1,62 +1,0 @@ -/* $Id: en-US.rc 24952 2006-11-28 21:44:53Z janderwald $ */ - -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Bem vindo" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Bem vindo ao Sistema Operacional React (ReactOS).\n\nClique em um tópico à esquerda." -// IDS_CHECKTEXT "Exibir este diálogo novamente" -// IDS_CLOSETEXT "Sair" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Instalar ReactOS" - IDS_TOPICBUTTON1 "Examinar este CD" - IDS_TOPICBUTTON2 "Sair" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Instalar ReactOS" - IDS_TOPICTITLE1 "Examinar este CD" - IDS_TOPICTITLE2 "Sair" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Cria uma nova instalação do ReactOS em seu computador ou atualiza uma instalação já existente." - IDS_TOPICDESC1 "Exibe os arquivos contidos no CD." - IDS_TOPICDESC2 "Clique para fechar este aplicativo." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13-clt2011/react… ============================================================================== --- branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/ru-RU.rc (removed) @@ -1,62 +1,0 @@ -/* $Id: En.rc 21257 2006-03-08 23:07:09Z audit $ */ - -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Äîáðî ïîæàëîâàòü!" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Äîáðî ïîæàëîâàòü â ReactOS.\n\nÂûáåðèòå ïóíêò ñëåâà." -// IDS_CHECKTEXT "Ïîêàçûâàòü ýòî îêíî ñíîâà" -// IDS_CLOSETEXT "Âûõîä" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Óñòàíîâèòü ReactOS" - IDS_TOPICBUTTON1 "Îáçîð äèñêà" - IDS_TOPICBUTTON2 "Âûõîä" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Óñòàíîâèòü ReactOS" - IDS_TOPICTITLE1 "Îáçîð äèñêà" - IDS_TOPICTITLE2 "Âûõîä" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Óñòàíîâèò ReactOS íà Âàø êîìïüþòåð ñ íóëÿ èëè îáíîâèò óæå óñòàíîâëåííóþ âåðñèþ." - IDS_TOPICDESC1 "Îáçîð äèñêà." - IDS_TOPICDESC2 "Âûáåðèòå äëÿ âûõîäà èç ýòîãî ïðèëîæåíèÿ." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13-clt2011/react… ============================================================================== --- branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/sk-SK.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/sk-SK.rc (removed) @@ -1,62 +1,0 @@ -// Slovak translation by Kario 2007 <kario(a)szm.sk> - -LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Vitajte" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Vitajte v operaènom systéme ReactOS.\n\nKliknite na tlaèidlo v ¾avom ståpci." -// IDS_CHECKTEXT "Zobrazi toto okno aj nabudúce" -// IDS_CLOSETEXT "Koniec" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Intalova ReactOS" - IDS_TOPICBUTTON1 "Prezera toto CD" - IDS_TOPICBUTTON2 "Koniec" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Intalova ReactOS" - IDS_TOPICTITLE1 "Prezera toto CD" - IDS_TOPICTITLE2 "Koniec" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Naintaluje ReactOS na Vá poèítaè alebo zaktualizuje u existujúci systém." - IDS_TOPICDESC1 "Prezera toto CD." - IDS_TOPICDESC2 "Kliknutím ukonèíte tento program." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13-clt2011/react… ============================================================================== --- branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/sv-SE.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/sv-SE.rc (removed) @@ -1,80 +1,0 @@ -/* - * Swedish (SE) resources - * - * Copyright (C) 2005 David Nordenberg - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Välkommen" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Välkommen till React Operating System.\n\nKlicka på ett avsnitt till vänster." -// IDS_CHECKTEXT "Show this dialog again" -// IDS_CLOSETEXT "Exit" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Installera ReactOS" - IDS_TOPICBUTTON1 "Utforska skivan" - IDS_TOPICBUTTON2 "Avsluta" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Installera ReactOS" - IDS_TOPICTITLE1 "Utforska skivan" - IDS_TOPICTITLE2 "Avsluta" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Skapa en ny ReactOS installation på den här datorn eller uppgradera en befintlig." - IDS_TOPICDESC1 "Utforska skivan." - IDS_TOPICDESC2 "Avsluta det här programmet." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13-clt2011/react… ============================================================================== --- branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/th-TH.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/th-TH.rc (removed) @@ -1,67 +1,0 @@ -/* - * PROJECT: ReactOS welcome/autorun application - * LICENSE: See COPYING in the top level directory - * FILE: base/setup/welcome/lang/th-TH.rc - * TRANSLATOR: Sumath Aowsakulsutthi - */ - -LANGUAGE LANG_THAI, SUBLANG_DEFAULT - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - ÂÔ¹´ÕµéÍ¹ÃÑº" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "ÂÔ¹´ÕµéÍ¹ÃÑºÊÙèÃÐºº»¯ÔºÑµÔ¡ÒÃ React \n\n¡´àÅ×Í¡à¹×éÍËÒº¹á¶º«éÒÂÁ×Í" -// IDS_CHECKTEXT "áÊ´§¤Óá¹Ð¹ÓÍÕ¡¤ÃÑé§" -// IDS_CLOSETEXT "ÍÍ¡¨Ò¡â»Ãá¡ÃÁ" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "µÔ´µÑé§ ReactOS" - IDS_TOPICBUTTON1 "´ÙÃÒÂÅÐàÍÕÂ´¢Í§á¼è¹«Õ´Õ¹Õé" - IDS_TOPICBUTTON2 "ÍÍ¡¨Ò¡â»Ãá¡ÃÁ" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "µÔ´µÑé§ ReactOS" - IDS_TOPICTITLE1 "´ÙÃÒÂÅÐàÍÕÂ´¢Í§á¼è¹«Õ´Õ¹Õé" - IDS_TOPICTITLE2 "ÍÍ¡¨Ò¡â»Ãá¡ÃÁ" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "¤Ø³µéÍ§¡ÒÃµÔ´µÑé§ ReactOS Å§ã¹à¤Ã×èÍ§¤ÍÁ¾ÔÇàµÍÃì¢Í§¤Ø³\n\nËÃ×ÍµéÍ§¡ÒÃ»ÃÑºáµè§à¾ÔèÁàµÔÁ¨Ò¡·ÕèÁÕÍÂÙèà´ÔÁ." - IDS_TOPICDESC1 "´ÙÃÒÂÅÐàÍÕÂ´¢Í§á¼è¹«Õ´Õ¹Õé." - IDS_TOPICDESC2 "¡´àÅ×Í¡·Õè¹Õèà¾×èÍµéÍ§¡ÒÃÍÍ¡¨Ò¡¡ÒÃµÔ´µÑé§." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13-clt2011/react… ============================================================================== --- branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/uk-UA.rc (removed) @@ -1,80 +1,0 @@ -/* - * Welcome (Ukrainian resources) - * - * Copyright 2006 Artem Reznikov - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - Ëàñêàâî ïðîñèìî" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Ëàñêàâî ïðîñèìî äî îïåðàö³éíî¿ ñèñòåìè ReactOS.\n\nÊëàöí³òü ïî òåì³ ë³âîðó÷" -// IDS_CHECKTEXT "Ïîêàçóâàòè öåé ä³àëîã çíîâ" -// IDS_CLOSETEXT "Âèõ³ä" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 "Âñòàíîâëåííÿ ReactOS" - IDS_TOPICBUTTON1 "Îãëÿä öüîãî CD" - IDS_TOPICBUTTON2 "Âèõ³ä" -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 "Âñòàíîâëåííÿ ReactOS" - IDS_TOPICTITLE1 "Îãëÿä öüîãî CD" - IDS_TOPICTITLE2 "Âèõ³ä" -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 "Ñòâîðåííÿ íîâî¿ ³íñòàëÿö³¿ ReactOS íà Âàøîìó êîìï'þòåð³ ÷è îíîâëåííÿ ³ñíóþ÷î¿ ³íñòàëÿö³¿." - IDS_TOPICDESC1 "Ïðîãëÿíóòè CD." - IDS_TOPICDESC2 "Íàòèñí³òü äëÿ âèõîäó ç ö³º¿ ïðîãðàìè." -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Removed: branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13-clt2011/react… ============================================================================== --- branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/zh-CN.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/lang/zh-CN.rc (removed) @@ -1,80 +1,0 @@ -/* - * welcome (Simplified Chinese resources) - * (¼òÌåÖÐÎÄ×ÊÔ´) - * Copyright 2007 zhangbing <e_zb(a)21cn.com, ezb(a)mail.gywb.cn> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED - -/* String Tables */ - -/* Default settings */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS - »¶Ó" - IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC " »¶ÓÊ¹ÓÃ React ²Ù×÷ÏµÍ³¡£\n\n Çëµã»÷×ó±ßµÄÖ÷Ìâ¡£" -// IDS_CHECKTEXT "Show this dialog again" -// IDS_CLOSETEXT "Exit" -END - -/* Topic buttons */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICBUTTON0 " °²×° ReactOS" - IDS_TOPICBUTTON1 " ä¯ÀÀ CD" - IDS_TOPICBUTTON2 " ÍË³ö " -// IDS_TOPICBUTTON3 "Empty Topic 3" -// IDS_TOPICBUTTON4 "Empty Topic 4" -// IDS_TOPICBUTTON5 "Empty Topic 5" -// IDS_TOPICBUTTON6 "Empty Topic 6" -// IDS_TOPICBUTTON7 "Empty Topic 7" -// IDS_TOPICBUTTON8 "Empty Topic 8" -// IDS_TOPICBUTTON9 "Empty Topic 9" -END - -/* Topic titles */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICTITLE0 " °²×° ReactOS" - IDS_TOPICTITLE1 " ä¯ÀÀ CD" - IDS_TOPICTITLE2 " ÍË³ö " -// IDS_TOPICTITLE3 "Empty Topic Title 3" -// IDS_TOPICTITLE4 "Empty Topic Title 4" -// IDS_TOPICTITLE5 "Empty Topic Title 5" -// IDS_TOPICTITLE6 "Empty Topic Title 6" -// IDS_TOPICTITLE7 "Empty Topic Title 7" -// IDS_TOPICTITLE8 "Empty Topic Title 8" -// IDS_TOPICTITLE9 "Empty Topic Title 9" -END - -/* Topic descriptions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICDESC0 " ÖØÐÂ°²×° ReactOS »ò ¸üÐÂÄãµÄReactOS ¡£" - IDS_TOPICDESC1 " ä¯ÀÀ CD µÄÄÚÈÝ¡£" - IDS_TOPICDESC2 " µã»÷ÍË³öÓ¦ÓÃ³ÌÐò¡£" -// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." -// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." -// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." -// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." -// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." -// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." -// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." -END - -/* EOF */ Modified: branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13-clt2011/react… ============================================================================== --- branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/rsrc.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/rsrc.rc [iso-8859-1] Wed Mar 16 23:19:36 2011 @@ -21,45 +21,5 @@ //IDB_TOPICBITMAP8 BITMAP DISCARDABLE "res/topic8.bmp" //IDB_TOPICBITMAP9 BITMAP DISCARDABLE "res/topic9.bmp" - -/* Topic actions */ -STRINGTABLE DISCARDABLE -BEGIN - IDS_TOPICACTION0 "reactos.exe" - IDS_TOPICACTION1 "explorer.exe" - IDS_TOPICACTION2 "<exit>" /* this quits the app */ -// IDS_TOPICACTION3 "..." -// IDS_TOPICACTION4 "..." -// IDS_TOPICACTION5 "..." -// IDS_TOPICACTION6 "..." -// IDS_TOPICACTION7 "..." -// IDS_TOPICACTION8 "..." -// IDS_TOPICACTION9 "..." -END - - /* Language-specific resources */ -#include "lang/bg-BG.rc" -#include "lang/cs-CZ.rc" -#include "lang/da-DK.rc" #include "lang/de-DE.rc" -#include "lang/el-GR.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/et-EE.rc" -#include "lang/fr-FR.rc" -#include "lang/hu-HU.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/ja-JP.rc" -#include "lang/lt-LT.rc" -#include "lang/no-NO.rc" -#include "lang/nl-NL.rc" -#include "lang/pl-PL.rc" -#include "lang/pt-BR.rc" -#include "lang/sk-SK.rc" -#include "lang/sv-SE.rc" -#include "lang/th-TH.rc" -#include "lang/ru-RU.rc" -#include "lang/uk-UA.rc" -#include "lang/zh-CN.rc" Modified: branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/welcome.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13-clt2011/react… ============================================================================== --- branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/welcome.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/welcome.c [iso-8859-1] Wed Mar 16 23:19:36 2011 @@ -46,6 +46,8 @@ #define TITLE_WIDTH 480 #define TITLE_HEIGHT 93 +#define TOPIC_DESC_LENGTH 1024 + /* GLOBALS ******************************************************************/ @@ -238,15 +240,11 @@ static BOOL RunApplication(int nTopic) { - PROCESS_INFORMATION ProcessInfo; - STARTUPINFO StartupInfo; - TCHAR AppName[256]; - TCHAR CurrentDir[256]; + TCHAR AppName[512]; + TCHAR Parameters[2]; int nLength; InvalidateRect(hwndMain, NULL, TRUE); - - GetCurrentDirectory(256, CurrentDir); nLength = LoadString(hInstance, IDS_TOPICACTION0 + nTopic, AppName, 256); if (nLength == 0) @@ -255,25 +253,18 @@ if (!_tcsicmp(AppName, TEXT("<exit>"))) return FALSE; + if (!_tcsnicmp(AppName, TEXT("<msg>"), 5)) + { + MessageBox(hwndMain, AppName + 5, TEXT("ReactOS"), MB_OK | MB_TASKMODAL); + return TRUE; + } + if (_tcsicmp(AppName, TEXT("explorer.exe")) == 0) - { - _tcscat(AppName, TEXT(" ")); - _tcscat(AppName, CurrentDir); - } - - memset(&StartupInfo, 0, sizeof(STARTUPINFO)); - StartupInfo.cb = sizeof(STARTUPINFO); - StartupInfo.lpTitle = TEXT("Test"); - StartupInfo.dwFlags = STARTF_USESHOWWINDOW; - StartupInfo.wShowWindow = SW_SHOWNORMAL; - - CreateProcess(NULL, AppName, NULL, NULL, FALSE, CREATE_NEW_CONSOLE,NULL, - CurrentDir, - &StartupInfo, - &ProcessInfo); - - CloseHandle(ProcessInfo.hProcess); - CloseHandle(ProcessInfo.hThread); + _tcscpy(Parameters, TEXT("\\")); + else + *Parameters = 0; + + ShellExecute(NULL, TEXT("open"), AppName, Parameters, NULL, SW_SHOWDEFAULT); return TRUE; } @@ -521,7 +512,7 @@ HFONT hOldFont; RECT rcTitle, rcDescription; TCHAR szTopicTitle[80]; - TCHAR szTopicDesc[256]; + TCHAR szTopicDesc[TOPIC_DESC_LENGTH]; int nLength; BITMAP bmpInfo; TCHAR version[50]; @@ -605,13 +596,13 @@ if (nTopic == -1) { - nLength = LoadString(hInstance, IDS_DEFAULTTOPICDESC, szTopicDesc, 256); + nLength = LoadString(hInstance, IDS_DEFAULTTOPICDESC, szTopicDesc, TOPIC_DESC_LENGTH); } else { - nLength = LoadString(hInstance, IDS_TOPICDESC0 + nTopic, szTopicDesc, 256); + nLength = LoadString(hInstance, IDS_TOPICDESC0 + nTopic, szTopicDesc, TOPIC_DESC_LENGTH); if (nLength == 0) - nLength = LoadString(hInstance, IDS_DEFAULTTOPICDESC, szTopicDesc, 256); + nLength = LoadString(hInstance, IDS_DEFAULTTOPICDESC, szTopicDesc, TOPIC_DESC_LENGTH); } SetBkMode(hdc, TRANSPARENT); Modified: branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/welcome.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13-clt2011/react… ============================================================================== --- branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/welcome.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_13-clt2011/reactos/base/setup/welcome/welcome.rbuild [iso-8859-1] Wed Mar 16 23:19:36 2011 @@ -5,6 +5,7 @@ <include base="welcome">.</include> <library>gdi32</library> <library>user32</library> + <library>shell32</library> <file>welcome.c</file> <file>welcome.rc</file> </module> Modified: branches/ros-branch-0_3_13-clt2011/reactos/boot/bootdata/readme.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13-clt2011/react… ============================================================================== --- branches/ros-branch-0_3_13-clt2011/reactos/boot/bootdata/readme.txt [iso-8859-1] (original) +++ branches/ros-branch-0_3_13-clt2011/reactos/boot/bootdata/readme.txt [iso-8859-1] Wed Mar 16 23:19:36 2011 @@ -1,54 +1,25 @@ -======================== -ReactOS Version 0.3.x -Updated July 28, 2007 -======================== +=========================================================================== +ReactOS Version 0.3.13 +für die Chemnitzer Linux-Tage 2011 +=========================================================================== -1. What is ReactOS? -------------------- +Willkommen zu ReactOS! -ReactOS is an Open Source effort to develop a quality operating system that is -compatible with applications and drivers written for the Microsoft Windows NT -family of operating systems (NT4, 2000, XP, 2003, Vista). +CD-INHALT: -Website: http://www.reactos.org/ + * ReactOS Live-System/Installation + * ReactOS in einer virtuellen QEMU-Maschine + * ReactOS Build Environment (RosBE) + * Quellcode +Diese CD sollte unter Windows ein AutoRun-Programm starten. Alternativ +können Sie sich den CD-Inhalt über einen Dateibrowser anschauen. +Die Ordnernamen sollten selbsterklärend sein. -2. Relationship with the WINE project -------------------------------------- +Der gesamte Quellcode des Betriebssystems lässt sich unter Einsatz des +ReactOS Build Environments sowohl unter Windows als auch unter +Unix-ähnlichen Betriebssystemen wie Linux kompilieren. -ReactOS has always intended to work with the WINE project to share as much -programming effort as possible. This mainly concerns User Mode DLLs and -still happens to a degree today. Other areas of cooperation lie in -applications and testing suites. +Weitere Informationen über ReactOS finden Sie unter www.reactos.org! - -3. Future compatibility ------------------------ - -The ReactOS project, although currently focused on Windows XP -compatibility, is always keeping an eye toward compatibility with -Windows Vista and future Windows NT releases. - - -4. Supporting other System Applications ---------------------------------------- - -The Windows NT architecture allows for subsystems, as does the ReactOS -architecture. A subsystem is an implementation of the APIs of another -operating system, allowing ReactOS to run applications from other systems. We -are already looking at subsystems for: Java, OS/2, and DOS and possibly others -in the future. - - -5. Tutorials ------------- - -Developer and User Tutorials: http://www.reactos.org/wiki/index.php/Main_Page - -The tutorials contain more information on the project, compiling and testing -ReactOS - among other topics. Contributors to the project are always welcome. - -6. Author ---------- - -This document was written by Jason Filby (jasonfilby(a)yahoo.com). +===========================================================================

13 years, 9 months

[cfinck] 51077: Import my Hybrid-CD stuff from last year. Hopefully the kernel hack is not required anymore..

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Mar 16 22:34:40 2011 New Revision: 51077 URL: http://svn.reactos.org/svn/reactos?rev=51077&view=rev Log: Import my Hybrid-CD stuff from last year. Hopefully the kernel hack is not required anymore.. Added: branches/ros-branch-0_3_13-clt2011/reactos/hybridcd_freeldr.ini - copied, changed from r51073, tags/ReactOS-0.3.11-CLT2010/reactos/hybridcd_freeldr.ini branches/ros-branch-0_3_13-clt2011/reactos/make_hybridcd.cmd - copied unchanged from r51073, tags/ReactOS-0.3.11-CLT2010/reactos/make_hybridcd.cmd Copied: branches/ros-branch-0_3_13-clt2011/reactos/hybridcd_freeldr.ini (from r51073, tags/ReactOS-0.3.11-CLT2010/reactos/hybridcd_freeldr.ini) URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13-clt2011/react… ============================================================================== --- tags/ReactOS-0.3.11-CLT2010/reactos/hybridcd_freeldr.ini [iso-8859-1] (original) +++ branches/ros-branch-0_3_13-clt2011/reactos/hybridcd_freeldr.ini [iso-8859-1] Wed Mar 16 22:34:40 2011 @@ -1,9 +1,9 @@ [FREELOADER] -DefaultOS=ReactOS +DefaultOS=Install Timeout=10 [Display] -TitleText=ReactOS @ CLT2010 +TitleText=ReactOS 0.3.13 - CLT 2011 StatusBarColor=Cyan StatusBarTextColor=Black BackdropTextColor=White @@ -20,13 +20,13 @@ SelectedColor=Gray [Operating Systems] +Install="ReactOS-Installation starten" Live="ReactOS Live-System starten" -Install="ReactOS-Installation starten" + +[Install] +BootType=ReactOSSetup2 [Live] -BootType=ReactOS +BootType=Windows2003 SystemPath=LiveCD\live -Options=/DEBUGPORT=COM1 /SOS - -[Install] -BootType=ReactOSSetup +Options=/DEBUGPORT=COM1 /SOS /MININT

13 years, 9 months

← Newer
1
...
11
12
13
14
15
16
17
...
28
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 March 2011