Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 43101: - Working with Michael Martin to fix the LoadMenu callback bug. MenuName is a variable string buffer and not a pointer. The minimum size is always four bytes. Initialization of the structure, zero out the memory, allowing Intersource check to function as it should. To make it Intersource, use the first word character in the buffer.
by jimtabor＠svn.reactos.org 21 Sep '09

21 Sep '09

Author: jimtabor Date: Mon Sep 21 03:22:32 2009 New Revision: 43101 URL: http://svn.reactos.org/svn/reactos?rev=43101&view=rev Log: - Working with Michael Martin to fix the LoadMenu callback bug. MenuName is a variable string buffer and not a pointer. The minimum size is always four bytes. Initialization of the structure, zero out the memory, allowing Intersource check to function as it should. To make it Intersource, use the first word character in the buffer. Modified: trunk/reactos/dll/win32/user32/windows/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/callback.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Mon Sep 21 03:22:32 2009 @@ -3967,7 +3967,10 @@ Common = (PLOADMENU_CALLBACK_ARGUMENTS) Arguments; - Result = (LRESULT)LoadMenuW(Common->hModule, IS_INTRESOURCE(Common->MenuName) ? Common->MenuName : (LPCWSTR)&Common->MenuName); + Result = (LRESULT)LoadMenuW( Common->hModule, + IS_INTRESOURCE(Common->MenuName) ? + MAKEINTRESOURCE(Common->MenuName[0]) : + (LPCWSTR)&Common->MenuName); return ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Mon Sep 21 03:22:32 2009 @@ -662,11 +662,13 @@ Argument = IntCbAllocateMemory(ArgumentLength); if (NULL == Argument) { - DPRINT1("EventProc callback failed: out of memory\n"); + DPRINT1("LoadMenu callback failed: out of memory\n"); return 0; } Common = (PLOADMENU_CALLBACK_ARGUMENTS) Argument; + // Help Intersource check and MenuName is now 4 bytes + so zero it. + RtlZeroMemory(Common, ArgumentLength); Common->hModule = hModule; if (pMenuName->Length)

1 0

[cgutman] 43100: - Stub and export GetAddrInfoW
by cgutman＠svn.reactos.org 20 Sep '09

20 Sep '09

Author: cgutman Date: Mon Sep 21 00:20:16 2009 New Revision: 43100 URL: http://svn.reactos.org/svn/reactos?rev=43100&view=rev Log: - Stub and export GetAddrInfoW Modified: trunk/reactos/dll/win32/ws2_32/misc/stubs.c trunk/reactos/dll/win32/ws2_32/ws2_32.spec Modified: trunk/reactos/dll/win32/ws2_32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] Mon Sep 21 00:20:16 2009 @@ -10,7 +10,6 @@ #include <ws2_32.h> #include <catalog.h> #include <handle.h> - /* * @implemented @@ -936,4 +935,21 @@ return FALSE; } +/* + * @unimplemented + */ +INT +EXPORT +GetAddrInfoW(IN PCWSTR pszNodeName, + IN PCWSTR pszServiceName, + IN const ADDRINFOW *ptHints, + OUT PADDRINFOW *pptResult) +{ + UNIMPLEMENTED + + WSASetLastError(EAI_FAIL); + return EAI_FAIL; +} + + /* EOF */ Modified: trunk/reactos/dll/win32/ws2_32/ws2_32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/ws2_32.sp… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/ws2_32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/ws2_32.spec [iso-8859-1] Mon Sep 21 00:20:16 2009 @@ -50,7 +50,7 @@ 500 stub WEP -# @ stdcall GetAddrInfoW(wstr wstr ptr ptr) +@ stdcall GetAddrInfoW(wstr wstr ptr ptr) @ stdcall WSApSetPostRoutine(ptr) @ stdcall WPUCompleteOverlappedRequest(long ptr long long ptr) @ stdcall WSAAccept(long ptr ptr ptr long)

1 0

[cgutman] 43099: - Simplify and fix a few bugs in datagram reassembly - Implement reassembly timeout
by cgutman＠svn.reactos.org 20 Sep '09

20 Sep '09

Author: cgutman Date: Sun Sep 20 23:07:45 2009 New Revision: 43099 URL: http://svn.reactos.org/svn/reactos?rev=43099&view=rev Log: - Simplify and fix a few bugs in datagram reassembly - Implement reassembly timeout Modified: trunk/reactos/drivers/network/tcpip/include/receive.h trunk/reactos/lib/drivers/ip/network/receive.c Modified: trunk/reactos/drivers/network/tcpip/include/receive.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/receive.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/receive.h [iso-8859-1] Sun Sep 20 23:07:45 2009 @@ -9,6 +9,8 @@ #include <ip.h> +/* Number of timeout ticks before destroying the IPDR */ +#define MAX_TIMEOUT_COUNT 10 /* IP datagram fragment descriptor. Used to store IP datagram fragments */ typedef struct IP_FRAGMENT { @@ -38,6 +40,7 @@ UINT HeaderSize; /* Length of IP header */ LIST_ENTRY FragmentListHead; /* IP fragment list */ LIST_ENTRY HoleListHead; /* IP datagram hole list */ + UINT TimeoutCount; /* Timeout counter */ } IPDATAGRAM_REASSEMBLY, *PIPDATAGRAM_REASSEMBLY; Modified: trunk/reactos/lib/drivers/ip/network/receive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/rec… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/receive.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/receive.c [iso-8859-1] Sun Sep 20 23:07:45 2009 @@ -17,12 +17,6 @@ NPAGED_LOOKASIDE_LIST IPDRList; NPAGED_LOOKASIDE_LIST IPFragmentList; NPAGED_LOOKASIDE_LIST IPHoleList; - -VOID ReflectPacketComplete( - PVOID Context, - PNDIS_PACKET Packet, - NDIS_STATUS Status ) { -} PIPDATAGRAM_HOLE CreateHoleDescriptor( ULONG First, @@ -299,8 +293,6 @@ TI_DbgPrint(DEBUG_IP, ("Continueing assembly.\n")); /* We have a reassembly structure */ TcpipAcquireSpinLock(&IPDR->Lock, &OldIrql); - CurrentEntry = IPDR->HoleListHead.Flink; - Hole = CONTAINING_RECORD(CurrentEntry, IPDATAGRAM_HOLE, ListEntry); } else { TI_DbgPrint(DEBUG_IP, ("Starting new assembly.\n")); @@ -323,10 +315,10 @@ AddrInitIPv4(&IPDR->DstAddr, IPv4Header->DstAddr); IPDR->Id = IPv4Header->Id; IPDR->Protocol = IPv4Header->Protocol; + IPDR->TimeoutCount = 0; InitializeListHead(&IPDR->FragmentListHead); InitializeListHead(&IPDR->HoleListHead); InsertTailList(&IPDR->HoleListHead, &Hole->ListEntry); - CurrentEntry = IPDR->HoleListHead.Flink; TcpipInitializeSpinLock(&IPDR->Lock); @@ -343,10 +335,12 @@ FragLast = FragFirst + WN2H(IPv4Header->TotalLength); MoreFragments = (WN2H(IPv4Header->FlagsFragOfs) & IPv4_MF_MASK) > 0; + CurrentEntry = IPDR->HoleListHead.Flink; for (;;) { if (CurrentEntry == &IPDR->HoleListHead) - /* No more entries */ - break; + break; + + Hole = CONTAINING_RECORD(CurrentEntry, IPDATAGRAM_HOLE, ListEntry); TI_DbgPrint(DEBUG_IP, ("Comparing Fragment (%d,%d) to Hole (%d,%d).\n", FragFirst, FragLast, Hole->First, Hole->Last)); @@ -357,8 +351,6 @@ descriptor in the list */ CurrentEntry = CurrentEntry->Flink; - if (CurrentEntry != &IPDR->HoleListHead) - Hole = CONTAINING_RECORD(CurrentEntry, IPDATAGRAM_HOLE, ListEntry); continue; } @@ -366,7 +358,7 @@ RemoveEntryList(CurrentEntry); if (FragFirst > Hole->First) { - NewHole = CreateHoleDescriptor(Hole->First, FragLast - 1); + NewHole = CreateHoleDescriptor(Hole->First, FragFirst - 1); if (!NewHole) { /* We don't have the resources to process this packet, discard it */ exFreeToNPagedLookasideList(&IPHoleList, Hole); @@ -378,14 +370,20 @@ InsertTailList(&IPDR->HoleListHead, &NewHole->ListEntry); } - if ((FragLast < Hole->Last) && (MoreFragments)) { - /* We can reuse the descriptor for the new hole */ - Hole->First = FragLast + 1; + if ((FragLast < Hole->Last) && MoreFragments) { + NewHole = CreateHoleDescriptor(FragLast + 1, Hole->Last); + if (!NewHole) { + /* We don't have the resources to process this packet, discard it */ + exFreeToNPagedLookasideList(&IPHoleList, Hole); + Cleanup(&IPDR->Lock, OldIrql, IPDR); + return; + } /* Put the new hole descriptor in the list */ - InsertTailList(&IPDR->HoleListHead, &Hole->ListEntry); - } else - exFreeToNPagedLookasideList(&IPHoleList, Hole); + InsertTailList(&IPDR->HoleListHead, &NewHole->ListEntry); + } + + exFreeToNPagedLookasideList(&IPHoleList, Hole); /* If this is the first fragment, save the IP header */ if (FragFirst == 0) { @@ -424,7 +422,7 @@ /* Copy datagram data into fragment buffer */ CopyPacketToBuffer(Fragment->Data, IPPacket->NdisPacket, - IPPacket->Position, + IPPacket->HeaderSize, Fragment->Size); Fragment->Offset = FragFirst; @@ -434,7 +432,7 @@ /* Put the fragment in the list */ InsertTailList(&IPDR->FragmentListHead, &Fragment->ListEntry); - break; + break; } TI_DbgPrint(DEBUG_IP, ("Done searching for hole descriptor.\n")); @@ -512,6 +510,36 @@ * to hold IP fragments that have taken too long to reassemble */ { + KIRQL OldIrql; + PLIST_ENTRY CurrentEntry, NextEntry; + PIPDATAGRAM_REASSEMBLY CurrentIPDR; + + TcpipAcquireSpinLock(&ReassemblyListLock, &OldIrql); + + CurrentEntry = ReassemblyListHead.Flink; + while (CurrentEntry != &ReassemblyListHead) + { + NextEntry = CurrentEntry->Flink; + CurrentIPDR = CONTAINING_RECORD(CurrentEntry, IPDATAGRAM_REASSEMBLY, ListEntry); + + TcpipAcquireSpinLockAtDpcLevel(&CurrentIPDR->Lock); + + if (++CurrentIPDR->TimeoutCount == MAX_TIMEOUT_COUNT) + { + TcpipReleaseSpinLockFromDpcLevel(&CurrentIPDR->Lock); + RemoveEntryList(CurrentEntry); + FreeIPDR(CurrentIPDR); + } + else + { + ASSERT(CurrentIPDR->TimeoutCount < MAX_TIMEOUT_COUNT); + TcpipReleaseSpinLockFromDpcLevel(&CurrentIPDR->Lock); + } + + CurrentEntry = NextEntry; + } + + TcpipReleaseSpinLock(&ReassemblyListLock, OldIrql); } VOID IPv4Receive(PIP_INTERFACE IF, PIP_PACKET IPPacket)

1 0

[dgorbachev] 43098: Update / add Japanese translations. Tomoya Kitagawa, bug #4852.
by dgorbachev＠svn.reactos.org 20 Sep '09

20 Sep '09

Author: dgorbachev Date: Sun Sep 20 21:35:23 2009 New Revision: 43098 URL: http://svn.reactos.org/svn/reactos?rev=43098&view=rev Log: Update / add Japanese translations. Tomoya Kitagawa, bug #4852. Added: trunk/reactos/base/applications/kbswitch/lang/ja-JP.rc (with props) trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc (with props) trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc (with props) trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc (with props) trunk/reactos/base/applications/screensavers/3dtext/lang/ja-JP.rc (with props) trunk/reactos/base/applications/screensavers/logon/lang/ja-JP.rc (with props) trunk/reactos/dll/cpl/powercfg/lang/ja-JP.rc (with props) trunk/reactos/dll/cpl/telephon/lang/ja-JP.rc (with props) trunk/reactos/dll/win32/msgina/lang/ja-JP.rc (with props) trunk/reactos/dll/win32/netid/lang/ja-JP.rc (with props) trunk/reactos/dll/win32/newdev/lang/ja-JP.rc (with props) Modified: trunk/reactos/base/applications/kbswitch/rsrc.rc trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc trunk/reactos/base/applications/mscutils/servman/rsrc.rc trunk/reactos/base/applications/rapps/lang/ja-JP.rc trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc trunk/reactos/base/applications/screensavers/logon/logon.rc trunk/reactos/dll/cpl/powercfg/rsrc.rc trunk/reactos/dll/cpl/telephon/rsrc.rc trunk/reactos/dll/cpl/timedate/lang/ja-JP.rc trunk/reactos/dll/win32/msgina/msgina.rc trunk/reactos/dll/win32/netid/rsrc.rc trunk/reactos/dll/win32/newdev/rsrc.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc Added: trunk/reactos/base/applications/kbswitch/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/ja-JP.rc (added) +++ trunk/reactos/base/applications/kbswitch/lang/ja-JP.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -1,0 +1,11 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "Ýè(&P)...", ID_PREFERENCES + MENUITEM SEPARATOR + MENUITEM "I¹(&E)", ID_EXIT + END +END Propchange: trunk/reactos/base/applications/kbswitch/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/kbswitch/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/rsrc.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -5,6 +5,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/lt-LT.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" Added: trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc (added) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -1,0 +1,82 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDR_MAINMENU MENU +BEGIN + POPUP "t@C(&F)" + BEGIN + MENUITEM "I¹(&X)", IDC_EXIT + END + POPUP "ì" + BEGIN + MENUITEM "óü", IDC_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "vpeB", IDC_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "wv", IDC_PROGHELP, GRAYED + END + POPUP "\\¦" + BEGIN + MENUITEM "foCX (íÞÊ)", IDC_DEVBYTYPE, CHECKED + MENUITEM "foCX (Ú±Ê)", IDC_STATIC, GRAYED + MENUITEM "\\[X (íÞÊ)", IDC_STATIC, GRAYED + MENUITEM "\\[X (Ú±Ê)", IDC_STATIC, GRAYED + END + POPUP "wv" + BEGIN + MENUITEM "wv", IDC_PROGHELP + MENUITEM "o[Wîñ", IDC_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "vpeB", IDC_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "wv", IDC_PROGHELP + END +END + +IDD_ABOUTBOX DIALOGEX 22,16,190,182 +CAPTION "foCX }l[WÉÂ¢Ä" +FONT 9, "MS UI Gothic",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "foCX }l[W v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 30 + PUSHBUTTON "Â¶é", IDOK, 75, 162, 44, 15 + ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "±ÌvOÍt[\\tgEFAÅ·B È½Í±êðAt[\\tgEFAàcÉæÁÄs³ê½ GNUêÊöOpø_ñ(o[W2©Aó]ÉæÁÄÍ»êÈ~Ìo[WÌ¤¿Çê©)ÌèßéðÌºÅÄÐzÜ½ÍüÏ·é±ÆªÅ«Ü·B\r\n\r\n±ÌvOÍLpÅ é±ÆðèÁÄzz³êÜ·ªA*SÌ³ÛØ* Å·B*¤ÆÂ\\«ÌÛØ*â*ÁèÌÚIÖÌK«*ÍA¾OÉ¦³ê½àÌàÜßS¶ÝµÜ¹ñBÚµÍGNUêÊöOpø_ñð²¾³¢B\r\n\r\n È½Í±ÌvOÆ¤ÉAGNUêÊöOpø_ñÌ¡»ðêó¯æÁ½Í¸Å·Bàµó¯æÁÄ¢È¯êÎAt[\\tgEFAàcÜÅ¿µÄ¾³¢(¶æÍ the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA)B" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_PROP "vpeB" + IDS_TOOLTIP_REFRESH "XV" + IDS_TOOLTIP_HELP "wv" + IDS_TOOLTIP_EXIT "I¹" +END + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ReactOS foCX }l[W" + IDS_HINT_BLANK " " + IDS_HINT_EXIT " ±ÌvOðI¹µÜ·B" + IDS_HINT_REFRESH " T[rXÌXgðXVµÜ·B" + IDS_HINT_PROP " »ÝIð³êÄ¢éV[gÌvpeBðJ«Ü·B" + IDS_HINT_HELP " wv EBhEð\\¦µÜ·B" + IDS_HINT_ABOUT " ReactOS foCX }l[WÉÂ¢Ä\\¦µÜ·B" + + IDS_HINT_SYS_RESTORE " ±ÌEBhEðÊíÌå«³É³µÜ·B" + IDS_HINT_SYS_MOVE " ±ÌEBhEðÚ®µÜ·B" + IDS_HINT_SYS_SIZE " ±ÌEBhEÌå«³ðÏXµÜ·B" + IDS_HINT_SYS_MINIMIZE " ±ÌEBhEðACRÉÜè½½ÝÜ·B" + IDS_HINT_SYS_MAXIMIZE " ±ÌEBhEðæÊ¢ÁÏ¢ÉJ«Ü·B" + IDS_HINT_SYS_CLOSE " ±ÌEBhEðÂ¶Ü·B" +END Propchange: trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -20,6 +20,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -22,7 +22,7 @@ BEGIN MENUITEM "&Refresh", IDM_REFRESH END - MENUITEM "&Options", ID_OPTIONS + MENUITEM "&Options", ID_OPTIONS POPUP "&Help" BEGIN MENUITEM "H&elp", IDM_HELP Added: trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc (added) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -1,0 +1,104 @@ +/* + * PROJECT: ReactOS Event Viewer + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/mscutils/eventvwr/lang/ja-JP.rc + * PURPOSE: Japanese Language File for ReactOS Event Viewer + * TRANSLATORS: Tomoya Kitagawa + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDC_EVENTVWR MENU +BEGIN + POPUP "O(&L)" + BEGIN + MENUITEM "AvP[V(&A)", ID_LOG_APPLICATION + MENUITEM "ZLeB(&S)", ID_LOG_SECURITY + MENUITEM "VXe(&S)", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "I¹(&X)", IDM_EXIT + END + POPUP "\\¦(&V)" + BEGIN + MENUITEM "XV(&R)", IDM_REFRESH + END + MENUITEM "IvV(&O)", ID_OPTIONS + POPUP "wv(&H)" + BEGIN + MENUITEM "wv(&E)", IDM_HELP + MENUITEM SEPARATOR + MENUITEM "o[Wîñ(&A)...", IDM_ABOUT + END +END + +IDC_EVENTVWR ACCELERATORS +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + +IDD_ABOUTBOX DIALOGEX 0, 0, 230, 75 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_CAPTION | WS_SYSMENU +CAPTION "o[Wîñ" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 + LTEXT "ReactOS Cxg r[A Version 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)",IDC_STATIC,49,20,119,22 + DEFPUSHBUTTON "OK",IDOK,90,48,42,16,WS_GROUP +END + +IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER +CAPTION "¨Ò¿¾³¢.." +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + CTEXT "Cxg OðÇÝñÅ¢Ü·B ¨Ò¿¾³¢ ...",IDC_STATIC,0,15,230,8,SS_NOPREFIX +END + +IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "CxgÌÚ×îñ" +FONT 9, "MS UI Gothic", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Â¶é(&C)",IDOK,12,258,50,14 + PUSHBUTTON "OÖ(&P)",IDPREVIOUS,78,258,50,14 + PUSHBUTTON "Ö(&N)",IDNEXT,144,258,50,14 + PUSHBUTTON "wv(&H)",IDHELP,210,258,50,14 + EDITTEXT IDC_EVENTTEXTEDIT,14,81,247,108,ES_MULTILINE | ES_READONLY + LTEXT "à¾(&D):",IDC_STATIC,15,70,39,8 + LTEXT "út:",IDC_STATIC,14,14,36,8 + LTEXT "Static",IDC_EVENTDATESTATIC,56,14,72,8 + LTEXT ":",IDC_STATIC,14,27,36,8 + LTEXT "Static",IDC_EVENTTIMESTATIC,56,27,72,8 + LTEXT "[U[(&U):",IDC_STATIC,14,41,36,8 + LTEXT "Static",IDC_EVENTUSERSTATIC,56,41,72,8 + LTEXT "Rs[^(&C):",IDC_STATIC,14,54,36,8 + LTEXT "Static",IDC_EVENTCOMPUTERSTATIC,56,54,72,8 + LTEXT "CxgID:",IDC_STATIC,133,15,36,8 + LTEXT "Static",IDC_EVENTIDSTATIC,175,15,87,8 + LTEXT "\\[X:",IDC_STATIC,133,28,36,8 + LTEXT "Static",IDC_EVENTSOURCESTATIC,175,28,87,8 + LTEXT "íÞ:",IDC_STATIC,133,42,36,8 + LTEXT "Static",IDC_EVENTTYPESTATIC,175,42,87,8 + LTEXT "ªÞ:",IDC_STATIC,133,55,36,8 + LTEXT "Static",IDC_EVENTCATEGORYSTATIC,175,55,87,8 + EDITTEXT IDC_EVENTDATAEDIT,14,204,247,44,ES_MULTILINE | ES_READONLY + LTEXT "f[^(&A)",IDC_STATIC,14,194,20,8 + CONTROL "oCg(&B)",IDC_BYTESRADIO,"Button",BS_AUTORADIOBUTTON,39,194,34,10 + CONTROL "[h(&W)",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,77,194,33,10 +END + +STRINGTABLE +BEGIN + IDS_APP_TITLE "Cxg r[A" + IDC_EVENTSTRINGIDNOTFOUND "Cxg ID (%lu) (\\[X %s à) ÉÖ·éà¾ª©Â©èÜ¹ñÅµ½B [g Rs[^©çbZ[Wð\\¦·é½ßÉKvÈWXgîñÜ½ÍbZ[W DLL t@Cª[J Rs[^ÉÈ¢Â\\«ª èÜ·B" + IDC_EVENTLOG_ERROR_TYPE "G[" + IDC_EVENTLOG_WARNING_TYPE "x" + IDC_EVENTLOG_INFORMATION_TYPE "îñ" + IDC_EVENTLOG_AUDIT_SUCCESS "¬÷ÌÄ¸" + IDC_EVENTLOG_AUDIT_FAILURE "¸sÌÄ¸" + IDC_EVENTLOG_SUCCESS "¬÷" + IDC_EVENTLOG_UNKNOWN_TYPE "s¾ÈCxg" +END Propchange: trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -16,6 +16,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" Added: trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc (added) +++ trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -1,0 +1,282 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDR_MAINMENU MENU +BEGIN + POPUP "t@C(&F)" + BEGIN + MENUITEM "GNX|[g...", ID_EXPORT + MENUITEM SEPARATOR + MENUITEM "I¹(&X)", ID_EXIT + END + POPUP "ì" + BEGIN + MENUITEM "ÊÌRs[^ÖÚ±...", ID_CONNECT, GRAYED + MENUITEM SEPARATOR + MENUITEM "Jn", ID_START, GRAYED + MENUITEM "â~", ID_STOP, GRAYED + MENUITEM "êâ~", ID_PAUSE, GRAYED + MENUITEM "ÄJ", ID_RESUME, GRAYED + MENUITEM "ÄN®", ID_RESTART, GRAYED + MENUITEM SEPARATOR + MENUITEM "XV", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "ÒW...", ID_EDIT, GRAYED + MENUITEM "ì¬...", ID_CREATE, GRAYED + MENUITEM "í...", ID_DELETE, GRAYED + MENUITEM SEPARATOR + MENUITEM "vpeB...", ID_PROP, GRAYED + END + POPUP "\\¦" + BEGIN + MENUITEM "å«¢ACR", ID_VIEW_LARGE + MENUITEM "¬³¢ACR", ID_VIEW_SMALL + MENUITEM "ê", ID_VIEW_LIST + MENUITEM "Ú×", ID_VIEW_DETAILS + MENUITEM SEPARATOR + MENUITEM "JX^}CY...", ID_VIEW_CUST, GRAYED + END + POPUP "wv" + BEGIN + MENUITEM "wv", ID_HELP + MENUITEM "o[Wîñ", ID_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "Jn", ID_START, GRAYED + MENUITEM "â~", ID_STOP, GRAYED + MENUITEM "êâ~", ID_PAUSE, GRAYED + MENUITEM "ÄJ", ID_RESUME, GRAYED + MENUITEM "ÄN®", ID_RESTART, GRAYED + MENUITEM SEPARATOR + MENUITEM "XV", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "ÒW...", ID_EDIT, GRAYED + MENUITEM "í...", ID_DELETE, GRAYED + MENUITEM SEPARATOR + MENUITEM "vpeB...", ID_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "wv...", ID_HELP + END +END + +IDD_ABOUTBOX DIALOGEX 22,16,190,182 +CAPTION "T[rX }l[WÉÂ¢Ä" +FONT 9, "MS UI Gothic",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "T[rX }l[W v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 30 + PUSHBUTTON "Â¶é", IDOK, 75, 162, 44, 15 + ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + +IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 +CAPTION "SÊ" +FONT 9, "MS UI Gothic",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP +BEGIN + LTEXT "", IDC_SERV_NAME, 70,11,176,11, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_DISP_NAME, 70, 29, 176, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY + EDITTEXT IDC_DESCRIPTION, 70, 46, 176, 24, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_MULTILINE | ES_READONLY + EDITTEXT IDC_EXEPATH, 6, 86, 240, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY + COMBOBOX IDC_START_TYPE, 70, 107, 176, 40, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST + PUSHBUTTON "Jn", IDC_START, 6, 155, 54, 15, WS_DISABLED + PUSHBUTTON "â~", IDC_STOP, 68, 155, 54, 15, WS_DISABLED + PUSHBUTTON "êâ~", IDC_PAUSE , 130, 155, 54, 15, WS_DISABLED + PUSHBUTTON "ÄJ", IDC_RESUME, 192, 155, 54, 15, WS_DISABLED + LTEXT "T[rX¼:", IDC_STATIC, 4, 11, 53, 11 + LTEXT "\\¦¼:", IDC_STATIC, 4, 29, 53, 11 + LTEXT "à¾:", IDC_STATIC, 4, 51, 53, 11 + LTEXT "Àst@CÌpX:", IDC_STATIC, 6, 73, 82, 9 + LTEXT "X^[gAbvÌíÞ:", IDC_STATIC, 6, 108, 53, 11 + LTEXT "T[rXÌóÔ:", IDC_STATIC, 4, 138, 53, 11 + LTEXT "", IDC_SERV_STATUS, 70, 138, 176, 11, WS_CHILD | WS_VISIBLE + LTEXT "±±ÅT[rXðJn·éÆ«ÉKp·éJnp[^ðwèÅ«Ü·B",IDC_STATIC, 6,177,240,15 + LTEXT "Jnp[^:", IDC_STATIC, 6, 200, 58, 11 + EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "ÒW", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED +END + +IDD_DLG_DEPEND DIALOGEX 6,6,253,225 +CAPTION "Ë¶ÖW" +FONT 9, "MS UI Gothic",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP +BEGIN + CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70, 236, 68, 0x00000200 + CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151, 234, 67, 0x00000200 + LTEXT "¼ÌT[rXAVXe hCoAÇÝÝO[vÈÇÉË¶µÄ¢éT[rXª èÜ·BVXe R|[lgªâ~·é©AÜ½Í³íÉÀs³êÈ¢êAË¶·éT[rXªe¿³êÄ¢éêª èÜ·B", IDC_STATIC,8, 7, 238, 26 + LTEXT "±ÌT[rXªË¶·éR|[lg", IDC_STATIC, 8, 57, 236, 9 + LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13 +END + +IDD_DLG_CREATE DIALOGEX 6,6,225,209 +CAPTION "T[rXÌì¬" +FONT 9, "MS UI Gothic",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP +BEGIN + EDITTEXT IDC_CREATE_SERVNAME, 72, 12, 150, 11, WS_CHILD | WS_VISIBLE | WS_EX_CLIENTEDGE + EDITTEXT IDC_CREATE_DISPNAME, 72, 31, 150, 11, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_PATH, 10, 62, 210, 13, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_DESC, 10, 97, 210, 48, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_OPTIONS, 10, 162, 210, 13, WS_CHILD | WS_VISIBLE + LTEXT "*T[rX¼ :", IDC_STATIC, 12, 12, 54, 9 + LTEXT "*\\¦¼ :", IDC_STATIC, 12, 33, 54, 9 + LTEXT "*Àst@CÌpX :", IDC_STATIC, 10, 51, 68, 9 + LTEXT "à¾ :", IDC_STATIC, 12, 86, 44, 9 + PUSHBUTTON "OK", IDOK, 126, 192, 44, 13 + PUSHBUTTON "LZ", IDCANCEL, 176, 192, 46, 13 + LTEXT "ÇÁIvV (Ú×ÍwvðNbN)", IDC_STATIC, 10, 151, 134, 9 + PUSHBUTTON "wv", ID_CREATE_HELP, 10, 192, 44, 13 +END + +IDD_DLG_DELETE DIALOGEX 6,6,185,148 +CAPTION "T[rXÌí" +FONT 9, "MS UI Gothic",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME +BEGIN + ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 + LTEXT "ÌT[rXðíµÜ·©? ±ÌìÍæèÁ¹Ü¹ñ!", IDC_STATIC, 50, 6, 125, 25 + LTEXT "T[rX¼:",IDC_STATIC, 6, 40, 80, 9 + LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 + EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY + PUSHBUTTON "Í¢", IDOK, 26, 129, 54, 13 + DEFPUSHBUTTON "¢¢¦", IDCANCEL, 102, 129, 54, 13 +END + +IDD_DLG_DEPEND_STOP DIALOGEX 6,6,240,148 +CAPTION "¼ÌT[rXÌâ~" +FONT 9, "MS UI Gothic",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME +BEGIN + ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 + LTEXT "", IDC_STOP_DEPENDS, 40, 8, 170, 25 + LISTBOX IDC_STOP_DEPENDS_LB, 15, 40, 210, 70, WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE | LBS_NOSEL + LTEXT "±êçÌT[rXðâ~µÜ·©?",IDC_STATIC, 15, 110, 150, 10 + DEFPUSHBUTTON "Í¢", IDOK, 60, 129, 54, 14 + PUSHBUTTON "¢¢¦", IDCANCEL, 120, 129, 54, 14 +END + +IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 +CAPTION "IvV" +FONT 9, "MS UI Gothic",0,0 +STYLE 0x10CF0000 +BEGIN + LTEXT "", IDC_CREATE_HELP, 6, 5, 200, 150 + PUSHBUTTON "Ok", IDOK, 75, 130, 44, 13 +END + +IDD_DLG_PROGRESS DIALOGEX 6,6,255,89 +CAPTION "T[rX Rg[" +FONT 9, "MS UI Gothic",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME +EXSTYLE WS_EX_TOOLWINDOW +BEGIN + CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13 + LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11 + LTEXT "", IDC_SERVCON_NAME, 8, 25, 66, 11 + PUSHBUTTON "Â¶é(&C)", IDOK, 100, 70, 54, 13 +END + + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_FIRSTCOLUMN "¼O" + IDS_SECONDCOLUMN "à¾" + IDS_THIRDCOLUMN "óÔ" + IDS_FOURTHCOLUMN "X^[gAbvÌíÞ" + IDS_FITHCOLUMN "OI" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_STARTED "Jn" + IDS_SERVICES_STOPPED "â~" + IDS_SERVICES_AUTO "©®" + IDS_SERVICES_MAN "è®" + IDS_SERVICES_DIS "³ø" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NUM_SERVICES "T[rXÌ: %d" + IDS_STOP_DEPENDS "%s ðâ~·éêA±êçÌT[rXàâ~µÜ·" + IDS_NO_DEPENDS "<Ë¶ÖWÈµ>" + IDS_LICENSE "±ÌvOÍt[\\tgEFAÅ·B È½Í±êðAt[\\tgEFAàcÉæÁÄs³ê½ GNUêÊöOpø_ñ(o[W2©Aó]ÉæÁÄÍ»êÈ~Ìo[WÌ¤¿Çê©)ÌèßéðÌºÅÄÐzÜ½ÍüÏ·é±ÆªÅ«Ü·B\r\n\r\n±ÌvOÍLpÅ é±ÆðèÁÄzz³êÜ·ªA*SÌ³ÛØ* Å·B*¤ÆÂ\\«ÌÛØ*â*ÁèÌÚIÖÌK«*ÍA¾OÉ¦³ê½àÌàÜßS¶ÝµÜ¹ñBÚµÍGNUêÊöOpø_ñð²¾³¢B\r\n\r\n È½Í±ÌvOÆ¤ÉAGNUêÊöOpø_ñÌ¡»ðêó¯æÁ½Í¸Å·Bàµó¯æÁÄ¢È¯êÎAt[\\tgEFAàcÜÅ¿µÄ¾³¢(¶æÍ the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA)B" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_PROP "vpeB" + IDS_TOOLTIP_REFRESH "XV" + IDS_TOOLTIP_EXPORT "êðGNX|[g" + IDS_TOOLTIP_CREATE "Vµ¢T[rXÌì¬" + IDS_TOOLTIP_DELETE "ù¶ÌT[rXÌí" + IDS_TOOLTIP_START "T[rXÌJn" + IDS_TOOLTIP_STOP "T[rXÌâ~" + IDS_TOOLTIP_PAUSE "T[rXÌêâ~" + IDS_TOOLTIP_RESTART "T[rXÌÄN®" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_PROGRESS_INFO_START "ReactOS ÍÌT[rXðJnµæ¤ÆµÄ¢Ü·" + IDS_PROGRESS_INFO_STOP "ReactOS ÍÌT[rXðâ~µæ¤ÆµÄ¢Ü·" + IDS_PROGRESS_INFO_PAUSE "ReactOS ÍÌT[rXðêâ~µæ¤ÆµÄ¢Ü·" + IDS_PROGRESS_INFO_RESUME "ReactOS ÍÌT[rXðÄJµæ¤ÆµÄ¢Ü·" + IDS_CREATE_SUCCESS "T[rXÌì¬É¬÷µÜµ½" + IDS_DELETE_SUCCESS "T[rXÌíÉ¬÷µÜµ½" + IDS_CREATE_REQ "AX^XNÌÂ¢Ä\n¢éÚÍK{Å·" + IDS_DELETE_STOP "T[rXðí·éOÉè®Åâ~µÄ¾³¢!" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_OPTIONS "ì¬IvV:\r\nÓ: IvV¼ÍCR[LðÜñÅ¢Ü·B\r\n type= <own|share|interact|kernel|filesys|rec>\r\n (ùèl = own)\r\n start= <boot|system|auto|demand|disabled>\r\n (ùèl = demand) \r\n error= <normal|severe|critical|ignore>\r\n (ùèl = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(separated by / (forward slash))>\r\n obj= <AccountName|ObjectName>\r\n (ùèl = LocalSystem)\r\n password= <password>\r\n" +END + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HINT_BLANK " " + IDS_HINT_EXPORT " »ÝÌXgðt@CÉGNX|[gµÜ·B" + IDS_HINT_EXIT " ±ÌvOðI¹µÜ·B" + + IDS_HINT_CONNECT " ¼ÌRs[^ðÇµÜ·B" + IDS_HINT_START " Iðµ½T[rXðJnµÜ·B" + IDS_HINT_STOP " Iðµ½T[rXðâ~µÜ·B" + IDS_HINT_PAUSE " Iðµ½T[rXðêâ~µÜ·B" + IDS_HINT_RESUME " Iðµ½T[rXðÄJµÜ·B" + IDS_HINT_RESTART " Iðµ½T[rXðâ~µAJnµÜ·B" + IDS_HINT_REFRESH " T[rXÌêðXVµÜ·B" + IDS_HINT_EDIT " Iðµ½T[rXÌvpeBðÒWµÜ·B" + IDS_HINT_CREATE " Vµ¢T[rXðì¬µÜ·B" + IDS_HINT_DELETE " Iðµ½T[rXðíµÜ·B" + IDS_HINT_PROP " »ÝIð³êÄ¢éÚÌvpeB V[gðJ«Ü·B" + + IDS_HINT_LARGE " ACeðå«¢ACRÅ\\¦µÜ·B" + IDS_HINT_SMALL " ACeð¬³¢ACRÅ\\¦µÜ·B" + IDS_HINT_LIST " ACeðêÅ\\¦µÜ·B" + IDS_HINT_DETAILS " eACeÌîñðEBhEÉ\\¦µÜ·B" + IDS_HINT_CUST " \\¦ðJX^}CYµÜ·B" + + IDS_HINT_HELP " wv EBhEð\\¦µÜ·B" + IDS_HINT_ABOUT " ReactOS T[rX }l[WÉÂ¢Ä\\¦µÜ·B" + + IDS_HINT_SYS_RESTORE " ±ÌEBhEðÊíÌå«³É³µÜ·B" + IDS_HINT_SYS_MOVE " ±ÌEBhEðÚ®µÜ·B" + IDS_HINT_SYS_SIZE " ±ÌEBhEÌå«³ðÏXµÜ·B" + IDS_HINT_SYS_MINIMIZE " ±ÌEBhEðACRÉÜè½½ÝÜ·B" + IDS_HINT_SYS_MAXIMIZE " ±ÌEBhEðæÊ¢ÁÏ¢ÉJ«Ü·B" + IDS_HINT_SYS_CLOSE " ±ÌEBhEðÂ¶Ü·B" +END + +/* Application title */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ReactOS T[rX }l[W" +END Propchange: trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mscutils/servman/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/rsrc.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -28,6 +28,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/rapps/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -46,37 +46,37 @@ IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE 0, 0, 250, 144 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Settings" -FONT 8, "MS Shell Dlg" +CAPTION "Ýè" +FONT 9, "MS UI Gothic" BEGIN - GROUPBOX "General", -1, 4, 2, 240, 61 - AUTOCHECKBOX "&Save window position", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "&Update the list of accessible programs at start", IDC_UPDATE_AVLIST, 15, 29, 219, 12 - AUTOCHECKBOX "&Log of installation and removal of programs", IDC_LOG_ENABLED, 15, 46, 219, 12 + GROUPBOX "SÊ", -1, 4, 2, 240, 61 + AUTOCHECKBOX "EBhEÌêðÛ¶·é(&S)", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 + AUTOCHECKBOX "N®ÉpÅ«évOÌXgðXV·é(&U)", IDC_UPDATE_AVLIST, 15, 29, 219, 12 + AUTOCHECKBOX "vOÌCXg[ÆíðL^·é(&L)", IDC_LOG_ENABLED, 15, 46, 219, 12 - GROUPBOX "Downloading", -1, 4, 65, 240, 51 - LTEXT "Folder for downloadings:", -1, 16, 75, 100, 9 + GROUPBOX "_E[h", -1, 4, 65, 240, 51 + LTEXT "_E[h·étH_:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP - PUSHBUTTON "&Choose", IDC_CHOOSE, 187, 85, 50, 14 - AUTOCHECKBOX "&Delete installers of programs after installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 + PUSHBUTTON "Ið(&C)", IDC_CHOOSE, 187, 85, 50, 14 + AUTOCHECKBOX "CXg[ãÉvOÌCXg[ðí·é(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 + PUSHBUTTON "ftHg", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 181, 124, 60, 14 + PUSHBUTTON "LZ", IDCANCEL, 181, 124, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE 0, 0, 216, 97 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Program installation" -FONT 8, "MS Shell Dlg" +CAPTION "vOÌCXg[" +FONT 9, "MS UI Gothic" BEGIN LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35 - AUTORADIOBUTTON "&Install from a disk (CD or DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP - AUTORADIOBUTTON "&Download and install", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "fBXN©çCXg[ (CD â DVD)(&I)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP + AUTORADIOBUTTON "_E[hµÄCXg[(&D)", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP PUSHBUTTON "OK", IDOK, 86, 78, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 150, 78, 60, 14 + PUSHBUTTON "LZ", IDCANCEL, 150, 78, 60, 14 END IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 @@ -101,86 +101,86 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_TOOLTIP_INSTALL "CXg[" - IDS_TOOLTIP_UNINSTALL "ACXg[" - IDS_TOOLTIP_MODIFY "ÏX" - IDS_TOOLTIP_SETTINGS "Ýè" - IDS_TOOLTIP_REFRESH "XV" - IDS_TOOLTIP_EXIT "I¹" + IDS_TOOLTIP_INSTALL "CXg[" + IDS_TOOLTIP_UNINSTALL "ACXg[" + IDS_TOOLTIP_MODIFY "ÏX" + IDS_TOOLTIP_SETTINGS "Ýè" + IDS_TOOLTIP_REFRESH "XV" + IDS_TOOLTIP_EXIT "I¹" END STRINGTABLE DISCARDABLE BEGIN - IDS_APP_NAME "¼O" - IDS_APP_INST_VERSION "o[W" - IDS_APP_DESCRIPTION "Tv" + IDS_APP_NAME "¼O" + IDS_APP_INST_VERSION "o[W" + IDS_APP_DESCRIPTION "Tv" END STRINGTABLE DISCARDABLE BEGIN - IDS_INFO_VERSION "\no[W: " - IDS_INFO_DESCRIPTION "\nTv: " - IDS_INFO_PUBLISHER "\ns³: " - IDS_INFO_HELPLINK "\nwvÖÌN: " - IDS_INFO_HELPPHONE "\nwvÌdbÔ: " - IDS_INFO_README "\nReadmeÌÊu: " - IDS_INFO_REGOWNER "\no^³ê½LÒ: " - IDS_INFO_PRODUCTID "\nv_NgID: " - IDS_INFO_CONTACT "\nAæ: " - IDS_INFO_UPDATEINFO "\nAbvf[gîñ: " - IDS_INFO_INFOABOUT "\n±êÉÖ·éîñ: " - IDS_INFO_COMMENTS "\nRg: " - IDS_INFO_INSTLOCATION "\nCXg[ê: " - IDS_INFO_INSTALLSRC "\nCXg[³: " - IDS_INFO_UNINSTALLSTR "\nACXg[Égp·é¶ñ: " - IDS_INFO_MODIFYPATH "\nÏXÉgp·épX: " - IDS_INFO_INSTALLDATE "\nCXg[µ½út: " + IDS_INFO_VERSION "\no[W: " + IDS_INFO_DESCRIPTION "\nTv: " + IDS_INFO_PUBLISHER "\ns³: " + IDS_INFO_HELPLINK "\nwvÖÌN: " + IDS_INFO_HELPPHONE "\nwvÌdbÔ: " + IDS_INFO_README "\nReadmeÌÊu: " + IDS_INFO_REGOWNER "\no^³ê½LÒ: " + IDS_INFO_PRODUCTID "\nv_NgID: " + IDS_INFO_CONTACT "\nAæ: " + IDS_INFO_UPDATEINFO "\nAbvf[gîñ: " + IDS_INFO_INFOABOUT "\n±êÉÖ·éîñ: " + IDS_INFO_COMMENTS "\nRg: " + IDS_INFO_INSTLOCATION "\nCXg[ê: " + IDS_INFO_INSTALLSRC "\nCXg[³: " + IDS_INFO_UNINSTALLSTR "\nACXg[Égp·é¶ñ: " + IDS_INFO_MODIFYPATH "\nÏXÉgp·épX: " + IDS_INFO_INSTALLDATE "\nCXg[µ½út: " END STRINGTABLE DISCARDABLE BEGIN - IDS_AINFO_VERSION "\no[W: " - IDS_AINFO_DESCRIPTION "\nTv: " - IDS_AINFO_SIZE "\nTCY: " - IDS_AINFO_URLSITE "\nz[y[W: " - IDS_AINFO_LICENCE "\nCZX: " + IDS_AINFO_VERSION "\no[W: " + IDS_AINFO_DESCRIPTION "\nTv: " + IDS_AINFO_SIZE "\nTCY: " + IDS_AINFO_URLSITE "\nz[y[W: " + IDS_AINFO_LICENCE "\nCZX: " END STRINGTABLE DISCARDABLE BEGIN - IDS_CAT_AUDIO "I[fBI" - IDS_CAT_DEVEL "J" - IDS_CAT_DRIVERS "hCo" - IDS_CAT_EDU "³ç" - IDS_CAT_ENGINEER "Hw" - IDS_CAT_FINANCE "oc" - IDS_CAT_GAMES "Q[Æ¨yµÝ" - IDS_CAT_GRAPHICS "OtBbNX" - IDS_CAT_INTERNET "C^[lbgÆlbg[N" - IDS_CAT_LIBS "Cu" - IDS_CAT_OFFICE "ItBX" - IDS_CAT_OTHER "»Ì¼" - IDS_CAT_SCIENCE "Èw" - IDS_CAT_TOOLS "c[" - IDS_CAT_VIDEO "rfI" + IDS_CAT_AUDIO "I[fBI" + IDS_CAT_DEVEL "J" + IDS_CAT_DRIVERS "hCo" + IDS_CAT_EDU "³ç" + IDS_CAT_ENGINEER "Hw" + IDS_CAT_FINANCE "oc" + IDS_CAT_GAMES "Q[Æ¨yµÝ" + IDS_CAT_GRAPHICS "OtBbNX" + IDS_CAT_INTERNET "C^[lbgÆlbg[N" + IDS_CAT_LIBS "Cu" + IDS_CAT_OFFICE "ItBX" + IDS_CAT_OTHER "»Ì¼" + IDS_CAT_SCIENCE "Èw" + IDS_CAT_TOOLS "c[" + IDS_CAT_VIDEO "rfI" END STRINGTABLE DISCARDABLE BEGIN - IDS_APPTITLE "ReactOS AvP[V }l[W[" - IDS_SEARCH_TEXT "õ..." - IDS_INSTALL "CXg[" - IDS_UNINSTALL "ACXg[" - IDS_MODIFY "ÏX" - IDS_APPS_COUNT "AvP[V: %d" - IDS_WELCOME_TITLE "ReactOS AvP[V }l[W[Öæ¤±»!\n\n" - IDS_WELCOME_TEXT "¶¤©çJeSðIðµACXg[ÍACXg[·éAvP[VðIñÅ¾³¢B\nReactOS EFu TCg: " - IDS_WELCOME_URL "http://www.reactos.org" - IDS_INSTALLED "CXg[ÏÝ" - IDS_AVAILABLEFORINST "CXg[Â\\" - IDS_UPDATES "Abvf[g" - IDS_APPLICATIONS "AvP[V" - IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will be used for downloading of programs:" - IDS_CHOOSE_FOLDER_ERROR "You have specified a nonexistent folder!" - IDS_USER_NOT_ADMIN "You should be administrator for start ""ReactOS Applications Manager""!" + IDS_APPTITLE "ReactOS AvP[V }l[W[" + IDS_SEARCH_TEXT "õ..." + IDS_INSTALL "CXg[" + IDS_UNINSTALL "ACXg[" + IDS_MODIFY "ÏX" + IDS_APPS_COUNT "AvP[V: %d" + IDS_WELCOME_TITLE "ReactOS AvP[V }l[W[Öæ¤±»!\n\n" + IDS_WELCOME_TEXT "¶¤©çJeSðIðµACXg[ÍACXg[·éAvP[VðIñÅ¾³¢B\nReactOS EFu TCg: " + IDS_WELCOME_URL "http://www.reactos.org" + IDS_INSTALLED "CXg[ÏÝ" + IDS_AVAILABLEFORINST "CXg[Â\\" + IDS_UPDATES "Abvf[g" + IDS_APPLICATIONS "AvP[V" + IDS_CHOOSE_FOLDER_TEXT "vOÌ_E[hÉgp·étH_ðIðµÄ¾³¢:" + IDS_CHOOSE_FOLDER_ERROR "wè³ê½tH_Í¶ÝµÜ¹ñ!" + IDS_USER_NOT_ADMIN """ReactOS AvP[V }l[W["" ðN®·éÉÍÇÒ ÀÅ éKvª èÜ·!" END Added: trunk/reactos/base/applications/screensavers/3dtext/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/lang/ja-JP.rc (added) +++ trunk/reactos/base/applications/screensavers/3dtext/lang/ja-JP.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -1,0 +1,17 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "3D eLXg XN[Z[o[ÌÝè" +FONT 9, "MS UI Gothic", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,216,7,50,14 + PUSHBUTTON "LZ",IDCANCEL,216,24,50,14 + EDITTEXT IDC_MESSAGE_TEXT,18,28,122,14,ES_AUTOHSCROLL + LTEXT "JX^ eLXg",IDC_STATIC,18,17,65,8 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "3D eLXg XN[Z[o[" +END Propchange: trunk/reactos/base/applications/screensavers/3dtext/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -18,6 +18,7 @@ #include "lang/eu-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/lt-LT.rc" #include "lang/no-NO.rc" Added: trunk/reactos/base/applications/screensavers/logon/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/lang/ja-JP.rc (added) +++ trunk/reactos/base/applications/screensavers/logon/lang/ja-JP.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -1,0 +1,7 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "OI XN[Z[o[" + IDS_TEXT "ÝèªKvÈIvVÍ èÜ¹ñB" +END Propchange: trunk/reactos/base/applications/screensavers/logon/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/screensavers/logon/logon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -20,6 +20,7 @@ #include "lang/es-ES.rc" #include "lang/eu-ES.rc" #include "lang/fr-FR.rc" +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" Added: trunk/reactos/dll/cpl/powercfg/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/ja-J… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/ja-JP.rc (added) +++ trunk/reactos/dll/cpl/powercfg/lang/ja-JP.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -1,0 +1,164 @@ +// Japanese (ja-JP) resources by Tomoya Kitagawa (jptomoya at yahoo dot co dot jp) + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_PROPPAGEPOWERSHEMES DIALOGEX 0, 0, 252, 237 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "d¹Ýè" +FONT 9, "MS UI Gothic" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 + LTEXT "±ÌRs[^ÉÅàKµ½d¹ÝèðIðµÄ¾³¢BºÌÝèðÏX·éÆAIð³ê½d¹ÝèàÏX³êé_ÉÓµÄ¾³¢B", + -1,37, 6, 209, 36 + GROUPBOX "d¹Ýè(&O)", -1, 6, 43, 240, 50 + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "¼Oðt¯ÄÛ¶(&S)...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED + PUSHBUTTON "í(&D)", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED + GROUPBOX "s¾", IDC_GRPDETAIL, 6, 95, 240, 136 + LTEXT "Rs[^ÌóÔ:",IDC_SAT, 12, 109, 60, 12 + LTEXT "d¹ÉÚ±",IDC_SAC, 123, 110, 45, 15 + ICON IDI_AC, IDC_IAC, 97, 108, 21, 20 + LTEXT "obegp",IDC_SDC, 195, 110, 45, 15 + ICON IDI_DC, IDC_IDC, 170, 108, 21, 20 + LTEXT "j^Ìd¹ðØé(&M):",IDC_MONITOR, 13, 148, 84, 10 + COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "n[hfBXNÌd¹ðØé(&I):",IDC_DISK, 13, 171, 84, 10 + COMBOBOX IDC_DISKACLIST, 100, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DISKDCLIST, 173, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "VXe X^oC(&T):",IDC_STANDBY, 13, 191, 84, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "VXeðx~óÔÉ·é(&H):",IDC_HYBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HYBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HYBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + +IDD_PROPPAGEALARMS DIALOGEX DISCARDABLE 0, 0, 252, 237 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "A[" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "obeáºA[",-1, 6, 7, 239, 104 + CONTROL "d¹xªÉBµ½çobeáºA[Åmç¹é(&L):",IDC_ALARM1, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP, 15, 17, 190, 15 + LTEXT "s¾",IDC_ALARMVALUE1, 209, 20, 33, 10 + LTEXT "0%",-1, 28, 43, 15, 10 + CONTROL "Slider1",IDC_ALARMBAR1,"msctls_trackbar32",TBS_HORZ | + TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15 + LTEXT "100%", -1, 214, 43, 25, 10 + PUSHBUTTON "A[Ì®ì(&M)...",-1, 17, 69, 70, 14,WS_DISABLED + LTEXT "Êmû@:",-1, 95, 71, 57, 10 + LTEXT "s¾",IDC_ALARMMSG1, 154, 71, 84, 10 + LTEXT "®ì:",-1, 95, 83, 55, 10 + LTEXT "s¾",IDC_ALARMAKTION1, 154, 83, 84, 10 + LTEXT "vOÌÀs:",-1, 95, 95, 55, 10 + LTEXT "s¾",IDC_ALARMPROG1, 154, 95, 84, 10 + + GROUPBOX "obeÀEA[",-1, 6, 120, 239, 106 + CONTROL "d¹xªÉBµ½çobeÀEA[Åmç¹é(&C):",IDC_ALARM2, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP, 15, 131, 180, 15 + LTEXT "s¾",IDC_ALARMVALUE2, 209, 133, 33, 10 + LTEXT "0%",-1, 28, 154, 15, 10 + CONTROL "Slider1",IDC_ALARMBAR2,"msctls_trackbar32",TBS_HORZ | + TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15 + LTEXT "100%",-1, 214, 154, 25, 10 + PUSHBUTTON "A[Ì®ì(&M)...",-1, 17, 183, 70, 14, WS_DISABLED + LTEXT "Êmû@:",-1, 95, 185, 50, 10 + LTEXT "s¾",IDC_ALARMMSG2, 154, 185, 84, 10 + LTEXT "®ì:",-1, 95, 198, 45, 10 + LTEXT "s¾",IDC_ALARMAKTION2, 154, 198, 84, 10 + LTEXT "vOÌÀs:",-1, 95, 211, 50, 10 + LTEXT "s¾",IDC_ALARMPROG2, 154, 211, 84, 10 +END + +IDD_PROPPAGEADVANCED DIALOGEX DISCARDABLE 0, 0, 252, 237 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ú×Ýè" +FONT 9, "MS UI Gothic" +BEGIN + ICON IDI_ACDC,IDI_ACDC, 7, 7, 20, 20 + LTEXT "gp·éÈdÍÝèðIðµÄ¾³¢B",-1, 37, 6, 207, 20 + GROUPBOX "IvV",-1, 6, 30, 240, 65 + CONTROL "ACRðíÉ^XN o[É\\¦·é(&S)",IDC_SYSTRAYBATTERYMETER,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP, 17, 43, 220, 10 + CONTROL "X^oC©çñ·éÆ«ÉpX[hÌüÍðßé(&P)",IDC_PASSWORDLOGON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP, 17, 60, 220, 10 + CONTROL "obeðgp·éÆ«ÍAÃ\\¦·é(&D)",IDC_VIDEODIMDISPLAY,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP, 17, 78, 220, 10 + GROUPBOX "d¹{^",-1, 6, 101, 240, 127 + LTEXT "|[^u Rs[^ðÂ¶½Æ«(&W):", IDC_SLIDCLOSE, 15, 115, 222, 10 + COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "Rs[^Ìd¹{^ðµ½Æ«(&E):", IDC_SPOWERBUTTON, 15, 153, 222, 10 + COMBOBOX IDC_POWERBUTTON, 15, 165, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "Rs[^ÌX[v {^ðµ½Æ«(&N):", IDC_SSLEEPBUTTON, 15, 191, 222, 10 + COMBOBOX IDC_SLEEPBUTTON, 15, 203, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP +END + +IDD_PROPPAGEHIBERNATE DIALOGEX DISCARDABLE 0, 0, 252, 237 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "x~óÔ" +FONT 9, "MS UI Gothic" +BEGIN + ICON IDI_HIBERNATE,IDI_HIBERNATE, 7, 7, 20, 20 + LTEXT "x~óÔÉÈéÆARs[^ÍãÉ éàÌð·×Än[h fBXNÉi[µÄ©çVbg_EµÜ·Bx~óÔªð³êéÆARs[^ÍÈOÌóÔÉßèÜ·B ", + -1, 37, 6, 210, 35 + GROUPBOX "x~óÔ",-1, 6, 41, 240, 32 + CONTROL "x~óÔðLøÉ·é(&H)",IDC_HIBERNATEFILE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP, 17, 55, 210, 10 + GROUPBOX "x~Ì½ßÌfBXNÌæ",-1, 6, 80, 240, 76 + LTEXT "fBXNÌó«Ìæ:",-1, 15, 95, 140, 10 + LTEXT "s¾",IDC_FREESPACE, 160, 95, 80, 10 + LTEXT "x~óÔÉKvÈfBXNÌæ:",-1, 15, 115, 140, 10 + LTEXT "s¾",IDC_SPACEFORHIBERNATEFILE, 160, 115, 80, 10 + LTEXT "x~óÔðT|[g·éÉÍAfBXNÌó«Ìæðâ·Kvª èÜ·B ",IDC_TOLESSFREESPACE, 15, 135, 224, 20 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME_1 "d¹IvV" + IDS_CPLDESCRIPTION_1 "Rs[^ÌÈdÍÝèð\\¬µÜ·B" + IDS_PROCENT "%i%%" + IDS_SOUND "¹" + IDS_TEXT "eLXg" + IDS_CONFIG1 "[%1] Ìd¹Ýè" + IDS_CONFIG2 "%1ÌÚ×Ýè" + + IDS_SIZEBYTS "%i oCg" + IDS_SIZEMB "%i MB" + + IDS_NOACTION "½àµÈ¢" + + IDS_PowerActionNone1 "½àµÈ¢" + IDS_PowerActionUnknown "s¾" + IDS_PowerActionSleep "X^oC" + IDS_PowerActionHibernate "x~óÔ" + IDS_PowerActionShutdown "Vbg_E" + IDS_PowerActionRestart "ÄN®" + IDS_PowerActionShutdownOff "Vbg_EµÄd¹ðØé" + IDS_PowerActionWarmEject "üÍðßé" + IDS_PowerActionNone2 "Èµ" + + IDS_TIMEOUT1 "1 ªã" + IDS_TIMEOUT2 "2 ªã" + IDS_TIMEOUT3 "3 ªã" + IDS_TIMEOUT4 "5 ªã" + IDS_TIMEOUT5 "10 ªã" + IDS_TIMEOUT6 "15 ªã" + IDS_TIMEOUT7 "20 ªã" + IDS_TIMEOUT8 "25 ªã" + IDS_TIMEOUT9 "30 ªã" + IDS_TIMEOUT10 "45 ªã" + IDS_TIMEOUT11 "1 Ôã" + IDS_TIMEOUT12 "2 Ôã" + IDS_TIMEOUT13 "3 Ôã" + IDS_TIMEOUT14 "4 Ôã" + IDS_TIMEOUT15 "5 Ôã" + IDS_TIMEOUT16 "Èµ" + + IDS_DEL_SCHEME "±Ìd¹ÝèðíµÜ·©?" + IDS_DEL_SCHEME_TITLE "d¹ÝèÌí" +END Propchange: trunk/reactos/dll/cpl/powercfg/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/powercfg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/rsrc.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -10,6 +10,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" Added: trunk/reactos/dll/cpl/telephon/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/ja-J… ============================================================================== --- trunk/reactos/dll/cpl/telephon/lang/ja-JP.rc (added) +++ trunk/reactos/dll/cpl/telephon/lang/ja-JP.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -1,0 +1,7 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "dbÆfÌIvV" + IDS_CPLSYSTEMDESCRIPTION "dbÌ_CîñÆfÌvpeBð\\¬µÜ·B" +END Propchange: trunk/reactos/dll/cpl/telephon/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/telephon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/telephon/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/telephon/rsrc.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -9,6 +9,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/ro-RO.rc" Modified: trunk/reactos/dll/cpl/timedate/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/ja-J… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/timedate/lang/ja-JP.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -33,36 +33,36 @@ COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE - AUTOCHECKBOX "©®IÉT}[ ^CÌ²®ð·é(&D)", + AUTOCHECKBOX "©®IÉÄÔÌ²®ð·é(&D)", IDC_AUTODAYLIGHT, 6, 132, 242, 11, WS_VISIBLE | WS_GROUP | WS_TABSTOP END IDD_INETTIMEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Internet Time" +CAPTION "C^[lbg" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Automatically synchronize with an Internet time server", IDC_AUTOSYNC, - "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,11,7,241,10 - LTEXT "Server:", -1, 34, 22, 28, 13 - PUSHBUTTON "Update Now", IDC_UPDATEBUTTON, 187, 22, 49, 14 + AUTOCHECKBOX "©®IÉC^[lbgT[o[Æ¯ú·é", IDC_AUTOSYNC, + 11 ,7, 241, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + LTEXT "T[o[:", IDC_SERVERTEXT, 34, 22, 28, 13 + PUSHBUTTON "¡·®XV", IDC_UPDATEBUTTON, 187, 22, 49, 14 LTEXT "", IDC_SUCSYNC, 16, 54, 214, 23 LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 - LTEXT "Synchronazation can only occur when your computer is connected to the internet.", -1, 12, 114, 225, 25 + LTEXT "Rs[^ªC^[lbgÉÚ±µÄ¢éêÉÌÝ¯úÍsíêÜ·B", -1, 12, 114, 225, 25 END STRINGTABLE BEGIN - IDS_CPLNAME "útÆ" - IDS_CPLDESCRIPTION "útAA^C ][ðÝèµÜ·B" - IDS_TIMEZONETEXT "»ÝÌ^C ][: %s" - IDS_TIMEZONEINVALID "s³Èl" + IDS_CPLNAME "útÆ" + IDS_CPLDESCRIPTION "útAÆ^C ][ðÝèµÜ·B" + IDS_TIMEZONETEXT "»ÝÌ^C ][: %s" + IDS_TIMEZONEINVALID "³ø" IDS_TIMEZONEUNKNOWN "s¾" - IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on %s at %s" - IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" - IDS_INETTIMESYNCING "Please wait while ReactOS synchronizes the time with %s" - IDS_INETTIMEERROR "An error occured while ReactOS was synchronizing with %s" + IDS_INETTIMESUCSYNC "Í %s Æ %s %s É³íÉ¯úµÜµ½" + IDS_INETTIMENEXTSYNC "ñÌ¯ú: %s %s" + IDS_INETTIMESYNCING "ReactOSª %s Æ¯ú·éÔA¨Ò¿¾³¢" + IDS_INETTIMEERROR "ReactOSª %s Æ¯úÉG[ª¶µÜµ½" END Added: trunk/reactos/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ja-J… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ja-JP.rc (added) +++ trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -1,0 +1,57 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "¨Ò¿¾³¢..." +FONT 9, "MS UI Gothic",400,0,1 +BEGIN + LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS +END + +IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "ReactOS Öæ¤±»" +FONT 9, "MS UI Gothic",400,0,1 +BEGIN + ICON IDI_LOCKICON, -1, 7, 5, 32, 32 + LTEXT "Ctrl-Alt-Del L[ÌgÝí¹ðµÄ¾³¢",IDC_STATIC, 38, 10, 144, 14 +END + +IDD_LOGGEDOUT_DLG DIALOGEX 0,0,275,147 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "OI" +FONT 9, "MS UI Gothic",400,0,1 +BEGIN + PUSHBUTTON "OK",IDOK,51,122,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "LZ",IDCANCEL,115,122,50,14 + PUSHBUTTON "Vbg_E",IDC_SHUTDOWN,179,122,50,14 + LTEXT "[U[¼:",IDC_STATIC,36,75,40,8 + LTEXT "pX[h:",IDC_STATIC,36,93,42,8 + EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL + EDITTEXT IDC_PASSWORD,84,91,119,14,ES_AUTOHSCROLL | ES_PASSWORD + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 +END + +IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU +CAPTION "ZLeB" +FONT 9, "MS UI Gothic",400,0,1 +BEGIN + PUSHBUTTON "LZ",IDCANCEL,170,95,70,14 + PUSHBUTTON "OIt",IDC_LOGOFF,90,76,70,14 + PUSHBUTTON "Vbg_E",IDC_SHUTDOWN,170,76,70,14 + LTEXT "½ðµÜ·©?",IDC_STATIC,86,60,87,8 + PUSHBUTTON "Rs[^ÌbN",IDC_LOCK,10,76,70,14 + PUSHBUTTON "^XN }l[W",IDC_TASKMGR,90,95,70,14 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 +END + +STRINGTABLE +BEGIN + IDS_LOGGEDOUTSAS "æ¤±»!" + IDS_LOCKEDSAS "±ÌRs[^Í»ÝbN³êÄ¢Ü·B" + IDS_PRESSCTRLALTDELETE "OI·éÉÍAControl+Alt+Delete ðµÄ¾³¢B" + IDS_ASKFORUSER "[U[¼: " + IDS_ASKFORPASSWORD "pX[h: " + IDS_FORCELOGOFF "»ÝÌ[U[ðOAEgµÜ·BÛ¶³êÄ¢È¢f[^Í·×Ä¸íêÜ·B ±sµÜ·©?" +END Propchange: trunk/reactos/dll/win32/msgina/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rc… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -17,6 +17,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/ro-RO.rc" Added: trunk/reactos/dll/win32/netid/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/ja-JP… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/ja-JP.rc (added) +++ trunk/reactos/dll/win32/netid/lang/ja-JP.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -1,0 +1,78 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, 256, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Rs[^¼" +FONT 9, "MS UI Gothic" +BEGIN + ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON + LTEXT "ReactOSÍÌîñðgÁÄlbg[NãÅ±ÌRs[^ð¯ÊµÜ·B", IDC_STATIC, 40, 5, 204, 20 + LTEXT "Rs[^Ìà¾:", IDC_STATIC, 6, 40, 90, 9 + EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "t Rs[^¼:", IDC_STATIC, 6, 68, 85, 9 + LTEXT "(ùèl)", IDC_COMPUTERNAME, 98, 68, 144, 11 + LTEXT "[NO[v:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "(Èµ)", IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 9 + LTEXT "lbg[N ID EBU[hðgÁÄhCÖÌQÁ¨æÑ[J [U[Ìì¬ðs¤ÉÍA[lbg[N ID] ðNbNµÄ¾³¢B", IDC_STATIC, 6, 113, 172, 24 + PUSHBUTTON "lbg[N ID(&N)...", IDC_NETWORK_ID, 190, 114, 58, 15 + LTEXT "Rs[^¼ðÏXµ½èhCÉQÁµ½è·éÉÍ [ÏX] ðNbNµÄ¾³¢B", IDC_STATIC, 6, 149, 170, 17 + PUSHBUTTON "ÏX(&C)...",IDC_NETWORK_PROPERTY, 190, 149, 58, 15 + LTEXT "Ó: ±ÌRs[^Ì ID ðÏXÅ«éÌÍÇÒÌÝÅ·B", IDC_STATIC, 6, 179, 300, 9 +END + +IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Rs[^¼ÌÏX" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "(±±ÉbZ[W)", 1017, 7, 5, 218, 30 + LTEXT "Rs[^¼(&C):", -1, 7, 41, 219, 8 + EDITTEXT 1002, 7, 53, 218, 14, ES_AUTOHSCROLL | ES_OEMCONVERT + LTEXT "t Rs[^¼:", 1016, 7, 72, 218, 10 + EDITTEXT 1001, 7, 82, 219, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + PUSHBUTTON "Ú×(&M)...", 1003, 150, 102, 75, 14 + GROUPBOX "Ìo", 1018, 7, 119, 219, 73 + AUTORADIOBUTTON "hC(&D):", 1008, 17, 132, 192, 10, WS_GROUP + AUTORADIOBUTTON "[NO[v(&W):", 1004, 17, 161, 191, 10 + EDITTEXT 116, 28, 144, 181, 14, ES_AUTOHSCROLL | WS_GROUP + PUSHBUTTON "hCÌõ(&F)", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED + EDITTEXT 1007, 28, 172, 181, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_OEMCONVERT + DEFPUSHBUTTON "OK", 1, 121, 203, 50, 14, WS_GROUP + PUSHBUTTON "LZ", 2, 176, 203, 50, 14 +END + +IDD_PROPPAGEDNSANDNETBIOS DIALOGEX 0, 0, 266, 125 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "DNS TtBbNXÆ NetBIOS Rs[^¼" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "±ÌRs[^ÌvC} DNS TtBbNX(&P):", -1, 7, 5, 253, 8 + EDITTEXT 1011, 7, 17, 252, 14, ES_AUTOHSCROLL + AUTOCHECKBOX "hCÌoVbvªÏX³êéÆ«ÉvC} DNS TtBbNXðÏX·é(&C)", 115, 11, 39, 250, 10 + LTEXT "NetBIOS Rs[^¼(&N):", -1, 7, 57, 148, 8 + EDITTEXT 1013, 7, 69, 150, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_READONLY + DEFPUSHBUTTON "OK", 1, 153, 104, 50, 14 + PUSHBUTTON "LZ", 2, 209, 104, 50, 14 + LTEXT "±Ì¼OÍAÃ¢Rs[^âT[rXÆÌÔÌÝ^pÉgp³êÜ·B", 13, 7, 88, 253, 8 +END + +STRINGTABLE +BEGIN + 1 "* s¾ *" + 2 "WORKGROUP" + 3 "hCÌoVbvîñðÇÝæèÉAÌG[ª¶µÜµ½:" + 4 "Rs[^¼ÌÏX" + 5 "[NO[v:" + 6 "hC:" + 22 "%1 [NO[vÖæ¤±»B" + 23 "%1 hCÖæ¤±»B" + 24 "ÏXðLøÉ·éÉÍARs[^ðÄN®µÄ¾³¢B" + 25 "±ÌRs[^Ì¼OÆoVbvðÏXÅ«Ü·BÏX·éÆlbg[N \\[XÖÌANZXÉe¿·éÂ\\«ª èÜ·B" + 1021 "Ó: ±ÌRs[^Ì ID ðÏXÅ«éÌÍÇÒÌÝÅ·B" + 1022 "Ó: ÌRÉæèA±ÌRs[^Ì ID ðÏXÅ«Ü¹ñ:" + 1030 "Vµ¢Rs[^¼ ""%s"" ÉÍAgpÅ«È¢È¶ªÜÜêÄ¢Ü·BgpÅ«È¢¶Í ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / ? Å·B" + 3210 "Ú×(&D) >>" + 3220 "<< Ú×(&D)" + 4000 "îñ" + 4001 "Vµ¢Rs[^¼ðÝèÅ«Ü¹ñ!" +END Propchange: trunk/reactos/dll/win32/netid/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/netid/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/rsrc.rc?re… ============================================================================== --- trunk/reactos/dll/win32/netid/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/rsrc.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -9,6 +9,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/id-ID.rc" +#include "lang/ja-JP.rc" #include "lang/it-IT.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" Added: trunk/reactos/dll/win32/newdev/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ja-J… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/ja-JP.rc (added) +++ trunk/reactos/dll/win32/newdev/lang/ja-JP.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -1,0 +1,109 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "foCXÌCXg[" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "æ¤±»",IDC_WELCOMETITLE,120,8,195,24 + LTEXT "±ÌEBU[hÅÍAÈºÌVµ¢foCX hCoðCXg[µÜ·:", + IDC_STATIC,120,21,195,16 + LTEXT "±s·éÉÍA[Ö] ðNbNµÄ¾³¢B",IDC_STATIC,120,169,195,17 + LTEXT "s¾ÈfoCX",IDC_DEVICE,134,36,164,11 + LTEXT "x! JX^ foCXðCXg[·éÆARs[^ªt[Yµ½èAN®s\\ÉÈéÂ\\«ª èÜ·!",IDC_STATIC,120,59,195,16 + CONTROL "hCoð©®IÉCXg[·é",IDC_RADIO_AUTO,"Button", + BS_AUTORADIOBUTTON,120,112,178,13 + CONTROL "hCoðÁèÌê©çCXg[·é",IDC_RADIO_MANUAL, + "Button",BS_AUTORADIOBUTTON,120,133,164,14 +END + +IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "foCXÌCXg[" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "CXg[¸s",IDC_FINISHTITLE,120,8,195,24 + LTEXT "hCoª©Â©çÈ©Á½½ßAfoCXÍCXg[³êÜ¹ñÅµ½B", + IDC_STATIC,120,40,195,19 + LTEXT "hCoÌfBXNðÁÄ¢½èAhCoÖÌpXðmÁÄ¢éêÍA[ßé] ðNbNµÄ¾³¢B", + IDC_STATIC,120,98,181,24 + CONTROL "±Ì_CAOð¡ã\\¦µÈ¢",IDC_DONOTSHOWDLG,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 +END + +IDD_INSTALLFAILED DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "foCXÌCXg[" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "CXg[¸s",IDC_FINISHTITLE,120,8,195,24 + LTEXT "\\ú¹ÊG[ª¶µ½½ßAfoCXÍCXg[³êÜ¹ñÅµ½B", + IDC_STATIC,120,40,195,19 + LTEXT "s¾ÈfoCX",IDC_DEVICE,134,55,164,11 +END + +IDD_CHSOURCE DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "foCXÌCXg[" +FONT 9, "MS UI Gothic" +BEGIN + CONTROL "Ìêðõ·é",IDC_RADIO_SEARCHHERE,"Button", + BS_AUTORADIOBUTTON,27,11,239,13 + CONTROL "è®ÅhCoðIð·é",IDC_RADIO_CHOOSE,"Button", + BS_AUTORADIOBUTTON,27,98,171,12 + CONTROL "[ou fBAðõ",IDC_CHECK_MEDIA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,47,33,163,9 + CONTROL "ÌpXðÜßé",IDC_CHECK_PATH,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,47,54,162,10 + PUSHBUTTON "QÆ",IDC_BROWSE,248,69,50,14 + COMBOBOX IDC_COMBO_PATH,61,71,176,12,CBS_DROPDOWN | CBS_SORT | + WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL +END + +IDD_SEARCHDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "foCXÌCXg[" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "s¾ÈfoCX",IDC_DEVICE,51,20,169,16 +END + +IDD_INSTALLDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "foCXÌCXg[" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "s¾ÈfoCX",IDC_DEVICE,51,20,169,16 +END + +IDD_NEEDREBOOT DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "foCXÌCXg[" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "CXg[®¹",IDC_FINISHTITLE,120,8,195,11 + LTEXT "ÈºÌCXg[ð®¹·éÉÍÄN®ªKvÅ·:", + IDC_STATIC,120,32,195,19 + LTEXT "[®¹] ðNbN·éÆEBU[hðÂ¶Ü·B",IDC_STATIC,120,174, + 179,11 + LTEXT "s¾ÈfoCX",IDC_DEVICE,148,53,147,12 +END + +IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "foCXÌCXg[" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "CXg[®¹",IDC_FINISHTITLE,120,8,195,11 + LTEXT "EBU[hÍÈºÌhCoÌCXg[ð®¹µÜµ½:", + IDC_STATIC,120,32,195,19 + LTEXT "[®¹] ðNbN·éÆEBU[hðÂ¶Ü·B",IDC_STATIC,120,174, + 179,11 + LTEXT "s¾ÈfoCX",IDC_DEVICE,148,53,147,12 +END + Propchange: trunk/reactos/dll/win32/newdev/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/newdev/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/win32/newdev/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/rsrc.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -16,6 +16,7 @@ #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/ro-RO.rc" Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Sun Sep 20 21:35:23 2009 @@ -128,7 +128,7 @@ LTEXT "o[W " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "±ÌReactOSÌo[WÍÌûÉöF³êÄ¢Ü·:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "±ÌReactOSÌo[WÍÌûÉo^³êÄ¢Ü·:", IDC_STATIC, 35, 115, 180, 10 LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ @@ -143,7 +143,7 @@ STYLE DS_SHELLFONT | WS_CHILD FONT 9, "MS UI Gothic" BEGIN - LTEXT "ReactOSÍÌûXÉæÁÄà½ç³êÜµ½:", IDC_STATIC, 0, 0, 180, 10 + LTEXT "ReactOSÍÌûXÉæÁÄñ³êÄ¢Ü·:", IDC_STATIC, 0, 0, 180, 10 LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END @@ -219,7 +219,6 @@ AUTOCHECKBOX "ÇÝæèêp(&R)", 14021, 45, 150, 67, 10 AUTOCHECKBOX "Bµt@C(&H)", 14022, 126, 150, 50, 10 END - SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION @@ -586,7 +585,7 @@ LTEXT "t@C¼:", -1, 7, 14, 208, 10 PUSHBUTTON "QÆ...",IDC_BUTTON_PATH, 148, 24,67,14 EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Icons:", -1, 7, 47, 208, 10 + LTEXT "ACR:", -1, 7, 47, 208, 10 LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 PUSHBUTTON "LZ",IDCANCEL, 167, 181, 50, 14 @@ -634,12 +633,12 @@ IDS_SELECT "Ið" IDS_OPEN "J" IDS_CREATELINK "V[gJbgÌì¬(&L)" - IDS_COPY "Rs[" + IDS_COPY "Rs[(&C)" IDS_DELETE "í" IDS_PROPERTIES "vpeB" - IDS_CUT "Øèæè" + IDS_CUT "Øèæè(&U)" IDS_RESTORE "³Éß·" - IDS_FORMATDRIVE "®..." + IDS_FORMATDRIVE "tH[}bg..." IDS_RENAME "¼OÌÏX" IDS_INSERT "}ü" @@ -669,14 +668,14 @@ /* shell folder path default values */ IDS_PROGRAMS "X^[g j[\\vO" - IDS_PERSONAL "}C hLg" - IDS_FAVORITES "¨CÉüè" + IDS_PERSONAL "My Documents" + IDS_FAVORITES "Favorites" IDS_STARTUP "X^[g j[\\vO\\X^[gAbv" IDS_RECENT "Recent" IDS_SENDTO "SendTo" IDS_STARTMENU "X^[g j[" - IDS_MYMUSIC "}C ~[WbN" - IDS_MYVIDEO "}C rfI" + IDS_MYMUSIC "My Music" + IDS_MYVIDEO "My Videos" IDS_DESKTOPDIRECTORY "fXNgbv" IDS_NETHOOD "NetHood" IDS_TEMPLATES "Templates" @@ -687,13 +686,13 @@ IDS_COOKIES "Cookies" IDS_HISTORY "History" IDS_PROGRAM_FILES "Program Files" - IDS_MYPICTURES "}C sN`" + IDS_MYPICTURES "My Pictures" IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" - IDS_COMMON_DOCUMENTS "hLg" + IDS_COMMON_DOCUMENTS "Documents" IDS_ADMINTOOLS "X^[g j[\\vO\\Çc[" - IDS_COMMON_MUSIC "hLg\\}C ~[WbN" - IDS_COMMON_PICTURES "hLg\\}C sN`" - IDS_COMMON_VIDEO "hLg\\}C rfI" + IDS_COMMON_MUSIC "Documents\\My Music" + IDS_COMMON_PICTURES "Documents\\My Pictures" + IDS_COMMON_VIDEO "Documents\\My Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" IDS_NETWORKPLACE "}C lbg[N" @@ -706,11 +705,11 @@ IDS_OPEN_WITH "vO©çJ" IDS_OPEN_WITH_CHOOSE "vOÌIð..." - IDS_SHELL_ABOUT_AUTHORS "ìÒ(&A)" + IDS_SHELL_ABOUT_AUTHORS "§ìÒ(&A)" IDS_SHELL_ABOUT_BACK "< ßé(&B)" - FCIDM_SHVIEW_NEW "VKì¬" - FCIDM_SHVIEW_NEWFOLDER "tH_(&F)" - FCIDM_SHVIEW_NEWLINK "V[gJbg(&L)" + FCIDM_SHVIEW_NEW "VKì¬" + FCIDM_SHVIEW_NEWFOLDER "tH_(&F)" + FCIDM_SHVIEW_NEWLINK "V[gJbg(&L)" IDS_FOLDER_OPTIONS "tH_ IvV" IDS_RECYCLEBIN_LOCATION "²Ý Ìê" IDS_RECYCLEBIN_DISKSPACE "pÅ«éÌæ" @@ -749,5 +748,5 @@ IDS_INSTALLNEWFONT "Vµ¢tHgÌCXg[..." IDS_DEFAULT_CLUSTER_SIZE "ftHg AP[V TCY" - IDS_COPY_OF "Copy of" -END + IDS_COPY_OF "Rs[ `" +END

1 0

[janderwald] 43097: - Fix a crash when an application hasnt defined a event label
by janderwald＠svn.reactos.org 20 Sep '09

20 Sep '09

Author: janderwald Date: Sun Sep 20 19:44:52 2009 New Revision: 43097 URL: http://svn.reactos.org/svn/reactos?rev=43097&view=rev Log: - Fix a crash when an application hasnt defined a event label Modified: trunk/reactos/dll/cpl/mmsys/sounds.c Modified: trunk/reactos/dll/cpl/mmsys/sounds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/sounds.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] Sun Sep 20 19:44:52 2009 @@ -66,6 +66,8 @@ while(pMap) { + ASSERT(pMap); + ASSERT(pMap->szName); if (!_tcscmp(pMap->szName, szName)) return pMap; @@ -77,6 +79,8 @@ while(pMap) { + ASSERT(pMap); + ASSERT(pMap->szName); if (!_tcscmp(pMap->szName, szName)) return pMap; @@ -84,8 +88,21 @@ } - - return NULL; + pMap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LABEL_MAP)); + if (!pMap) + return NULL; + + pMap->szName = pMap->szDesc = _tcsdup(szName); + if (!pMap->szName) + { + HeapFree(GetProcessHeap(), 0, pMap); + return NULL; + } + pMap->AppMap = pAppMap; + pMap->Next = s_Map; + s_Map = pMap; + + return pMap; } VOID RemoveLabel(PLABEL_MAP pMap) @@ -206,7 +223,7 @@ return FALSE; } - pMap = HeapAlloc(GetProcessHeap(), 0, sizeof(LABEL_MAP)); + pMap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LABEL_MAP)); if (!pMap) { return FALSE; @@ -492,10 +509,9 @@ { return FALSE; } - - //MessageBox(hwndDlg, szLabelName, szAppName, MB_OK); - - pLabel = FindLabel(NULL, szLabelName); + pLabel = FindLabel(pAppMap, szLabelName); + + ASSERT(pLabel); RemoveLabel(pLabel); pLabel->AppMap = pAppMap;

1 0

[janderwald] 43096: - Rewrite sound scheme handling - Implement changing sound scheme & sound action
by janderwald＠svn.reactos.org 20 Sep '09

20 Sep '09

Author: janderwald Date: Sun Sep 20 17:47:32 2009 New Revision: 43096 URL: http://svn.reactos.org/svn/reactos?rev=43096&view=rev Log: - Rewrite sound scheme handling - Implement changing sound scheme & sound action Modified: trunk/reactos/dll/cpl/mmsys/sounds.c Modified: trunk/reactos/dll/cpl/mmsys/sounds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/sounds.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] Sun Sep 20 17:47:32 2009 @@ -16,41 +16,152 @@ #include <stdio.h> #include "mmsys.h" #include "resource.h" +#include <debug.h> + +struct __APP_MAP__; + +typedef struct __LABEL_MAP__ +{ + TCHAR * szName; + TCHAR * szDesc; + TCHAR * szIcon; + struct __APP_MAP__ * AppMap; + struct __LABEL_MAP__ * Next; +}LABEL_MAP, *PLABEL_MAP; + +typedef struct __APP_MAP__ +{ + TCHAR szName[MAX_PATH]; + TCHAR szDesc[MAX_PATH]; + TCHAR szIcon[MAX_PATH]; + + struct __APP_MAP__ *Next; + PLABEL_MAP LabelMap; +}APP_MAP, *PAPP_MAP; typedef struct __LABEL_CONTEXT__ { - TCHAR szName[MAX_PATH]; + PLABEL_MAP LabelMap; + PAPP_MAP AppMap; TCHAR szValue[MAX_PATH]; struct __LABEL_CONTEXT__ *Next; }LABEL_CONTEXT, *PLABEL_CONTEXT; -typedef struct __APP_CONTEXT__ +typedef struct __SOUND_SCHEME_CONTEXT__ { TCHAR szName[MAX_PATH]; TCHAR szDesc[MAX_PATH]; - TCHAR szIcon[MAX_PATH]; PLABEL_CONTEXT LabelContext; - struct __APP_CONTEXT__ * Next; -}APP_CONTEXT, *PAPP_CONTEXT; - - -typedef struct __SOUND_SCHEME_CONTEXT__ -{ - TCHAR szName[MAX_PATH]; - TCHAR szDesc[MAX_PATH]; - PAPP_CONTEXT AppContext; }SOUND_SCHEME_CONTEXT, *PSOUND_SCHEME_CONTEXT; -typedef struct __LABEL_MAP__ -{ - TCHAR * szName; - TCHAR * szDesc; - TCHAR * szIcon; - struct __LABEL_MAP__ * Next; -}LABEL_MAP, *PLABEL_MAP; - static PLABEL_MAP s_Map = NULL; - +static PAPP_MAP s_App = NULL; + +TCHAR szDefault[MAX_PATH]; + + +PLABEL_MAP FindLabel(PAPP_MAP pAppMap, TCHAR * szName) +{ + PLABEL_MAP pMap = s_Map; + + while(pMap) + { + if (!_tcscmp(pMap->szName, szName)) + return pMap; + + pMap = pMap->Next; + + } + + pMap = pAppMap->LabelMap; + + while(pMap) + { + if (!_tcscmp(pMap->szName, szName)) + return pMap; + + pMap = pMap->Next; + + } + + + return NULL; +} + +VOID RemoveLabel(PLABEL_MAP pMap) +{ + PLABEL_MAP pCurMap = s_Map; + + if (pCurMap == pMap) + { + s_Map = s_Map->Next; + return; + } + + + while(pCurMap) + { + if (pCurMap->Next == pMap) + { + pCurMap->Next = pCurMap->Next->Next; + return; + } + pCurMap = pCurMap->Next; + } +} + + + + + + +PAPP_MAP FindApp(TCHAR * szName) +{ + PAPP_MAP pMap = s_App; + + while(pMap) + { + if (!_tcscmp(pMap->szName, szName)) + return pMap; + + pMap = pMap->Next; + + } + return NULL; +} + +PLABEL_CONTEXT FindLabelContext(PSOUND_SCHEME_CONTEXT pSoundScheme, TCHAR * AppName, TCHAR * LabelName) +{ + PLABEL_CONTEXT pLabelContext; + + pLabelContext = pSoundScheme->LabelContext; + + while(pLabelContext) + { + ASSERT(pLabelContext->AppMap); + ASSERT(pLabelContext->LabelMap); + + if(!_tcsicmp(pLabelContext->AppMap->szName, AppName) && !_tcsicmp(pLabelContext->LabelMap->szName, LabelName)) + { + return pLabelContext; + } + pLabelContext = pLabelContext->Next; + } + + pLabelContext = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LABEL_CONTEXT)); + if (!pLabelContext) + return NULL; + + pLabelContext->AppMap = FindApp(AppName); + pLabelContext->LabelMap = FindLabel(pLabelContext->AppMap, LabelName); + ASSERT(pLabelContext->AppMap); + ASSERT(pLabelContext->LabelMap); + pLabelContext->szValue[0] = _T('\0'); + pLabelContext->Next = pSoundScheme->LabelContext; + pSoundScheme->LabelContext = pLabelContext; + + return pLabelContext; +} BOOL LoadEventLabel(HKEY hKey, TCHAR * szSubKey) @@ -163,20 +274,6 @@ RegCloseKey(hSubKey); return (dwCount != 0); } -PLABEL_MAP FindLabel(TCHAR * szName) -{ - PLABEL_MAP pMap = s_Map; - - while(pMap) - { - if (!_tcscmp(pMap->szName, szName)) - return pMap; - - pMap = pMap->Next; - - } - return NULL; -} BOOL AddSoundProfile(HWND hwndDlg, HKEY hKey, TCHAR * szSubKey, BOOL SetDefault) @@ -212,7 +309,6 @@ { _tcscpy(pScheme->szDesc, szValue); _tcscpy(pScheme->szName, szSubKey); - pScheme->AppContext = NULL; } SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)pScheme); @@ -232,7 +328,6 @@ HKEY hSubKey; DWORD dwName, dwCurKey, dwResult, dwNumSchemes; TCHAR szName[MAX_PATH]; - TCHAR szDefault[MAX_PATH]; dwName = sizeof(szDefault) / sizeof(TCHAR); if (RegQueryValueEx(hKey, @@ -310,41 +405,25 @@ return pScheme; } } - return FALSE; -} -PAPP_CONTEXT FindAppContext(PSOUND_SCHEME_CONTEXT pScheme, TCHAR * szAppName) -{ - PAPP_CONTEXT pAppContext = pScheme->AppContext; - while(pAppContext) - { - if (!_tcsicmp(pAppContext->szName, szAppName)) - return pScheme->AppContext; - pAppContext = pAppContext->Next; - } - return FALSE; -} - - - + return NULL; +} BOOL -ImportSoundLabel(HWND hwndDlg, HKEY hKey, TCHAR * szProfile, TCHAR * szLabelName, TCHAR * szAppName) +ImportSoundLabel(HWND hwndDlg, HKEY hKey, TCHAR * szProfile, TCHAR * szLabelName, TCHAR * szAppName, PAPP_MAP AppMap, PLABEL_MAP LabelMap) { HKEY hSubKey; TCHAR szValue[MAX_PATH]; TCHAR szBuffer[MAX_PATH]; DWORD dwValue; PSOUND_SCHEME_CONTEXT pScheme; - PAPP_CONTEXT pAppContext; PLABEL_CONTEXT pLabelContext; - BOOL Create = FALSE; + BOOL bCurrentProfile, bActiveProfile; + //MessageBox(hwndDlg, szProfile, szLabelName, MB_OK); - if (!_tcsicmp(szProfile, _T(".Current"))) - { - //ignore current settings for now - return TRUE; - } + bCurrentProfile = !_tcsicmp(szProfile, _T(".Current")); + bActiveProfile = !_tcsicmp(szProfile, szDefault); + if (RegOpenKeyEx(hKey, szProfile, @@ -365,64 +444,37 @@ { return FALSE; } - pScheme = FindSoundProfile(hwndDlg, szProfile); + + if (bCurrentProfile) + pScheme = FindSoundProfile(hwndDlg, szDefault); + else + pScheme = FindSoundProfile(hwndDlg, szProfile); + if (!pScheme) { //MessageBox(hwndDlg, szProfile, _T("no profile!!"), MB_OK); return FALSE; } - - pAppContext = FindAppContext(pScheme, szAppName); - if (!pAppContext) - { - pAppContext = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(APP_CONTEXT)); - Create = TRUE; - } - - if (!pAppContext) - { - - //MessageBox(hwndDlg, szAppName, _T("no appcontext"), MB_OK); - return FALSE; - } - pLabelContext = (PLABEL_CONTEXT)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LABEL_CONTEXT)); - if (!pLabelContext) - { - HeapFree(GetProcessHeap(), 0, pLabelContext); - if (Create) - { - HeapFree(GetProcessHeap(), 0, pAppContext); - } - return FALSE; - } + pLabelContext = FindLabelContext(pScheme, AppMap->szName, LabelMap->szName); + dwValue = ExpandEnvironmentStrings(szValue, szBuffer, sizeof(szBuffer) / sizeof(TCHAR)); if (dwValue == 0 || dwValue > (sizeof(szBuffer) / sizeof(TCHAR))) { /* fixme */ - HeapFree(GetProcessHeap(), 0, pLabelContext); - if (Create) - { - HeapFree(GetProcessHeap(), 0, pAppContext); - } - return FALSE; - } - _tcscpy(pLabelContext->szValue, szBuffer); - _tcscpy(pLabelContext->szName, szLabelName); - pLabelContext->Next = pAppContext->LabelContext; - pAppContext->LabelContext = pLabelContext; - - if (Create) - { - _tcscpy(pAppContext->szName, szAppName); - pAppContext->Next = pScheme->AppContext; - pScheme->AppContext = pAppContext; - } + return FALSE; + } + + if (bCurrentProfile) + _tcscpy(pLabelContext->szValue, szBuffer); + else if (!bActiveProfile) + _tcscpy(pLabelContext->szValue, szBuffer); + return TRUE; } DWORD -ImportSoundEntry(HWND hwndDlg, HKEY hKey, TCHAR * szLabelName, TCHAR * szAppName) +ImportSoundEntry(HWND hwndDlg, HKEY hKey, TCHAR * szLabelName, TCHAR * szAppName, PAPP_MAP pAppMap) { HKEY hSubKey; DWORD dwNumProfiles; @@ -430,6 +482,7 @@ DWORD dwResult; DWORD dwProfile; TCHAR szProfile[MAX_PATH]; + PLABEL_MAP pLabel; if (RegOpenKeyEx(hKey, szLabelName, @@ -441,6 +494,13 @@ } //MessageBox(hwndDlg, szLabelName, szAppName, MB_OK); + + pLabel = FindLabel(NULL, szLabelName); + RemoveLabel(pLabel); + + pLabel->AppMap = pAppMap; + pLabel->Next = pAppMap->LabelMap; + pAppMap->LabelMap = pLabel; dwNumProfiles = 0; dwCurKey = 0; @@ -458,7 +518,7 @@ if (dwResult == ERROR_SUCCESS) { - if (ImportSoundLabel(hwndDlg, hSubKey, szProfile, szLabelName, szAppName)) + if (ImportSoundLabel(hwndDlg, hSubKey, szProfile, szLabelName, szAppName, pAppMap, pLabel)) { dwNumProfiles++; } @@ -468,6 +528,7 @@ }while(dwResult == ERROR_SUCCESS); RegCloseKey(hSubKey); + return dwNumProfiles; } @@ -485,8 +546,13 @@ DWORD dwName; TCHAR szName[MAX_PATH]; TCHAR szIcon[MAX_PATH]; + PAPP_MAP AppMap; //MessageBox(hwndDlg, szAppName, _T("Importing...\n"), MB_OK); + + AppMap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(APP_MAP)); + if (!AppMap) + return 0; if (RegOpenKeyEx(hKey, szAppName, @@ -494,7 +560,8 @@ KEY_READ, &hSubKey) != ERROR_SUCCESS) { - return FALSE; + HeapFree(GetProcessHeap(), 0, AppMap); + return 0; } dwDefault = sizeof(szDefault) / sizeof(TCHAR); @@ -506,7 +573,8 @@ &dwDefault) != ERROR_SUCCESS) { RegCloseKey(hSubKey); - return FALSE; + HeapFree(GetProcessHeap(), 0, AppMap); + return 0; } dwDefault = sizeof(szIcon) / sizeof(TCHAR); @@ -519,6 +587,15 @@ { szIcon[0] = _T('\0'); } + + /* initialize app map */ + _tcscpy(AppMap->szName, szAppName); + _tcscpy(AppMap->szDesc, szDefault); + _tcscpy(AppMap->szIcon, szIcon); + + AppMap->Next = s_App; + s_App = AppMap; + dwCurKey = 0; dwNumEntry = 0; @@ -535,38 +612,8 @@ NULL); if (dwResult == ERROR_SUCCESS) { - if (ImportSoundEntry(hwndDlg, hSubKey, szName, szAppName)) + if (ImportSoundEntry(hwndDlg, hSubKey, szName, szAppName, AppMap)) { - LRESULT lCount = SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_GETCOUNT, (WPARAM)0, (LPARAM)0); - if (lCount != CB_ERR) - { - LRESULT lIndex; - LRESULT lResult; - for (lIndex = 0; lIndex < lCount; lIndex++) - { - lResult = SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_GETITEMDATA, (WPARAM)lIndex, (LPARAM)0); - if (lResult != CB_ERR) - { - PAPP_CONTEXT pAppContext; - PSOUND_SCHEME_CONTEXT pScheme = (PSOUND_SCHEME_CONTEXT)lResult; - if (!_tcsicmp(pScheme->szName, _T(".None"))) - { - continue; - } - pAppContext = FindAppContext(pScheme, szAppName); - if (pAppContext) - { - _tcscpy(pAppContext->szDesc, szDefault); - _tcscpy(pAppContext->szIcon, szIcon); - } - - } - } - - - } - - dwNumEntry++; } } @@ -712,7 +759,7 @@ { LRESULT lIndex; PSOUND_SCHEME_CONTEXT pScheme; - PAPP_CONTEXT pAppContext; + PAPP_MAP pAppMap; LV_ITEM listItem; LV_COLUMN dummy; HWND hDlgCtrl, hList; @@ -733,11 +780,8 @@ return FALSE; } pScheme = (PSOUND_SCHEME_CONTEXT)lIndex; - pAppContext = pScheme->AppContext; - if (!pAppContext) - { - return FALSE; - } + + _tcscpy(szDefault, pScheme->szName); /* add column for app */ GetClientRect(hList, &rect); @@ -747,42 +791,96 @@ dummy.cx = rect.right - rect.left - GetSystemMetrics(SM_CXVSCROLL); (void)ListView_InsertColumn(hList, 0, &dummy); ItemIndex = 0; - while(pAppContext) - { - PLABEL_CONTEXT pLabelContext = pAppContext->LabelContext; - if (pLabelContext) - { -#if 0 + + pAppMap = s_App; + while(pAppMap) + { + PLABEL_MAP pLabelMap = pAppMap->LabelMap; + while(pLabelMap) + { ZeroMemory(&listItem, sizeof(LV_ITEM)); listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE; - listItem.pszText = pAppContext->szDesc; - listItem.lParam = (LPARAM)pAppContext; + listItem.pszText = pLabelMap->szDesc; + listItem.lParam = (LPARAM)FindLabelContext(pScheme, pAppMap->szName, pLabelMap->szName); listItem.iItem = ItemIndex; listItem.iImage = -1; (void)ListView_InsertItem(hList, &listItem); ItemIndex++; -#endif - while(pLabelContext) - { - PLABEL_MAP pMap = FindLabel(pLabelContext->szName); - if (pMap) - { - ZeroMemory(&listItem, sizeof(LV_ITEM)); - listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE; - listItem.pszText = pMap->szDesc; - listItem.lParam = (LPARAM)pLabelContext; - listItem.iItem = ItemIndex; - listItem.iImage = -1; - (void)ListView_InsertItem(hList, &listItem); - ItemIndex++; - } - pLabelContext = pLabelContext->Next; - } - } - pAppContext = pAppContext->Next; + + pLabelMap = pLabelMap->Next; + } + pAppMap = pAppMap->Next; } return TRUE; } + +BOOL +ApplyChanges(HWND hwndDlg) +{ + HKEY hKey, hSubKey; + LRESULT lIndex; + PSOUND_SCHEME_CONTEXT pScheme; + HWND hDlgCtrl; + PLABEL_CONTEXT pLabelContext; + TCHAR Buffer[100]; + + hDlgCtrl = GetDlgItem(hwndDlg, IDC_SOUND_SCHEME); + + lIndex = SendMessage(hDlgCtrl, CB_GETCURSEL, (WPARAM)0, (LPARAM)0); + if (lIndex == CB_ERR) + { + return FALSE; + } + + lIndex = SendMessage(hDlgCtrl, CB_GETITEMDATA, (WPARAM)lIndex, (LPARAM)0); + if (lIndex == CB_ERR) + { + return FALSE; + } + pScheme = (PSOUND_SCHEME_CONTEXT)lIndex; + + if (RegOpenKeyEx(HKEY_CURRENT_USER, + _T("AppEvents\\Schemes"), + 0, + KEY_WRITE, + &hKey) != ERROR_SUCCESS) + { + return FALSE; + } + + RegSetValueEx(hKey, NULL, 0, REG_SZ, (LPBYTE)pScheme->szName, (_tcslen(pScheme->szName) +1) * sizeof(TCHAR)); + RegCloseKey(hKey); + + if (RegOpenKeyEx(HKEY_CURRENT_USER, + _T("AppEvents\\Schemes\\Apps"), + 0, + KEY_WRITE, + &hKey) != ERROR_SUCCESS) + { + return FALSE; + } + + pLabelContext = pScheme->LabelContext; + + while(pLabelContext) + { + _stprintf(Buffer, _T("%s\\%s\\.Current"), pLabelContext->AppMap->szName, pLabelContext->LabelMap->szName); + + if (RegOpenKeyEx(hKey, Buffer, 0, KEY_WRITE, &hSubKey) == ERROR_SUCCESS) + { + RegSetValueEx(hSubKey, NULL, 0, REG_EXPAND_SZ, (LPBYTE)pLabelContext->szValue, (_tcslen(pLabelContext->szValue) +1) * sizeof(TCHAR)); + RegCloseKey(hSubKey); + } + + pLabelContext = pLabelContext->Next; + } + RegCloseKey(hKey); + + SetWindowLong(hwndDlg, DWL_MSGRESULT, (LONG)PSNRET_NOERROR); + return TRUE; +} + + /* Sounds property page dialog callback */ INT_PTR CALLBACK @@ -849,6 +947,7 @@ EnableWindow(GetDlgItem(hwndDlg, IDC_TEXT_SOUND), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_BROWSE_SOUND), FALSE); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } break; } @@ -860,7 +959,7 @@ INT SelCount; LVITEM item; LRESULT lIndex; - SelCount = ListView_GetSelectionMark(GetDlgItem(hwndDlg, IDC_SOUND_LIST)); + SelCount = ListView_GetSelectionMark(GetDlgItem(hwndDlg, IDC_SCHEME_LIST)); if (SelCount == -1) { break; @@ -875,14 +974,28 @@ item.iItem = SelCount; if (ListView_GetItem(GetDlgItem(hwndDlg, IDC_SCHEME_LIST), &item)) { - TCHAR szValue[MAX_PATH]; + LRESULT lResult; pLabelContext = (PLABEL_CONTEXT)item.lParam; - SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_GETLBTEXT, (WPARAM)lIndex, (LPARAM)szValue); - /// - /// should store in current member - /// - _tcscpy(pLabelContext->szValue, szValue); - if (_tcslen(szValue) && lIndex != 0) + + lResult = SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_GETITEMDATA, (WPARAM)lIndex, (LPARAM)0); + if (lResult == CB_ERR || lResult == 0) + { + if (lIndex != pLabelContext->szValue[0]) + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + + pLabelContext->szValue[0] = L'\0'; + break; + } + + if (_tcsicmp(pLabelContext->szValue, (TCHAR*)lResult) || (lIndex != pLabelContext->szValue[0])) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + /// + /// should store in current member + /// + _tcscpy(pLabelContext->szValue, (TCHAR*)lResult); + } + if (_tcslen((TCHAR*)lResult) && lIndex != 0) { EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), TRUE); } @@ -901,10 +1014,19 @@ { LVITEM item; PLABEL_CONTEXT pLabelContext; + LPPSHNOTIFY lppsn; + TCHAR * ptr; + LPNMHDR lpnm = (LPNMHDR)lParam; - TCHAR * ptr; + lppsn = (LPPSHNOTIFY) lParam; + switch(lpnm->code) { + case PSN_APPLY: + { + ApplyChanges(hwndDlg); + break; + } case LVN_ITEMCHANGED: { LPNMLISTVIEW nm = (LPNMLISTVIEW)lParam;

1 0

[cgutman] 43095: - Partial rewrite of dispatch() - Header cleanup - Fix several bugs related to null pointer access and out-of-bounds array access - Found by Amine Khaldi - This should fix the issue with dhcp crashing and hogging tons of cpu time
by cgutman＠svn.reactos.org 20 Sep '09

20 Sep '09

Author: cgutman Date: Sun Sep 20 17:00:08 2009 New Revision: 43095 URL: http://svn.reactos.org/svn/reactos?rev=43095&view=rev Log: - Partial rewrite of dispatch() - Header cleanup - Fix several bugs related to null pointer access and out-of-bounds array access - Found by Amine Khaldi - This should fix the issue with dhcp crashing and hogging tons of cpu time Modified: trunk/reactos/base/services/dhcp/adapter.c trunk/reactos/base/services/dhcp/dhclient.c trunk/reactos/base/services/dhcp/dispatch.c trunk/reactos/base/services/dhcp/include/dhcpd.h trunk/reactos/base/services/dhcp/include/rosdhcp.h trunk/reactos/base/services/dhcp/options.c Modified: trunk/reactos/base/services/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/adapter… ============================================================================== --- trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] Sun Sep 20 17:00:08 2009 @@ -169,10 +169,9 @@ Adapter->DhclientState.state = S_STATIC; Netmask = RegReadString( AdapterKey, NULL, "Subnetmask" ); - if( !Netmask ) Netmask = "255.255.255.0"; Status = AddIPAddress( inet_addr( IPAddress ), - inet_addr( Netmask ), + inet_addr( Netmask ? Netmask : "255.255.255.0" ), Adapter->IfMib.dwIndex, &Adapter->NteContext, &Adapter->NteInstance ); @@ -257,7 +256,7 @@ DH_DbgPrint(MID_TRACE,("Getting adapter %d attributes\n", Table->table[i].dwIndex)); - if (AdapterFindByHardwareAddress(Table->table[i].bPhysAddr, Table->table[i].dwPhysAddrLen)) + if ((Adapter = AdapterFindByHardwareAddress(Table->table[i].bPhysAddr, Table->table[i].dwPhysAddrLen))) { /* This is an existing adapter */ if (InterfaceConnected(Table->table[i])) { Modified: trunk/reactos/base/services/dhcp/dhclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dhclien… ============================================================================== --- trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] Sun Sep 20 17:00:08 2009 @@ -1576,8 +1576,10 @@ if (!leaseFile) { /* XXX */ leaseFile = fopen(path_dhclient_db, "w"); - if (!leaseFile) + if (!leaseFile) { error("can't create %s", path_dhclient_db); + return; + } } fprintf(leaseFile, "lease {\n"); @@ -1600,17 +1602,20 @@ lease->options[i].len, 1, 1)); t = gmtime(&lease->renewal); - fprintf(leaseFile, " renew %d %d/%d/%d %02d:%02d:%02d;\n", - t->tm_wday, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, - t->tm_hour, t->tm_min, t->tm_sec); + if (t) + fprintf(leaseFile, " renew %d %d/%d/%d %02d:%02d:%02d;\n", + t->tm_wday, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, + t->tm_hour, t->tm_min, t->tm_sec); t = gmtime(&lease->rebind); - fprintf(leaseFile, " rebind %d %d/%d/%d %02d:%02d:%02d;\n", - t->tm_wday, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, - t->tm_hour, t->tm_min, t->tm_sec); + if (t) + fprintf(leaseFile, " rebind %d %d/%d/%d %02d:%02d:%02d;\n", + t->tm_wday, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, + t->tm_hour, t->tm_min, t->tm_sec); t = gmtime(&lease->expiry); - fprintf(leaseFile, " expire %d %d/%d/%d %02d:%02d:%02d;\n", - t->tm_wday, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, - t->tm_hour, t->tm_min, t->tm_sec); + if (t) + fprintf(leaseFile, " expire %d %d/%d/%d %02d:%02d:%02d;\n", + t->tm_wday, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, + t->tm_hour, t->tm_min, t->tm_sec); fprintf(leaseFile, "}\n"); fflush(leaseFile); } @@ -1765,7 +1770,7 @@ config->defaults[i].data, ip->client-> config->defaults[i].len); - dp[len] = '\0'; + dp[len-1] = '\0'; } } else { dp = ip->client-> Modified: trunk/reactos/base/services/dhcp/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dispatc… ============================================================================== --- trunk/reactos/base/services/dhcp/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/dispatch.c [iso-8859-1] Sun Sep 20 17:00:08 2009 @@ -63,11 +63,16 @@ void dispatch(void) { - int count, i, to_msec, nfds, err; + int count, to_msec, err; struct protocol *l; fd_set fds; time_t howlong, cur_time; struct timeval timeval; + + if (!AdapterDiscover()) { + AdapterStop(); + return; + } ApiLock(); @@ -76,17 +81,6 @@ * Call any expired timeouts, and then if there's still * a timeout registered, time out the select call then. */ - another: - if (!AdapterDiscover()) { - AdapterStop(); - break; - } - - for (l = protocols, nfds = 0; l; l = l->next) - nfds++; - - FD_ZERO(&fds); - time(&cur_time); if (timeouts) { @@ -98,7 +92,7 @@ (*(t->func))(t->what); t->next = free_timeouts; free_timeouts = t; - goto another; + continue; } /* @@ -112,49 +106,30 @@ howlong = INT_MAX / 1000; to_msec = howlong * 1000; } else - to_msec = -1; + to_msec = 5000; /* Set up the descriptors to be polled. */ - for (i = 0, l = protocols; l; l = l->next) { - struct interface_info *ip = l->local; - - if (ip && (l->handler != got_one || !ip->dead)) { - FD_SET(l->fd, &fds); - i++; - } - } - - if (i == 0) { - /* Wait for 5 seconds before looking for more interfaces */ - Sleep(5000); - continue; - } else { - /* Wait for a packet or a timeout... XXX */ - timeval.tv_sec = to_msec / 1000; - timeval.tv_usec = (to_msec % 1000) * 1000; - } + FD_ZERO(&fds); + + for (l = protocols; l; l = l->next) + FD_SET(l->fd, &fds); + + /* Wait for a packet or a timeout... XXX */ + timeval.tv_sec = to_msec / 1000; + timeval.tv_usec = to_msec % 1000; ApiUnlock(); - count = select(nfds, &fds, NULL, NULL, &timeval); + if (protocols) + count = select(0, &fds, NULL, NULL, &timeval); + else { + Sleep(to_msec); + count = 0; + } + + ApiLock(); DH_DbgPrint(MID_TRACE,("Select: %d\n", count)); - - /* Review poll output */ - for (i = 0, l = protocols; l; l = l->next) { - struct interface_info *ip = l->local; - - if (ip && (l->handler != got_one || !ip->dead)) { - DH_DbgPrint - (MID_TRACE, - ("set(%d) -> %s\n", - l->fd, FD_ISSET(l->fd, &fds) ? "true" : "false")); - i++; - } - } - - - ApiLock(); /* Not likely to be transitory... */ if (count == SOCKET_ERROR) { @@ -163,7 +138,6 @@ break; } - i = 0; for (l = protocols; l; l = l->next) { struct interface_info *ip; ip = l->local; @@ -173,7 +147,6 @@ DH_DbgPrint(MID_TRACE,("Handling %x\n", l)); (*(l->handler))(l); } - i++; } } } while (1); @@ -269,8 +242,10 @@ q->what = what; } else { q = malloc(sizeof(struct timeout)); - if (!q) + if (!q) { error("Can't allocate timeout structure!"); + return; + } q->func = where; q->what = what; } Modified: trunk/reactos/base/services/dhcp/include/dhcpd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/include… ============================================================================== --- trunk/reactos/base/services/dhcp/include/dhcpd.h [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/include/dhcpd.h [iso-8859-1] Sun Sep 20 17:00:08 2009 @@ -101,7 +101,6 @@ #include <fcntl.h> #include <limits.h> //#include <unistd.h> -#include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> Modified: trunk/reactos/base/services/dhcp/include/rosdhcp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/include… ============================================================================== --- trunk/reactos/base/services/dhcp/include/rosdhcp.h [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/include/rosdhcp.h [iso-8859-1] Sun Sep 20 17:00:08 2009 @@ -10,7 +10,6 @@ #include <dhcpcsdk.h> #include <stdio.h> #include <io.h> -#include <setjmp.h> #include "stdint.h" #include "predec.h" #include <dhcp/rosdhcp_public.h> Modified: trunk/reactos/base/services/dhcp/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/options… ============================================================================== --- trunk/reactos/base/services/dhcp/options.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/options.c [iso-8859-1] Sun Sep 20 17:00:08 2009 @@ -175,9 +175,11 @@ * for clients, but what the heck... */ t = calloc(1, len + packet->options[code].len + 1); - if (!t) + if (!t) { error("Can't expand storage for option %s.", dhcp_options[code].name); + return; + } memcpy(t, packet->options[code].data, packet->options[code].len); memcpy(t + packet->options[code].len,

1 0

[janderwald] 43094: - Fix several bugs in printer ' IShellFolder implementation - Partly implement IShellFolder::GetAttributesOf - Implement IShellFolder::GetDisplayNameOf for root pidl - Implement ISF_ControlPanel_fnParseDisplayName to parse display names <spoiler>Gets rid of the annoying message box when clicking on the printer folder in the start menu</spoiler>
by janderwald＠svn.reactos.org 20 Sep '09

20 Sep '09

Author: janderwald Date: Sun Sep 20 06:21:29 2009 New Revision: 43094 URL: http://svn.reactos.org/svn/reactos?rev=43094&view=rev Log: - Fix several bugs in printer ' IShellFolder implementation - Partly implement IShellFolder::GetAttributesOf - Implement IShellFolder::GetDisplayNameOf for root pidl - Implement ISF_ControlPanel_fnParseDisplayName to parse display names <spoiler>Gets rid of the annoying message box when clicking on the printer folder in the start menu</spoiler> Modified: trunk/reactos/dll/win32/shell32/pidl.c trunk/reactos/dll/win32/shell32/pidl.h trunk/reactos/dll/win32/shell32/shfldr_cpanel.c trunk/reactos/dll/win32/shell32/shfldr_printers.c Modified: trunk/reactos/dll/win32/shell32/pidl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.c?r… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] Sun Sep 20 06:21:29 2009 @@ -1654,6 +1654,17 @@ return FALSE; } +BOOL _ILIsPrinter(LPCITEMIDLIST pidl) +{ + REFIID iid = _ILGetGUIDPointer(pidl); + + TRACE("(%p)\n",pidl); + + if (iid) + return IsEqualIID(iid, &CLSID_Printers); + return FALSE; +} + BOOL _ILIsBitBucket(LPCITEMIDLIST pidl) { REFIID iid = _ILGetGUIDPointer(pidl); Modified: trunk/reactos/dll/win32/shell32/pidl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.h?r… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/pidl.h [iso-8859-1] Sun Sep 20 06:21:29 2009 @@ -232,6 +232,7 @@ BOOL _ILIsUnicode (LPCITEMIDLIST pidl); BOOL _ILIsDesktop (LPCITEMIDLIST pidl); BOOL _ILIsMyComputer (LPCITEMIDLIST pidl); +BOOL _ILIsPrinter (LPCITEMIDLIST pidl); BOOL _ILIsMyDocuments (LPCITEMIDLIST pidl); BOOL _ILIsControlPanel (LPCITEMIDLIST pidl); BOOL _ILIsBitBucket (LPCITEMIDLIST pidl); Modified: trunk/reactos/dll/win32/shell32/shfldr_cpanel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_c… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_cpanel.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_cpanel.c [iso-8859-1] Sun Sep 20 06:21:29 2009 @@ -204,17 +204,55 @@ DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes) { ICPanelImpl *This = (ICPanelImpl *)iface; - - HRESULT hr = E_INVALIDARG; - - FIXME("(%p)->(HWND=%p,%p,%p=%s,%p,pidl=%p,%p)\n", - This, hwndOwner, pbc, lpszDisplayName, debugstr_w(lpszDisplayName), pchEaten, ppidl, pdwAttributes); + WCHAR szElement[MAX_PATH]; + LPCWSTR szNext = NULL; + LPITEMIDLIST pidlTemp = NULL; + HRESULT hr = S_OK; + CLSID clsid; + + TRACE ("(%p)->(HWND=%p,%p,%p=%s,%p,pidl=%p,%p)\n", + This, hwndOwner, pbc, lpszDisplayName, debugstr_w(lpszDisplayName), + pchEaten, ppidl, pdwAttributes); + + if (!lpszDisplayName || !ppidl) + return E_INVALIDARG; *ppidl = 0; + if (pchEaten) - *pchEaten = 0; - - TRACE("(%p)->(-- ret=0x%08x)\n", This, hr); + *pchEaten = 0; /* strange but like the original */ + + if (lpszDisplayName[0] == ':' && lpszDisplayName[1] == ':') + { + szNext = GetNextElementW (lpszDisplayName, szElement, MAX_PATH); + TRACE ("-- element: %s\n", debugstr_w (szElement)); + CLSIDFromString (szElement + 2, &clsid); + pidlTemp = _ILCreateGuid (PT_GUID, &clsid); + } + else if( (pidlTemp = SHELL32_CreatePidlFromBindCtx(pbc, lpszDisplayName)) ) + { + *ppidl = pidlTemp; + return S_OK; + } + + if (SUCCEEDED(hr) && pidlTemp) + { + if (szNext && *szNext) + { + hr = SHELL32_ParseNextElement(iface, hwndOwner, pbc, + &pidlTemp, (LPOLESTR) szNext, pchEaten, pdwAttributes); + } + else + { + if (pdwAttributes && *pdwAttributes) + hr = SHELL32_GetItemAttributes(_IShellFolder_ (This), + pidlTemp, pdwAttributes); + } + } + + *ppidl = pidlTemp; + + TRACE ("(%p)->(-- ret=0x%08x)\n", This, hr); return hr; } Modified: trunk/reactos/dll/win32/shell32/shfldr_printers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_p… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_printers.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_printers.c [iso-8859-1] Sun Sep 20 06:21:29 2009 @@ -333,7 +333,7 @@ IsEqualIID (riid, &IID_IShellFolder) || IsEqualIID (riid, &IID_IShellFolder2)) { - *ppvObj = This; + *ppvObj = _IShellFolder_(This); } else if (IsEqualIID (riid, &IID_IPersist) || @@ -609,12 +609,20 @@ static HRESULT WINAPI ISF_Printers_fnGetAttributesOf (IShellFolder2 * iface, UINT cidl, LPCITEMIDLIST * apidl, DWORD * rgfInOut) { + static const DWORD dwPrintersAttributes = + SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_CANRENAME | SFGAO_CANDELETE; + HRESULT hr = S_OK; IGenericSFImpl *This = (IGenericSFImpl *)iface; FIXME ("(%p)->(cidl=%d apidl=%p mask=0x%08lx): stub\n", This, cidl, apidl, *rgfInOut); - return E_NOTIMPL; + *rgfInOut &= dwPrintersAttributes; + + *rgfInOut &= ~SFGAO_VALIDATE; + + TRACE ("-- result=0x%08x\n", *rgfInOut); + return hr; } /************************************************************************** @@ -669,6 +677,7 @@ static HRESULT WINAPI ISF_Printers_fnGetDisplayNameOf (IShellFolder2 * iface, LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet) { + LPWSTR pszName; IGenericSFImpl *This = (IGenericSFImpl *)iface; PIDLPrinterStruct * p; @@ -676,12 +685,34 @@ pdump (pidl); if (!strRet) + { + WARN("no strRet\n"); return E_INVALIDARG; + } + + if (_ILIsPrinter(pidl)) + { + pszName = CoTaskMemAlloc(MAX_PATH * sizeof(WCHAR)); + if (!pszName) + return E_OUTOFMEMORY; + + if (LoadStringW(shell32_hInstance, IDS_PRINTERS, pszName, MAX_PATH)) + { + pszName[MAX_PATH-1] = L'\0'; + strRet->uType = STRRET_WSTR; + strRet->u.pOleStr = pszName; + return S_OK; + } + CoTaskMemFree(pszName); + return E_FAIL; + } p = _ILGetPrinterStruct(pidl); if (!p) + { + WARN("no printer struct\n"); return E_INVALIDARG; - + } strRet->u.pOleStr = SHAlloc(p->offsServer * sizeof(WCHAR)); if (!strRet->u.pOleStr) return E_OUTOFMEMORY;

1 0

[cgutman] 43093: - Remove a DbgPrint that was forgotten
by cgutman＠svn.reactos.org 20 Sep '09

20 Sep '09

Author: cgutman Date: Sun Sep 20 03:58:06 2009 New Revision: 43093 URL: http://svn.reactos.org/svn/reactos?rev=43093&view=rev Log: - Remove a DbgPrint that was forgotten Modified: trunk/reactos/lib/drivers/ip/network/neighbor.c Modified: trunk/reactos/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/nei… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] Sun Sep 20 03:58:06 2009 @@ -114,8 +114,6 @@ if (NCE->EventCount % ARP_RATE == 0) NBSendSolicit(NCE); if (NCE->EventTimer - NCE->EventCount == 0) { - DbgPrint("Marking NCE stale: %s\n", A2S(&NCE->Address)); - NCE->State |= NUD_STALE; NCE->EventCount = 0;

1 0

[cgutman] 43092: - Fix GetIpNetTable - Arp -a will now show a complete list of ARP information
by cgutman＠svn.reactos.org 20 Sep '09

20 Sep '09

Author: cgutman Date: Sun Sep 20 03:37:40 2009 New Revision: 43092 URL: http://svn.reactos.org/svn/reactos?rev=43092&view=rev Log: - Fix GetIpNetTable - Arp -a will now show a complete list of ARP information Modified: trunk/reactos/dll/win32/iphlpapi/ifenum.h trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c trunk/reactos/lib/drivers/ip/network/neighbor.c Modified: trunk/reactos/dll/win32/iphlpapi/ifenum.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/ifenum.… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/ifenum.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/ifenum.h [iso-8859-1] Sun Sep 20 03:37:40 2009 @@ -147,4 +147,6 @@ /* Inserts a route into the route table. */ DWORD createIpForwardEntryOS(PMIB_IPFORWARDROW pRoute); +BOOL isLoopback( HANDLE tcpFile, TDIEntityID *loop_maybe ); + #endif /* ndef WINE_IFENUM_H_ */ Modified: trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/ifenum_… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c [iso-8859-1] Sun Sep 20 03:37:40 2009 @@ -315,7 +315,7 @@ if_maybe->tei_entity == IF_ENTITY; } -static BOOL isLoopback( HANDLE tcpFile, TDIEntityID *loop_maybe ) { +BOOL isLoopback( HANDLE tcpFile, TDIEntityID *loop_maybe ) { IFEntrySafelySized entryInfo; NTSTATUS status; Modified: trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/ipstats… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c [iso-8859-1] Sun Sep 20 03:37:40 2009 @@ -539,7 +539,8 @@ for( i = 0; i < numEntities; i++ ) { if( isInterface( &entitySet[i] ) && - hasArp( tcpFile, &entitySet[i] ) ) { + hasArp( tcpFile, &entitySet[i] ) && + !isLoopback( tcpFile, &entitySet[i] ) ) { status = tdiGetSetOfThings( tcpFile, INFO_CLASS_PROTOCOL, @@ -571,7 +572,7 @@ DWORD numEntities, returnSize; TDIEntityID *entitySet; HANDLE tcpFile; - int i, row = 0, totalNumber; + int i, totalNumber, TmpIdx, CurrIdx = 0; NTSTATUS status; PMIB_IPNETTABLE IpArpTable = NULL; PMIB_IPNETROW AdapterArpTable = NULL; @@ -598,8 +599,9 @@ status = tdiGetEntityIDSet( tcpFile, &entitySet, &numEntities ); for( i = 0; i < numEntities; i++ ) { - if( isIpEntity( tcpFile, &entitySet[i] ) && - hasArp( tcpFile, &entitySet[i] ) ) { + if( isInterface( &entitySet[i] ) && + hasArp( tcpFile, &entitySet[i] ) && + !isLoopback( tcpFile, &entitySet[i] ) ) { status = tdiGetSetOfThings( tcpFile, INFO_CLASS_PROTOCOL, @@ -613,8 +615,8 @@ &returnSize ); if( status == STATUS_SUCCESS ) { - for( row = 0; row < returnSize; row++ ) - IpArpTable->table[row] = AdapterArpTable[row]; + for( TmpIdx = 0; TmpIdx < returnSize; TmpIdx++, CurrIdx++ ) + IpArpTable->table[CurrIdx] = AdapterArpTable[TmpIdx]; } if( AdapterArpTable ) tdiFreeThingSet( AdapterArpTable ); @@ -624,7 +626,7 @@ closeTcpFile( tcpFile ); tdiFreeThingSet( entitySet ); - IpArpTable->dwNumEntries = row; + IpArpTable->dwNumEntries = CurrIdx; return IpArpTable; } Modified: trunk/reactos/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/nei… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] Sun Sep 20 03:37:40 2009 @@ -490,7 +490,8 @@ for( CurNCE = NeighborCache[i].Cache; CurNCE; CurNCE = CurNCE->Next ) { - if( CurNCE->Interface == Interface ) { + if( CurNCE->Interface == Interface && + !AddrIsEqual( &CurNCE->Address, &CurNCE->Interface->Unicast ) ) { if( ArpTable ) { ArpTable[Size].Index = Interface->Index; ArpTable[Size].AddrSize = CurNCE->LinkAddressLength;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs