Ros-diffs October 2010

ros-diffs@reactos.org

20 participants
435 discussions

[gadamopoulos] 49115: [win32k] - Remove the FreeLParam 'feature' from win32k. This hack allowed us to post messages that contain pointers. However we don't do it anymore so we can also remove this ...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Oct 11 13:01:46 2010 New Revision: 49115 URL: http://svn.reactos.org/svn/reactos?rev=49115&view=rev Log: [win32k] - Remove the FreeLParam 'feature' from win32k. This hack allowed us to post messages that contain pointers. However we don't do it anymore so we can also remove this as well - Add keyboard messages to the list with Hardware messages and not in the list with post messages Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] Mon Oct 11 13:01:46 2010 @@ -11,7 +11,6 @@ typedef struct _USER_MESSAGE { LIST_ENTRY ListEntry; - BOOLEAN FreeLParam; MSG Msg; } USER_MESSAGE, *PUSER_MESSAGE; @@ -116,12 +115,12 @@ UINT uTimeout, BOOL Block, INT HookMessage, ULONG_PTR *uResult); PUSER_MESSAGE FASTCALL -MsqCreateMessage(LPMSG Msg, BOOLEAN FreeLParam); +MsqCreateMessage(LPMSG Msg); VOID FASTCALL MsqDestroyMessage(PUSER_MESSAGE Message); VOID FASTCALL MsqPostMessage(PUSER_MESSAGE_QUEUE MessageQueue, - MSG* Msg, BOOLEAN FreeLParam, DWORD MessageBits); + MSG* Msg, BOOLEAN HardwareMessage, DWORD MessageBits); VOID FASTCALL MsqPostQuitMessage(PUSER_MESSAGE_QUEUE MessageQueue, ULONG ExitCode); BOOLEAN APIENTRY Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Mon Oct 11 13:01:46 2010 @@ -810,7 +810,6 @@ Msg->Msg.message = WM_QUIT; Msg->Msg.wParam = ThreadQueue->QuitExitCode; Msg->Msg.lParam = 0; - Msg->FreeLParam = FALSE; if (RemoveMessages) { ThreadQueue->QuitPosted = FALSE; @@ -866,7 +865,6 @@ &Msg->Msg, RemoveMessages)) { - Msg->FreeLParam = FALSE; goto MsgExit; } @@ -2143,10 +2141,6 @@ RETURN( (BOOL) -1); } Info.Msg.lParam = (LPARAM) UserMem; - } - if (Msg.FreeLParam && 0 != Msg.Msg.lParam) - { - ExFreePool((void *) Msg.Msg.lParam); } Status = MmCopyToCaller(UnsafeInfo, &Info, sizeof(NTUSERGETMESSAGEINFO)); if (! NT_SUCCESS(Status)) @@ -2299,10 +2293,6 @@ RETURN( (BOOL) -1); } Info.Msg.lParam = (LPARAM) UserMem; - } - if (RemoveMsg && Msg.FreeLParam && 0 != Msg.Msg.lParam) - { - ExFreePool((void *) Msg.Msg.lParam); } Status = MmCopyToCaller(UnsafeInfo, &Info, sizeof(NTUSERGETMESSAGEINFO)); if (! NT_SUCCESS(Status)) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Mon Oct 11 13:01:46 2010 @@ -591,7 +591,7 @@ if (DesktopWindow) { - UserRefObjectCo(DesktopWindow, &Ref);//can DesktopWindow be NULL? + UserRefObjectCo(DesktopWindow, &Ref); Desk = DesktopWindow->head.pti->pDeskInfo; } @@ -628,6 +628,18 @@ } } + else + { + if (Remove) + { + RemoveEntryList(&Current->ListEntry); + } + IntUnLockHardwareMessageQueue(MessageQueue); + IntUnLockSystemHardwareMessageQueueLock(FALSE); + *Message = Current; + + RETURN(TRUE); + } } IntUnLockHardwareMessageQueue(MessageQueue); @@ -650,7 +662,6 @@ UserMsg = ExAllocateFromPagedLookasideList(&MessageLookasideList); /* What to do if out of memory? For now we just panic a bit in debug */ ASSERT(UserMsg); - UserMsg->FreeLParam = FALSE; UserMsg->Msg = Msg; InsertTailList(&HardwareMessageQueueHead, &UserMsg->ListEntry); @@ -808,7 +819,7 @@ FocusMessageQueue->Desktop->pDeskInfo->LastInputWasKbd = TRUE; Msg.pt = gpsi->ptCursor; - MsqPostMessage(FocusMessageQueue, &Msg, FALSE, QS_KEY); + MsqPostMessage(FocusMessageQueue, &Msg, TRUE, QS_KEY); } else { @@ -866,7 +877,7 @@ } PUSER_MESSAGE FASTCALL -MsqCreateMessage(LPMSG Msg, BOOLEAN FreeLParam) +MsqCreateMessage(LPMSG Msg) { PUSER_MESSAGE Message; @@ -876,7 +887,6 @@ return NULL; } - Message->FreeLParam = FreeLParam; RtlMoveMemory(&Message->Msg, Msg, sizeof(MSG)); return Message; @@ -1302,17 +1312,26 @@ } VOID FASTCALL -MsqPostMessage(PUSER_MESSAGE_QUEUE MessageQueue, MSG* Msg, BOOLEAN FreeLParam, +MsqPostMessage(PUSER_MESSAGE_QUEUE MessageQueue, MSG* Msg, BOOLEAN HardwareMessage, DWORD MessageBits) { PUSER_MESSAGE Message; - if(!(Message = MsqCreateMessage(Msg, FreeLParam))) + if(!(Message = MsqCreateMessage(Msg))) { return; } - InsertTailList(&MessageQueue->PostedMessagesListHead, - &Message->ListEntry); + + if(!HardwareMessage) + { + InsertTailList(&MessageQueue->PostedMessagesListHead, + &Message->ListEntry); + } + else + { + InsertTailList(&MessageQueue->HardwareMessagesListHead, + &Message->ListEntry); + } MessageQueue->QueueBits |= MessageBits; MessageQueue->ChangedBits |= MessageBits; if (MessageQueue->WakeMask & MessageBits)

15 years

[gadamopoulos] 49114: [win32k] -Move checks for active hooks in co_HOOK_CallHooks

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Oct 11 10:58:33 2010 New Revision: 49114 URL: http://svn.reactos.org/svn/reactos?rev=49114&view=rev Log: [win32k] -Move checks for active hooks in co_HOOK_CallHooks Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] Mon Oct 11 10:58:33 2010 @@ -117,7 +117,6 @@ case WM_SYSCOMMAND: { DPRINT1("hwnd %p WM_SYSCOMMAND %lx %lx\n", Wnd->head.h, wParam, lParam ); - if (!ISITHOOKED(WH_CBT)) break; lResult = co_HOOK_CallHooks(WH_CBT, HCBT_SYSCOMMAND, wParam, lParam); break; } @@ -145,8 +144,6 @@ case WM_CBT: { - if (!ISITHOOKED(WH_CBT)) break; - switch (wParam) { case HCBT_MOVESIZE: Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Mon Oct 11 10:58:33 2010 @@ -331,6 +331,12 @@ NTSTATUS Status; ASSERT(WH_MINHOOK <= HookId && HookId <= WH_MAXHOOK); + + /* FIXME! Check pDeskInfo->fsHooks for global hooks! */ + if (!ISITHOOKED(HookId)) + { + return 0; + } pti = PsGetCurrentThreadWin32Thread(); if (!pti) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Mon Oct 11 10:58:33 2010 @@ -330,20 +330,16 @@ ( PWND Window, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { BOOL SameThread = FALSE; + CWPSTRUCT CWP; if (Window->head.pti == ((PTHREADINFO)PsGetCurrentThreadWin32Thread())) SameThread = TRUE; - if ((!SameThread && (Window->head.pti->fsHooks & HOOKID_TO_FLAG(WH_CALLWNDPROC))) || - (SameThread && ISITHOOKED(WH_CALLWNDPROC)) ) - { - CWPSTRUCT CWP; - CWP.hwnd = hWnd; - CWP.message = Msg; - CWP.wParam = wParam; - CWP.lParam = lParam; - co_HOOK_CallHooks( WH_CALLWNDPROC, HC_ACTION, SameThread, (LPARAM)&CWP ); - } + CWP.hwnd = hWnd; + CWP.message = Msg; + CWP.wParam = wParam; + CWP.lParam = lParam; + co_HOOK_CallHooks( WH_CALLWNDPROC, HC_ACTION, SameThread, (LPARAM)&CWP ); } static @@ -353,21 +349,17 @@ ( PWND Window, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT *uResult) { BOOL SameThread = FALSE; + CWPRETSTRUCT CWPR; if (Window->head.pti == ((PTHREADINFO)PsGetCurrentThreadWin32Thread())) SameThread = TRUE; - if ((!SameThread && (Window->head.pti->fsHooks & HOOKID_TO_FLAG(WH_CALLWNDPROCRET))) || - (SameThread && ISITHOOKED(WH_CALLWNDPROCRET)) ) - { - CWPRETSTRUCT CWPR; - CWPR.hwnd = hWnd; - CWPR.message = Msg; - CWPR.wParam = wParam; - CWPR.lParam = lParam; - CWPR.lResult = *uResult; - co_HOOK_CallHooks( WH_CALLWNDPROCRET, HC_ACTION, SameThread, (LPARAM)&CWPR ); - } + CWPR.hwnd = hWnd; + CWPR.message = Msg; + CWPR.wParam = wParam; + CWPR.lParam = lParam; + CWPR.lResult = *uResult; + co_HOOK_CallHooks( WH_CALLWNDPROCRET, HC_ACTION, SameThread, (LPARAM)&CWPR ); } LRESULT @@ -709,17 +701,14 @@ Msg->message, (LPARAM)&MHook )) { - if (ISITHOOKED(WH_CBT)) - { - MHook.pt = Msg->pt; - MHook.hwnd = Msg->hwnd; - MHook.wHitTestCode = HitTest; - MHook.dwExtraInfo = 0; - co_HOOK_CallHooks( WH_CBT, - HCBT_CLICKSKIPPED, - Msg->message, - (LPARAM)&MHook); - } + MHook.pt = Msg->pt; + MHook.hwnd = Msg->hwnd; + MHook.wHitTestCode = HitTest; + MHook.dwExtraInfo = 0; + co_HOOK_CallHooks( WH_CBT, + HCBT_CLICKSKIPPED, + Msg->message, + (LPARAM)&MHook); return FALSE; } @@ -743,14 +732,11 @@ LOWORD(Msg->wParam), Msg->lParam)) { - if (ISITHOOKED(WH_CBT)) - { - /* skip this message */ - co_HOOK_CallHooks( WH_CBT, - HCBT_KEYSKIPPED, - LOWORD(Msg->wParam), - Msg->lParam ); - } + /* skip this message */ + co_HOOK_CallHooks( WH_CBT, + HCBT_KEYSKIPPED, + LOWORD(Msg->wParam), + Msg->lParam ); return FALSE; } return TRUE; @@ -965,7 +951,7 @@ MsgExit: pti->rpdesk->htEx = HitTest; /* Now set the capture hit. */ - if ( ISITHOOKED(WH_MOUSE) && IS_MOUSE_MESSAGE(Msg->Msg.message)) + if ( IS_MOUSE_MESSAGE(Msg->Msg.message)) { if (!ProcessMouseMessage(&Msg->Msg, HitTest, RemoveMsg)) { @@ -973,7 +959,7 @@ } } - if ( ISITHOOKED(WH_KEYBOARD) && IS_KBD_MESSAGE(Msg->Msg.message)) + if ( IS_KBD_MESSAGE(Msg->Msg.message)) { if(!ProcessKeyboardMessage(&Msg->Msg, RemoveMsg)) { @@ -982,11 +968,8 @@ } // The WH_GETMESSAGE hook enables an application to monitor messages about to // be returned by the GetMessage or PeekMessage function. - if (ISITHOOKED(WH_GETMESSAGE)) - { - //DPRINT1("Peek WH_GETMESSAGE -> %x\n",&Msg); - co_HOOK_CallHooks( WH_GETMESSAGE, HC_ACTION, RemoveMsg & PM_REMOVE, (LPARAM)&Msg->Msg); - } + + co_HOOK_CallHooks( WH_GETMESSAGE, HC_ACTION, RemoveMsg & PM_REMOVE, (LPARAM)&Msg->Msg); return TRUE; } @@ -2419,17 +2402,13 @@ if (BadChk) RETURN( FALSE); - if ( ISITHOOKED(WH_SYSMSGFILTER) && - co_HOOK_CallHooks( WH_SYSMSGFILTER, code, 0, (LPARAM)&Msg)) + if ( co_HOOK_CallHooks( WH_SYSMSGFILTER, code, 0, (LPARAM)&Msg)) { Ret = TRUE; } else { - if ( ISITHOOKED(WH_MSGFILTER) ) - { - Ret = co_HOOK_CallHooks( WH_MSGFILTER, code, 0, (LPARAM)&Msg); - } + Ret = co_HOOK_CallHooks( WH_MSGFILTER, code, 0, (LPARAM)&Msg); } _SEH2_TRY @@ -2620,12 +2599,13 @@ case FNID_SENDMESSAGECALLBACK: { PCALL_BACK_INFO CallBackInfo = (PCALL_BACK_INFO)ResultInfo; + ULONG_PTR uResult; if (!CallBackInfo) break; if (!co_IntSendMessageWithCallBack(hWnd, Msg, wParam, lParam, - CallBackInfo->CallBack, CallBackInfo->Context, NULL)) + CallBackInfo->CallBack, CallBackInfo->Context, &uResult)) { DPRINT1("Callback failure!\n"); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Mon Oct 11 10:58:33 2010 @@ -1966,14 +1966,13 @@ Cs->style = Window->style; /* HCBT_CREATEWND needs the real window style */ CbtCreate.lpcs = Cs; CbtCreate.hwndInsertAfter = HWND_TOP; - if (ISITHOOKED(WH_CBT)) - { - if (co_HOOK_CallHooks(WH_CBT, HCBT_CREATEWND, (WPARAM) hWnd, (LPARAM) &CbtCreate)) - { - DPRINT1("HCBT_CREATEWND hook failed!\n"); - RETURN( (PWND) NULL); - } - } + + if (co_HOOK_CallHooks(WH_CBT, HCBT_CREATEWND, (WPARAM) hWnd, (LPARAM) &CbtCreate)) + { + DPRINT1("HCBT_CREATEWND hook failed!\n"); + RETURN( (PWND) NULL); + } + Cs->style = dwStyle; /* NCCREATE and WM_NCCALCSIZE need the original values*/ /* Send the WM_GETMINMAXINFO message*/ @@ -2342,7 +2341,7 @@ } /* If window was created successfully and it is hooked */ - if ((Window->state2 & WNDS2_WMCREATEMSGPROCESSED) && (ISITHOOKED(WH_CBT))) + if ((Window->state2 & WNDS2_WMCREATEMSGPROCESSED)) { if (co_HOOK_CallHooks(WH_CBT, HCBT_DESTROYWND, (WPARAM) hWnd, 0)) return FALSE; }

15 years

[fireball] 49113: [HEAP] - Fix DWORD -> ULONG in function definitions too.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Oct 11 10:29:41 2010 New Revision: 49113 URL: http://svn.reactos.org/svn/reactos?rev=49113&view=rev Log: [HEAP] - Fix DWORD -> ULONG in function definitions too. Modified: trunk/reactos/lib/rtl/heap.c trunk/reactos/lib/rtl/heap_rewrite.c Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=49113&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Mon Oct 11 10:29:41 2010 @@ -1982,9 +1982,9 @@ NTSTATUS NTAPI RtlMultipleAllocateHeap(IN PVOID HeapHandle, - IN DWORD Flags, + IN ULONG Flags, IN SIZE_T Size, - IN DWORD Count, + IN ULONG Count, OUT PVOID *Array) { UNIMPLEMENTED; @@ -1994,8 +1994,8 @@ NTSTATUS NTAPI RtlMultipleFreeHeap(IN PVOID HeapHandle, - IN DWORD Flags, - IN DWORD Count, + IN ULONG Flags, + IN ULONG Count, OUT PVOID *Array) { UNIMPLEMENTED; Modified: trunk/reactos/lib/rtl/heap_rewrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap_rewrite.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] Mon Oct 11 10:29:41 2010 @@ -3553,9 +3553,9 @@ NTSTATUS NTAPI RtlMultipleAllocateHeap(IN PVOID HeapHandle, - IN DWORD Flags, + IN ULONG Flags, IN SIZE_T Size, - IN DWORD Count, + IN ULONG Count, OUT PVOID *Array) { UNIMPLEMENTED; @@ -3565,8 +3565,8 @@ NTSTATUS NTAPI RtlMultipleFreeHeap(IN PVOID HeapHandle, - IN DWORD Flags, - IN DWORD Count, + IN ULONG Flags, + IN ULONG Count, OUT PVOID *Array) { UNIMPLEMENTED;

15 years

[pschweitzer] 49112: [NDK] Fixed build

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Oct 11 10:20:40 2010 New Revision: 49112 URL: http://svn.reactos.org/svn/reactos?rev=49112&view=rev Log: [NDK] Fixed build Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Mon Oct 11 10:20:40 2010 @@ -761,9 +761,9 @@ NTAPI RtlMultipleAllocateHeap ( IN PVOID HeapHandle, - IN DWORD Flags, + IN ULONG Flags, IN SIZE_T Size, - IN DWORD Count, + IN ULONG Count, OUT PVOID * Array ); @@ -772,8 +772,8 @@ NTAPI RtlMultipleFreeHeap ( IN PVOID HeapHandle, - IN DWORD Flags, - IN DWORD Count, + IN ULONG Flags, + IN ULONG Count, OUT PVOID * Array ); Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Mon Oct 11 10:20:40 2010 @@ -367,6 +367,15 @@ } RTL_PATH_TYPE; #ifndef NTOS_MODE_USER + +// +// Heap Information Class +// +typedef enum _HEAP_INFORMATION_CLASS +{ + HeapCompatibilityInformation, + HeapEnableTerminationOnCorruption +} HEAP_INFORMATION_CLASS; // // Callback function for RTL Timers or Registered Waits

15 years

[fireball] 49111: [HEAP] - Fix RtlQuery/SetHeapInformation prototypes, move them to an appropriate place. - Implement RtlQuery/SetHeapInformation. - Implement in-place block growing. - Amount of wi...

by fireball＠svn.reactos.org

Author: fireball Date: Mon Oct 11 08:39:04 2010 New Revision: 49111 URL: http://svn.reactos.org/svn/reactos?rev=49111&view=rev Log: [HEAP] - Fix RtlQuery/SetHeapInformation prototypes, move them to an appropriate place. - Implement RtlQuery/SetHeapInformation. - Implement in-place block growing. - Amount of winetest heap failures is down to 6 (3 exceptions still happen). Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/psdk/winnt.h trunk/reactos/lib/rtl/heap.c trunk/reactos/lib/rtl/heap_rewrite.c Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Mon Oct 11 08:39:04 2010 @@ -708,6 +708,17 @@ ); NTSYSAPI +NTSTATUS +NTAPI +RtlQueryHeapInformation ( + IN PVOID HeapHandle, + IN HEAP_INFORMATION_CLASS HeapInformationClass, + OUT PVOID HeapInformation OPTIONAL, + IN SIZE_T HeapInformationLength OPTIONAL, + OUT PSIZE_T ReturnLength OPTIONAL + ); + +NTSYSAPI PWSTR NTAPI RtlQueryTagHeap( @@ -729,11 +740,42 @@ ); NTSYSAPI +NTSTATUS +NTAPI +RtlSetHeapInformation ( + IN PVOID HeapHandle, + IN HEAP_INFORMATION_CLASS HeapInformationClass, + IN PVOID HeapInformation OPTIONAL, + IN SIZE_T HeapInformationLength OPTIONAL + ); + +NTSYSAPI BOOLEAN NTAPI RtlLockHeap( IN HANDLE Heap ); + +NTSYSAPI +NTSTATUS +NTAPI +RtlMultipleAllocateHeap ( + IN PVOID HeapHandle, + IN DWORD Flags, + IN SIZE_T Size, + IN DWORD Count, + OUT PVOID * Array + ); + +NTSYSAPI +NTSTATUS +NTAPI +RtlMultipleFreeHeap ( + IN PVOID HeapHandle, + IN DWORD Flags, + IN DWORD Count, + OUT PVOID * Array + ); NTSYSAPI NTSTATUS Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Mon Oct 11 08:39:04 2010 @@ -4958,50 +4958,6 @@ HeapEnableTerminationOnCorruption } HEAP_INFORMATION_CLASS; -NTSYSAPI -DWORD -NTAPI -RtlSetHeapInformation ( - IN PVOID HeapHandle, - IN HEAP_INFORMATION_CLASS HeapInformationClass, - IN PVOID HeapInformation OPTIONAL, - IN SIZE_T HeapInformationLength OPTIONAL - ); - -NTSYSAPI -DWORD -NTAPI -RtlQueryHeapInformation ( - IN PVOID HeapHandle, - IN HEAP_INFORMATION_CLASS HeapInformationClass, - OUT PVOID HeapInformation OPTIONAL, - IN SIZE_T HeapInformationLength OPTIONAL, - OUT PSIZE_T ReturnLength OPTIONAL - ); - -// -// Multiple alloc-free APIS -// - -DWORD -NTAPI -RtlMultipleAllocateHeap ( - IN PVOID HeapHandle, - IN DWORD Flags, - IN SIZE_T Size, - IN DWORD Count, - OUT PVOID * Array - ); - -DWORD -NTAPI -RtlMultipleFreeHeap ( - IN PVOID HeapHandle, - IN DWORD Flags, - IN DWORD Count, - OUT PVOID * Array - ); - typedef enum _PROCESSOR_CACHE_TYPE { CacheUnified, CacheInstruction, Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=49111&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Mon Oct 11 08:39:04 2010 @@ -1934,7 +1934,7 @@ return NULL; } -DWORD +NTSTATUS NTAPI RtlSetHeapInformation(IN HANDLE HeapHandle OPTIONAL, IN HEAP_INFORMATION_CLASS HeapInformationClass, @@ -1945,7 +1945,7 @@ return 0; } -DWORD +NTSTATUS NTAPI RtlQueryHeapInformation(HANDLE HeapHandle, HEAP_INFORMATION_CLASS HeapInformationClass, @@ -1979,7 +1979,7 @@ } } -DWORD +NTSTATUS NTAPI RtlMultipleAllocateHeap(IN PVOID HeapHandle, IN DWORD Flags, @@ -1991,7 +1991,7 @@ return 0; } -DWORD +NTSTATUS NTAPI RtlMultipleFreeHeap(IN PVOID HeapHandle, IN DWORD Flags, Modified: trunk/reactos/lib/rtl/heap_rewrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap_rewrite.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] Mon Oct 11 08:39:04 2010 @@ -955,32 +955,32 @@ Use classic, lernt from university times algorithm for removing an entry from a static array */ - Current = (PHEAP *)&Peb->ProcessHeaps[Heap->ProcessHeapsListIndex - 1]; - Next = Current + 1; - - /* How many items we need to shift to the left */ - Count = Peb->NumberOfHeaps - (Heap->ProcessHeapsListIndex - 1); - - /* Move them all in a loop */ - while (--Count) - { - /* Copy it and advance next pointer */ - *Current = *Next; - - /* Update its index */ - (*Current)->ProcessHeapsListIndex -= 1; - - /* Advance pointers */ - Current++; - Next++; - } - - /* Decrease total number of heaps */ - Peb->NumberOfHeaps--; - - /* Zero last unused item */ - Peb->ProcessHeaps[Peb->NumberOfHeaps] = NULL; - Heap->ProcessHeapsListIndex = 0; + Current = (PHEAP *)&Peb->ProcessHeaps[Heap->ProcessHeapsListIndex - 1]; + Next = Current + 1; + + /* How many items we need to shift to the left */ + Count = Peb->NumberOfHeaps - (Heap->ProcessHeapsListIndex - 1); + + /* Move them all in a loop */ + while (--Count) + { + /* Copy it and advance next pointer */ + *Current = *Next; + + /* Update its index */ + (*Current)->ProcessHeapsListIndex -= 1; + + /* Advance pointers */ + Current++; + Next++; + } + + /* Decrease total number of heaps */ + Peb->NumberOfHeaps--; + + /* Zero last unused item */ + Peb->ProcessHeaps[Peb->NumberOfHeaps] = NULL; + Heap->ProcessHeapsListIndex = 0; /* Release the lock */ RtlLeaveHeapLock(&RtlpProcessHeapsListLock); @@ -1977,6 +1977,8 @@ /* Release the lock */ if (HeapLocked) RtlLeaveHeapLock(Heap->LockVariable); + DPRINT1("HEAP: Allocation failed!\n"); + DPRINT1("Flags %x\n", Heap->Flags); return NULL; } @@ -2016,7 +2018,8 @@ if (Size >= 0x80000000) { RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_NO_MEMORY); - return FALSE; + DPRINT1("HEAP: Allocation failed!\n"); + return NULL; } if (Flags & ( @@ -2167,6 +2170,7 @@ // Set STATUS! /* Release the lock */ if (HeapLocked) RtlLeaveHeapLock(Heap->LockVariable); + DPRINT1("HEAP: Allocation failed!\n"); return NULL; } @@ -2202,6 +2206,7 @@ /* Release the lock */ if (HeapLocked) RtlLeaveHeapLock(Heap->LockVariable); + DPRINT1("HEAP: Allocation failed!\n"); return NULL; } @@ -2277,7 +2282,8 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("Failed releasing memory with Status 0x%08X\n", Status); + DPRINT1("HEAP: Failed releasing memory with Status 0x%08X. Heap %p, ptr %p, base address %p\n", + Status, Heap, Ptr, VirtualEntry); RtlSetLastWin32ErrorAndNtStatusFromNtStatus(Status); } } @@ -2351,8 +2357,225 @@ IN SIZE_T Size, IN SIZE_T Index) { - /* We always fail growing in place now */ - return FALSE; + UCHAR EntryFlags, RememberFlags; + PHEAP_FREE_ENTRY FreeEntry, UnusedEntry, FollowingEntry; + SIZE_T FreeSize, PrevSize, TailPart, AddedSize = 0; + PHEAP_ENTRY_EXTRA OldExtra, NewExtra; + + /* We can't grow beyond specified threshold */ + if (Index > Heap->VirtualMemoryThreshold) + return FALSE; + + /* Get entry flags */ + EntryFlags = InUseEntry->Flags; + + /* Get the next free entry */ + FreeEntry = (PHEAP_FREE_ENTRY)(InUseEntry + InUseEntry->Size); + + if (EntryFlags & HEAP_ENTRY_LAST_ENTRY) + { + /* There is no next block, just uncommitted space. Calculate how much is needed */ + FreeSize = (Index - InUseEntry->Size) << HEAP_ENTRY_SHIFT; + FreeSize = ROUND_UP(FreeSize, PAGE_SIZE); + + /* Find and commit those pages */ + FreeEntry = RtlpFindAndCommitPages(Heap, + Heap->Segments[InUseEntry->SegmentOffset], + &FreeSize, + FreeEntry); + + /* Fail if it failed... */ + if (!FreeEntry) return FALSE; + + /* It was successful, perform coalescing */ + FreeSize = FreeSize >> HEAP_ENTRY_SHIFT; + FreeEntry = RtlpCoalesceFreeBlocks(Heap, FreeEntry, &FreeSize, FALSE); + + /* Check if it's enough */ + if (FreeSize + InUseEntry->Size < Index) + { + /* Still not enough */ + RtlpInsertFreeBlock(Heap, FreeEntry, FreeSize); + Heap->TotalFreeSize += FreeSize; + return FALSE; + } + + /* Remember flags of this free entry */ + RememberFlags = FreeEntry->Flags; + + /* Sum up sizes */ + FreeSize += InUseEntry->Size; + } + else + { + /* The next block indeed exists. Check if it's free or in use */ + if (FreeEntry->Flags & HEAP_ENTRY_BUSY) return FALSE; + + /* Next entry is free, check if it can fit the block we need */ + FreeSize = InUseEntry->Size + FreeEntry->Size; + if (FreeSize < Index) return FALSE; + + /* Remember flags of this free entry */ + RememberFlags = FreeEntry->Flags; + + /* Remove this block from the free list */ + RtlpRemoveFreeBlock(Heap, FreeEntry, FALSE, FALSE); + Heap->TotalFreeSize -= FreeEntry->Size; + } + + PrevSize = (InUseEntry->Size << HEAP_ENTRY_SHIFT) - InUseEntry->UnusedBytes; + FreeSize -= Index; + + /* Don't produce too small blocks */ + if (FreeSize <= 2) + { + Index += FreeSize; + FreeSize = 0; + } + + /* Process extra stuff */ + if (RememberFlags & HEAP_ENTRY_EXTRA_PRESENT) + { + /* Calculate pointers */ + OldExtra = (PHEAP_ENTRY_EXTRA)(InUseEntry + InUseEntry->Size - 1); + NewExtra = (PHEAP_ENTRY_EXTRA)(InUseEntry + Index - 1); + + /* Copy contents */ + *NewExtra = *OldExtra; + + // FIXME Tagging + } + + /* Update sizes */ + InUseEntry->Size = Index; + InUseEntry->UnusedBytes = ((Index << HEAP_ENTRY_SHIFT) - Size); + + /* Check if there is a free space remaining after merging those blocks */ + if (!FreeSize) + { + /* Update flags and sizes */ + InUseEntry->Flags |= RememberFlags & HEAP_ENTRY_LAST_ENTRY; + + /* Either update previous size of the next entry or mark it as a last + entry in the segment*/ + if (RememberFlags & HEAP_ENTRY_LAST_ENTRY) + Heap->Segments[InUseEntry->SegmentOffset]->LastEntryInSegment = InUseEntry; + else + (InUseEntry + InUseEntry->Size)->PreviousSize = InUseEntry->Size; + } + else + { + /* Complex case, we need to split the block to give unused free space + back to the heap */ + UnusedEntry = (PHEAP_FREE_ENTRY)(InUseEntry + Index); + UnusedEntry->PreviousSize = Index; + UnusedEntry->SegmentOffset = InUseEntry->SegmentOffset; + + /* Update the following block or set the last entry in the segment */ + if (RememberFlags & HEAP_ENTRY_LAST_ENTRY) + { + /* Set last entry and set flags and size */ + Heap->Segments[InUseEntry->SegmentOffset]->LastEntryInSegment = InUseEntry; + UnusedEntry->Flags = RememberFlags; + UnusedEntry->Size = FreeSize; + + /* Insert it to the heap and update total size */ + RtlpInsertFreeBlockHelper(Heap, UnusedEntry, FreeSize, FALSE); + Heap->TotalFreeSize += FreeSize; + } + else + { + /* There is a block after this one */ + FollowingEntry = (PHEAP_FREE_ENTRY)((PHEAP_ENTRY)UnusedEntry + FreeSize); + + if (FollowingEntry->Flags & HEAP_ENTRY_BUSY) + { + /* Update flags and set size of the unused space entry */ + UnusedEntry->Flags = RememberFlags & (~HEAP_ENTRY_LAST_ENTRY); + UnusedEntry->Size = FreeSize; + + /* Update previous size of the following entry */ + FollowingEntry->PreviousSize = FreeSize; + + /* Insert it to the heap and update total free size */ + RtlpInsertFreeBlockHelper(Heap, UnusedEntry, FreeSize, FALSE); + Heap->TotalFreeSize += FreeSize; + } + else + { + /* That following entry is also free, what a fortune! */ + RememberFlags = FollowingEntry->Flags; + + /* Remove it */ + RtlpRemoveFreeBlock(Heap, FollowingEntry, FALSE, FALSE); + Heap->TotalFreeSize -= FollowingEntry->Size; + + /* And make up a new combined block */ + FreeSize += FollowingEntry->Size; + UnusedEntry->Flags = RememberFlags; + + /* Check where to put it */ + if (FreeSize <= HEAP_MAX_BLOCK_SIZE) + { + /* Fine for a dedicated list */ + UnusedEntry->Size = FreeSize; + + if (RememberFlags & HEAP_ENTRY_LAST_ENTRY) + Heap->Segments[UnusedEntry->SegmentOffset]->LastEntryInSegment = (PHEAP_ENTRY)UnusedEntry; + else + ((PHEAP_ENTRY)UnusedEntry + FreeSize)->PreviousSize = FreeSize; + + /* Insert it back and update total size */ + RtlpInsertFreeBlockHelper(Heap, UnusedEntry, FreeSize, FALSE); + Heap->TotalFreeSize += FreeSize; + } + else + { + /* The block is very large, leave all the hassle to the insertion routine */ + RtlpInsertFreeBlock(Heap, UnusedEntry, FreeSize); + } + } + } + } + + /* Copy user settable flags */ + InUseEntry->Flags &= ~HEAP_ENTRY_SETTABLE_FLAGS; + InUseEntry->Flags |= ((Flags & HEAP_SETTABLE_USER_FLAGS) >> 4); + + /* Properly "zero out" (and fill!) the space */ + if (Flags & HEAP_ZERO_MEMORY) + { + RtlZeroMemory((PCHAR)(InUseEntry + 1) + PrevSize, Size - PrevSize); + } + else if (Heap->Flags & HEAP_FREE_CHECKING_ENABLED) + { + /* Calculate tail part which we need to fill */ + TailPart = PrevSize & (sizeof(ULONG) - 1); + + /* "Invert" it as usual */ + if (TailPart) TailPart = 4 - TailPart; + + if (Size > (PrevSize + TailPart)) + AddedSize = (Size - (PrevSize + TailPart)) & ~(sizeof(ULONG) - 1); + + if (AddedSize) + { + RtlFillMemoryUlong((PCHAR)(InUseEntry + 1) + PrevSize + TailPart, + AddedSize, + ARENA_INUSE_FILLER); + } + } + + /* Fill the new tail */ + if (Heap->Flags & HEAP_TAIL_CHECKING_ENABLED) + { + RtlFillMemory((PCHAR)(InUseEntry + 1) + Size, + HEAP_ENTRY_SIZE, + HEAP_TAIL_FILL); + } + + /* Return success */ + return TRUE; } PHEAP_ENTRY_EXTRA NTAPI @@ -3270,18 +3493,34 @@ return NULL; } -DWORD +NTSTATUS NTAPI RtlSetHeapInformation(IN HANDLE HeapHandle OPTIONAL, IN HEAP_INFORMATION_CLASS HeapInformationClass, IN PVOID HeapInformation, IN SIZE_T HeapInformationLength) { - UNIMPLEMENTED; - return 0; -} - -DWORD + /* Setting heap information is not really supported except for enabling LFH */ + if (HeapInformationClass == 0) return STATUS_SUCCESS; + + /* Check buffer length */ + if (HeapInformationLength < sizeof(ULONG)) + { + /* The provided buffer is too small */ + return STATUS_BUFFER_TOO_SMALL; + } + + /* Check for a special magic value for enabling LFH */ + if (*(PULONG)HeapInformation == 2) + { + DPRINT1("RtlSetHeapInformation() needs to enable LFH\n"); + return STATUS_SUCCESS; + } + + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS NTAPI RtlQueryHeapInformation(HANDLE HeapHandle, HEAP_INFORMATION_CLASS HeapInformationClass, @@ -3289,11 +3528,29 @@ SIZE_T HeapInformationLength OPTIONAL, PSIZE_T ReturnLength OPTIONAL) { - UNIMPLEMENTED; - return 0; -} - -DWORD + PHEAP Heap = (PHEAP)HeapHandle; + + /* Only HeapCompatibilityInformation is supported */ + if (HeapInformationClass != HeapCompatibilityInformation) + return STATUS_UNSUCCESSFUL; + + /* Set result length */ + if (ReturnLength) *ReturnLength = sizeof(ULONG); + + /* Check buffer length */ + if (HeapInformationLength < sizeof(ULONG)) + { + /* It's too small, return needed length */ + return STATUS_BUFFER_TOO_SMALL; + } + + /* Return front end heap type */ + *(PULONG)HeapInformation = Heap->FrontEndHeapType; + + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI RtlMultipleAllocateHeap(IN PVOID HeapHandle, IN DWORD Flags, @@ -3305,7 +3562,7 @@ return 0; } -DWORD +NTSTATUS NTAPI RtlMultipleFreeHeap(IN PVOID HeapHandle, IN DWORD Flags,

15 years

[fireball] 49110: [ADVAPI32] - Katayama Hirofumi: Use DataLength field in RegEnumValueW instead of DataOffset. - Roel Messiant: Test behaviour in Vista and apply same fix to RegEnumValueA. See issu...

by fireball＠svn.reactos.org

Author: fireball Date: Mon Oct 11 07:47:52 2010 New Revision: 49110 URL: http://svn.reactos.org/svn/reactos?rev=49110&view=rev Log: [ADVAPI32] - Katayama Hirofumi: Use DataLength field in RegEnumValueW instead of DataOffset. - Roel Messiant: Test behaviour in Vista and apply same fix to RegEnumValueA. See issue #2492 for more details. Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Mon Oct 11 07:47:52 2010 @@ -2793,14 +2793,14 @@ status = NtEnumerateValueKey( KeyHandle, index, KeyValueFullInformation, buffer, total_size, &total_size ); - if (status && status != STATUS_BUFFER_OVERFLOW) goto done; + if (status && (status != STATUS_BUFFER_OVERFLOW) && (status != STATUS_BUFFER_TOO_SMALL)) goto done; /* we need to fetch the contents for a string type even if not requested, * because we need to compute the length of the ASCII string. */ if (value || data || is_string(info->Type)) { /* retry with a dynamically allocated buffer */ - while (status == STATUS_BUFFER_OVERFLOW) + while ((status == STATUS_BUFFER_OVERFLOW) || (status == STATUS_BUFFER_TOO_SMALL)) { if (buf_ptr != buffer) HeapFree( GetProcessHeap(), 0, buf_ptr ); if (!(buf_ptr = HeapAlloc( GetProcessHeap(), 0, total_size ))) @@ -2819,14 +2819,14 @@ { ULONG len; RtlUnicodeToMultiByteSize( &len, (WCHAR *)(buf_ptr + info->DataOffset), - total_size - info->DataOffset ); + info->DataLength ); if (data && len) { if (len > *count) status = STATUS_BUFFER_OVERFLOW; else { RtlUnicodeToMultiByteN( (PCHAR)data, len, NULL, (WCHAR *)(buf_ptr + info->DataOffset), - total_size - info->DataOffset ); + info->DataLength ); /* if the type is REG_SZ and data is not 0-terminated * and there is enough space in the buffer NT appends a \0 */ if (len < *count && data[len-1]) data[len] = 0; @@ -2836,8 +2836,8 @@ } else if (data) { - if (total_size - info->DataOffset > *count) status = STATUS_BUFFER_OVERFLOW; - else memcpy( data, buf_ptr + info->DataOffset, total_size - info->DataOffset ); + if (info->DataLength > *count) status = STATUS_BUFFER_OVERFLOW; + else memcpy( data, buf_ptr + info->DataOffset, info->DataLength ); } if (value && !status) @@ -2962,17 +2962,17 @@ if (data) { - if (total_size - info->DataOffset > *count) + if (info->DataLength > *count) { status = STATUS_BUFFER_OVERFLOW; goto overflow; } - memcpy( data, buf_ptr + info->DataOffset, total_size - info->DataOffset ); - if (total_size - info->DataOffset <= *count-sizeof(WCHAR) && is_string(info->Type)) + memcpy( data, buf_ptr + info->DataOffset, info->DataLength ); + if (is_string(info->Type) && info->DataLength <= *count - sizeof(WCHAR)) { /* if the type is REG_SZ and data is not 0-terminated * and there is enough space in the buffer NT appends a \0 */ - WCHAR *ptr = (WCHAR *)(data + total_size - info->DataOffset); + WCHAR *ptr = (WCHAR *)(data + info->DataLength); if (ptr > (WCHAR *)data && ptr[-1]) *ptr = 0; } }

15 years

[jimtabor] 49109: [Win32k|User32] - Move to the new window structure. Window Object served us well.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Oct 11 03:41:41 2010 New Revision: 49109 URL: http://svn.reactos.org/svn/reactos?rev=49109&view=rev Log: [Win32k|User32] - Move to the new window structure. Window Object served us well. Modified: trunk/reactos/dll/win32/user32/misc/misc.c trunk/reactos/dll/win32/user32/windows/class.c trunk/reactos/dll/win32/user32/windows/dialog.c trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/eng/engwindow.c trunk/reactos/subsystems/win32/win32k/include/caret.h trunk/reactos/subsystems/win32/win32k/include/clipboard.h trunk/reactos/subsystems/win32/win32k/include/dce.h trunk/reactos/subsystems/win32/win32k/include/desktop.h trunk/reactos/subsystems/win32/win32k/include/eng.h trunk/reactos/subsystems/win32/win32k/include/focus.h trunk/reactos/subsystems/win32/win32k/include/hotkey.h trunk/reactos/subsystems/win32/win32k/include/menu.h trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/include/painting.h trunk/reactos/subsystems/win32/win32k/include/prop.h trunk/reactos/subsystems/win32/win32k/include/scroll.h trunk/reactos/subsystems/win32/win32k/include/timer.h trunk/reactos/subsystems/win32/win32k/include/userfuncs.h trunk/reactos/subsystems/win32/win32k/include/vis.h trunk/reactos/subsystems/win32/win32k/include/window.h trunk/reactos/subsystems/win32/win32k/include/winpos.h trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c trunk/reactos/subsystems/win32/win32k/ntuser/caret.c trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/event.c trunk/reactos/subsystems/win32/win32k/ntuser/focus.c trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/object.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/prop.c trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c trunk/reactos/subsystems/win32/win32k/ntuser/vis.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c trunk/reactos/subsystems/win32/win32k/objects/device.c trunk/reactos/subsystems/win32/win32k/objects/palette.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… Modified: trunk/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… Modified: trunk/reactos/subsystems/win32/win32k/eng/engwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/include/caret.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/clipboard.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/dce.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/eng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/focus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/hotkey.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/menu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/painting.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/prop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/scroll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/timer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/userfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/vis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/winpos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/vis.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/objects/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…

15 years

[dreimer] 49108: Merge r49107.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Oct 10 23:30:05 2010 New Revision: 49108 URL: http://svn.reactos.org/svn/reactos?rev=49108&view=rev Log: Merge r49107. Modified: branches/cmake-bringup/dll/shellext/deskmon/lang/en-US.rc branches/cmake-bringup/dll/shellext/deskmon/lang/it-IT.rc branches/cmake-bringup/dll/shellext/deskmon/lang/pl-PL.rc branches/cmake-bringup/dll/win32/devmgr/lang/cs-CZ.rc branches/cmake-bringup/dll/win32/devmgr/lang/el-GR.rc branches/cmake-bringup/dll/win32/devmgr/lang/en-US.rc branches/cmake-bringup/dll/win32/devmgr/lang/it-IT.rc branches/cmake-bringup/dll/win32/devmgr/lang/no-NO.rc branches/cmake-bringup/dll/win32/devmgr/lang/ru-RU.rc branches/cmake-bringup/dll/win32/devmgr/lang/sk-SK.rc Modified: branches/cmake-bringup/dll/shellext/deskmon/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/desk… ============================================================================== --- branches/cmake-bringup/dll/shellext/deskmon/lang/en-US.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/shellext/deskmon/lang/en-US.rc [iso-8859-1] Sun Oct 10 23:30:05 2010 @@ -12,7 +12,7 @@ GROUPBOX "Monitor settings", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 LTEXT "&Screen refresh rate:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT - AUTOCHECKBOX "&Hide modes that this monitor can\'t display", IDC_PRUNINGCHECK, 13, 106, 225, 10 + AUTOCHECKBOX "&Hide modes that this monitor can't display", IDC_PRUNINGCHECK, 13, 106, 225, 10 END STRINGTABLE Modified: branches/cmake-bringup/dll/shellext/deskmon/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/desk… ============================================================================== --- branches/cmake-bringup/dll/shellext/deskmon/lang/it-IT.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/shellext/deskmon/lang/it-IT.rc [iso-8859-1] Sun Oct 10 23:30:05 2010 @@ -17,6 +17,6 @@ STRINGTABLE BEGIN - IDS_USEDEFFRQUENCY "Usare le impostazioni predefinite per l\'hardware" + IDS_USEDEFFRQUENCY "Usare le impostazioni predefinite per l'hardware" IDS_FREQFMT "%u Hertz" END Modified: branches/cmake-bringup/dll/shellext/deskmon/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/desk… ============================================================================== --- branches/cmake-bringup/dll/shellext/deskmon/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/shellext/deskmon/lang/pl-PL.rc [iso-8859-1] Sun Oct 10 23:30:05 2010 @@ -18,7 +18,7 @@ GROUPBOX "Ustawienia monitora", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 LTEXT "&Czêstotliwoæi odwie¿ania ekranu:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT - AUTOCHECKBOX "&Ukryj tryby których monitor n\ie mo¿e wywietliæ", IDC_PRUNINGCHECK, 13, 106, 225, 10 + AUTOCHECKBOX "&Ukryj tryby których monitor n ie mo¿e wywietliæ", IDC_PRUNINGCHECK, 13, 106, 225, 10 END STRINGTABLE Modified: branches/cmake-bringup/dll/win32/devmgr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/devmgr/… ============================================================================== --- branches/cmake-bringup/dll/win32/devmgr/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/devmgr/lang/cs-CZ.rc [iso-8859-1] Sun Oct 10 23:30:05 2010 @@ -75,7 +75,7 @@ IDS_DEV_FAILED_ADD "Toto zaøízení nepracuje správnì, protoe $1 nepracuje správnì." IDS_DEV_DISABLED_SERVICE "ReactOS nemùe nainstalovat ovladaèe tohoto zaøízení, protoe nemá pøístup na disk nebo síové umístìní, na kterém se nacházejí instalaèní soubory." IDS_DEV_TRANSLATION_FAILED "Toto zaøízení neodpovídá svému ovladaèi." - IDS_DEV_NO_SOFTCONFIG "ReactOS nedokáe urèit nastavení tohoto zaøízení. Konzultujte manuál, který byl pøibalen k zaøízení a pouijte záloku \"Zdroje\" k vybrání nastavení." + IDS_DEV_NO_SOFTCONFIG "ReactOS nedokáe urèit nastavení tohoto zaøízení. Konzultujte manuál, který byl pøibalen k zaøízení a pouijte záloku ""Zdroje"" k vybrání nastavení." IDS_DEV_BIOS_TABLE "Firmware tohoto poèítaèe nezahrnuje dost informací nutných pro správné nastavení a pouití tohoto zaøízení.\nAby bylo moné pouít toto zaøízení, kontaktujte výrobce poèítaèe k získání novìjí verze firmwaru nebo BIOSu." IDS_DEV_IRQ_TRANSLATION_FAILED "Toto zaøízení poaduje PCI pøeruení, ale je konfigurováno pro ISA pøeruení (èi naopak).\nProsím, nastavte správnì pøeruení pro toto zaøízení." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS nemùe incializovat ovladaè zaøízení pro toto zaøízení." Modified: branches/cmake-bringup/dll/win32/devmgr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/devmgr/… ============================================================================== --- branches/cmake-bringup/dll/win32/devmgr/lang/el-GR.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/devmgr/lang/el-GR.rc [iso-8859-1] Sun Oct 10 23:30:05 2010 @@ -43,7 +43,7 @@ IDS_DEV_FAILED_FILTER "Ïé ïäçãïß ãéá áõôÞ ôç óõóêåõÞ ðñÝðåé íá åðáíåãêáôáóôáèïýí." IDS_DEV_DEVLOADER_NOT_FOUND "ÁõôÞ ç óõóêåõÞ äå ëåéôïõñãåß êáíïíéêÜ åðåéäÞ ôï ReactOS äå ìðïñåß íá öïñôþóåé ôï áñ÷åßï $1 ðïõ öïñôþíåé ôïõò ïäçãïýò ãéá ôç óõóêåõÞ." IDS_DEV_DEVLOADER_NOT_FOUND2 "ÁõôÞ ç óõóêåõÞ äå ëåéôïõñãåß êáíïíéêÜ åðåéäÞ ôï áñ÷åßï $1 ðïõ öïñôþíåé ôïõò ïäçãïýò ãéá áõôÞ ôç óõóêåõÞ åßíáé ëáíèáóìÝíï." - IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn\'t work, see your hardware documentation." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn't work, see your hardware documentation." IDS_DEV_INVALID_DATA "This device is not working properly because the BIOS in your computer is reporting the resources for the device incorrectly." IDS_DEV_INVALID_DATA2 "This device is not working properly because the BIOS in the device is reporting the resources for the device incorrectly. " IDS_DEV_FAILED_START "This device is either not present, not working properly, or does not have all the drivers installed." @@ -65,16 +65,16 @@ IDS_DEV_DEVICE_NOT_THERE "This device is either not present, not working properly, or does not have all the drivers installed." IDS_DEV_MOVED "ReactOS is in the process of setting up this device." IDS_DEV_TOO_EARLY "ReactOS is in the process of setting up this device." - IDS_DEV_NO_VALID_LOG_CONF "ReactOS can\'t specify the resources for this device." + IDS_DEV_NO_VALID_LOG_CONF "ReactOS can't specify the resources for this device." IDS_DEV_FAILED_INSTALL "The drivers for this device are not installed." IDS_DEV_HARDWARE_DISABLED "This device is disabled because the BIOS for the device did not give it any resources." IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict." IDS_DEV_FAILED_ADD "This device is not working properly because $1 is not working properly." IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it." - IDS_DEV_TRANSLATION_FAILED "This device isn\'t responding to its driver." + IDS_DEV_TRANSLATION_FAILED "This device isn't responding to its driver." IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration." - IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." - IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer\'s system setup program to reconfigure the interrupt for this device." + IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." + IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer's system setup program to reconfigure the interrupt for this device." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS cannot initialize the device driver for this hardware." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS cannot load the device driver for this hardware because a previous instance of the device driver is still in memory." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS cannot load the device driver for this hardware. The driver may be corrupted or missing." @@ -88,7 +88,7 @@ IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for safe removal, but it has not been removed from the computer" IDS_DEV_DRIVER_BLOCKED "The software for this device has been blocked from starting because it is known to have problems with ReactOS. Contact the hardware vendor for a new driver." IDS_DEV_REGISTRY_TOO_LARGE "ReactOS cannot start new hardware devices because the system hive is too large (exceeds the Registry Size Limit)." - IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn\'t able to change the settings of this device." + IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn't able to change the settings of this device." END STRINGTABLE Modified: branches/cmake-bringup/dll/win32/devmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/devmgr/… ============================================================================== --- branches/cmake-bringup/dll/win32/devmgr/lang/en-US.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/devmgr/lang/en-US.rc [iso-8859-1] Sun Oct 10 23:30:05 2010 @@ -43,7 +43,7 @@ IDS_DEV_FAILED_FILTER "The drivers for this device need to be reinstalled." IDS_DEV_DEVLOADER_NOT_FOUND "This device is not working properly because ReactOS cannot load the file $1 that loads the drivers for the device." IDS_DEV_DEVLOADER_NOT_FOUND2 "This device is not working properly because the file $1 that loads the drivers for this device is bad." - IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn\'t work, see your hardware documentation." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn't work, see your hardware documentation." IDS_DEV_INVALID_DATA "This device is not working properly because the BIOS in your computer is reporting the resources for the device incorrectly." IDS_DEV_INVALID_DATA2 "This device is not working properly because the BIOS in the device is reporting the resources for the device incorrectly. " IDS_DEV_FAILED_START "This device is either not present, not working properly, or does not have all the drivers installed." @@ -65,16 +65,16 @@ IDS_DEV_DEVICE_NOT_THERE "This device is either not present, not working properly, or does not have all the drivers installed." IDS_DEV_MOVED "ReactOS is in the process of setting up this device." IDS_DEV_TOO_EARLY "ReactOS is in the process of setting up this device." - IDS_DEV_NO_VALID_LOG_CONF "ReactOS can\'t specify the resources for this device." + IDS_DEV_NO_VALID_LOG_CONF "ReactOS can't specify the resources for this device." IDS_DEV_FAILED_INSTALL "The drivers for this device are not installed." IDS_DEV_HARDWARE_DISABLED "This device is disabled because the BIOS for the device did not give it any resources." IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict." IDS_DEV_FAILED_ADD "This device is not working properly because $1 is not working properly." IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it." - IDS_DEV_TRANSLATION_FAILED "This device isn\'t responding to its driver." + IDS_DEV_TRANSLATION_FAILED "This device isn't responding to its driver." IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration." - IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." - IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer\'s system setup program to reconfigure the interrupt for this device." + IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." + IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer's system setup program to reconfigure the interrupt for this device." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS cannot initialize the device driver for this hardware." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS cannot load the device driver for this hardware because a previous instance of the device driver is still in memory." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS cannot load the device driver for this hardware. The driver may be corrupted or missing." @@ -88,7 +88,7 @@ IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for safe removal, but it has not been removed from the computer" IDS_DEV_DRIVER_BLOCKED "The software for this device has been blocked from starting because it is known to have problems with ReactOS. Contact the hardware vendor for a new driver." IDS_DEV_REGISTRY_TOO_LARGE "ReactOS cannot start new hardware devices because the system hive is too large (exceeds the Registry Size Limit)." - IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn\'t able to change the settings of this device." + IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn't able to change the settings of this device." END STRINGTABLE Modified: branches/cmake-bringup/dll/win32/devmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/devmgr/… ============================================================================== --- branches/cmake-bringup/dll/win32/devmgr/lang/it-IT.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/devmgr/lang/it-IT.rc [iso-8859-1] Sun Oct 10 23:30:05 2010 @@ -43,7 +43,7 @@ IDS_DEV_FAILED_FILTER "Il driver di questo dispositivo deve essere reinstallato." IDS_DEV_DEVLOADER_NOT_FOUND "Questo dispositivo non funziona regolarmente perchè ReactOS non può caricare il file $1 che carica i driver per questo dispositivo." IDS_DEV_DEVLOADER_NOT_FOUND2 "Questo dispositivo non funziona regolarmente perchè il file $1 che carica i driver per questo dispositivo è sbagliato." - IDS_DEV_DEVLOADER_NOT_FOUND3 "Anomalia del dispositivo: Prova a cambiare il driver. Se non ha effetto verifica la documentazione dell\'hardware." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Anomalia del dispositivo: Prova a cambiare il driver. Se non ha effetto verifica la documentazione dell'hardware." IDS_DEV_INVALID_DATA "Questo dispositivo non funziona regolarmente perchè il BIOS del computer indica in modo errato le risorse per il dispositivo." IDS_DEV_INVALID_DATA2 "Questo dispositivo non funziona regolarmente perchè il BIOS del dispositivo indica in modo errato le risorse per il dispositivo. " IDS_DEV_FAILED_START "Il dispositivo può essere assente, malfunzionante o non ha tutti i driver necessari." @@ -68,22 +68,22 @@ IDS_DEV_NO_VALID_LOG_CONF "ReactOS non può indicare le risorse per questo dispositivo." IDS_DEV_FAILED_INSTALL "I driver non sono installati." IDS_DEV_HARDWARE_DISABLED "Disabilitato perchè il BIOS del dispositivo non ha assegnato nessuna risorsa." - IDS_DEV_CANT_SHARE_IRQ "Questo dispositivo usa un Interrupt Request (IRQ) che è già in uso e non può essere condiviso.\nDevi cambiare l'impostazione in conflitto o togliere il driver \"real-mode\" che provoca il conflitto." + IDS_DEV_CANT_SHARE_IRQ "Questo dispositivo usa un Interrupt Request (IRQ) che è già in uso e non può essere condiviso.\nDevi cambiare l'impostazione in conflitto o togliere il driver ""real-mode"" che provoca il conflitto." IDS_DEV_FAILED_ADD "Non funziona regolarmente a causa di $1 ." IDS_DEV_DISABLED_SERVICE "ReactOS non può installare i driver del dispositivo perchè non è possibile accedere al disco o alla rete dove si trovano i file di setup." IDS_DEV_TRANSLATION_FAILED "Il dispositivo non risponde ai suoi driver." IDS_DEV_NO_SOFTCONFIG "ReactOS non può individuare le impostazioni necessarie. Verificate la documentazione e usate il tab Risorse per impostare la configurazione." - IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." - IDS_DEV_IRQ_TRANSLATION_FAILED "E\' necessario un Interrupt PCI ma è configurato uno ISA o viceversa. \nUsate il setup di sistema del computer per riconfigurare l\'Interrupt." + IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." + IDS_DEV_IRQ_TRANSLATION_FAILED "E' necessario un Interrupt PCI ma è configurato uno ISA o viceversa. \nUsate il setup di sistema del computer per riconfigurare l'Interrupt." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS non può inizializzare il driver di questo hardware." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS non puo' caricare il driver perchè si trova in memoria una attivazione precedente." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS non puo' caricare il driver, potrebbe essere corrotto o assente." IDS_DEV_DRIVER_SERVICE_KEY_INVALID "ReactOS non può accedere a questo hardware perchè le informazioni nel registry sono mancanti o memorizzate in modo errato." - IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS ha caricato regolarmente il driver ma non ha rilevato l\'hardware." + IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS ha caricato regolarmente il driver ma non ha rilevato l'hardware." IDS_DEV_DUPLICATE_DEVICE "ReactOS non puo' caricare il driver perchè si trova nel sistema un suo duplicato già attivo." IDS_DEV_FAILED_POST_START "ReactOS ha fermato il driver perchè sono stati rileveti dei problemi." IDS_DEV_HALTED "Una applicazione o un servizio ha disattivato il dispositivo hardware." - IDS_DEV_PHANTOM "Al momento l\'hardware non è collegato al computer." + IDS_DEV_PHANTOM "Al momento l'hardware non è collegato al computer." IDS_DEV_SYSTEM_SHUTDOWN "ReactOS Non può accede a questo hardware perchè il sistema operativo si stà spegnendo." IDS_DEV_HELD_FOR_EJECT "ReactOS non può accedere al dispositivo perchè è stato predisposto per la rimozione ma non è ancora stato rimosso" IDS_DEV_DRIVER_BLOCKED "Il software per questo dispositivo non può essere avviato perchè è noto che ha problemi con ReactOS. Contate il venditore hardware per un aggiornamento del driver." Modified: branches/cmake-bringup/dll/win32/devmgr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/devmgr/… ============================================================================== --- branches/cmake-bringup/dll/win32/devmgr/lang/no-NO.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/devmgr/lang/no-NO.rc [iso-8859-1] Sun Oct 10 23:30:05 2010 @@ -65,16 +65,16 @@ IDS_DEV_DEVICE_NOT_THERE "Denne enheten er heller ikke valgt, eller vil ikke fungere riktig, eller så har den ikke alle driverene som trengs." IDS_DEV_MOVED "ReactOS starter prosessen for å setter opp denne enheten." IDS_DEV_TOO_EARLY "ReactOS er i prosessen for å setter opp denne enheten." - IDS_DEV_NO_VALID_LOG_CONF "ReactOS kan\ ikke spesifisere ressursen for denne enheten." + IDS_DEV_NO_VALID_LOG_CONF "ReactOS kan ikke spesifisere ressursen for denne enheten." IDS_DEV_FAILED_INSTALL "Driveren for denne enheten er ikke installert." IDS_DEV_HARDWARE_DISABLED "Denne enheten er deaktivert fordi BIOS for enheten gir ikke andre ressurser." IDS_DEV_CANT_SHARE_IRQ "Denne enheten bruker en Interrupt Request (IRQ) ressurs som er i bruk av en annen enhet og kan ikke bli delt.\nDu må endre konflikt innstillingen eller fjerne ekte-modus driver som forårsaker konflikten." IDS_DEV_FAILED_ADD "Denne enheten vil ikke fungere som den skal fordi $1 vil ikke fungere som den skal." IDS_DEV_DISABLED_SERVICE "ReactOS kan ikke installere driveren for denne enheten, fordi den får ikke tilgang til driveren eller nettverks plasseringen som har installering filen." - IDS_DEV_TRANSLATION_FAILED "Denne enheten vil\ ikke svare på grunn av driveren." + IDS_DEV_TRANSLATION_FAILED "Denne enheten vil ikke svare på grunn av driveren." IDS_DEV_NO_SOFTCONFIG "ReactOS kan ikke oppdage innstillingene for denne enheten. Ta hensyn til dokumentasjon som kommer med denne enheten og bruker ressursen tab for å sette konfigurasjonen." - IDS_DEV_BIOS_TABLE "Din datamaskin\ system firmware følger ikke med nok informasjon til å riktig konfigurere og bruke denne enheten. \nFor å bruke denne enheten, kontakt din datamaskin fabrikant for å få en firmware eller BIOS oppdatering." - IDS_DEV_IRQ_TRANSLATION_FAILED "Denne enheten trenger en PCI interrupt men den er konfigurert for en ISA interrupt (eller vice versa). \nVennligst bruk datamaskinens\'s system installering program for å rekonfigurere interrupt for denne enheten." + IDS_DEV_BIOS_TABLE "Din datamaskin system firmware følger ikke med nok informasjon til å riktig konfigurere og bruke denne enheten. \nFor å bruke denne enheten, kontakt din datamaskin fabrikant for å få en firmware eller BIOS oppdatering." + IDS_DEV_IRQ_TRANSLATION_FAILED "Denne enheten trenger en PCI interrupt men den er konfigurert for en ISA interrupt (eller vice versa). \nVennligst bruk datamaskinens's system installering program for å rekonfigurere interrupt for denne enheten." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS kan ikke initialise enhetsdriveren for denne maskinvaren." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS kan ikke laste enhetsdriveren for denne maskinvaren fordi en forrige tilfelle av enhetsdriveren er fremdeles i minnet." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS kan ikke laste enhetsdriveren for denne maskinvaren. Driveren kan være korrupt eller mangler." Modified: branches/cmake-bringup/dll/win32/devmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/devmgr/… ============================================================================== --- branches/cmake-bringup/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] Sun Oct 10 23:30:05 2010 @@ -41,7 +41,7 @@ IDS_DEV_FAILED_FILTER "Äðàéâåðû äëÿ ýòîãî óñòðîéñòâà äîëæíû áûòü ïåðåóñòàíîâëåíû." IDS_DEV_DEVLOADER_NOT_FOUND "This device is not working properly because ReactOS cannot load the file $1 that loads the drivers for the device." IDS_DEV_DEVLOADER_NOT_FOUND2 "This device is not working properly because the file $1 that loads the drivers for this device is bad." - IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn\'t work, see your hardware documentation." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn't work, see your hardware documentation." IDS_DEV_INVALID_DATA "This device is not working properly because the BIOS in your computer is reporting the resources for the device incorrectly." IDS_DEV_INVALID_DATA2 "This device is not working properly because the BIOS in the device is reporting the resources for the device incorrectly. " IDS_DEV_FAILED_START "This device is either not present, not working properly, or does not have all the drivers installed." @@ -69,10 +69,10 @@ IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict." IDS_DEV_FAILED_ADD "This device is not working properly because $1 is not working properly." IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it." - IDS_DEV_TRANSLATION_FAILED "This device isn\'t responding to its driver." + IDS_DEV_TRANSLATION_FAILED "This device isn't responding to its driver." IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration." - IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." - IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer\'s system setup program to reconfigure the interrupt for this device." + IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." + IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer's system setup program to reconfigure the interrupt for this device." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS íå ìîæåò èíèöèàëèçèðîâàòü äðàéâåð óñòðîéñòâà äëÿ äàííîãî îáîðóäîâàíèÿ." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS cannot load the device driver for this hardware because a previous instance of the device driver is still in memory." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS cannot load the device driver for this hardware. The driver may be corrupted or missing." @@ -86,7 +86,7 @@ IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for safe removal, but it has not been removed from the computer" IDS_DEV_DRIVER_BLOCKED "The software for this device has been blocked from starting because it is known to have problems with ReactOS. Contact the hardware vendor for a new driver." IDS_DEV_REGISTRY_TOO_LARGE "ReactOS cannot start new hardware devices because the system hive is too large (exceeds the Registry Size Limit)." - IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn\'t able to change the settings of this device." + IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn't able to change the settings of this device." END STRINGTABLE Modified: branches/cmake-bringup/dll/win32/devmgr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/devmgr/… ============================================================================== --- branches/cmake-bringup/dll/win32/devmgr/lang/sk-SK.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/devmgr/lang/sk-SK.rc [iso-8859-1] Sun Oct 10 23:30:05 2010 @@ -46,7 +46,7 @@ IDS_DEV_FAILED_FILTER "The drivers for this device need to be reinstalled." IDS_DEV_DEVLOADER_NOT_FOUND "This device is not working properly because ReactOS cannot load the file $1 that loads the drivers for the device." IDS_DEV_DEVLOADER_NOT_FOUND2 "This device is not working properly because the file $1 that loads the drivers for this device is bad." - IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn\'t work, see your hardware documentation." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn't work, see your hardware documentation." IDS_DEV_INVALID_DATA "This device is not working properly because the BIOS in your computer is reporting the resources for the device incorrectly." IDS_DEV_INVALID_DATA2 "This device is not working properly because the BIOS in the device is reporting the resources for the device incorrectly. " IDS_DEV_FAILED_START "This device is either not present, not working properly, or does not have all the drivers installed." @@ -68,16 +68,16 @@ IDS_DEV_DEVICE_NOT_THERE "This device is either not present, not working properly, or does not have all the drivers installed." IDS_DEV_MOVED "ReactOS is in the process of setting up this device." IDS_DEV_TOO_EARLY "ReactOS is in the process of setting up this device." - IDS_DEV_NO_VALID_LOG_CONF "ReactOS can\'t specify the resources for this device." + IDS_DEV_NO_VALID_LOG_CONF "ReactOS can't specify the resources for this device." IDS_DEV_FAILED_INSTALL "The drivers for this device are not installed." IDS_DEV_HARDWARE_DISABLED "This device is disabled because the BIOS for the device did not give it any resources." IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict." IDS_DEV_FAILED_ADD "This device is not working properly because $1 is not working properly." IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it." - IDS_DEV_TRANSLATION_FAILED "This device isn\'t responding to its driver." + IDS_DEV_TRANSLATION_FAILED "This device isn't responding to its driver." IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration." - IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." - IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer\'s system setup program to reconfigure the interrupt for this device." + IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." + IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer's system setup program to reconfigure the interrupt for this device." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS cannot initialize the device driver for this hardware." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS cannot load the device driver for this hardware because a previous instance of the device driver is still in memory." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS cannot load the device driver for this hardware. The driver may be corrupted or missing." @@ -91,7 +91,7 @@ IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for safe removal, but it has not been removed from the computer" IDS_DEV_DRIVER_BLOCKED "The software for this device has been blocked from starting because it is known to have problems with ReactOS. Contact the hardware vendor for a new driver." IDS_DEV_REGISTRY_TOO_LARGE "ReactOS cannot start new hardware devices because the system hive is too large (exceeds the Registry Size Limit)." - IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn\'t able to change the settings of this device." + IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn't able to change the settings of this device." END STRINGTABLE

15 years

[dreimer] 49107: RC file fixes for inconsistences shown up by the recent dll work in r49105.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Oct 10 23:29:32 2010 New Revision: 49107 URL: http://svn.reactos.org/svn/reactos?rev=49107&view=rev Log: RC file fixes for inconsistences shown up by the recent dll work in r49105. Modified: trunk/reactos/dll/shellext/deskmon/lang/en-US.rc trunk/reactos/dll/shellext/deskmon/lang/it-IT.rc trunk/reactos/dll/shellext/deskmon/lang/pl-PL.rc trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc trunk/reactos/dll/win32/devmgr/lang/el-GR.rc trunk/reactos/dll/win32/devmgr/lang/en-US.rc trunk/reactos/dll/win32/devmgr/lang/it-IT.rc trunk/reactos/dll/win32/devmgr/lang/no-NO.rc trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc Modified: trunk/reactos/dll/shellext/deskmon/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/lang/en-US.rc [iso-8859-1] Sun Oct 10 23:29:32 2010 @@ -12,7 +12,7 @@ GROUPBOX "Monitor settings", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 LTEXT "&Screen refresh rate:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT - AUTOCHECKBOX "&Hide modes that this monitor can\'t display", IDC_PRUNINGCHECK, 13, 106, 225, 10 + AUTOCHECKBOX "&Hide modes that this monitor can't display", IDC_PRUNINGCHECK, 13, 106, 225, 10 END STRINGTABLE Modified: trunk/reactos/dll/shellext/deskmon/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/lang/it-IT.rc [iso-8859-1] Sun Oct 10 23:29:32 2010 @@ -17,6 +17,6 @@ STRINGTABLE BEGIN - IDS_USEDEFFRQUENCY "Usare le impostazioni predefinite per l\'hardware" + IDS_USEDEFFRQUENCY "Usare le impostazioni predefinite per l'hardware" IDS_FREQFMT "%u Hertz" END Modified: trunk/reactos/dll/shellext/deskmon/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/lang/pl-PL.rc [iso-8859-1] Sun Oct 10 23:29:32 2010 @@ -18,7 +18,7 @@ GROUPBOX "Ustawienia monitora", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 LTEXT "&Czêstotliwoæi odwie¿ania ekranu:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT - AUTOCHECKBOX "&Ukryj tryby których monitor n\ie mo¿e wywietliæ", IDC_PRUNINGCHECK, 13, 106, 225, 10 + AUTOCHECKBOX "&Ukryj tryby których monitor n ie mo¿e wywietliæ", IDC_PRUNINGCHECK, 13, 106, 225, 10 END STRINGTABLE Modified: trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/cs-C… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc [iso-8859-1] Sun Oct 10 23:29:32 2010 @@ -75,7 +75,7 @@ IDS_DEV_FAILED_ADD "Toto zaøízení nepracuje správnì, protoe $1 nepracuje správnì." IDS_DEV_DISABLED_SERVICE "ReactOS nemùe nainstalovat ovladaèe tohoto zaøízení, protoe nemá pøístup na disk nebo síové umístìní, na kterém se nacházejí instalaèní soubory." IDS_DEV_TRANSLATION_FAILED "Toto zaøízení neodpovídá svému ovladaèi." - IDS_DEV_NO_SOFTCONFIG "ReactOS nedokáe urèit nastavení tohoto zaøízení. Konzultujte manuál, který byl pøibalen k zaøízení a pouijte záloku \"Zdroje\" k vybrání nastavení." + IDS_DEV_NO_SOFTCONFIG "ReactOS nedokáe urèit nastavení tohoto zaøízení. Konzultujte manuál, který byl pøibalen k zaøízení a pouijte záloku ""Zdroje"" k vybrání nastavení." IDS_DEV_BIOS_TABLE "Firmware tohoto poèítaèe nezahrnuje dost informací nutných pro správné nastavení a pouití tohoto zaøízení.\nAby bylo moné pouít toto zaøízení, kontaktujte výrobce poèítaèe k získání novìjí verze firmwaru nebo BIOSu." IDS_DEV_IRQ_TRANSLATION_FAILED "Toto zaøízení poaduje PCI pøeruení, ale je konfigurováno pro ISA pøeruení (èi naopak).\nProsím, nastavte správnì pøeruení pro toto zaøízení." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS nemùe incializovat ovladaè zaøízení pro toto zaøízení." Modified: trunk/reactos/dll/win32/devmgr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/el-G… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/el-GR.rc [iso-8859-1] Sun Oct 10 23:29:32 2010 @@ -43,7 +43,7 @@ IDS_DEV_FAILED_FILTER "Ïé ïäçãïß ãéá áõôÞ ôç óõóêåõÞ ðñÝðåé íá åðáíåãêáôáóôáèïýí." IDS_DEV_DEVLOADER_NOT_FOUND "ÁõôÞ ç óõóêåõÞ äå ëåéôïõñãåß êáíïíéêÜ åðåéäÞ ôï ReactOS äå ìðïñåß íá öïñôþóåé ôï áñ÷åßï $1 ðïõ öïñôþíåé ôïõò ïäçãïýò ãéá ôç óõóêåõÞ." IDS_DEV_DEVLOADER_NOT_FOUND2 "ÁõôÞ ç óõóêåõÞ äå ëåéôïõñãåß êáíïíéêÜ åðåéäÞ ôï áñ÷åßï $1 ðïõ öïñôþíåé ôïõò ïäçãïýò ãéá áõôÞ ôç óõóêåõÞ åßíáé ëáíèáóìÝíï." - IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn\'t work, see your hardware documentation." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn't work, see your hardware documentation." IDS_DEV_INVALID_DATA "This device is not working properly because the BIOS in your computer is reporting the resources for the device incorrectly." IDS_DEV_INVALID_DATA2 "This device is not working properly because the BIOS in the device is reporting the resources for the device incorrectly. " IDS_DEV_FAILED_START "This device is either not present, not working properly, or does not have all the drivers installed." @@ -65,16 +65,16 @@ IDS_DEV_DEVICE_NOT_THERE "This device is either not present, not working properly, or does not have all the drivers installed." IDS_DEV_MOVED "ReactOS is in the process of setting up this device." IDS_DEV_TOO_EARLY "ReactOS is in the process of setting up this device." - IDS_DEV_NO_VALID_LOG_CONF "ReactOS can\'t specify the resources for this device." + IDS_DEV_NO_VALID_LOG_CONF "ReactOS can't specify the resources for this device." IDS_DEV_FAILED_INSTALL "The drivers for this device are not installed." IDS_DEV_HARDWARE_DISABLED "This device is disabled because the BIOS for the device did not give it any resources." IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict." IDS_DEV_FAILED_ADD "This device is not working properly because $1 is not working properly." IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it." - IDS_DEV_TRANSLATION_FAILED "This device isn\'t responding to its driver." + IDS_DEV_TRANSLATION_FAILED "This device isn't responding to its driver." IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration." - IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." - IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer\'s system setup program to reconfigure the interrupt for this device." + IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." + IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer's system setup program to reconfigure the interrupt for this device." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS cannot initialize the device driver for this hardware." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS cannot load the device driver for this hardware because a previous instance of the device driver is still in memory." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS cannot load the device driver for this hardware. The driver may be corrupted or missing." @@ -88,7 +88,7 @@ IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for safe removal, but it has not been removed from the computer" IDS_DEV_DRIVER_BLOCKED "The software for this device has been blocked from starting because it is known to have problems with ReactOS. Contact the hardware vendor for a new driver." IDS_DEV_REGISTRY_TOO_LARGE "ReactOS cannot start new hardware devices because the system hive is too large (exceeds the Registry Size Limit)." - IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn\'t able to change the settings of this device." + IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn't able to change the settings of this device." END STRINGTABLE Modified: trunk/reactos/dll/win32/devmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/en-US.rc [iso-8859-1] Sun Oct 10 23:29:32 2010 @@ -43,7 +43,7 @@ IDS_DEV_FAILED_FILTER "The drivers for this device need to be reinstalled." IDS_DEV_DEVLOADER_NOT_FOUND "This device is not working properly because ReactOS cannot load the file $1 that loads the drivers for the device." IDS_DEV_DEVLOADER_NOT_FOUND2 "This device is not working properly because the file $1 that loads the drivers for this device is bad." - IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn\'t work, see your hardware documentation." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn't work, see your hardware documentation." IDS_DEV_INVALID_DATA "This device is not working properly because the BIOS in your computer is reporting the resources for the device incorrectly." IDS_DEV_INVALID_DATA2 "This device is not working properly because the BIOS in the device is reporting the resources for the device incorrectly. " IDS_DEV_FAILED_START "This device is either not present, not working properly, or does not have all the drivers installed." @@ -65,16 +65,16 @@ IDS_DEV_DEVICE_NOT_THERE "This device is either not present, not working properly, or does not have all the drivers installed." IDS_DEV_MOVED "ReactOS is in the process of setting up this device." IDS_DEV_TOO_EARLY "ReactOS is in the process of setting up this device." - IDS_DEV_NO_VALID_LOG_CONF "ReactOS can\'t specify the resources for this device." + IDS_DEV_NO_VALID_LOG_CONF "ReactOS can't specify the resources for this device." IDS_DEV_FAILED_INSTALL "The drivers for this device are not installed." IDS_DEV_HARDWARE_DISABLED "This device is disabled because the BIOS for the device did not give it any resources." IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict." IDS_DEV_FAILED_ADD "This device is not working properly because $1 is not working properly." IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it." - IDS_DEV_TRANSLATION_FAILED "This device isn\'t responding to its driver." + IDS_DEV_TRANSLATION_FAILED "This device isn't responding to its driver." IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration." - IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." - IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer\'s system setup program to reconfigure the interrupt for this device." + IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." + IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer's system setup program to reconfigure the interrupt for this device." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS cannot initialize the device driver for this hardware." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS cannot load the device driver for this hardware because a previous instance of the device driver is still in memory." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS cannot load the device driver for this hardware. The driver may be corrupted or missing." @@ -88,7 +88,7 @@ IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for safe removal, but it has not been removed from the computer" IDS_DEV_DRIVER_BLOCKED "The software for this device has been blocked from starting because it is known to have problems with ReactOS. Contact the hardware vendor for a new driver." IDS_DEV_REGISTRY_TOO_LARGE "ReactOS cannot start new hardware devices because the system hive is too large (exceeds the Registry Size Limit)." - IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn\'t able to change the settings of this device." + IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn't able to change the settings of this device." END STRINGTABLE Modified: trunk/reactos/dll/win32/devmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/it-I… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/it-IT.rc [iso-8859-1] Sun Oct 10 23:29:32 2010 @@ -43,7 +43,7 @@ IDS_DEV_FAILED_FILTER "Il driver di questo dispositivo deve essere reinstallato." IDS_DEV_DEVLOADER_NOT_FOUND "Questo dispositivo non funziona regolarmente perchè ReactOS non può caricare il file $1 che carica i driver per questo dispositivo." IDS_DEV_DEVLOADER_NOT_FOUND2 "Questo dispositivo non funziona regolarmente perchè il file $1 che carica i driver per questo dispositivo è sbagliato." - IDS_DEV_DEVLOADER_NOT_FOUND3 "Anomalia del dispositivo: Prova a cambiare il driver. Se non ha effetto verifica la documentazione dell\'hardware." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Anomalia del dispositivo: Prova a cambiare il driver. Se non ha effetto verifica la documentazione dell'hardware." IDS_DEV_INVALID_DATA "Questo dispositivo non funziona regolarmente perchè il BIOS del computer indica in modo errato le risorse per il dispositivo." IDS_DEV_INVALID_DATA2 "Questo dispositivo non funziona regolarmente perchè il BIOS del dispositivo indica in modo errato le risorse per il dispositivo. " IDS_DEV_FAILED_START "Il dispositivo può essere assente, malfunzionante o non ha tutti i driver necessari." @@ -68,22 +68,22 @@ IDS_DEV_NO_VALID_LOG_CONF "ReactOS non può indicare le risorse per questo dispositivo." IDS_DEV_FAILED_INSTALL "I driver non sono installati." IDS_DEV_HARDWARE_DISABLED "Disabilitato perchè il BIOS del dispositivo non ha assegnato nessuna risorsa." - IDS_DEV_CANT_SHARE_IRQ "Questo dispositivo usa un Interrupt Request (IRQ) che è già in uso e non può essere condiviso.\nDevi cambiare l'impostazione in conflitto o togliere il driver \"real-mode\" che provoca il conflitto." + IDS_DEV_CANT_SHARE_IRQ "Questo dispositivo usa un Interrupt Request (IRQ) che è già in uso e non può essere condiviso.\nDevi cambiare l'impostazione in conflitto o togliere il driver ""real-mode"" che provoca il conflitto." IDS_DEV_FAILED_ADD "Non funziona regolarmente a causa di $1 ." IDS_DEV_DISABLED_SERVICE "ReactOS non può installare i driver del dispositivo perchè non è possibile accedere al disco o alla rete dove si trovano i file di setup." IDS_DEV_TRANSLATION_FAILED "Il dispositivo non risponde ai suoi driver." IDS_DEV_NO_SOFTCONFIG "ReactOS non può individuare le impostazioni necessarie. Verificate la documentazione e usate il tab Risorse per impostare la configurazione." - IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." - IDS_DEV_IRQ_TRANSLATION_FAILED "E\' necessario un Interrupt PCI ma è configurato uno ISA o viceversa. \nUsate il setup di sistema del computer per riconfigurare l\'Interrupt." + IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." + IDS_DEV_IRQ_TRANSLATION_FAILED "E' necessario un Interrupt PCI ma è configurato uno ISA o viceversa. \nUsate il setup di sistema del computer per riconfigurare l'Interrupt." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS non può inizializzare il driver di questo hardware." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS non puo' caricare il driver perchè si trova in memoria una attivazione precedente." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS non puo' caricare il driver, potrebbe essere corrotto o assente." IDS_DEV_DRIVER_SERVICE_KEY_INVALID "ReactOS non può accedere a questo hardware perchè le informazioni nel registry sono mancanti o memorizzate in modo errato." - IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS ha caricato regolarmente il driver ma non ha rilevato l\'hardware." + IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS ha caricato regolarmente il driver ma non ha rilevato l'hardware." IDS_DEV_DUPLICATE_DEVICE "ReactOS non puo' caricare il driver perchè si trova nel sistema un suo duplicato già attivo." IDS_DEV_FAILED_POST_START "ReactOS ha fermato il driver perchè sono stati rileveti dei problemi." IDS_DEV_HALTED "Una applicazione o un servizio ha disattivato il dispositivo hardware." - IDS_DEV_PHANTOM "Al momento l\'hardware non è collegato al computer." + IDS_DEV_PHANTOM "Al momento l'hardware non è collegato al computer." IDS_DEV_SYSTEM_SHUTDOWN "ReactOS Non può accede a questo hardware perchè il sistema operativo si stà spegnendo." IDS_DEV_HELD_FOR_EJECT "ReactOS non può accedere al dispositivo perchè è stato predisposto per la rimozione ma non è ancora stato rimosso" IDS_DEV_DRIVER_BLOCKED "Il software per questo dispositivo non può essere avviato perchè è noto che ha problemi con ReactOS. Contate il venditore hardware per un aggiornamento del driver." Modified: trunk/reactos/dll/win32/devmgr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/no-N… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/no-NO.rc [iso-8859-1] Sun Oct 10 23:29:32 2010 @@ -65,16 +65,16 @@ IDS_DEV_DEVICE_NOT_THERE "Denne enheten er heller ikke valgt, eller vil ikke fungere riktig, eller så har den ikke alle driverene som trengs." IDS_DEV_MOVED "ReactOS starter prosessen for å setter opp denne enheten." IDS_DEV_TOO_EARLY "ReactOS er i prosessen for å setter opp denne enheten." - IDS_DEV_NO_VALID_LOG_CONF "ReactOS kan\ ikke spesifisere ressursen for denne enheten." + IDS_DEV_NO_VALID_LOG_CONF "ReactOS kan ikke spesifisere ressursen for denne enheten." IDS_DEV_FAILED_INSTALL "Driveren for denne enheten er ikke installert." IDS_DEV_HARDWARE_DISABLED "Denne enheten er deaktivert fordi BIOS for enheten gir ikke andre ressurser." IDS_DEV_CANT_SHARE_IRQ "Denne enheten bruker en Interrupt Request (IRQ) ressurs som er i bruk av en annen enhet og kan ikke bli delt.\nDu må endre konflikt innstillingen eller fjerne ekte-modus driver som forårsaker konflikten." IDS_DEV_FAILED_ADD "Denne enheten vil ikke fungere som den skal fordi $1 vil ikke fungere som den skal." IDS_DEV_DISABLED_SERVICE "ReactOS kan ikke installere driveren for denne enheten, fordi den får ikke tilgang til driveren eller nettverks plasseringen som har installering filen." - IDS_DEV_TRANSLATION_FAILED "Denne enheten vil\ ikke svare på grunn av driveren." + IDS_DEV_TRANSLATION_FAILED "Denne enheten vil ikke svare på grunn av driveren." IDS_DEV_NO_SOFTCONFIG "ReactOS kan ikke oppdage innstillingene for denne enheten. Ta hensyn til dokumentasjon som kommer med denne enheten og bruker ressursen tab for å sette konfigurasjonen." - IDS_DEV_BIOS_TABLE "Din datamaskin\ system firmware følger ikke med nok informasjon til å riktig konfigurere og bruke denne enheten. \nFor å bruke denne enheten, kontakt din datamaskin fabrikant for å få en firmware eller BIOS oppdatering." - IDS_DEV_IRQ_TRANSLATION_FAILED "Denne enheten trenger en PCI interrupt men den er konfigurert for en ISA interrupt (eller vice versa). \nVennligst bruk datamaskinens\'s system installering program for å rekonfigurere interrupt for denne enheten." + IDS_DEV_BIOS_TABLE "Din datamaskin system firmware følger ikke med nok informasjon til å riktig konfigurere og bruke denne enheten. \nFor å bruke denne enheten, kontakt din datamaskin fabrikant for å få en firmware eller BIOS oppdatering." + IDS_DEV_IRQ_TRANSLATION_FAILED "Denne enheten trenger en PCI interrupt men den er konfigurert for en ISA interrupt (eller vice versa). \nVennligst bruk datamaskinens's system installering program for å rekonfigurere interrupt for denne enheten." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS kan ikke initialise enhetsdriveren for denne maskinvaren." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS kan ikke laste enhetsdriveren for denne maskinvaren fordi en forrige tilfelle av enhetsdriveren er fremdeles i minnet." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS kan ikke laste enhetsdriveren for denne maskinvaren. Driveren kan være korrupt eller mangler." Modified: trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] Sun Oct 10 23:29:32 2010 @@ -41,7 +41,7 @@ IDS_DEV_FAILED_FILTER "Äðàéâåðû äëÿ ýòîãî óñòðîéñòâà äîëæíû áûòü ïåðåóñòàíîâëåíû." IDS_DEV_DEVLOADER_NOT_FOUND "This device is not working properly because ReactOS cannot load the file $1 that loads the drivers for the device." IDS_DEV_DEVLOADER_NOT_FOUND2 "This device is not working properly because the file $1 that loads the drivers for this device is bad." - IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn\'t work, see your hardware documentation." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn't work, see your hardware documentation." IDS_DEV_INVALID_DATA "This device is not working properly because the BIOS in your computer is reporting the resources for the device incorrectly." IDS_DEV_INVALID_DATA2 "This device is not working properly because the BIOS in the device is reporting the resources for the device incorrectly. " IDS_DEV_FAILED_START "This device is either not present, not working properly, or does not have all the drivers installed." @@ -69,10 +69,10 @@ IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict." IDS_DEV_FAILED_ADD "This device is not working properly because $1 is not working properly." IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it." - IDS_DEV_TRANSLATION_FAILED "This device isn\'t responding to its driver." + IDS_DEV_TRANSLATION_FAILED "This device isn't responding to its driver." IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration." - IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." - IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer\'s system setup program to reconfigure the interrupt for this device." + IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." + IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer's system setup program to reconfigure the interrupt for this device." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS íå ìîæåò èíèöèàëèçèðîâàòü äðàéâåð óñòðîéñòâà äëÿ äàííîãî îáîðóäîâàíèÿ." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS cannot load the device driver for this hardware because a previous instance of the device driver is still in memory." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS cannot load the device driver for this hardware. The driver may be corrupted or missing." @@ -86,7 +86,7 @@ IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for safe removal, but it has not been removed from the computer" IDS_DEV_DRIVER_BLOCKED "The software for this device has been blocked from starting because it is known to have problems with ReactOS. Contact the hardware vendor for a new driver." IDS_DEV_REGISTRY_TOO_LARGE "ReactOS cannot start new hardware devices because the system hive is too large (exceeds the Registry Size Limit)." - IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn\'t able to change the settings of this device." + IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn't able to change the settings of this device." END STRINGTABLE Modified: trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/sk-S… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc [iso-8859-1] Sun Oct 10 23:29:32 2010 @@ -46,7 +46,7 @@ IDS_DEV_FAILED_FILTER "The drivers for this device need to be reinstalled." IDS_DEV_DEVLOADER_NOT_FOUND "This device is not working properly because ReactOS cannot load the file $1 that loads the drivers for the device." IDS_DEV_DEVLOADER_NOT_FOUND2 "This device is not working properly because the file $1 that loads the drivers for this device is bad." - IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn\'t work, see your hardware documentation." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn't work, see your hardware documentation." IDS_DEV_INVALID_DATA "This device is not working properly because the BIOS in your computer is reporting the resources for the device incorrectly." IDS_DEV_INVALID_DATA2 "This device is not working properly because the BIOS in the device is reporting the resources for the device incorrectly. " IDS_DEV_FAILED_START "This device is either not present, not working properly, or does not have all the drivers installed." @@ -68,16 +68,16 @@ IDS_DEV_DEVICE_NOT_THERE "This device is either not present, not working properly, or does not have all the drivers installed." IDS_DEV_MOVED "ReactOS is in the process of setting up this device." IDS_DEV_TOO_EARLY "ReactOS is in the process of setting up this device." - IDS_DEV_NO_VALID_LOG_CONF "ReactOS can\'t specify the resources for this device." + IDS_DEV_NO_VALID_LOG_CONF "ReactOS can't specify the resources for this device." IDS_DEV_FAILED_INSTALL "The drivers for this device are not installed." IDS_DEV_HARDWARE_DISABLED "This device is disabled because the BIOS for the device did not give it any resources." IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict." IDS_DEV_FAILED_ADD "This device is not working properly because $1 is not working properly." IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it." - IDS_DEV_TRANSLATION_FAILED "This device isn\'t responding to its driver." + IDS_DEV_TRANSLATION_FAILED "This device isn't responding to its driver." IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration." - IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." - IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer\'s system setup program to reconfigure the interrupt for this device." + IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." + IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer's system setup program to reconfigure the interrupt for this device." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS cannot initialize the device driver for this hardware." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS cannot load the device driver for this hardware because a previous instance of the device driver is still in memory." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS cannot load the device driver for this hardware. The driver may be corrupted or missing." @@ -91,7 +91,7 @@ IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for safe removal, but it has not been removed from the computer" IDS_DEV_DRIVER_BLOCKED "The software for this device has been blocked from starting because it is known to have problems with ReactOS. Contact the hardware vendor for a new driver." IDS_DEV_REGISTRY_TOO_LARGE "ReactOS cannot start new hardware devices because the system hive is too large (exceeds the Registry Size Limit)." - IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn\'t able to change the settings of this device." + IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn't able to change the settings of this device." END STRINGTABLE

15 years

[akhaldi] 49106: [CMAKE] - Fix cryptui build. This should be sent upstream.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Oct 10 22:59:37 2010 New Revision: 49106 URL: http://svn.reactos.org/svn/reactos?rev=49106&view=rev Log: [CMAKE] - Fix cryptui build. This should be sent upstream. Modified: branches/cmake-bringup/dll/win32/cryptui/cryptui_Fr.rc Modified: branches/cmake-bringup/dll/win32/cryptui/cryptui_Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cryptui… ============================================================================== --- branches/cmake-bringup/dll/win32/cryptui/cryptui_Fr.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cryptui/cryptui_Fr.rc [iso-8859-1] Sun Oct 10 22:59:37 2010 @@ -428,7 +428,7 @@ IDC_EXPORT_FORMAT_BASE64, 31,30,200,12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "Standard de syntaxe de message cryptographique - Messages PKCS #7 (.p7b)", IDC_EXPORT_FORMAT_CMS, 31,42,200,12, BS_AUTORADIOBUTTON - CHECKBOX "&Inclure tous les certificats dans le chemin de certification si possible" + CHECKBOX "&Inclure tous les certificats dans le chemin de certification si possible", IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,230,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED AUTORADIOBUTTON "Ãchange d'informations &Personnelles - PKCS #12 (.pfx)", IDC_EXPORT_FORMAT_PFX, 31,72,200,12, BS_AUTORADIOBUTTON|WS_DISABLED

15 years

← Newer
1
...
25
26
27
28
29
30
31
...
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2010