Ros-diffs March 2011

ros-diffs@reactos.org

21 participants
276 discussions

[jimtabor] 51216: [Win32k] - Fix wine post message test, corrected the peek message window selection. - Add a check for dead windows and new message queue flags. - Other miscellaneous fix ups.
by jimtabor＠svn.reactos.org 31 Mar '11

31 Mar '11

Author: jimtabor Date: Thu Mar 31 21:20:06 2011 New Revision: 51216 URL: http://svn.reactos.org/svn/reactos?rev=51216&view=rev Log: [Win32k] - Fix wine post message test, corrected the peek message window selection. - Add a check for dead windows and new message queue flags. - Other miscellaneous fix ups. 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] Thu Mar 31 21:20:06 2011 @@ -78,12 +78,16 @@ HANDLE NewMessagesHandle; /* Last time PeekMessage() was called. */ ULONG LastMsgRead; + /* Current capture window for this queue. */ + HWND CaptureWindow; + PWND spwndCapture; /* Current window with focus (ie. receives keyboard input) for this queue. */ HWND FocusWindow; + PWND spwndFocus; /* Current active window for this queue. */ HWND ActiveWindow; - /* Current capture window for this queue. */ - HWND CaptureWindow; + PWND spwndActive; + PWND spwndActivePrev; /* Current move/size window for this queue */ HWND MoveSize; /* Current menu owner window for this queue */ @@ -92,6 +96,8 @@ BYTE MenuState; /* Caret information for this queue */ PTHRDCARETINFO CaretInfo; + /* Message Queue Flags */ + DWORD QF_flags; /* queue state tracking */ // Send list QS_SENDMESSAGE @@ -112,8 +118,28 @@ struct _DESKTOP *Desktop; } USER_MESSAGE_QUEUE, *PUSER_MESSAGE_QUEUE; +#define QF_UPDATEKEYSTATE 0x00000001 +#define QF_FMENUSTATUSBREAK 0x00000004 +#define QF_FMENUSTATUS 0x00000008 +#define QF_FF10STATUS 0x00000010 +#define QF_MOUSEMOVED 0x00000020 // See MouseMoved. +#define QF_ACTIVATIONCHANGE 0x00000040 +#define QF_TABSWITCHING 0x00000080 +#define QF_KEYSTATERESET 0x00000100 +#define QF_INDESTROY 0x00000200 +#define QF_LOCKNOREMOVE 0x00000400 +#define QF_FOCUSNULLSINCEACTIVE 0x00000800 +#define QF_DIALOGACTIVE 0x00004000 +#define QF_EVENTDEACTIVATEREMOVED 0x00008000 +#define QF_TRACKMOUSELEAVE 0x00020000 +#define QF_TRACKMOUSEHOVER 0x00040000 +#define QF_TRACKMOUSEFIRING 0x00080000 +#define QF_CAPTURELOCKED 0x00100000 +#define QF_ACTIVEWNDTRACKING 0x00200000 + BOOL FASTCALL MsqIsHung(PUSER_MESSAGE_QUEUE MessageQueue); +VOID CALLBACK HungAppSysTimerProc(HWND,UINT,UINT_PTR,DWORD); NTSTATUS FASTCALL co_MsqSendMessage(PUSER_MESSAGE_QUEUE MessageQueue, HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam, 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] Thu Mar 31 21:20:06 2011 @@ -1233,6 +1233,7 @@ if (uFlags & SMTO_ABORTIFHUNG && MsqIsHung(Window->head.pti->MessageQueue)) { + // FIXME - Set window hung and add to a list. /* FIXME - Set a LastError? */ RETURN( FALSE); } @@ -1258,7 +1259,7 @@ } while ((STATUS_TIMEOUT == Status) && (uFlags & SMTO_NOTIMEOUTIFNOTHUNG) && - !MsqIsHung(Window->head.pti->MessageQueue)); + !MsqIsHung(Window->head.pti->MessageQueue)); // FIXME - Set window hung and add to a list. IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, (LRESULT *)uResult); @@ -1348,7 +1349,13 @@ &Result); return Result; } - +/* MSDN: + If you send a message in the range below WM_USER to the asynchronous message + functions (PostMessage, SendNotifyMessage, and SendMessageCallback), its + message parameters cannot include pointers. Otherwise, the operation will fail. + The functions will return before the receiving thread has had a chance to + process the message and the sender will free the memory before it is used. +*/ LRESULT FASTCALL co_IntSendMessageWithCallBack( HWND hWnd, UINT Msg, @@ -2014,24 +2021,23 @@ UserEnterExclusive(); - /* Validate input */ - if (hWnd && (hWnd != INVALID_HANDLE_VALUE)) - { - Window = UserGetWindowObject(hWnd); - if (!Window) - { - UserLeave(); - return FALSE; - } - } - switch(dwType) { case FNID_DEFWINDOWPROC: - if (Window) UserRefObjectCo(Window, &Ref); + /* Validate input */ + if (hWnd && (hWnd != INVALID_HANDLE_VALUE)) + { + Window = UserGetWindowObject(hWnd); + if (!Window) + { + UserLeave(); + return FALSE; + } + } + UserRefObjectCo(Window, &Ref); lResult = IntDefWindowProc(Window, Msg, wParam, lParam, Ansi); Ret = TRUE; - if (Window) UserDerefObjectCo(Window); + UserDerefObjectCo(Window); break; case FNID_SENDNOTIFYMESSAGE: Ret = UserSendNotifyMessage(hWnd, Msg, wParam, lParam); @@ -2050,7 +2056,6 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Ret = FALSE; _SEH2_YIELD(break); } _SEH2_END; @@ -2121,13 +2126,18 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Ret = FALSE; _SEH2_YIELD(break); } _SEH2_END; - if (!co_IntSendMessageWithCallBack(hWnd, Msg, wParam, lParam, - CallBackInfo.CallBack, CallBackInfo.Context, &uResult)) + if (is_pointer_message(Msg)) + { + EngSetLastError(ERROR_MESSAGE_SYNC_ONLY ); + break; + } + + if (!(Ret = co_IntSendMessageWithCallBack(hWnd, Msg, wParam, lParam, + CallBackInfo.CallBack, CallBackInfo.Context, &uResult))) { DPRINT1("Callback failure!\n"); } @@ -2165,7 +2175,6 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Ret = FALSE; _SEH2_YIELD(break); } _SEH2_END; 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] Thu Mar 31 21:20:06 2011 @@ -121,7 +121,7 @@ pti = Queue->Thread->Tcb.Win32Thread; if (MessageBits & QS_KEY) - { + { if (--Queue->nCntsQBits[QSRosKey] == 0) ClrMask |= QS_KEY; } if (MessageBits & QS_MOUSEMOVE) // ReactOS hard coded. @@ -244,7 +244,13 @@ pwnd != NULL; pwnd = pwnd->spwndNext ) { - if((pwnd->style & WS_VISIBLE) && + if ( pwnd->state2 & WNDS2_INDESTROY || pwnd->state & WNDS_DESTROYED ) + { + DPRINT("The Window is in DESTROY!\n"); + continue; + } + + if((pwnd->style & WS_VISIBLE) && IntPtInWindow(pwnd, Msg->pt.x, Msg->pt.y)) { Msg->hwnd = pwnd->head.h; @@ -623,7 +629,7 @@ UINT uTimeout, BOOL Block, INT HookMessage, ULONG_PTR *uResult) { - PTHREADINFO pti; + PTHREADINFO pti, ptirec; PUSER_SENT_MESSAGE Message; KEVENT CompletionEvent; NTSTATUS WaitStatus; @@ -642,8 +648,10 @@ pti = PsGetCurrentThreadWin32Thread(); ThreadQueue = pti->MessageQueue; + ptirec = MessageQueue->Thread->Tcb.Win32Thread; ASSERT(ThreadQueue != MessageQueue); - + ASSERT(ptirec->pcti); // Send must have a client side to receive it!!!! + Timeout.QuadPart = (LONGLONG) uTimeout * (LONGLONG) -10000; /* FIXME - increase reference counter of sender's message queue here */ @@ -727,7 +735,7 @@ Entry = Entry->Flink; } - DPRINT("MsqSendMessage (blocked) timed out\n"); + DPRINT("MsqSendMessage (blocked) timed out 1\n"); } while (co_MsqDispatchOneSentMessage(ThreadQueue)) ; @@ -787,7 +795,7 @@ Entry = Entry->Flink; } - DPRINT("MsqSendMessage timed out\n"); + DPRINT("MsqSendMessage timed out 2\n"); break; } while (co_MsqDispatchOneSentMessage(ThreadQueue)) @@ -860,7 +868,7 @@ if (pwndParent == pwndDesktop) break; pt.x += pwnd->rcClient.left - pwndParent->rcClient.left; pt.y += pwnd->rcClient.top - pwndParent->rcClient.top; - + pwnd = pwndParent; co_IntSendMessage( UserHMGetHandle(pwnd), WM_PARENTNOTIFY, MAKEWPARAM( event, idChild ), MAKELPARAM( pt.x, pt.y ) ); @@ -902,7 +910,7 @@ } DPRINT("Got mouse message for 0x%x, hittest: 0x%x\n", msg->hwnd, hittest ); - + if (pwndMsg == NULL || pwndMsg->head.pti != pti) { /* Remove and ignore the message */ @@ -972,7 +980,7 @@ } } - if (!((first == 0 && last == 0) || (message >= first || message <= last))) + if (!((first == 0 && last == 0) || (message >= first || message <= last))) { DPRINT("Message out of range!!!\n"); RETURN(FALSE); @@ -1095,8 +1103,8 @@ if (pwndTop && pwndTop != pwndDesktop) { - LONG ret = co_IntSendMessage( msg->hwnd, - WM_MOUSEACTIVATE, + LONG ret = co_IntSendMessage( msg->hwnd, + WM_MOUSEACTIVATE, (WPARAM)UserHMGetHandle(pwndTop), MAKELONG( hittest, msg->message)); switch(ret) @@ -1250,7 +1258,7 @@ CurrentMessage = CONTAINING_RECORD(CurrentEntry, USER_MESSAGE, ListEntry); - do + do { if (IsListEmpty(CurrentEntry)) break; if (!CurrentMessage) break; @@ -1296,7 +1304,7 @@ PLIST_ENTRY CurrentEntry; PUSER_MESSAGE CurrentMessage; PLIST_ENTRY ListHead; - + CurrentEntry = MessageQueue->PostedMessagesListHead.Flink; ListHead = &MessageQueue->PostedMessagesListHead; @@ -1309,8 +1317,15 @@ if (IsListEmpty(CurrentEntry)) break; if (!CurrentMessage) break; CurrentEntry = CurrentEntry->Flink; - - if ( ( !Window || Window == HWND_BOTTOM || Window->head.h == CurrentMessage->Msg.hwnd ) && +/* + MSDN: + 1: any window that belongs to the current thread, and any messages on the current thread's message queue whose hwnd value is NULL. + 2: retrieves only messages on the current thread's message queue whose hwnd value is NULL. + 3: handle to the window whose messages are to be retrieved. + */ + if ( ( !Window || // 1 + ( Window == HWND_BOTTOM && CurrentMessage->Msg.hwnd == NULL ) || // 2 + ( Window != HWND_BOTTOM && Window->head.h == CurrentMessage->Msg.hwnd ) ) && // 3 ( ( ( MsgFilterLow == 0 && MsgFilterHigh == 0 ) && CurrentMessage->QS_Flags & QSflags ) || ( MsgFilterLow <= CurrentMessage->Msg.message && MsgFilterHigh >= CurrentMessage->Msg.message ) ) ) { @@ -1342,7 +1357,7 @@ ret = KeWaitForSingleObject(MessageQueue->NewMessages, Executive, UserMode, - FALSE, + FALSE, NULL); UserEnterCo(); return ret; @@ -1355,6 +1370,15 @@ KeQueryTickCount(&LargeTickCount); return ((LargeTickCount.u.LowPart - MessageQueue->LastMsgRead) > MSQ_HUNG); +} + +VOID +CALLBACK +HungAppSysTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) +{ + //DoTheScreenSaver(); + DPRINT("HungAppSysTimerProc\n"); + // Process list of windows that are hung and waiting. } BOOLEAN FASTCALL @@ -1405,7 +1429,7 @@ PUSER_MESSAGE CurrentMessage; PUSER_SENT_MESSAGE CurrentSentMessage; PTHREADINFO pti; - + pti = MessageQueue->Thread->Tcb.Win32Thread; @@ -1428,7 +1452,7 @@ DPRINT("Notify the sender and remove a message from the queue that had not been dispatched\n"); /* remove the message from the dispatching list if needed */ - if ((!(CurrentSentMessage->HookMessage & MSQ_SENTNOWAIT)) + if ((!(CurrentSentMessage->HookMessage & MSQ_SENTNOWAIT)) && (CurrentSentMessage->DispatchingListEntry.Flink != NULL)) { RemoveEntryList(&CurrentSentMessage->DispatchingListEntry); @@ -1554,6 +1578,8 @@ MsqDestroyMessageQueue(PUSER_MESSAGE_QUEUE MessageQueue) { PDESKTOP desk; + + MessageQueue->QF_flags |= QF_INDESTROY; /* remove the message queue from any desktops */ if ((desk = InterlockedExchangePointer((PVOID*)&MessageQueue->Desktop, 0)))

1 0

[rharabien] 51215: [SYSTEMINFO] Add System Manufacturer and System Model to resources Convert TABs to spaces in resources Sort strings in resources a bit
by rharabien＠svn.reactos.org 31 Mar '11

31 Mar '11

Author: rharabien Date: Thu Mar 31 16:51:19 2011 New Revision: 51215 URL: http://svn.reactos.org/svn/reactos?rev=51215&view=rev Log: [SYSTEMINFO] Add System Manufacturer and System Model to resources Convert TABs to spaces in resources Sort strings in resources a bit Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc trunk/rosapps/applications/sysutils/systeminfo/resource.h trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc [iso-8859-1] Thu Mar 31 16:51:19 2011 @@ -11,16 +11,16 @@ /S System Bestimmt das Remotesystem mit dem die Verbindung\n\ hergestellt werden soll.\n\n\ /U [Domäne\]Benutzer Bestimmt den Benutzerkontext unter dem\n\ - der Befehl ausgeführt werden soll.\n\n\ + der Befehl ausgeführt werden soll.\n\n\ /P [Passwort] Bestimmt das Kennwort für den zugewiesenen\n\ - Benutzerkontext. Bei Auslassung, wird dieses\n\ + Benutzerkontext. Bei Auslassung, wird dieses\n\ angefordert.\n\n\ /FO Format Bestimmt das Format in dem die Ausgabe\n\ - angezeigt werden soll.\n\ - Gültige Werte: TABLE, LIST, CSV.\n\n\ + angezeigt werden soll.\n\ + Gültige Werte: TABLE, LIST, CSV.\n\n\ /NH Bestimmt, dass der Spalten-Header in der\n\ - Ausgabe nicht angezeigt werden soll.\n\ - Nur für Formate TABLE und CSV.\n\n\ + Ausgabe nicht angezeigt werden soll.\n\ + Nur für Formate TABLE und CSV.\n\n\ /? Zeigt die Hilfemeldung an.\n\n\ Beispiele:\n\ SYSTEMINFO\n\ @@ -31,36 +31,38 @@ SYSTEMINFO /S system /FO LIST\n\ SYSTEMINFO /S system /FO CSV /NH\n" -IDS_OS_NAME, "OS Name: %s\n" -IDS_OS_VERSION, "OS Version: %u.%u.%u %s Build %u\n" -IDS_OS_BUILD_TYPE, "OS Build Typ: %s\n" -IDS_REG_OWNER, "Registrierter Benutzer: %s\n" -IDS_REG_ORG, "Registrierte Organisation: %s\n" -IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" -IDS_PRODUCT_ID, "Produkt ID: %s\n" -IDS_INST_DATE, "Installationsdatum: %s, " -IDS_INST_TIME, "%s\n" -IDS_SYS_TYPE_UNKNOWN, "Systemtyp: Unbekannt\n" -IDS_SYS_TYPE_X86, "Systemtyp: X86-based PC\n" -IDS_SYS_TYPE_IA64, "Systemtyp: IA64-based PC\n" -IDS_SYS_TYPE_AMD64, "Systemtyp: AMD64-based PC\n" -IDS_PROCESSORS, "Prozessor(en): %u Prozessor(en) Installiert.\n" -IDS_ROS_DIR, "ReactOS Verzeichnis: %s\n" -IDS_SYS_DIR, "System Verzeichnis: %s\n" -IDS_BOOT_DEV, "Startgerät: %s\n" -IDS_SYS_LOCALE, "Systemgebietsschema: %s\n" -IDS_INPUT_LOCALE, "Eingabegebietsschema: %s\n" -IDS_TOTAL_PHYS_MEM, "Gesamter Physikalischer Speicher: %ld MB (%ld KB)\n" -IDS_AVAIL_PHISICAL_MEM, "Verfügbarer Physikalischer Speicher: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_MAX, "Auslagerungsdatei: Max Größe: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_AVAIL, "Auslagerungsdatei: Verfügbar: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_INUSE, "Auslagerungsdatei: In Verwendung: %ld MB (%ld KB)\n" -IDS_HOST_NAME, "Domäne: %s\n" -IDS_PAGEFILE_LOC, "Auslagerungsdateipfad(e) %s" -IDS_TIME_ZONE, "Zeitzone: %s\n" -IDS_DOMINE, "Domain: %s\n" -IDS_BIOS_DATE, "BIOS Datum: %s\n" -IDS_BIOS_VERSION, "BIOS Version: %s\n" -IDS_NETWORK_CARDS, "Netzwerkkarte(n) %u Installiert.\n" +IDS_HOST_NAME, "Domäne: %s\n" +IDS_OS_NAME, "OS Name: %s\n" +IDS_OS_VERSION, "OS Version: %u.%u.%u %s Build %u\n" +IDS_OS_BUILD_TYPE, "OS Build Typ: %s\n" +IDS_REG_OWNER, "Registrierter Benutzer: %s\n" +IDS_REG_ORG, "Registrierte Organisation: %s\n" +IDS_PRODUCT_ID, "Produkt ID: %s\n" +IDS_INST_DATE, "Installationsdatum: %s, " +IDS_INST_TIME, "%s\n" +IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" +IDS_SYS_MANUFACTURER, "System Manufacturer: %s\n" +IDS_SYS_MODEL, "System Model: %s\n" +IDS_SYS_TYPE_UNKNOWN, "Systemtyp: Unbekannt\n" +IDS_SYS_TYPE_X86, "Systemtyp: X86-based PC\n" +IDS_SYS_TYPE_IA64, "Systemtyp: IA64-based PC\n" +IDS_SYS_TYPE_AMD64, "Systemtyp: AMD64-based PC\n" +IDS_PROCESSORS, "Prozessor(en): %u Prozessor(en) Installiert.\n" +IDS_BIOS_DATE, "BIOS Datum: %s\n" +IDS_BIOS_VERSION, "BIOS Version: %s\n" +IDS_ROS_DIR, "ReactOS Verzeichnis: %s\n" +IDS_SYS_DIR, "System Verzeichnis: %s\n" +IDS_BOOT_DEV, "Startgerät: %s\n" +IDS_SYS_LOCALE, "Systemgebietsschema: %s\n" +IDS_INPUT_LOCALE, "Eingabegebietsschema: %s\n" +IDS_TOTAL_PHYS_MEM, "Gesamter Physikalischer Speicher: %ld MB (%ld KB)\n" +IDS_AVAIL_PHISICAL_MEM, "Verfügbarer Physikalischer Speicher: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_MAX, "Auslagerungsdatei: Max Größe: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_AVAIL, "Auslagerungsdatei: Verfügbar: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_INUSE, "Auslagerungsdatei: In Verwendung: %ld MB (%ld KB)\n" +IDS_PAGEFILE_LOC, "Auslagerungsdateipfad(e) %s" +IDS_TIME_ZONE, "Zeitzone: %s\n" +IDS_DOMINE, "Domain: %s\n" +IDS_NETWORK_CARDS, "Netzwerkkarte(n) %u Installiert.\n" END Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc [iso-8859-1] Thu Mar 31 16:51:19 2011 @@ -10,15 +10,15 @@ Parameter List:\n\ /S system Specifies the remote system to connect to.\n\n\ /U [domain\\]user Specifies the user context under which\n\ - the command should execute.\n\n\ + the command should execute.\n\n\ /P [password] Specifies the password for the given\n\ - user context. Prompts for input if omitted.\n\n\ + user context. Prompts for input if omitted.\n\n\ /FO format Specifies the format in which the output\n\ - is to be displayed.\n\ - Valid values: ""TABLE"", ""LIST"", ""CSV"".\n\n\ + is to be displayed.\n\ + Valid values: ""TABLE"", ""LIST"", ""CSV"".\n\n\ /NH Specifies that the ""Column Header"" should\n\ - not be displayed in the output.\n\ - Valid only for ""TABLE"" and ""CSV"" formats.\n\n\ + not be displayed in the output.\n\ + Valid only for ""TABLE"" and ""CSV"" formats.\n\n\ /? Displays this help/usage.\n\n\ Examples:\n\ SYSTEMINFO\n\ @@ -29,36 +29,38 @@ SYSTEMINFO /S system /FO LIST\n\ SYSTEMINFO /S system /FO CSV /NH\n" -IDS_OS_NAME, "OS Name: %s\n" -IDS_OS_VERSION, "OS Version: %u.%u.%u %s Build %u\n" -IDS_OS_BUILD_TYPE, "OS Build Type: %s\n" -IDS_REG_OWNER, "Registered Owner: %s\n" -IDS_REG_ORG, "Registered Organization: %s\n" -IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" -IDS_PRODUCT_ID, "Product ID: %s\n" -IDS_INST_DATE, "Install Date: %s, " -IDS_INST_TIME, "%s\n" -IDS_SYS_TYPE_UNKNOWN, "System type: Unknown\n" -IDS_SYS_TYPE_X86, "System type: X86-based PC\n" -IDS_SYS_TYPE_IA64, "System type: IA64-based PC\n" -IDS_SYS_TYPE_AMD64, "System type: AMD64-based PC\n" -IDS_PROCESSORS, "Processor(s): %u Processor(s) Installed.\n" -IDS_ROS_DIR, "ReactOS Directory: %s\n" -IDS_SYS_DIR, "System Directory: %s\n" -IDS_BOOT_DEV, "Boot Device: %s\n" -IDS_SYS_LOCALE, "System Locale: %s\n" -IDS_INPUT_LOCALE, "Input Locale: %s\n" -IDS_TOTAL_PHYS_MEM, "Total Physical Memory: %ld MB (%ld KB)\n" -IDS_AVAIL_PHISICAL_MEM, "Available Physical Memory: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_MAX, "Virtual Memory: Max Size: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_AVAIL, "Virtual Memory: Available: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_INUSE, "Virtual Memory: In Use: %ld MB (%ld KB)\n" -IDS_HOST_NAME, "Host Name: %s\n" -IDS_PAGEFILE_LOC, "Page File Location(s) %s\n" -IDS_TIME_ZONE, "Time zone: %s\n" -IDS_DOMINE, "Domain: %s\n" -IDS_BIOS_DATE, "BIOS Date: %s\n" -IDS_BIOS_VERSION, "BIOS Version: %s\n" -IDS_NETWORK_CARDS, "Network Card(s) %u Installed.\n" +IDS_HOST_NAME, "Host Name: %s\n" +IDS_OS_NAME, "OS Name: %s\n" +IDS_OS_VERSION, "OS Version: %u.%u.%u %s Build %u\n" +IDS_OS_BUILD_TYPE, "OS Build Type: %s\n" +IDS_REG_OWNER, "Registered Owner: %s\n" +IDS_REG_ORG, "Registered Organization: %s\n" +IDS_PRODUCT_ID, "Product ID: %s\n" +IDS_INST_DATE, "Install Date: %s, " +IDS_INST_TIME, "%s\n" +IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" +IDS_SYS_MANUFACTURER, "System Manufacturer: %s\n" +IDS_SYS_MODEL, "System Model: %s\n" +IDS_SYS_TYPE_UNKNOWN, "System type: Unknown\n" +IDS_SYS_TYPE_X86, "System type: X86-based PC\n" +IDS_SYS_TYPE_IA64, "System type: IA64-based PC\n" +IDS_SYS_TYPE_AMD64, "System type: AMD64-based PC\n" +IDS_PROCESSORS, "Processor(s): %u Processor(s) Installed.\n" +IDS_BIOS_DATE, "BIOS Date: %s\n" +IDS_BIOS_VERSION, "BIOS Version: %s\n" +IDS_ROS_DIR, "ReactOS Directory: %s\n" +IDS_SYS_DIR, "System Directory: %s\n" +IDS_BOOT_DEV, "Boot Device: %s\n" +IDS_SYS_LOCALE, "System Locale: %s\n" +IDS_INPUT_LOCALE, "Input Locale: %s\n" +IDS_TOTAL_PHYS_MEM, "Total Physical Memory: %ld MB (%ld KB)\n" +IDS_AVAIL_PHISICAL_MEM, "Available Physical Memory: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_MAX, "Virtual Memory: Max Size: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_AVAIL, "Virtual Memory: Available: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_INUSE, "Virtual Memory: In Use: %ld MB (%ld KB)\n" +IDS_PAGEFILE_LOC, "Page File Location(s) %s\n" +IDS_TIME_ZONE, "Time zone: %s\n" +IDS_DOMINE, "Domain: %s\n" +IDS_NETWORK_CARDS, "Network Card(s) %u Installed.\n" END Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc [iso-8859-1] Thu Mar 31 16:51:19 2011 @@ -15,15 +15,15 @@ Lista de Parametros:\n\ /S sistema Especifica el sistema remoto al cual conectarse.\n\n\ /U [dominio\\]usuario Especifica el usuario bajo el cual el comando\n\ - debe ejecutarse.\n\n\ + debe ejecutarse.\n\n\ /P [contraseña] Especifica la contraseña de usuario.\n\ - Pregunta por ella si es omitida.\n\n\ + Pregunta por ella si es omitida.\n\n\ /FO formato Especifica el formato en el que la salida\n\ - será mostrada.\n\ - Valores válidos: ""TABLE"", ""LIST"", ""CSV"".\n\n\ + será mostrada.\n\ + Valores válidos: ""TABLE"", ""LIST"", ""CSV"".\n\n\ /NH Especifica que la ""Columna cabezera"" no será\n\ - mostrada en la salida.\n\ - Válido sólo para formatos ""TABLE"" y ""CSV"" .\n\n\ + mostrada en la salida.\n\ + Válido sólo para formatos ""TABLE"" y ""CSV"" .\n\n\ /? Muestra esta ayuda.\n\n\ Ejemplos:\n\ SYSTEMINFO\n\ @@ -34,36 +34,38 @@ SYSTEMINFO /S sistema /FO LIST\n\ SYSTEMINFO /S sistema /FO CSV /NH\n" -IDS_OS_NAME, "Nombre Sistema Operativo: %s\n" -IDS_OS_VERSION, "Versión Sistema Operativo: %u.%u.%u %s Compilación %u\n" -IDS_OS_BUILD_TYPE, "Tipo Compilación: %s\n" -IDS_REG_OWNER, "Propietario: %s\n" -IDS_REG_ORG, "Organización: %s\n" -IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" -IDS_PRODUCT_ID, "Identificador de Producto %s\n" -IDS_INST_DATE, "Fecha de Instalación: %s, " -IDS_INST_TIME, "%s\n" -IDS_SYS_TYPE_UNKNOWN, "Tipo de sistema: Desconocido\n" -IDS_SYS_TYPE_X86, "Tipo de sistema: PC basado en X86\n" -IDS_SYS_TYPE_IA64, "Tipo de sistema: PC basado en IA64\n" -IDS_SYS_TYPE_AMD64, "Tipo de sistema: PC basado en AMD64\n" -IDS_PROCESSORS, "Procesador(es): %u Procesador(es) Instalados.\n" -IDS_ROS_DIR, "Directorio de ReactOS: %s\n" -IDS_SYS_DIR, "Directorio del Sistema: %s\n" -IDS_BOOT_DEV, "Dispositivo de Inicio: %s\n" -IDS_SYS_LOCALE, "Idioma del sistema: %s\n" -IDS_INPUT_LOCALE, "Idioma de entrada: %s\n" -IDS_TOTAL_PHYS_MEM, "Memoria Física Total: %ld MB (%ld KB)\n" -IDS_AVAIL_PHISICAL_MEM, "Memoria Física Disponible: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_MAX, "Memoria Virtual: Tamaño Máx: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_AVAIL, "Memoria Virtual: Disponible: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_INUSE, "Memoria Virtual: En Uso: %ld MB (%ld KB)\n" -IDS_HOST_NAME, "Nombre del Servidor: %s\n" -IDS_PAGEFILE_LOC, "Ruta(s) Archivo Paginación %s\n" -IDS_TIME_ZONE, "Zona horario: %s\n" -IDS_DOMINE, "Dominio: %s\n" -IDS_BIOS_DATE, "Fecha BIOS: %s\n" -IDS_BIOS_VERSION, "Versión BIOS: %s\n" -IDS_NETWORK_CARDS, "Tarjeta(s) de Red %u No Instalada.\n" +IDS_HOST_NAME, "Nombre del Servidor: %s\n" +IDS_OS_NAME, "Nombre Sistema Operativo: %s\n" +IDS_OS_VERSION, "Versión Sistema Operativo: %u.%u.%u %s Compilación %u\n" +IDS_OS_BUILD_TYPE, "Tipo Compilación: %s\n" +IDS_REG_OWNER, "Propietario: %s\n" +IDS_REG_ORG, "Organización: %s\n" +IDS_PRODUCT_ID, "Identificador de Producto %s\n" +IDS_INST_DATE, "Fecha de Instalación: %s, " +IDS_INST_TIME, "%s\n" +IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" +IDS_SYS_MANUFACTURER, "System Manufacturer: %s\n" +IDS_SYS_MODEL, "System Model: %s\n" +IDS_SYS_TYPE_UNKNOWN, "Tipo de sistema: Desconocido\n" +IDS_SYS_TYPE_X86, "Tipo de sistema: PC basado en X86\n" +IDS_SYS_TYPE_IA64, "Tipo de sistema: PC basado en IA64\n" +IDS_SYS_TYPE_AMD64, "Tipo de sistema: PC basado en AMD64\n" +IDS_PROCESSORS, "Procesador(es): %u Procesador(es) Instalados.\n" +IDS_BIOS_DATE, "Fecha BIOS: %s\n" +IDS_BIOS_VERSION, "Versión BIOS: %s\n" +IDS_ROS_DIR, "Directorio de ReactOS: %s\n" +IDS_SYS_DIR, "Directorio del Sistema: %s\n" +IDS_BOOT_DEV, "Dispositivo de Inicio: %s\n" +IDS_SYS_LOCALE, "Idioma del sistema: %s\n" +IDS_INPUT_LOCALE, "Idioma de entrada: %s\n" +IDS_TOTAL_PHYS_MEM, "Memoria Física Total: %ld MB (%ld KB)\n" +IDS_AVAIL_PHISICAL_MEM, "Memoria Física Disponible: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_MAX, "Memoria Virtual: Tamaño Máx: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_AVAIL, "Memoria Virtual: Disponible: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_INUSE, "Memoria Virtual: En Uso: %ld MB (%ld KB)\n" +IDS_PAGEFILE_LOC, "Ruta(s) Archivo Paginación %s\n" +IDS_TIME_ZONE, "Zona horario: %s\n" +IDS_DOMINE, "Dominio: %s\n" +IDS_NETWORK_CARDS, "Tarjeta(s) de Red %u No Instalada.\n" END Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc [iso-8859-1] Thu Mar 31 16:51:19 2011 @@ -10,15 +10,15 @@ Parameter List:\n\ /S système Spécifie le système distant auquel se connecter.\n\n\ /U [domain\\]user Spécifie le contexte utilisateur dans lequel\n\ - la commande doit être exécutée.\n\n\ + la commande doit être exécutée.\n\n\ /P [motdepasse] Spécifie le mot de passe pour le contexte utilisateur\n\ - fourni. Le demande si ommis.\n\n\ + fourni. Le demande si ommis.\n\n\ /FO format Spécifie le format dans lequel la sortie\n\ - doit être affichée.\n\ - Valeurs valides: ""TABLE"", ""LIST"", ""CSV"".\n\n\ + doit être affichée.\n\ + Valeurs valides: ""TABLE"", ""LIST"", ""CSV"".\n\n\ /NH Spécifie que ""L'entête de colonne"" ne doit\n\ - pas être affiché dans la sortie.\n\ - Valide uniquement pour les format ""TABLE"" et ""CSV"".\n\n\ + pas être affiché dans la sortie.\n\ + Valide uniquement pour les format ""TABLE"" et ""CSV"".\n\n\ /? Affiche cette aide.\n\n\ Exemples:\n\ SYSTEMINFO\n\ @@ -29,36 +29,38 @@ SYSTEMINFO /S système /FO LIST\n\ SYSTEMINFO /S système /FO CSV /NH\n" -IDS_OS_NAME, "Nom du système d'exploitation : %s\n" -IDS_OS_VERSION, "Version du système d'exploitation : %u.%u.%u %s Compilation %u\n" -IDS_OS_BUILD_TYPE, "Type de compilation du système d'exploitation : %s\n" -IDS_REG_OWNER, "Propriétaire enregistré : %s\n" -IDS_REG_ORG, "Organisation enregistrée : %s\n" -IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" -IDS_PRODUCT_ID, "ID du produit : %s\n" -IDS_INST_DATE, "Date d'installation : %s, " -IDS_INST_TIME, "%s\n" -IDS_SYS_TYPE_UNKNOWN, "Type du système : Inconnu\n" -IDS_SYS_TYPE_X86, "Type du système : Basé sur un PC X86\n" -IDS_SYS_TYPE_IA64, "Type du système : Basé sur un PC IA64\n" -IDS_SYS_TYPE_AMD64, "Type du système : Basé sur un PC AMD64\n" -IDS_PROCESSORS, "Processeur(s) : %u Processeur(s) installé(s).\n" -IDS_ROS_DIR, "Répertoire ReactOS : %s\n" -IDS_SYS_DIR, "Répertoire système : %s\n" -IDS_BOOT_DEV, "Périphérique de démarrage : %s\n" -IDS_SYS_LOCALE, "Paramètre régional du système : %s\n" -IDS_INPUT_LOCALE, "Paramètre régional de saisie : %s\n" -IDS_TOTAL_PHYS_MEM, "Mémoire physique totale : %ld Mo (%ld Ko)\n" -IDS_AVAIL_PHISICAL_MEM, "Mémoire physique disponible : %ld Mo (%ld Ko)\n" -IDS_VIRT_MEM_MAX, "Mémoire virtuelle: Taille max : %ld Mo (%ld Ko)\n" -IDS_VIRT_MEM_AVAIL, "Mémoire virtuelle: Disponible : %ld Mo (%ld Ko)\n" -IDS_VIRT_MEM_INUSE, "Mémoire virtuelle: Utilisée : %ld Mo (%ld Ko)\n" -IDS_HOST_NAME, "Nom d'hôte : %s\n" -IDS_PAGEFILE_LOC, "Emplacement(s) des fichiers d'échange %s" -IDS_TIME_ZONE, "Fuseau horaire : %s\n" -IDS_DOMINE, "Domaine : %s\n" -IDS_BIOS_DATE, "Date du BIOS : %s\n" -IDS_BIOS_VERSION, "Version du BIOS : %s\n" -IDS_NETWORK_CARDS, "Carte(s) réseau %u installée(s).\n" +IDS_HOST_NAME, "Nom d'hôte : %s\n" +IDS_OS_NAME, "Nom du système d'exploitation : %s\n" +IDS_OS_VERSION, "Version du système d'exploitation : %u.%u.%u %s Compilation %u\n" +IDS_OS_BUILD_TYPE, "Type de compilation du système d'exploitation : %s\n" +IDS_REG_OWNER, "Propriétaire enregistré : %s\n" +IDS_REG_ORG, "Organisation enregistrée : %s\n" +IDS_PRODUCT_ID, "ID du produit : %s\n" +IDS_INST_DATE, "Date d'installation : %s, " +IDS_INST_TIME, "%s\n" +IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" +IDS_SYS_MANUFACTURER, "System Manufacturer: %s\n" +IDS_SYS_MODEL, "System Model: %s\n" +IDS_SYS_TYPE_UNKNOWN, "Type du système : Inconnu\n" +IDS_SYS_TYPE_X86, "Type du système : Basé sur un PC X86\n" +IDS_SYS_TYPE_IA64, "Type du système : Basé sur un PC IA64\n" +IDS_SYS_TYPE_AMD64, "Type du système : Basé sur un PC AMD64\n" +IDS_PROCESSORS, "Processeur(s) : %u Processeur(s) installé(s).\n" +IDS_BIOS_DATE, "Date du BIOS : %s\n" +IDS_BIOS_VERSION, "Version du BIOS : %s\n" +IDS_ROS_DIR, "Répertoire ReactOS : %s\n" +IDS_SYS_DIR, "Répertoire système : %s\n" +IDS_BOOT_DEV, "Périphérique de démarrage : %s\n" +IDS_SYS_LOCALE, "Paramètre régional du système : %s\n" +IDS_INPUT_LOCALE, "Paramètre régional de saisie : %s\n" +IDS_TOTAL_PHYS_MEM, "Mémoire physique totale : %ld Mo (%ld Ko)\n" +IDS_AVAIL_PHISICAL_MEM, "Mémoire physique disponible : %ld Mo (%ld Ko)\n" +IDS_VIRT_MEM_MAX, "Mémoire virtuelle: Taille max : %ld Mo (%ld Ko)\n" +IDS_VIRT_MEM_AVAIL, "Mémoire virtuelle: Disponible : %ld Mo (%ld Ko)\n" +IDS_VIRT_MEM_INUSE, "Mémoire virtuelle: Utilisée : %ld Mo (%ld Ko)\n" +IDS_PAGEFILE_LOC, "Emplacement(s) des fichiers d'échange %s" +IDS_TIME_ZONE, "Fuseau horaire : %s\n" +IDS_DOMINE, "Domaine : %s\n" +IDS_NETWORK_CARDS, "Carte(s) réseau %u installée(s).\n" END Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc [iso-8859-1] Thu Mar 31 16:51:19 2011 @@ -8,18 +8,18 @@ Denne komando linje verktøyet gjør det mulig for en administrator å spørre om basis\n\ system konfigurasjon informasjon.\n\n\ Parameter liste:\n\ - /S system Spesifisere eksternt system for å kunne kobles til.\n\n\ - /U [domene\\]bruker Spesifisere brukeren sammenheng under hvilken\n\ - av kommando som skal kjøres.\n\n\ - /P [passord] Spesifisere passord for gitt\n\ - bruker sammenheng. Prompts for input if omitted.\n\n\ - /FO format Spesifisere formatet som i utgående\n\ - som skal vises.\n\ - Gyldige verdier: ""TABLE"", ""LIST"", ""CSV"".\n\n\ - /NH Spesifisere at ""Column Header"" skal\n\ - ikke vises i utgående.\n\ - Gyldig for bare ""TABLE"" og ""CSV"" formater.\n\n\ - /? Vis denne hjelp/bruk meldingen.\n\n\ + /S system Spesifisere eksternt system for å kunne kobles til.\n\n\ + /U [domene\\]bruker Spesifisere brukeren sammenheng under hvilken\n\ + av kommando som skal kjøres.\n\n\ + /P [passord] Spesifisere passord for gitt\n\ + bruker sammenheng. Prompts for input if omitted.\n\n\ + /FO format Spesifisere formatet som i utgående\n\ + som skal vises.\n\ + Gyldige verdier: ""TABLE"", ""LIST"", ""CSV"".\n\n\ + /NH Spesifisere at ""Column Header"" skal\n\ + ikke vises i utgående.\n\ + Gyldig for bare ""TABLE"" og ""CSV"" formater.\n\n\ + /? Vis denne hjelp/bruk meldingen.\n\n\ Eksempler:\n\ SYSTEMINFO\n\ SYSTEMINFO /?\n\ @@ -29,36 +29,38 @@ SYSTEMINFO /S system /FO LIST\n\ SYSTEMINFO /S system /FO CSV /NH\n" -IDS_OS_NAME, "OS navn: %s\n" -IDS_OS_VERSION, "OS versjon: %u.%u.%u %s Bygget %u\n" -IDS_OS_BUILD_TYPE, "OS bygg type: %s\n" -IDS_REG_OWNER, "Registert eier: %s\n" -IDS_REG_ORG, "Registerert organisasjon: %s\n" -IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" -IDS_PRODUCT_ID, "Produkt ID: %s\n" -IDS_INST_DATE, "Installert dato: %s, " -IDS_INST_TIME, "%s\n" -IDS_SYS_TYPE_UNKNOWN, "Systemtype: Ukjent\n" -IDS_SYS_TYPE_X86, "Systemtype: X86-basert PC\n" -IDS_SYS_TYPE_IA64, "Systemtype: IA64-basert PC\n" -IDS_SYS_TYPE_AMD64, "Systemtype: AMD64-basert PC\n" -IDS_PROCESSORS, "Prosessor(er): %u Prosessor(er) installert.\n" -IDS_ROS_DIR, "ReactOS mappe: %s\n" -IDS_SYS_DIR, "System mappe: %s\n" -IDS_BOOT_DEV, "Oppstartsenhet: %s\n" -IDS_SYS_LOCALE, "System lokal: %s\n" -IDS_INPUT_LOCALE, "Input lokal: %s\n" -IDS_TOTAL_PHYS_MEM, "Total fysisk minne: %ld MB (%ld KB)\n" -IDS_AVAIL_PHISICAL_MEM, "Tilgjengelig fysisk minne: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_MAX, "Virtuelt minne: Maks Størrelse: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_AVAIL, "Virtuelt minne: Tilgjengelig: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_INUSE, "Virtuelt minne: i bruk: %ld MB (%ld KB)\n" -IDS_HOST_NAME, "Datamaskin navn: %s\n" -IDS_PAGEFILE_LOC, "Sidevekslingsfil lokalsjon(er) %s\n" -IDS_TIME_ZONE, "Tidssone: %s\n" -IDS_DOMINE, "Domene: %s\n" -IDS_BIOS_DATE, "BIOS dato: %s\n" -IDS_BIOS_VERSION, "BIOS Versjon: %s\n" -IDS_NETWORK_CARDS, "Nettverkskort(er) %u installert.\n" +IDS_HOST_NAME, "Datamaskin navn: %s\n" +IDS_OS_NAME, "OS navn: %s\n" +IDS_OS_VERSION, "OS versjon: %u.%u.%u %s Bygget %u\n" +IDS_OS_BUILD_TYPE, "OS bygg type: %s\n" +IDS_REG_OWNER, "Registert eier: %s\n" +IDS_REG_ORG, "Registerert organisasjon: %s\n" +IDS_PRODUCT_ID, "Produkt ID: %s\n" +IDS_INST_DATE, "Installert dato: %s, " +IDS_INST_TIME, "%s\n" +IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" +IDS_SYS_MANUFACTURER, "System Manufacturer: %s\n" +IDS_SYS_MODEL, "System Model: %s\n" +IDS_SYS_TYPE_UNKNOWN, "Systemtype: Ukjent\n" +IDS_SYS_TYPE_X86, "Systemtype: X86-basert PC\n" +IDS_SYS_TYPE_IA64, "Systemtype: IA64-basert PC\n" +IDS_SYS_TYPE_AMD64, "Systemtype: AMD64-basert PC\n" +IDS_PROCESSORS, "Prosessor(er): %u Prosessor(er) installert.\n" +IDS_BIOS_DATE, "BIOS dato: %s\n" +IDS_BIOS_VERSION, "BIOS Versjon: %s\n" +IDS_ROS_DIR, "ReactOS mappe: %s\n" +IDS_SYS_DIR, "System mappe: %s\n" +IDS_BOOT_DEV, "Oppstartsenhet: %s\n" +IDS_SYS_LOCALE, "System lokal: %s\n" +IDS_INPUT_LOCALE, "Input lokal: %s\n" +IDS_TOTAL_PHYS_MEM, "Total fysisk minne: %ld MB (%ld KB)\n" +IDS_AVAIL_PHISICAL_MEM, "Tilgjengelig fysisk minne: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_MAX, "Virtuelt minne: Maks Størrelse: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_AVAIL, "Virtuelt minne: Tilgjengelig: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_INUSE, "Virtuelt minne: i bruk: %ld MB (%ld KB)\n" +IDS_PAGEFILE_LOC, "Sidevekslingsfil lokalsjon(er) %s\n" +IDS_TIME_ZONE, "Tidssone: %s\n" +IDS_DOMINE, "Domene: %s\n" +IDS_NETWORK_CARDS, "Nettverkskort(er) %u installert.\n" END Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc [iso-8859-1] Thu Mar 31 16:51:19 2011 @@ -17,15 +17,15 @@ Lista parametrów:\n\ /S system Wyznacza nazwê systemu zdalnego do po³¹czenia.\n\n\ /U [domain\\]user Wyznacza u¿ytkownika (domenê) z którego konta\n\ - komenda bêdzie wywo³ana.\n\n\ + komenda bêdzie wywo³ana.\n\n\ /P [password] Wyznacza has³o do u¿ytego konta u¿ytkownika\n\ - Program sam zapyta o has³o, jeli nie jest podane.\n\n\ + Program sam zapyta o has³o, jeli nie jest podane.\n\n\ /FO format Wyznacza format w którym wywietlone zostan¹\n\ - informacje o systemie.\n\ - Dostêpne formaty: ""TABLE"", ""LIST"", ""CSV"".\n\n\ + informacje o systemie.\n\ + Dostêpne formaty: ""TABLE"", ""LIST"", ""CSV"".\n\n\ /NH Blokuje wywietlanie kolumny ""Column Header"" w\n\ - informacjach systemowych.\n\ - Dzia³a tylko z formatami ""TABLE"" i ""CSV"".\n\n\ + informacjach systemowych.\n\ + Dzia³a tylko z formatami ""TABLE"" i ""CSV"".\n\n\ /? Wywietla niniejszy tekst pomocy.\n\n\ Przyk³ady:\n\ SYSTEMINFO\n\ @@ -36,36 +36,38 @@ SYSTEMINFO /S system /FO LIST\n\ SYSTEMINFO /S system /FO CSV /NH\n" -IDS_OS_NAME, "Nazwa Systemu: %s\n" -IDS_OS_VERSION, "Wersja: %u.%u.%u %s Kompilacja %u\n" -IDS_OS_BUILD_TYPE, "Rodzaj kompilacji: %s\n" -IDS_REG_OWNER, "U¿ytkownik: %s\n" -IDS_REG_ORG, "Organizacja: %s\n" -IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" -IDS_PRODUCT_ID, "ID produktu: %s\n" -IDS_INST_DATE, "Data instalacji: %s, " -IDS_INST_TIME, "%s\n" -IDS_SYS_TYPE_UNKNOWN, "Rodzaj systemu: Unknown\n" -IDS_SYS_TYPE_X86, "Architektura: X86-based PC\n" -IDS_SYS_TYPE_IA64, "Architektura: IA64-based PC\n" -IDS_SYS_TYPE_AMD64, "Rodzaj systemu: AMD64-based PC\n" -IDS_PROCESSORS, "Iloæ Procesorów: %u.\n" -IDS_ROS_DIR, "Katalog ReactOS: %s\n" -IDS_SYS_DIR, "Katalog Systemowy: %s\n" -IDS_BOOT_DEV, "Urz¹dzenie ród³owe: %s\n" -IDS_SYS_LOCALE, "Wersja lokalizacji: %s\n" -IDS_INPUT_LOCALE, "Lokalizacja klawiatury: %s\n" -IDS_TOTAL_PHYS_MEM, "Pamiêci fizycznej ogó³em: %ld MB (%ld KB)\n" -IDS_AVAIL_PHISICAL_MEM, "Dostêpnej pamiêci fizycznej: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_MAX, "Pamiêci wirtualnej: Maksymalnie: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_AVAIL, "Pamiêci wirtualnej: Dostêpne: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_INUSE, "Pamiêci wirtualnej: W u¿yciu: %ld MB (%ld KB)\n" -IDS_HOST_NAME, "Nazwa hosta: %s\n" -IDS_PAGEFILE_LOC, "Lokalizacja pliku wymiany %s\n" -IDS_TIME_ZONE, "Strefa czasowa: %s\n" -IDS_DOMINE, "Domena: %s\n" -IDS_BIOS_DATE, "Data BIOSu: %s\n" -IDS_BIOS_VERSION, "Wersja BIOSu: %s\n" -IDS_NETWORK_CARDS, "Liczba kart sieciowych %u.\n" +IDS_HOST_NAME, "Nazwa hosta: %s\n" +IDS_OS_NAME, "Nazwa Systemu: %s\n" +IDS_OS_VERSION, "Wersja: %u.%u.%u %s Kompilacja %u\n" +IDS_OS_BUILD_TYPE, "Rodzaj kompilacji: %s\n" +IDS_REG_OWNER, "U¿ytkownik: %s\n" +IDS_REG_ORG, "Organizacja: %s\n" +IDS_PRODUCT_ID, "ID produktu: %s\n" +IDS_INST_DATE, "Data instalacji: %s, " +IDS_INST_TIME, "%s\n" +IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" +IDS_SYS_MANUFACTURER, "Producent systemu: %s\n" +IDS_SYS_MODEL, "Model systemu: %s\n" +IDS_SYS_TYPE_UNKNOWN, "Rodzaj systemu: Unknown\n" +IDS_SYS_TYPE_X86, "Architektura: X86-based PC\n" +IDS_SYS_TYPE_IA64, "Architektura: IA64-based PC\n" +IDS_SYS_TYPE_AMD64, "Rodzaj systemu: AMD64-based PC\n" +IDS_PROCESSORS, "Iloæ Procesorów: %u.\n" +IDS_BIOS_DATE, "Data BIOSu: %s\n" +IDS_BIOS_VERSION, "Wersja BIOSu: %s\n" +IDS_ROS_DIR, "Katalog ReactOS: %s\n" +IDS_SYS_DIR, "Katalog Systemowy: %s\n" +IDS_BOOT_DEV, "Urz¹dzenie ród³owe: %s\n" +IDS_SYS_LOCALE, "Wersja lokalizacji: %s\n" +IDS_INPUT_LOCALE, "Lokalizacja klawiatury: %s\n" +IDS_TOTAL_PHYS_MEM, "Pamiêci fizycznej ogó³em: %ld MB (%ld KB)\n" +IDS_AVAIL_PHISICAL_MEM, "Dostêpnej pamiêci fizycznej: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_MAX, "Pamiêci wirtualnej: Maksymalnie: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_AVAIL, "Pamiêci wirtualnej: Dostêpne: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_INUSE, "Pamiêci wirtualnej: W u¿yciu: %ld MB (%ld KB)\n" +IDS_PAGEFILE_LOC, "Lokalizacja pliku wymiany %s\n" +IDS_TIME_ZONE, "Strefa czasowa: %s\n" +IDS_DOMINE, "Domena: %s\n" +IDS_NETWORK_CARDS, "Liczba kart sieciowych %u.\n" END Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc [iso-8859-1] Thu Mar 31 16:51:19 2011 @@ -12,18 +12,18 @@ This command line tool enables an administrator to query for basic\n\ system configuration information.\n\n\ Parameter List:\n\ - /S systm Specifies the remote system to connect to.\n\n\ - /U [domna\\]pou§¡vate Specifies the user context under which\n\ - the command should execute.\n\n\ - /P [heslo] Specifies the password for the given\n\ - user context. Prompts for input if omitted.\n\n\ - /FO form t Specifies the format in which the output\n\ - is to be displayed.\n\ - Valid values: ""TABLE"", ""LIST"", ""CSV"".\n\n\ - /NH Specifies that the ""Column Header"" should\n\ - not be displayed in the output.\n\ - Valid only for ""TABLE"" and ""CSV"" formats.\n\n\ - /? Displays this help/usage.\n\n\ + /S systm Specifies the remote system to connect to.\n\n\ + /U [domna\\]pou§¡vate Specifies the user context under which\n\ + the command should execute.\n\n\ + /P [heslo] Specifies the password for the given\n\ + user context. Prompts for input if omitted.\n\n\ + /FO form t Specifies the format in which the output\n\ + is to be displayed.\n\ + Valid values: ""TABLE"", ""LIST"", ""CSV"".\n\n\ + /NH Specifies that the ""Column Header"" should\n\ + not be displayed in the output.\n\ + Valid only for ""TABLE"" and ""CSV"" formats.\n\n\ + /? Displays this help/usage.\n\n\ Examples:\n\ SYSTEMINFO\n\ SYSTEMINFO /?\n\ @@ -33,36 +33,38 @@ SYSTEMINFO /S system /FO LIST\n\ SYSTEMINFO /S system /FO CSV /NH\n" -IDS_OS_NAME, "N zov OS: %s\n" -IDS_OS_VERSION, "Verzia OS: %u.%u.%u %s Build %u\n" -IDS_OS_BUILD_TYPE, "OS Build typ: %s\n" -IDS_REG_OWNER, "Registovanì vlastn¡k: %s\n" -IDS_REG_ORG, "Registrovan organiz cia: %s\n" -IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" -IDS_PRODUCT_ID, "ID produktu: %s\n" -IDS_INST_DATE, "D tum inçtal cie: %s, " -IDS_INST_TIME, "%s\n" -IDS_SYS_TYPE_UNKNOWN, "Typ systmu: Nezn my\n" -IDS_SYS_TYPE_X86, "Typ systmu: PC zalo§en na X86\n" -IDS_SYS_TYPE_IA64, "Typ systmu: PC zalo§en na IA64\n" -IDS_SYS_TYPE_AMD64, "Typ systmu: PC zalo§en na AMD64\n" -IDS_PROCESSORS, "Procesor(y): %u Procesor(y) nainçtalovanì.\n" -IDS_ROS_DIR, "Adres r ReactOS: %s\n" -IDS_SYS_DIR, "Adres r System: %s\n" -IDS_BOOT_DEV, "Zav dzacie zariadenie: %s\n" -IDS_SYS_LOCALE, "System Locale: %s\n" -IDS_INPUT_LOCALE, "Input Locale: %s\n" -IDS_TOTAL_PHYS_MEM, "Celkov fyzick pam: %ld MB (%ld KB)\n" -IDS_AVAIL_PHISICAL_MEM, "Dostupn fyzick pam: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_MAX, "Virtu lna pam: Max Size: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_AVAIL, "Virtu lna pam: Available: %ld MB (%ld KB)\n" -IDS_VIRT_MEM_INUSE, "Virtu lna pam: In Use: %ld MB (%ld KB)\n" -IDS_HOST_NAME, "Host Name: %s\n" -IDS_PAGEFILE_LOC, "Umiestnenie(a) str nkovacieho s£boru: %s\n" -IDS_TIME_ZONE, "¬asov p smo: %s\n" -IDS_DOMINE, "Domna: %s\n" -IDS_BIOS_DATE, "D tum BIOSu: %s\n" -IDS_BIOS_VERSION, "Verzia BIOSu: %s\n" -IDS_NETWORK_CARDS, "Sieov karta(y) %u nainçtalovan .\n" +IDS_HOST_NAME, "Host Name: %s\n" +IDS_OS_NAME, "N zov OS: %s\n" +IDS_OS_VERSION, "Verzia OS: %u.%u.%u %s Build %u\n" +IDS_OS_BUILD_TYPE, "OS Build typ: %s\n" +IDS_REG_OWNER, "Registovanì vlastn¡k: %s\n" +IDS_REG_ORG, "Registrovan organiz cia: %s\n" +IDS_PRODUCT_ID, "ID produktu: %s\n" +IDS_INST_DATE, "D tum inçtal cie: %s, " +IDS_INST_TIME, "%s\n" +IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" +IDS_SYS_MANUFACTURER, "System Manufacturer: %s\n" +IDS_SYS_MODEL, "System Model: %s\n" +IDS_SYS_TYPE_UNKNOWN, "Typ systmu: Nezn my\n" +IDS_SYS_TYPE_X86, "Typ systmu: PC zalo§en na X86\n" +IDS_SYS_TYPE_IA64, "Typ systmu: PC zalo§en na IA64\n" +IDS_SYS_TYPE_AMD64, "Typ systmu: PC zalo§en na AMD64\n" +IDS_PROCESSORS, "Procesor(y): %u Procesor(y) nainçtalovanì.\n" +IDS_BIOS_DATE, "D tum BIOSu: %s\n" +IDS_BIOS_VERSION, "Verzia BIOSu: %s\n" +IDS_ROS_DIR, "Adres r ReactOS: %s\n" +IDS_SYS_DIR, "Adres r System: %s\n" +IDS_BOOT_DEV, "Zav dzacie zariadenie: %s\n" +IDS_SYS_LOCALE, "System Locale: %s\n" +IDS_INPUT_LOCALE, "Input Locale: %s\n" +IDS_TOTAL_PHYS_MEM, "Celkov fyzick pam: %ld MB (%ld KB)\n" +IDS_AVAIL_PHISICAL_MEM, "Dostupn fyzick pam: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_MAX, "Virtu lna pam: Max Size: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_AVAIL, "Virtu lna pam: Available: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_INUSE, "Virtu lna pam: In Use: %ld MB (%ld KB)\n" +IDS_PAGEFILE_LOC, "Umiestnenie(a) str nkovacieho s£boru: %s\n" +IDS_TIME_ZONE, "¬asov p smo: %s\n" +IDS_DOMINE, "Domna: %s\n" +IDS_NETWORK_CARDS, "Sieov karta(y) %u nainçtalovan .\n" END Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc [iso-8859-1] Thu Mar 31 16:51:19 2011 @@ -20,13 +20,13 @@ /U [äîìåí\\]êîðèñò. Âèçíà÷àº êîíòåêñò êîðèñòóâà÷à, â ÿêîìó ìàº\n\ âèêîíóâàòèñÿ öÿ êîìàíäà.\n\n\ /P [ïàðîëü] Âèçíà÷àº ïàðîëü äëÿ öüîãî êîðèñòóâàöüêîãî êîíòåêñòó.\n\ - Çàïðîøóº ââåäåííÿ ïàðîëÿ, ÿêùî â³í íå çàäàíèé.\n\n\ + Çàïðîøóº ââåäåííÿ ïàðîëÿ, ÿêùî â³í íå çàäàíèé.\n\n\ /FO ôîðìàò Âèçíà÷àº ôîðìàò, â ÿêîìó â³äîáðàæàþòüñÿ\n\ - âèõ³äí³ äàí³.\n\ - Äîïóñòèì³ ôîðìàòè: ""TABLE"", ""LIST"", ""CSV"".\n\n\ + âèõ³äí³ äàí³.\n\ + Äîïóñòèì³ ôîðìàòè: ""TABLE"", ""LIST"", ""CSV"".\n\n\ /NH Íå â³äîáðàæàòè çàãîëîâêè ñòîâïö³â\n\ - âèõ³äíèõ äàíèõ.\n\ - Äîïóñêàºòüñÿ äëÿ ôîðìàò³â ""TABLE"" and ""CSV"".\n\n\ + âèõ³äíèõ äàíèõ.\n\ + Äîïóñêàºòüñÿ äëÿ ôîðìàò³â ""TABLE"" and ""CSV"".\n\n\ /? Ïîêàçóº öþ äîâ³äêó.\n\n\ Ïðèêëàäè:\n\ SYSTEMINFO\n\ @@ -37,36 +37,38 @@ SYSTEMINFO /S ñèñòåìà /FO LIST\n\ SYSTEMINFO /S ñèñòåìà /FO CSV /NH\n" -IDS_OS_NAME, "²ì'ÿ ÎÑ: %s\n" -IDS_OS_VERSION, "Âåðñ³ÿ ÎÑ: %u.%u.%u %s Çá³ðêà %u\n" -IDS_OS_BUILD_TYPE, "Òèï çá³ðêè ÎÑ: %s\n" -IDS_REG_OWNER, "Çàðåºñòðîâàíèé âëàñíèê: %s\n" -IDS_REG_ORG, "Çàðåºñòðîâàíà îðãàí³çàö³ÿ: %s\n" -IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" -IDS_PRODUCT_ID, "ID ïðîäóêòà: %s\n" -IDS_INST_DATE, "Äàòà óñòàíîâêè: %s, " -IDS_INST_TIME, "%s\n" -IDS_SYS_TYPE_UNKNOWN, "Òèï ñèñòåìè: Íåâ³äîìà\n" -IDS_SYS_TYPE_X86, "Òèï ñèñòåìè: X86-based PC\n" -IDS_SYS_TYPE_IA64, "Òèï ñèñòåìè: IA64-based PC\n" -IDS_SYS_TYPE_AMD64, "Òèï ñèñòåìè: AMD64-based PC\n" -IDS_PROCESSORS, "Ïðîöåñîð(è): %u ïðîöåñîð(à,³â) âñòàíîâëåíî.\n" -IDS_ROS_DIR, "Ïàïêà ReactOS: %s\n" -IDS_SYS_DIR, "Ñèñòåìíà ïàïêà: %s\n" -IDS_BOOT_DEV, "Ïðèñòð³é çàâàíòàæåííÿ: %s\n" -IDS_SYS_LOCALE, "Ìîâà ñèñòåìè: %s\n" -IDS_INPUT_LOCALE, "Ìîâà ââîäó: %s\n" -IDS_TOTAL_PHYS_MEM, "Âñüîãî ô³çè÷íî¿ ïàì'ÿò³: %ld ÌÁ (%ld ÊÁ)\n" -IDS_AVAIL_PHISICAL_MEM, "Äîñòóïíî ô³çè÷íî¿ ïàì'ÿò³: %ld ÌÁ (%ld ÊÁ)\n" -IDS_VIRT_MEM_MAX, "Â³ðòóàëüíà ïàì'ÿòü: Ìàêñ. ðîçì³ð: %ld ÌÁ (%ld ÊÁ)\n" -IDS_VIRT_MEM_AVAIL, "Â³ðòóàëüíà ïàì'ÿòü: Äîñòóïíî: %ld ÌÁ (%ld ÊÁ)\n" -IDS_VIRT_MEM_INUSE, "Â³ðòóàëüíà ïàì'ÿòü: Âèêîðèñò.: %ld ÌÁ (%ld ÊÁ)\n" -IDS_HOST_NAME, "²ì'ÿ êîìï'þòåðà: %s\n" -IDS_PAGEFILE_LOC, "Ðîçòàøóâàííÿ ôàéëó äîâàíòàæåííÿ %s\n" -IDS_TIME_ZONE, "×àñîâèé ïîÿñ: %s\n" -IDS_DOMINE, "Äîìåí: %s\n" -IDS_BIOS_DATE, "Äàòà BIOS: %s\n" -IDS_BIOS_VERSION, "Âåðñ³ÿ BIOS: %s\n" -IDS_NETWORK_CARDS, "Ìåðåæíà êàðòà(è) %u Installed.\n" +IDS_HOST_NAME, "²ì'ÿ êîìï'þòåðà: %s\n" +IDS_OS_NAME, "²ì'ÿ ÎÑ: %s\n" +IDS_OS_VERSION, "Âåðñ³ÿ ÎÑ: %u.%u.%u %s Çá³ðêà %u\n" +IDS_OS_BUILD_TYPE, "Òèï çá³ðêè ÎÑ: %s\n" +IDS_REG_OWNER, "Çàðåºñòðîâàíèé âëàñíèê: %s\n" +IDS_REG_ORG, "Çàðåºñòðîâàíà îðãàí³çàö³ÿ: %s\n" +IDS_PRODUCT_ID, "ID ïðîäóêòà: %s\n" +IDS_INST_DATE, "Äàòà óñòàíîâêè: %s, " +IDS_INST_TIME, "%s\n" +IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" +IDS_SYS_MANUFACTURER, "System Manufacturer: %s\n" +IDS_SYS_MODEL, "System Model: %s\n" +IDS_SYS_TYPE_UNKNOWN, "Òèï ñèñòåìè: Íåâ³äîìà\n" +IDS_SYS_TYPE_X86, "Òèï ñèñòåìè: X86-based PC\n" +IDS_SYS_TYPE_IA64, "Òèï ñèñòåìè: IA64-based PC\n" +IDS_SYS_TYPE_AMD64, "Òèï ñèñòåìè: AMD64-based PC\n" +IDS_PROCESSORS, "Ïðîöåñîð(è): %u ïðîöåñîð(à,³â) âñòàíîâëåíî.\n" +IDS_BIOS_DATE, "Äàòà BIOS: %s\n" +IDS_BIOS_VERSION, "Âåðñ³ÿ BIOS: %s\n" +IDS_ROS_DIR, "Ïàïêà ReactOS: %s\n" +IDS_SYS_DIR, "Ñèñòåìíà ïàïêà: %s\n" +IDS_BOOT_DEV, "Ïðèñòð³é çàâàíòàæåííÿ: %s\n" +IDS_SYS_LOCALE, "Ìîâà ñèñòåìè: %s\n" +IDS_INPUT_LOCALE, "Ìîâà ââîäó: %s\n" +IDS_TOTAL_PHYS_MEM, "Âñüîãî ô³çè÷íî¿ ïàì'ÿò³: %ld ÌÁ (%ld ÊÁ)\n" +IDS_AVAIL_PHISICAL_MEM, "Äîñòóïíî ô³çè÷íî¿ ïàì'ÿò³: %ld ÌÁ (%ld ÊÁ)\n" +IDS_VIRT_MEM_MAX, "Â³ðòóàëüíà ïàì'ÿòü: Ìàêñ. ðîçì³ð: %ld ÌÁ (%ld ÊÁ)\n" +IDS_VIRT_MEM_AVAIL, "Â³ðòóàëüíà ïàì'ÿòü: Äîñòóïíî: %ld ÌÁ (%ld ÊÁ)\n" +IDS_VIRT_MEM_INUSE, "Â³ðòóàëüíà ïàì'ÿòü: Âèêîðèñò.: %ld ÌÁ (%ld ÊÁ)\n" +IDS_PAGEFILE_LOC, "Ðîçòàøóâàííÿ ôàéëó äîâàíòàæåííÿ %s\n" +IDS_TIME_ZONE, "×àñîâèé ïîÿñ: %s\n" +IDS_DOMINE, "Äîìåí: %s\n" +IDS_NETWORK_CARDS, "Ìåðåæíà êàðòà(è) %u Installed.\n" END Modified: trunk/rosapps/applications/sysutils/systeminfo/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/resource.h [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/resource.h [iso-8859-1] Thu Mar 31 16:51:19 2011 @@ -1,33 +1,35 @@ -#define IDS_USAGE 1000 +#define IDS_USAGE 1000 -#define IDS_OS_NAME 100 -#define IDS_OS_VERSION 101 -#define IDS_OS_BUILD_TYPE 102 -#define IDS_REG_OWNER 103 -#define IDS_REG_ORG 104 -#define IDS_PRODUCT_ID 105 -#define IDS_INST_DATE 106 -#define IDS_INST_TIME 107 -#define IDS_UP_TIME 108 -#define IDS_SYS_TYPE_UNKNOWN 109 -#define IDS_SYS_TYPE_X86 110 -#define IDS_SYS_TYPE_IA64 111 -#define IDS_SYS_TYPE_AMD64 112 -#define IDS_PROCESSORS 113 -#define IDS_ROS_DIR 114 -#define IDS_SYS_DIR 115 -#define IDS_BOOT_DEV 116 -#define IDS_SYS_LOCALE 117 -#define IDS_INPUT_LOCALE 118 -#define IDS_TOTAL_PHYS_MEM 119 -#define IDS_AVAIL_PHISICAL_MEM 120 -#define IDS_VIRT_MEM_MAX 121 -#define IDS_VIRT_MEM_AVAIL 122 -#define IDS_VIRT_MEM_INUSE 123 -#define IDS_HOST_NAME 124 -#define IDS_PAGEFILE_LOC 125 -#define IDS_TIME_ZONE 126 -#define IDS_DOMINE 127 -#define IDS_BIOS_DATE 128 -#define IDS_BIOS_VERSION 129 -#define IDS_NETWORK_CARDS 130 +#define IDS_HOST_NAME 100 +#define IDS_OS_NAME 101 +#define IDS_OS_VERSION 102 +#define IDS_OS_BUILD_TYPE 103 +#define IDS_REG_OWNER 104 +#define IDS_REG_ORG 105 +#define IDS_PRODUCT_ID 106 +#define IDS_INST_DATE 107 +#define IDS_INST_TIME 108 +#define IDS_UP_TIME 109 +#define IDS_SYS_MANUFACTURER 110 +#define IDS_SYS_MODEL 111 +#define IDS_SYS_TYPE_UNKNOWN 112 +#define IDS_PROCESSORS 113 +#define IDS_BIOS_DATE 114 +#define IDS_BIOS_VERSION 115 +#define IDS_ROS_DIR 116 +#define IDS_SYS_DIR 117 +#define IDS_BOOT_DEV 118 +#define IDS_SYS_LOCALE 119 +#define IDS_INPUT_LOCALE 120 +#define IDS_TOTAL_PHYS_MEM 121 +#define IDS_AVAIL_PHISICAL_MEM 122 +#define IDS_VIRT_MEM_MAX 123 +#define IDS_VIRT_MEM_AVAIL 124 +#define IDS_VIRT_MEM_INUSE 125 +#define IDS_PAGEFILE_LOC 126 +#define IDS_TIME_ZONE 127 +#define IDS_DOMINE 128 +#define IDS_NETWORK_CARDS 130 +#define IDS_SYS_TYPE_X86 140 +#define IDS_SYS_TYPE_IA64 141 +#define IDS_SYS_TYPE_AMD64 142 Modified: trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c [iso-8859-1] Thu Mar 31 16:51:19 2011 @@ -180,7 +180,8 @@ Buf, sizeof(Buf)/sizeof(Buf[0]), Tmp); - printf("System Manufacturer:\t\t%s\n", Buf); + if (GetOemStrings(IDS_SYS_MANUFACTURER, Msg)) + printf(Msg, Buf); //getting System Model GetPrivateProfileString(TEXT("General"), @@ -189,7 +190,8 @@ Buf, sizeof(Buf)/sizeof(Buf[0]), Tmp); - printf("System Model:\t\t\t%s\n", Buf); + if (GetOemStrings(IDS_SYS_MODEL, Msg)) + printf(Msg, Buf); //getting System type switch (SysInfo.wProcessorArchitecture)

1 0

[janderwald] 51214: - Fix build attempt #1
by janderwald＠svn.reactos.org 31 Mar '11

31 Mar '11

Author: janderwald Date: Thu Mar 31 16:21:38 2011 New Revision: 51214 URL: http://svn.reactos.org/svn/reactos?rev=51214&view=rev Log: - Fix build attempt #1 Modified: trunk/reactos/include/psdk/ksmedia.h Modified: trunk/reactos/include/psdk/ksmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksmedia.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] Thu Mar 31 16:21:38 2011 @@ -753,6 +753,10 @@ ULONG ChannelMask; } KSDATARANGE_MUSIC, *PKSDATARANGE_MUSIC; +#ifndef _SPEAKER_POSITIONS_ +#define _SPEAKER_POSITIONS_ + + #define SPEAKER_FRONT_LEFT 0x1 #define SPEAKER_FRONT_RIGHT 0x2 #define SPEAKER_FRONT_CENTER 0x4 @@ -775,6 +779,7 @@ #define SPEAKER_RESERVED 0x7FFC0000 #define SPEAKER_ALL 0x80000000 +#endif #if (NTDDI_VERSION >= NTDDI_WINXP) #define KSAUDIO_SPEAKER_DIRECTOUT 0

1 0

[janderwald] 51213: [PSDK] - More header updates
by janderwald＠svn.reactos.org 31 Mar '11

31 Mar '11

Author: janderwald Date: Thu Mar 31 16:16:10 2011 New Revision: 51213 URL: http://svn.reactos.org/svn/reactos?rev=51213&view=rev Log: [PSDK] - More header updates Modified: trunk/reactos/include/psdk/ksmedia.h Modified: trunk/reactos/include/psdk/ksmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksmedia.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] Thu Mar 31 16:16:10 2011 @@ -347,6 +347,25 @@ KSDATAFORMAT DataFormat; WAVEFORMATEX WaveFormatEx; } KSDATAFORMAT_WAVEFORMATEX, *PKSDATAFORMAT_WAVEFORMATEX; + +#ifndef _WAVEFORMATEXTENSIBLE_ +#define _WAVEFORMATEXTENSIBLE_ +typedef struct { + WAVEFORMATEX Format; + union + { + WORD wValidBitsPerSample; + WORD wSamplesPerBlock; + WORD wReserved; + }Samples; + DWORD dwChannelMask; + GUID SubFormat; +} WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE; +#endif + +#if !defined(WAVE_FORMAT_EXTENSIBLE) +#define WAVE_FORMAT_EXTENSIBLE 0xFFFE +#endif typedef struct { ULONG Flags; @@ -734,4 +753,45 @@ ULONG ChannelMask; } KSDATARANGE_MUSIC, *PKSDATARANGE_MUSIC; -#endif +#define SPEAKER_FRONT_LEFT 0x1 +#define SPEAKER_FRONT_RIGHT 0x2 +#define SPEAKER_FRONT_CENTER 0x4 +#define SPEAKER_LOW_FREQUENCY 0x8 +#define SPEAKER_BACK_LEFT 0x10 +#define SPEAKER_BACK_RIGHT 0x20 +#define SPEAKER_FRONT_LEFT_OF_CENTER 0x40 +#define SPEAKER_FRONT_RIGHT_OF_CENTER 0x80 +#define SPEAKER_BACK_CENTER 0x100 +#define SPEAKER_SIDE_LEFT 0x200 +#define SPEAKER_SIDE_RIGHT 0x400 +#define SPEAKER_TOP_CENTER 0x800 +#define SPEAKER_TOP_FRONT_LEFT 0x1000 +#define SPEAKER_TOP_FRONT_CENTER 0x2000 +#define SPEAKER_TOP_FRONT_RIGHT 0x4000 +#define SPEAKER_TOP_BACK_LEFT 0x8000 +#define SPEAKER_TOP_BACK_CENTER 0x10000 +#define SPEAKER_TOP_BACK_RIGHT 0x20000 + +#define SPEAKER_RESERVED 0x7FFC0000 +#define SPEAKER_ALL 0x80000000 + + +#if (NTDDI_VERSION >= NTDDI_WINXP) +#define KSAUDIO_SPEAKER_DIRECTOUT 0 +#endif + +#define KSAUDIO_SPEAKER_MONO (SPEAKER_FRONT_CENTER) +#define KSAUDIO_SPEAKER_STEREO (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT) +#define KSAUDIO_SPEAKER_QUAD (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | \ + SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT) +#define KSAUDIO_SPEAKER_SURROUND (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | \ + SPEAKER_FRONT_CENTER | SPEAKER_BACK_CENTER) +#define KSAUDIO_SPEAKER_5POINT1 (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | \ + SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | \ + SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT) +#define KSAUDIO_SPEAKER_7POINT1 (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | \ + SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | \ + SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT | \ + SPEAKER_FRONT_LEFT_OF_CENTER | SPEAKER_FRONT_RIGHT_OF_CENTER) + +#endif

1 0

[rharabien] 51212: [SYSTEMINFO] Convert TABs to spaces Print output to stdout instead of stderr Close opened registry keys Simplify a bit Add System Manufacturer and System Model Add System Up Time...
by rharabien＠svn.reactos.org 31 Mar '11

31 Mar '11

Author: rharabien Date: Thu Mar 31 15:56:24 2011 New Revision: 51212 URL: http://svn.reactos.org/svn/reactos?rev=51212&view=rev Log: [SYSTEMINFO] Convert TABs to spaces Print output to stdout instead of stderr Close opened registry keys Simplify a bit Add System Manufacturer and System Model Add System Up Time (patch by Edijs Kolesnikovics <terminedijs at yahoo dot com>, see issue 6055 for more details) Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc trunk/rosapps/applications/sysutils/systeminfo/resource.h trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc [iso-8859-1] Thu Mar 31 15:56:24 2011 @@ -32,11 +32,11 @@ SYSTEMINFO /S system /FO CSV /NH\n" IDS_OS_NAME, "OS Name: %s\n" -IDS_OS_VERSION, "OS Version: %d.%d.%d %s" -IDS_OS_BUILD, " Build %s\n" +IDS_OS_VERSION, "OS Version: %u.%u.%u %s Build %u\n" IDS_OS_BUILD_TYPE, "OS Build Typ: %s\n" IDS_REG_OWNER, "Registrierter Benutzer: %s\n" IDS_REG_ORG, "Registrierte Organisation: %s\n" +IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" IDS_PRODUCT_ID, "Produkt ID: %s\n" IDS_INST_DATE, "Installationsdatum: %s, " IDS_INST_TIME, "%s\n" Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc [iso-8859-1] Thu Mar 31 15:56:24 2011 @@ -30,11 +30,11 @@ SYSTEMINFO /S system /FO CSV /NH\n" IDS_OS_NAME, "OS Name: %s\n" -IDS_OS_VERSION, "OS Version: %d.%d.%d %s" -IDS_OS_BUILD, " Build %s\n" +IDS_OS_VERSION, "OS Version: %u.%u.%u %s Build %u\n" IDS_OS_BUILD_TYPE, "OS Build Type: %s\n" IDS_REG_OWNER, "Registered Owner: %s\n" IDS_REG_ORG, "Registered Organization: %s\n" +IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" IDS_PRODUCT_ID, "Product ID: %s\n" IDS_INST_DATE, "Install Date: %s, " IDS_INST_TIME, "%s\n" Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc [iso-8859-1] Thu Mar 31 15:56:24 2011 @@ -35,11 +35,11 @@ SYSTEMINFO /S sistema /FO CSV /NH\n" IDS_OS_NAME, "Nombre Sistema Operativo: %s\n" -IDS_OS_VERSION, "Versión Sistema Operativo: %d.%d.%d %s" -IDS_OS_BUILD, " Compilación %s\n" +IDS_OS_VERSION, "Versión Sistema Operativo: %u.%u.%u %s Compilación %u\n" IDS_OS_BUILD_TYPE, "Tipo Compilación: %s\n" IDS_REG_OWNER, "Propietario: %s\n" IDS_REG_ORG, "Organización: %s\n" +IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" IDS_PRODUCT_ID, "Identificador de Producto %s\n" IDS_INST_DATE, "Fecha de Instalación: %s, " IDS_INST_TIME, "%s\n" Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc [iso-8859-1] Thu Mar 31 15:56:24 2011 @@ -30,11 +30,11 @@ SYSTEMINFO /S système /FO CSV /NH\n" IDS_OS_NAME, "Nom du système d'exploitation : %s\n" -IDS_OS_VERSION, "Version du système d'exploitation : %d.%d.%d %s" -IDS_OS_BUILD, " Compilation %s\n" +IDS_OS_VERSION, "Version du système d'exploitation : %u.%u.%u %s Compilation %u\n" IDS_OS_BUILD_TYPE, "Type de compilation du système d'exploitation : %s\n" IDS_REG_OWNER, "Propriétaire enregistré : %s\n" IDS_REG_ORG, "Organisation enregistrée : %s\n" +IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" IDS_PRODUCT_ID, "ID du produit : %s\n" IDS_INST_DATE, "Date d'installation : %s, " IDS_INST_TIME, "%s\n" Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc [iso-8859-1] Thu Mar 31 15:56:24 2011 @@ -30,11 +30,11 @@ SYSTEMINFO /S system /FO CSV /NH\n" IDS_OS_NAME, "OS navn: %s\n" -IDS_OS_VERSION, "OS versjon: %d.%d.%d %s" -IDS_OS_BUILD, " Bygget %s\n" +IDS_OS_VERSION, "OS versjon: %u.%u.%u %s Bygget %u\n" IDS_OS_BUILD_TYPE, "OS bygg type: %s\n" IDS_REG_OWNER, "Registert eier: %s\n" IDS_REG_ORG, "Registerert organisasjon: %s\n" +IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" IDS_PRODUCT_ID, "Produkt ID: %s\n" IDS_INST_DATE, "Installert dato: %s, " IDS_INST_TIME, "%s\n" Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc [iso-8859-1] Thu Mar 31 15:56:24 2011 @@ -37,11 +37,11 @@ SYSTEMINFO /S system /FO CSV /NH\n" IDS_OS_NAME, "Nazwa Systemu: %s\n" -IDS_OS_VERSION, "Wersja: %d.%d.%d %s" -IDS_OS_BUILD, " Kompilacja %s\n" +IDS_OS_VERSION, "Wersja: %u.%u.%u %s Kompilacja %u\n" IDS_OS_BUILD_TYPE, "Rodzaj kompilacji: %s\n" IDS_REG_OWNER, "U¿ytkownik: %s\n" IDS_REG_ORG, "Organizacja: %s\n" +IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" IDS_PRODUCT_ID, "ID produktu: %s\n" IDS_INST_DATE, "Data instalacji: %s, " IDS_INST_TIME, "%s\n" @@ -49,7 +49,7 @@ IDS_SYS_TYPE_X86, "Architektura: X86-based PC\n" IDS_SYS_TYPE_IA64, "Architektura: IA64-based PC\n" IDS_SYS_TYPE_AMD64, "Rodzaj systemu: AMD64-based PC\n" -IDS_PROCESSORS, "Iloæ Procesorów: %u .\n" +IDS_PROCESSORS, "Iloæ Procesorów: %u.\n" IDS_ROS_DIR, "Katalog ReactOS: %s\n" IDS_SYS_DIR, "Katalog Systemowy: %s\n" IDS_BOOT_DEV, "Urz¹dzenie ród³owe: %s\n" Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc [iso-8859-1] Thu Mar 31 15:56:24 2011 @@ -34,11 +34,11 @@ SYSTEMINFO /S system /FO CSV /NH\n" IDS_OS_NAME, "N zov OS: %s\n" -IDS_OS_VERSION, "Verzia OS: %d.%d.%d %s" -IDS_OS_BUILD, " Build %s\n" +IDS_OS_VERSION, "Verzia OS: %u.%u.%u %s Build %u\n" IDS_OS_BUILD_TYPE, "OS Build typ: %s\n" IDS_REG_OWNER, "Registovanì vlastn¡k: %s\n" IDS_REG_ORG, "Registrovan organiz cia: %s\n" +IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" IDS_PRODUCT_ID, "ID produktu: %s\n" IDS_INST_DATE, "D tum inçtal cie: %s, " IDS_INST_TIME, "%s\n" Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc [iso-8859-1] Thu Mar 31 15:56:24 2011 @@ -38,11 +38,11 @@ SYSTEMINFO /S ñèñòåìà /FO CSV /NH\n" IDS_OS_NAME, "²ì'ÿ ÎÑ: %s\n" -IDS_OS_VERSION, "Âåðñ³ÿ ÎÑ: %d.%d.%d %s" -IDS_OS_BUILD, " Çá³ðêà %s\n" +IDS_OS_VERSION, "Âåðñ³ÿ ÎÑ: %u.%u.%u %s Çá³ðêà %u\n" IDS_OS_BUILD_TYPE, "Òèï çá³ðêè ÎÑ: %s\n" IDS_REG_OWNER, "Çàðåºñòðîâàíèé âëàñíèê: %s\n" IDS_REG_ORG, "Çàðåºñòðîâàíà îðãàí³çàö³ÿ: %s\n" +IDS_UP_TIME, "System Up Time: %u Days, %u Hours, %u, Minutes, %u Seconds\n" IDS_PRODUCT_ID, "ID ïðîäóêòà: %s\n" IDS_INST_DATE, "Äàòà óñòàíîâêè: %s, " IDS_INST_TIME, "%s\n" Modified: trunk/rosapps/applications/sysutils/systeminfo/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/resource.h [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/resource.h [iso-8859-1] Thu Mar 31 15:56:24 2011 @@ -2,13 +2,13 @@ #define IDS_OS_NAME 100 #define IDS_OS_VERSION 101 -#define IDS_OS_BUILD 102 -#define IDS_OS_BUILD_TYPE 103 -#define IDS_REG_OWNER 104 -#define IDS_REG_ORG 105 -#define IDS_PRODUCT_ID 106 -#define IDS_INST_DATE 107 -#define IDS_INST_TIME 108 +#define IDS_OS_BUILD_TYPE 102 +#define IDS_REG_OWNER 103 +#define IDS_REG_ORG 104 +#define IDS_PRODUCT_ID 105 +#define IDS_INST_DATE 106 +#define IDS_INST_TIME 107 +#define IDS_UP_TIME 108 #define IDS_SYS_TYPE_UNKNOWN 109 #define IDS_SYS_TYPE_X86 110 #define IDS_SYS_TYPE_IA64 111 Modified: trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c [iso-8859-1] Thu Mar 31 15:56:24 2011 @@ -21,23 +21,26 @@ #include <ctype.h> #include <windows.h> #include <io.h> +#include <tchar.h> #include "resource.h" #define BUFFER_SIZE 32767 +#define B_TO_MB(bytes) ((bytes)/(1024*1024)) +#define B_TO_KB(bytes) ((bytes)/1024) /* Load from resource and convert to OEM */ static BOOL GetOemStrings(UINT rcID, LPSTR OutMsg) { - TCHAR Msg[BUFFER_SIZE]; - if (LoadString(GetModuleHandle(NULL), rcID, (LPTSTR)Msg, BUFFER_SIZE)) - { - CharToOem(Msg, OutMsg); - return TRUE; - } - return FALSE; + TCHAR Msg[BUFFER_SIZE]; + if (LoadString(GetModuleHandle(NULL), rcID, (LPTSTR)Msg, BUFFER_SIZE)) + { + CharToOem(Msg, OutMsg); + return TRUE; + } + return FALSE; } /* Load data from registry */ @@ -45,25 +48,25 @@ BOOL GetRegistryValue(HKEY hKeyName, LPCTSTR SubKey, LPCTSTR ValueName, LPCTSTR Buf) { - DWORD CharCount = BUFFER_SIZE; - HKEY hKey; - LONG lRet; - - CharCount = BUFFER_SIZE; - lRet = RegOpenKeyEx(hKeyName, - SubKey, - 0, - KEY_QUERY_VALUE, - &hKey); - if (lRet != ERROR_SUCCESS) return FALSE; - lRet = RegQueryValueEx(hKey, - ValueName, - NULL, - NULL, - (LPBYTE)Buf, - &CharCount); - if (lRet != ERROR_SUCCESS) return FALSE; - return TRUE; + DWORD CharCount = BUFFER_SIZE; + HKEY hKey; + LONG lRet; + + lRet = RegOpenKeyEx(hKeyName, + SubKey, + 0, + KEY_QUERY_VALUE, + &hKey); + if (lRet != ERROR_SUCCESS) return FALSE; + lRet = RegQueryValueEx(hKey, + ValueName, + NULL, + NULL, + (LPBYTE)Buf, + &CharCount); + if (lRet != ERROR_SUCCESS) return FALSE; + RegCloseKey(hKey); + return TRUE; } /* Show usage */ @@ -71,298 +74,298 @@ VOID Usage(VOID) { - TCHAR Buf[BUFFER_SIZE]; - if(GetOemStrings(IDS_USAGE,Buf)) printf("%s",Buf); + TCHAR Buf[BUFFER_SIZE]; + if(GetOemStrings(IDS_USAGE, Buf)) printf("%s",Buf); } /* Print all system information */ VOID AllSysInfo(VOID) { - DWORD CharCount = BUFFER_SIZE; - OSVERSIONINFO VersionInfo; - BOOL bOsVersionInfoEx; - SYSTEM_INFO SysInfo; - TCHAR Buf[BUFFER_SIZE],Tmp[BUFFER_SIZE], Msg[BUFFER_SIZE]; - MEMORYSTATUS memory; - unsigned int DIV = 1024; - TIME_ZONE_INFORMATION TimeZoneInfo; - - GetSystemInfo(&SysInfo); - - // getting computer name - CharCount = BUFFER_SIZE; - if(!GetComputerName(Buf,&CharCount)) printf("Error getting: GetComputerName"); - if(GetOemStrings(IDS_HOST_NAME,Msg)) fprintf(stderr,Msg,Buf); - - //getting OS Name - GetRegistryValue(HKEY_LOCAL_MACHINE, - TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"), - TEXT("ProductName"), - Buf); - if(GetOemStrings(IDS_OS_NAME,Msg)) fprintf(stderr,Msg,Buf); - - //getting OS Version - ZeroMemory(&VersionInfo, sizeof(OSVERSIONINFO)); - VersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - if(!(bOsVersionInfoEx = GetVersionEx((OSVERSIONINFO*)&VersionInfo))) - { - VersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - if (!GetVersionEx((OSVERSIONINFO*)&VersionInfo)) - return; - } - if (VersionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT) - { - if (GetRegistryValue(HKEY_LOCAL_MACHINE, - TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"), - TEXT("CSDVersion"), - Buf)) - if(GetOemStrings(IDS_OS_VERSION,Msg)) - fprintf(stderr, Msg, - (int)VersionInfo.dwMajorVersion, - (int)VersionInfo.dwMinorVersion, - (int)VersionInfo.dwBuildNumber, - Buf); - if (GetRegistryValue(HKEY_LOCAL_MACHINE, - TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"), - TEXT("CurrentBuildNumber"), - Buf)) - if(GetOemStrings(IDS_OS_BUILD,Msg)) fprintf(stderr,Msg,Buf); - } - - //getting OS Manufacturer - - //getting OS Configuration - - //getting OS Build Type - if (GetRegistryValue(HKEY_LOCAL_MACHINE, - TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"), - TEXT("CurrentType"), - Buf)) - if(GetOemStrings(IDS_OS_BUILD_TYPE,Msg)) fprintf(stderr,Msg,Buf); - - //getting Registered Owner - if (GetRegistryValue(HKEY_LOCAL_MACHINE, - TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"), - TEXT("RegisteredOwner"), - Buf)) - if(GetOemStrings(IDS_REG_OWNER,Msg)) fprintf(stderr,Msg,Buf); - - //getting Registered Organization - if (GetRegistryValue(HKEY_LOCAL_MACHINE, - TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"), - TEXT("RegisteredOrganization"), - Buf)) - if(GetOemStrings(IDS_REG_ORG,Msg)) fprintf(stderr,Msg,Buf); - - //getting Product ID - if (GetRegistryValue(HKEY_LOCAL_MACHINE, - TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"), - TEXT("ProductId"), - Buf)) - if(GetOemStrings(IDS_PRODUCT_ID,Msg)) fprintf(stderr,Msg,Buf); - - //getting Install Date - if (GetRegistryValue(HKEY_LOCAL_MACHINE, - TEXT("SOFTWARE\\Microsoft\\WBEM\\CIMOM"), - TEXT("SetupDate"), - Buf)) - if(GetOemStrings(IDS_INST_DATE,Msg)) fprintf(stderr,Msg,Buf); - - //getting Install Time - if (GetRegistryValue(HKEY_LOCAL_MACHINE, - TEXT("SOFTWARE\\Microsoft\\WBEM\\CIMOM"), - TEXT("SetupTime"), - Buf)) - if(GetOemStrings(IDS_INST_TIME,Msg)) fprintf(stderr,Msg,Buf); - - //getting System Up Time - - //getting System Manufacturer - - //getting System Model - - //getting System type - switch (SysInfo.wProcessorArchitecture) - { - case PROCESSOR_ARCHITECTURE_UNKNOWN: - if(GetOemStrings(IDS_SYS_TYPE_UNKNOWN,Msg)) printf("%s",Msg); - break; - case PROCESSOR_ARCHITECTURE_INTEL: - if(GetOemStrings(IDS_SYS_TYPE_X86,Msg)) printf("%s",Msg); - break; - case PROCESSOR_ARCHITECTURE_IA64: - if(GetOemStrings(IDS_SYS_TYPE_IA64,Msg)) printf("%s",Msg); - break; - case PROCESSOR_ARCHITECTURE_AMD64: - if(GetOemStrings(IDS_SYS_TYPE_AMD64,Msg)) printf("%s",Msg); - break; - } - - //getting Processor(s) - if(GetOemStrings(IDS_PROCESSORS,Msg)) - { - unsigned int i; - fprintf(stderr,Msg,(unsigned int)SysInfo.dwNumberOfProcessors); - for(i = 0; i < (unsigned int)SysInfo.dwNumberOfProcessors; i++) - { - sprintf(Tmp,"HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\%u",i); - if (GetRegistryValue(HKEY_LOCAL_MACHINE, - (LPCTSTR)Tmp, - TEXT("Identifier"), - Buf)) - printf(" [0%u]: %s",i+1,Buf); - if (GetRegistryValue(HKEY_LOCAL_MACHINE, - (LPCTSTR)Tmp, - TEXT("VendorIdentifier"), - Buf)) - printf(" %s\n",Buf); - } - } - - //getting BIOS Version - if (GetRegistryValue(HKEY_LOCAL_MACHINE, - TEXT("HARDWARE\\DESCRIPTION\\System"), - TEXT("SystemBiosVersion"), - Buf)) - if(GetOemStrings(IDS_BIOS_VERSION,Msg)) fprintf(stderr,Msg,Buf); - - //gettings BIOS date - if (GetRegistryValue(HKEY_LOCAL_MACHINE, - TEXT("HARDWARE\\DESCRIPTION\\System"), - TEXT("SystemBiosDate"), - Buf)) - if(GetOemStrings(IDS_BIOS_DATE,Msg)) fprintf(stderr,Msg,Buf); - - //getting ReactOS Directory - if(!GetWindowsDirectory(Buf,BUFFER_SIZE)) printf("Error getting: GetWindowsDirectory"); - if(GetOemStrings(IDS_ROS_DIR,Msg)) fprintf(stderr,Msg,Buf); - - //getting System Directory - if(!GetSystemDirectory(Buf,BUFFER_SIZE)) printf("Error getting: GetSystemDirectory"); - if(GetOemStrings(IDS_SYS_DIR,Msg)) fprintf(stderr,Msg,Buf); - - //getting Boot Device - if (GetRegistryValue(HKEY_LOCAL_MACHINE, - TEXT("SYSTEM\\Setup"), - TEXT("SystemPartition"), - Buf)) - if(GetOemStrings(IDS_BOOT_DEV,Msg)) fprintf(stderr,Msg,Buf); - - //getting System Locale - if (GetRegistryValue(HKEY_CURRENT_USER, - TEXT("Control Panel\\International"), - TEXT("Locale"), - Tmp)) - if (GetRegistryValue(HKEY_CLASSES_ROOT, - TEXT("MIME\\Database\\Rfc1766"), - (LPTSTR)Tmp, - Buf)) - if(GetOemStrings(IDS_SYS_LOCALE,Msg)) fprintf(stderr,Msg,Buf); - - //getting Input Locale - if (GetRegistryValue(HKEY_CURRENT_USER, - TEXT("Keyboard Layout\\Preload"), - TEXT("1"), - Buf)) - { - int i,j; - for(j = 0, i = 4; i <= 8; j++, i++) Tmp[j] = Buf[i]; - if (GetRegistryValue(HKEY_CLASSES_ROOT, - TEXT("MIME\\Database\\Rfc1766"), - (LPTSTR)Tmp, - Buf)) - if(GetOemStrings(IDS_INPUT_LOCALE,Msg)) fprintf(stderr,Msg,Buf); - } - - //getting Time Zone - GetTimeZoneInformation(&TimeZoneInfo); - sprintf(Tmp,"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones\\%S",TimeZoneInfo.StandardName); - if (GetRegistryValue(HKEY_LOCAL_MACHINE, - (LPCTSTR)Tmp, - TEXT("Display"), - Buf)) - if(GetOemStrings(IDS_TIME_ZONE,Msg)) fprintf(stderr,Msg,Buf); - - //getting Total Physical Memory - GlobalMemoryStatus(&memory); - if(GetOemStrings(IDS_TOTAL_PHYS_MEM,Msg)) - fprintf(stderr, - Msg, - memory.dwTotalPhys/(DIV*DIV), - memory.dwTotalPhys/DIV); - - //getting Available Physical Memory - if(GetOemStrings(IDS_AVAIL_PHISICAL_MEM,Msg)) - fprintf(stderr, - Msg, - memory.dwAvailPhys/(DIV*DIV), - memory.dwAvailPhys/DIV); - - //getting Virtual Memory: Max Size - if(GetOemStrings(IDS_VIRT_MEM_MAX,Msg)) - fprintf(stderr, - Msg, - memory.dwTotalVirtual/(DIV*DIV), - memory.dwTotalVirtual/DIV); - - //getting Virtual Memory: Available - if(GetOemStrings(IDS_VIRT_MEM_AVAIL,Msg)) - fprintf(stderr, - Msg, - memory.dwAvailVirtual/(DIV*DIV), - memory.dwAvailVirtual/DIV); - - //getting Virtual Memory: In Use - if(GetOemStrings(IDS_VIRT_MEM_INUSE,Msg)) - fprintf(stderr, - Msg, - (memory.dwTotalVirtual-memory.dwAvailVirtual)/(DIV*DIV), - (memory.dwTotalVirtual-memory.dwAvailVirtual)/DIV); - - //getting Page File Location(s) - if (GetRegistryValue(HKEY_LOCAL_MACHINE, - TEXT("SYSTEM\\ControlSet001\\Control\\Session Manager\\Memory Management"), - TEXT("PagingFiles"), - Buf)) - { - int i; - for(i = 0; i < strlen((char*)Buf); i++) - { - if (Buf[i] == ' ') - { - Buf[i] = '\0'; - break; - } - } - if(GetOemStrings(IDS_PAGEFILE_LOC,Msg)) fprintf(stderr,Msg,Buf); - } - - //getting Domain - if (GetRegistryValue(HKEY_LOCAL_MACHINE, - TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon"), - TEXT("CachePrimaryDomain"), - Buf)) - if(GetOemStrings(IDS_DOMINE,Msg)) fprintf(stderr,Msg,Buf); - - //getting Logon Server - - //getting NetWork Card(s) - if(GetOemStrings(IDS_NETWORK_CARDS,Msg)) - { - - } + DWORD dwCharCount = BUFFER_SIZE; + OSVERSIONINFO VersionInfo; + SYSTEM_INFO SysInfo; + TCHAR Buf[BUFFER_SIZE], Tmp[BUFFER_SIZE], Msg[BUFFER_SIZE], szSystemDir[MAX_PATH]; + MEMORYSTATUS MemoryStatus; + unsigned int cSeconds; + TIME_ZONE_INFORMATION TimeZoneInfo; + + if (!GetSystemDirectory(szSystemDir, sizeof(szSystemDir)/sizeof(szSystemDir[0]))) + printf("Error getting: GetSystemDirectory\n"); + GetSystemInfo(&SysInfo); + + // getting computer name + dwCharCount = BUFFER_SIZE; + if (!GetComputerName(Buf, &dwCharCount)) + printf("Error getting: GetComputerName"); + if (GetOemStrings(IDS_HOST_NAME, Msg)) + printf(Msg, Buf); + + //getting OS Name + GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"), + TEXT("ProductName"), + Buf); + if (GetOemStrings(IDS_OS_NAME, Msg)) printf(Msg, Buf); + + //getting OS Version + ZeroMemory(&VersionInfo, sizeof(VersionInfo)); + VersionInfo.dwOSVersionInfoSize = sizeof(VersionInfo); + GetVersionEx(&VersionInfo); + + if (GetOemStrings(IDS_OS_VERSION, Msg)) + printf(Msg, + (unsigned)VersionInfo.dwMajorVersion, + (unsigned)VersionInfo.dwMinorVersion, + (unsigned)VersionInfo.dwBuildNumber, + VersionInfo.szCSDVersion, + (unsigned)VersionInfo.dwBuildNumber); + + //getting OS Manufacturer + + //getting OS Configuration + + //getting OS Build Type + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"), + TEXT("CurrentType"), + Buf)) + if (GetOemStrings(IDS_OS_BUILD_TYPE, Msg)) printf(Msg, Buf); + + //getting Registered Owner + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"), + TEXT("RegisteredOwner"), + Buf)) + if (GetOemStrings(IDS_REG_OWNER, Msg)) printf(Msg, Buf); + + //getting Registered Organization + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"), + TEXT("RegisteredOrganization"), + Buf)) + if (GetOemStrings(IDS_REG_ORG, Msg)) printf(Msg, Buf); + + //getting Product ID // use SOFTWARE\Microsoft\Windows NT\CurrentVersion\InstallDate + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"), + TEXT("ProductId"), + Buf)) + if (GetOemStrings(IDS_PRODUCT_ID, Msg)) printf(Msg, Buf); + + //getting Install Date + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("SOFTWARE\\Microsoft\\WBEM\\CIMOM"), + TEXT("SetupDate"), + Buf)) + if (GetOemStrings(IDS_INST_DATE, Msg)) printf(Msg, Buf); + + //getting Install Time + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("SOFTWARE\\Microsoft\\WBEM\\CIMOM"), + TEXT("SetupTime"), + Buf)) + if (GetOemStrings(IDS_INST_TIME, Msg)) printf(Msg, Buf); + + //getting System Up Time + cSeconds = GetTickCount() / 1000; + if (GetOemStrings(IDS_UP_TIME, Msg)) + printf(Msg, cSeconds / (60*60*24), (cSeconds / (60*60)) % 24, (cSeconds / 60) % 60, cSeconds % 60); + + //getting System Manufacturer + sprintf(Tmp, "%s\\oeminfo.ini", szSystemDir); + GetPrivateProfileString(TEXT("General"), + TEXT("Manufacturer"), + TEXT("To Be Filled By O.E.M."), + Buf, + sizeof(Buf)/sizeof(Buf[0]), + Tmp); + printf("System Manufacturer:\t\t%s\n", Buf); + + //getting System Model + GetPrivateProfileString(TEXT("General"), + TEXT("Model"), + TEXT("To Be Filled By O.E.M."), + Buf, + sizeof(Buf)/sizeof(Buf[0]), + Tmp); + printf("System Model:\t\t\t%s\n", Buf); + + //getting System type + switch (SysInfo.wProcessorArchitecture) + { + case PROCESSOR_ARCHITECTURE_UNKNOWN: + if (GetOemStrings(IDS_SYS_TYPE_UNKNOWN, Msg)) printf("%s", Msg); + break; + case PROCESSOR_ARCHITECTURE_INTEL: + if (GetOemStrings(IDS_SYS_TYPE_X86, Msg)) printf("%s", Msg); + break; + case PROCESSOR_ARCHITECTURE_IA64: + if (GetOemStrings(IDS_SYS_TYPE_IA64, Msg)) printf("%s", Msg); + break; + case PROCESSOR_ARCHITECTURE_AMD64: + if (GetOemStrings(IDS_SYS_TYPE_AMD64, Msg)) printf("%s", Msg); + break; + } + + //getting Processor(s) + if (GetOemStrings(IDS_PROCESSORS, Msg)) + { + unsigned int i; + printf(Msg, (unsigned int)SysInfo.dwNumberOfProcessors); + for(i = 0; i < (unsigned int)SysInfo.dwNumberOfProcessors; i++) + { + sprintf(Tmp,"HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\%u",i); + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + (LPCTSTR)Tmp, + TEXT("Identifier"), + Buf)) + printf(" [0%u]: %s", i+1, Buf); + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + (LPCTSTR)Tmp, + TEXT("VendorIdentifier"), + Buf)) + printf(" %s\n", Buf); + } + } + + //getting BIOS Version + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("HARDWARE\\DESCRIPTION\\System"), + TEXT("SystemBiosVersion"), + Buf)) + if (GetOemStrings(IDS_BIOS_VERSION, Msg)) printf(Msg, Buf); + + //gettings BIOS date + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("HARDWARE\\DESCRIPTION\\System"), + TEXT("SystemBiosDate"), + Buf)) + if (GetOemStrings(IDS_BIOS_DATE, Msg)) printf(Msg, Buf); + + //getting ReactOS Directory + if (!GetWindowsDirectory(Buf, BUFFER_SIZE)) printf("Error getting: GetWindowsDirectory"); + if (GetOemStrings(IDS_ROS_DIR, Msg)) printf(Msg, Buf); + + //getting System Directory + if (GetOemStrings(IDS_SYS_DIR, Msg)) printf(Msg, szSystemDir); + + //getting Boot Device + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("SYSTEM\\Setup"), + TEXT("SystemPartition"), + Buf)) + if (GetOemStrings(IDS_BOOT_DEV, Msg)) printf(Msg, Buf); + + //getting System Locale + if (GetRegistryValue(HKEY_CURRENT_USER, + TEXT("Control Panel\\International"), + TEXT("Locale"), + Tmp)) + if (GetRegistryValue(HKEY_CLASSES_ROOT, + TEXT("MIME\\Database\\Rfc1766"), + (LPTSTR)Tmp, + Buf)) + if (GetOemStrings(IDS_SYS_LOCALE, Msg)) printf(Msg, Buf); + + //getting Input Locale + if (GetRegistryValue(HKEY_CURRENT_USER, + TEXT("Keyboard Layout\\Preload"), + TEXT("1"), + Buf)) + { + int i,j; + for(j = 0, i = 4; i <= 8; j++, i++) Tmp[j] = Buf[i]; + if (GetRegistryValue(HKEY_CLASSES_ROOT, + TEXT("MIME\\Database\\Rfc1766"), + (LPTSTR)Tmp, + Buf)) + if (GetOemStrings(IDS_INPUT_LOCALE, Msg)) printf(Msg, Buf); + } + + //getting Time Zone + GetTimeZoneInformation(&TimeZoneInfo); + sprintf(Tmp,"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones\\%S",TimeZoneInfo.StandardName); + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + (LPCTSTR)Tmp, + TEXT("Display"), + Buf)) + if (GetOemStrings(IDS_TIME_ZONE, Msg)) printf(Msg, Buf); + + //getting Total Physical Memory + GlobalMemoryStatus(&MemoryStatus); + if(GetOemStrings(IDS_TOTAL_PHYS_MEM, Msg)) + printf(Msg, + B_TO_MB(MemoryStatus.dwTotalPhys), + B_TO_KB(MemoryStatus.dwTotalPhys)); + + //getting Available Physical Memory + if(GetOemStrings(IDS_AVAIL_PHISICAL_MEM,Msg)) + printf(Msg, + B_TO_MB(MemoryStatus.dwAvailPhys), + B_TO_KB(MemoryStatus.dwAvailPhys)); + + //getting Virtual Memory: Max Size + if(GetOemStrings(IDS_VIRT_MEM_MAX, Msg)) + printf(Msg, + B_TO_MB(MemoryStatus.dwTotalVirtual), + B_TO_KB(MemoryStatus.dwTotalVirtual)); + + //getting Virtual Memory: Available + if(GetOemStrings(IDS_VIRT_MEM_AVAIL, Msg)) + printf(Msg, + B_TO_MB(MemoryStatus.dwAvailVirtual), + B_TO_KB(MemoryStatus.dwAvailVirtual)); + + //getting Virtual Memory: In Use + if(GetOemStrings(IDS_VIRT_MEM_INUSE, Msg)) + printf(Msg, + B_TO_MB(MemoryStatus.dwTotalVirtual-MemoryStatus.dwAvailVirtual), + B_TO_KB(MemoryStatus.dwTotalVirtual-MemoryStatus.dwAvailVirtual)); + + //getting Page File Location(s) + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("SYSTEM\\ControlSet001\\Control\\Session Manager\\Memory Management"), + TEXT("PagingFiles"), + Buf)) + { + int i; + for(i = 0; i < strlen((char*)Buf); i++) + { + if (Buf[i] == ' ') + { + Buf[i] = '\0'; + break; + } + } + if(GetOemStrings(IDS_PAGEFILE_LOC, Msg)) printf(Msg, Buf); + } + + //getting Domain + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon"), + TEXT("CachePrimaryDomain"), + Buf)) + if(GetOemStrings(IDS_DOMINE, Msg)) printf(Msg, Buf); + + //getting Logon Server + + //getting NetWork Card(s) + if(GetOemStrings(IDS_NETWORK_CARDS, Msg)) + { + + } } /* Main program */ int main(int argc, char *argv[]) { - if (argc > 1 && !strcmp(argv[1], "/?")) - { - Usage(); - return 0; - } - AllSysInfo(); - return 0; -} + if (argc > 1 && (!strcmp(argv[1], "/?") || !strcmp(argv[1], "-?"))) + { + Usage(); + return 0; + } + AllSysInfo(); + return 0; +}

1 0

[nyadav] 51211: AudioServiceNew
by nyadav＠svn.reactos.org 31 Mar '11

31 Mar '11

Author: nyadav Date: Thu Mar 31 15:06:36 2011 New Revision: 51211 URL: http://svn.reactos.org/svn/reactos?rev=51211&view=rev Log: AudioServiceNew Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/ (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/PortInterface.cpp (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/PortInterface.h (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/RedirectConsole.cpp (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/RedirectConsole.h (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/audfilter.cpp (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/audfilter.h (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/audiosrv.h (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/audpin.cpp (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/audpin.h (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/audsrv.vcproj (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/audsrv.vcproj.PK-28562EDC995A.pk.user (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/enum.cpp (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/enum.h (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/filter.cpp (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/filter.h (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/irptgt.cpp (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/irptgt.h (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/kssample.cpp (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/kssample.h (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/main.cpp (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/node.cpp (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/node.h (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/pin.cpp (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/pin.h (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/resource.h (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/stdafx.cpp (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/stdafx.h (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/targetver.h (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/tlist.h (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/util.cpp (with props) branches/nyadav-audio-branch/reactos/base/services/audsrv2/util.h (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/PortInterface.cpp URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/PortInterface.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/RedirectConsole.cpp URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/RedirectConsole.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/audfilter.cpp URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/audfilter.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/audiosrv.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/audpin.cpp URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/audpin.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/audsrv.vcproj URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/audsrv.vcproj.PK-28562EDC995A.pk.user URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/enum.cpp URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/enum.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/filter.cpp URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/filter.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/irptgt.cpp URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/irptgt.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/kssample.cpp URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/kssample.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/main.cpp URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/node.cpp URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/node.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/pin.cpp URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/pin.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/resource.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/stdafx.cpp URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/stdafx.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/targetver.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/tlist.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/util.cpp URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas… Added: branches/nyadav-audio-branch/reactos/base/services/audsrv2/util.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/reactos/bas…

1 0

[fireball] 51210: [NTDLL] - Change Context/Parameter in LdrEnumerateLoadedModules() to PVOID (previous ULONG type was a typo).
by fireball＠svn.reactos.org 31 Mar '11

31 Mar '11

Author: fireball Date: Thu Mar 31 11:32:57 2011 New Revision: 51210 URL: http://svn.reactos.org/svn/reactos?rev=51210&view=rev Log: [NTDLL] - Change Context/Parameter in LdrEnumerateLoadedModules() to PVOID (previous ULONG type was a typo). Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c trunk/reactos/include/ndk/ldrfuncs.h trunk/reactos/include/ndk/ldrtypes.h Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Thu Mar 31 11:32:57 2011 @@ -532,7 +532,7 @@ NTSTATUS NTAPI -LdrEnumerateLoadedModules(BOOLEAN ReservedFlag, PLDR_ENUM_CALLBACK EnumProc, ULONG Context) +LdrEnumerateLoadedModules(BOOLEAN ReservedFlag, PLDR_ENUM_CALLBACK EnumProc, PVOID Context) { PLIST_ENTRY ListHead, ListEntry; PLDR_DATA_TABLE_ENTRY LdrEntry; Modified: trunk/reactos/include/ndk/ldrfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/ldrfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ldrfuncs.h [iso-8859-1] Thu Mar 31 11:32:57 2011 @@ -123,7 +123,7 @@ LdrEnumerateLoadedModules( IN BOOLEAN ReservedFlag, IN PLDR_ENUM_CALLBACK EnumProc, - IN ULONG Context + IN PVOID Context ); #endif Modified: trunk/reactos/include/ndk/ldrtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrtypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] Thu Mar 31 11:32:57 2011 @@ -191,7 +191,7 @@ // // Callback function for LdrEnumerateLoadedModules // -typedef NTSTATUS (NTAPI LDR_ENUM_CALLBACK)(IN PLDR_DATA_TABLE_ENTRY ModuleInformation, IN ULONG Parameter, OUT BOOLEAN *Stop); +typedef NTSTATUS (NTAPI LDR_ENUM_CALLBACK)(IN PLDR_DATA_TABLE_ENTRY ModuleInformation, IN PVOID Parameter, OUT BOOLEAN *Stop); typedef LDR_ENUM_CALLBACK *PLDR_ENUM_CALLBACK; #endif

1 0

[fireball] 51209: - Fix build.
by fireball＠svn.reactos.org 30 Mar '11

30 Mar '11

Author: fireball Date: Wed Mar 30 21:33:57 2011 New Revision: 51209 URL: http://svn.reactos.org/svn/reactos?rev=51209&view=rev Log: - Fix build. Modified: trunk/reactos/include/ndk/ldrfuncs.h trunk/reactos/include/ndk/ldrtypes.h Modified: trunk/reactos/include/ndk/ldrfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/ldrfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ldrfuncs.h [iso-8859-1] Wed Mar 30 21:33:57 2011 @@ -118,4 +118,12 @@ IN LONGLONG Delta ); +NTSTATUS +NTAPI +LdrEnumerateLoadedModules( + IN BOOLEAN ReservedFlag, + IN PLDR_ENUM_CALLBACK EnumProc, + IN ULONG Context +); + #endif Modified: trunk/reactos/include/ndk/ldrtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrtypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] Wed Mar 30 21:33:57 2011 @@ -188,4 +188,10 @@ #endif } ALT_RESOURCE_MODULE, *PALT_RESOURCE_MODULE; +// +// Callback function for LdrEnumerateLoadedModules +// +typedef NTSTATUS (NTAPI LDR_ENUM_CALLBACK)(IN PLDR_DATA_TABLE_ENTRY ModuleInformation, IN ULONG Parameter, OUT BOOLEAN *Stop); +typedef LDR_ENUM_CALLBACK *PLDR_ENUM_CALLBACK; + #endif

1 0

[fireball] 51208: [NTDLL] - Implement LdrEnumerateLoadedModules().
by fireball＠svn.reactos.org 30 Mar '11

30 Mar '11

Author: fireball Date: Wed Mar 30 21:21:42 2011 New Revision: 51208 URL: http://svn.reactos.org/svn/reactos?rev=51208&view=rev Log: [NTDLL] - Implement LdrEnumerateLoadedModules(). Modified: trunk/reactos/dll/ntdll/def/ntdll.pspec trunk/reactos/dll/ntdll/ldr/ldrapi.c Modified: trunk/reactos/dll/ntdll/def/ntdll.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.pspec?… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.pspec [iso-8859-1] Wed Mar 30 21:21:42 2011 @@ -77,7 +77,7 @@ //@ stdcall LdrDestroyOutOfProcessImage @ stdcall LdrDisableThreadCalloutsForDll(long) @ stdcall LdrEnumResources(ptr ptr long ptr ptr) -//@ stdcall LdrEnumerateLoadedModules +@ stdcall LdrEnumerateLoadedModules(long ptr long) //@ stdcall LdrFindCreateProcessManifest // 5.1 and 5.2 only @ stdcall LdrFindEntryForAddress(ptr ptr) @ stdcall LdrFindResourceDirectory_U(long ptr long ptr) Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Wed Mar 30 21:21:42 2011 @@ -530,4 +530,66 @@ return LdrQueryProcessModuleInformationEx(0, 0, ModuleInformation, Size, ReturnedSize); } +NTSTATUS +NTAPI +LdrEnumerateLoadedModules(BOOLEAN ReservedFlag, PLDR_ENUM_CALLBACK EnumProc, ULONG Context) +{ + PLIST_ENTRY ListHead, ListEntry; + PLDR_DATA_TABLE_ENTRY LdrEntry; + NTSTATUS Status; + ULONG Cookie; + BOOLEAN Stop = FALSE; + + /* Check parameters */ + if (ReservedFlag || !EnumProc) return STATUS_INVALID_PARAMETER; + + /* Acquire the loader lock */ + Status = LdrLockLoaderLock(0, NULL, &Cookie); + if (!NT_SUCCESS(Status)) return Status; + + /* Loop all the modules and call enum proc */ + ListHead = &NtCurrentPeb()->Ldr->InLoadOrderModuleList; + ListEntry = ListHead->Flink; + while (ListHead != ListEntry) + { + /* Get the entry */ + LdrEntry = CONTAINING_RECORD(ListEntry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); + + /* Call the enumeration proc inside SEH */ + _SEH2_TRY + { + EnumProc(LdrEntry, Context, &Stop); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Ignoring the exception */ + } _SEH2_END; + + /* Break if we were asked to stop enumeration */ + if (Stop) + { + /* Release loader lock */ + Status = LdrUnlockLoaderLock(0, Cookie); + + /* Reset any successful status to STATUS_SUCCESS, but leave + failure to the caller */ + if (NT_SUCCESS(Status)) + Status = STATUS_SUCCESS; + + /* Return any possible failure status */ + return Status; + } + + /* Advance to the next module */ + ListEntry = ListEntry->Flink; + } + + /* Release loader lock, it must succeed this time */ + Status = LdrUnlockLoaderLock(0, Cookie); + ASSERT(NT_SUCCESS(Status)); + + /* Return success */ + return STATUS_SUCCESS; +} + /* EOF */

1 0

[fireball] 51207: [NTDLL] - Add RtlDosApplyFileIsolationRedirection_Ustr() stub.
by fireball＠svn.reactos.org 30 Mar '11

30 Mar '11

Author: fireball Date: Wed Mar 30 20:56:05 2011 New Revision: 51207 URL: http://svn.reactos.org/svn/reactos?rev=51207&view=rev Log: [NTDLL] - Add RtlDosApplyFileIsolationRedirection_Ustr() stub. Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/libsupp.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] Wed Mar 30 20:56:05 2011 @@ -519,3 +519,22 @@ *BaseOfImage = ImageBase; return ImageBase; } + +NTSYSAPI +NTSTATUS +NTAPI +RtlDosApplyFileIsolationRedirection_Ustr( + IN BOOLEAN Unknown, + IN PUNICODE_STRING OriginalName, + IN PUNICODE_STRING Extension, + IN OUT PUNICODE_STRING RedirectedName, + IN OUT PUNICODE_STRING RedirectedName2, + IN OUT PUNICODE_STRING *OriginalName2, + IN PVOID Unknown1, + IN PVOID Unknown2, + IN PVOID Unknown3 +) +{ + return STATUS_SXS_KEY_NOT_FOUND; +} +

1 0

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 March 2011