Ros-diffs October 2008

ros-diffs@reactos.org

25 participants
517 discussions

[mjmartin] 36750: - REnumServicesStatusExW: Correct check for returning ERROR_SERVICE_DOES_NOT_EXIST. - fixes bug #3787
by mjmartin＠svn.reactos.org 14 Oct '08

14 Oct '08

Author: mjmartin Date: Tue Oct 14 10:59:09 2008 New Revision: 36750 URL: http://svn.reactos.org/svn/reactos?rev=36750&view=rev Log: - REnumServicesStatusExW: Correct check for returning ERROR_SERVICE_DOES_NOT_EXIST. - fixes bug #3787 Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Tue Oct 14 10:59:09 2008 @@ -4995,7 +4995,7 @@ *pcbBytesNeeded = dwRequiredSize; /* If there was no services that matched */ - if (!dwServiceCount) + if ((!dwServiceCount) && (dwError != ERROR_MORE_DATA)) { dwError = ERROR_SERVICE_DOES_NOT_EXIST; goto Done;

1 0

[pschweitzer] 36749: Apply patch by Cameron Gutman from bug #3315 This encapsulates CcInitializeCacheMap calls using SEH
by pschweitzer＠svn.reactos.org 14 Oct '08

14 Oct '08

Author: pschweitzer Date: Tue Oct 14 10:41:42 2008 New Revision: 36749 URL: http://svn.reactos.org/svn/reactos?rev=36749&view=rev Log: Apply patch by Cameron Gutman from bug #3315 This encapsulates CcInitializeCacheMap calls using SEH Modified: branches/pierre-fsd/drivers/filesystems/fastfat/fcb.c branches/pierre-fsd/drivers/filesystems/fastfat/fsctl.c branches/pierre-fsd/drivers/filesystems/fastfat/rw.c Modified: branches/pierre-fsd/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/fastfat/fcb.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/fastfat/fcb.c [iso-8859-1] Tue Oct 14 10:41:42 2008 @@ -314,6 +314,7 @@ static NTSTATUS vfatFCBInitializeCacheFromVolume (PVCB vcb, PVFATFCB fcb) { + NTSTATUS Status = STATUS_SUCCESS; PFILE_OBJECT fileObject; PVFATCCB newCCB; @@ -332,14 +333,27 @@ fcb->FileObject = fileObject; fcb->RefCount++; - CcInitializeCacheMap(fileObject, - (PCC_FILE_SIZES)(&fcb->RFCB.AllocationSize), - FALSE, - &VfatGlobalData->CacheMgrCallbacks, - fcb); + _SEH_TRY + { + CcInitializeCacheMap(fileObject, + (PCC_FILE_SIZES)(&fcb->RFCB.AllocationSize), + FALSE, + &VfatGlobalData->CacheMgrCallbacks, + fcb); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + return Status; + } fcb->Flags |= FCB_CACHE_INITIALIZED; - return STATUS_SUCCESS; + return Status; } PVFATFCB Modified: branches/pierre-fsd/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Tue Oct 14 10:41:42 2008 @@ -537,11 +537,25 @@ Fcb->RFCB.ValidDataLength = Fcb->RFCB.FileSize; Fcb->RFCB.AllocationSize = Fcb->RFCB.FileSize; - CcInitializeCacheMap(DeviceExt->FATFileObject, - (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), - FALSE, - &VfatGlobalData->CacheMgrCallbacks, - Fcb); + _SEH_TRY + { + CcInitializeCacheMap(DeviceExt->FATFileObject, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + FALSE, + &VfatGlobalData->CacheMgrCallbacks, + Fcb); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + goto ByeBye; + } + DeviceExt->LastAvailableCluster = 2; ExInitializeResourceLite(&DeviceExt->FatResource); Modified: branches/pierre-fsd/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/fastfat/rw.c [iso-8859-1] Tue Oct 14 10:41:42 2008 @@ -671,11 +671,24 @@ CHECKPOINT; if (IrpContext->FileObject->PrivateCacheMap == NULL) { - CcInitializeCacheMap(IrpContext->FileObject, - (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), - FALSE, - &(VfatGlobalData->CacheMgrCallbacks), - Fcb); + _SEH_TRY + { + CcInitializeCacheMap(IrpContext->FileObject, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + FALSE, + &(VfatGlobalData->CacheMgrCallbacks), + Fcb); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + goto ByeBye; + } } if (!CcCopyRead(IrpContext->FileObject, &ByteOffset, Length, (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT), Buffer, @@ -964,11 +977,24 @@ if (IrpContext->FileObject->PrivateCacheMap == NULL) { - CcInitializeCacheMap(IrpContext->FileObject, - (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), - FALSE, - &VfatGlobalData->CacheMgrCallbacks, - Fcb); + _SEH_TRY + { + CcInitializeCacheMap(IrpContext->FileObject, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + FALSE, + &(VfatGlobalData->CacheMgrCallbacks), + Fcb); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + goto ByeBye; + } } if (ByteOffset.QuadPart > OldFileSize.QuadPart) {

1 0

[pschweitzer] 36748: Fixed CcInitializeCacheMap to raise an exception when it fails to allocate memory. That way, bug #3351 were good, and will be applied.
by pschweitzer＠svn.reactos.org 14 Oct '08

14 Oct '08

Author: pschweitzer Date: Tue Oct 14 10:19:21 2008 New Revision: 36748 URL: http://svn.reactos.org/svn/reactos?rev=36748&view=rev Log: Fixed CcInitializeCacheMap to raise an exception when it fails to allocate memory. That way, bug #3351 were good, and will be applied. Modified: branches/pierre-fsd/include/reactos/ccros.h branches/pierre-fsd/ntoskrnl/cc/view.c Modified: branches/pierre-fsd/include/reactos/ccros.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/include/reactos/ccro… ============================================================================== --- branches/pierre-fsd/include/reactos/ccros.h [iso-8859-1] (original) +++ branches/pierre-fsd/include/reactos/ccros.h [iso-8859-1] Tue Oct 14 10:19:21 2008 @@ -1,7 +1,7 @@ #ifndef __INCLUDE_DDK_NTIFS_H #define __INCLUDE_DDK_NTIFS_H -NTSTATUS NTAPI +VOID NTAPI CcRosInitializeFileCache(PFILE_OBJECT FileObject, ULONG CacheSegmentSize, PCACHE_MANAGER_CALLBACKS CallBacks, Modified: branches/pierre-fsd/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/cc/view.c?r… ============================================================================== --- branches/pierre-fsd/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/cc/view.c [iso-8859-1] Tue Oct 14 10:19:21 2008 @@ -1238,7 +1238,7 @@ } -NTSTATUS NTAPI +VOID NTAPI CcRosInitializeFileCache(PFILE_OBJECT FileObject, ULONG CacheSegmentSize, PCACHE_MANAGER_CALLBACKS CallBacks, @@ -1260,7 +1260,7 @@ if (Bcb == NULL) { KeReleaseGuardedMutex(&ViewLock); - return(STATUS_UNSUCCESSFUL); + ExRaiseStatus(STATUS_INSUFFICIENT_RESOURCES); } memset(Bcb, 0, sizeof(BCB)); ObReferenceObjectByPointer(FileObject, @@ -1293,8 +1293,6 @@ Bcb->BcbRemoveListEntry.Flink = NULL; } KeReleaseGuardedMutex(&ViewLock); - - return(STATUS_SUCCESS); } /*

1 0

[fireball] 36747: - Don't pass CMP_LOCK_HASHES_FOR_KCB flag because no locking is perform in CmpBuildHashStackAndLookupCache, fixes an assert when trying to unlock not locked object. - Add a hack (one and only one) for the MaxNameLen being different in KCB and actual KeyNode to allow regression testing framework go further.
by fireball＠svn.reactos.org 14 Oct '08

14 Oct '08

Author: fireball Date: Tue Oct 14 08:56:58 2008 New Revision: 36747 URL: http://svn.reactos.org/svn/reactos?rev=36747&view=rev Log: - Don't pass CMP_LOCK_HASHES_FOR_KCB flag because no locking is perform in CmpBuildHashStackAndLookupCache, fixes an assert when trying to unlock not locked object. - Add a hack (one and only one) for the MaxNameLen being different in KCB and actual KeyNode to allow regression testing framework go further. Modified: trunk/reactos/ntoskrnl/config/cmparse.c Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] Tue Oct 14 08:56:58 2008 @@ -339,7 +339,7 @@ *KeyCell, KeyNode, ParentKcb, - CMP_LOCK_HASHES_FOR_KCB, + 0, // CMP_LOCK_HASHES_FOR_KCB, Name); if (!Kcb) { @@ -492,7 +492,16 @@ ASSERT(KeyBody->KeyControlBlock->ParentKcb->KeyCell == Cell); ASSERT(KeyBody->KeyControlBlock->ParentKcb->KeyHive == Hive); ASSERT(KeyBody->KeyControlBlock->ParentKcb == ParentKcb); - ASSERT(KeyBody->KeyControlBlock->ParentKcb->KcbMaxNameLen == KeyNode->MaxNameLen); + //ASSERT(KeyBody->KeyControlBlock->ParentKcb->KcbMaxNameLen == KeyNode->MaxNameLen); + if (KeyBody->KeyControlBlock->ParentKcb->KcbMaxNameLen != KeyNode->MaxNameLen) + { + /* HACK: this gets unsynced due to (?) mismatching KCB referencing */ + DPRINT1("BUG: KCB MaxNameLen %d does not match KeyNode's MaxNameLen %d!\n", + KeyBody->KeyControlBlock->ParentKcb->KcbMaxNameLen, KeyNode->MaxNameLen); + + /* Manually sync MaxNameLens, remove once fixed */ + KeyBody->KeyControlBlock->ParentKcb->KcbMaxNameLen = KeyNode->MaxNameLen; + } /* Update the timestamp */ KeQuerySystemTime(&TimeStamp);

1 0

[dreimer] 36746: Bug 3750: spanish update for netcfgx by Javier Remacha Bug 3774: Greek update for usetup by Apostulos Alexandris Sync wordpad and Winhlp32 to Wine HEAD.
by dreimer＠svn.reactos.org 14 Oct '08

14 Oct '08

Author: dreimer Date: Tue Oct 14 08:47:07 2008 New Revision: 36746 URL: http://svn.reactos.org/svn/reactos?rev=36746&view=rev Log: Bug 3750: spanish update for netcfgx by Javier Remacha Bug 3774: Greek update for usetup by Apostulos Alexandris Sync wordpad and Winhlp32 to Wine HEAD. Modified: trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc trunk/reactos/base/applications/wordpad/Da.rc trunk/reactos/base/applications/wordpad/De.rc trunk/reactos/base/applications/wordpad/En.rc trunk/reactos/base/applications/wordpad/Fr.rc trunk/reactos/base/applications/wordpad/Hu.rc trunk/reactos/base/applications/wordpad/Ja.rc trunk/reactos/base/applications/wordpad/Ko.rc trunk/reactos/base/applications/wordpad/Nl.rc trunk/reactos/base/applications/wordpad/No.rc trunk/reactos/base/applications/wordpad/Pl.rc trunk/reactos/base/applications/wordpad/Ru.rc trunk/reactos/base/applications/wordpad/Si.rc trunk/reactos/base/applications/wordpad/Tr.rc trunk/reactos/base/applications/wordpad/Zh.rc trunk/reactos/base/applications/wordpad/print.c trunk/reactos/base/applications/wordpad/registry.c trunk/reactos/base/applications/wordpad/wordpad.c trunk/reactos/base/applications/wordpad/wordpad.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc trunk/reactos/dll/win32/netshell/lang/es-ES.rc Modified: trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/ja-JP.rc [iso-8859-1] Tue Oct 14 08:47:07 2008 @@ -19,49 +19,52 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* UTF-8 */ +#pragma code_page(65001) + /* Menu */ MAIN_MENU MENU LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT { - POPUP "t@C(&F)" { - MENUITEM "J(&O)", MNID_FILE_OPEN + POPUP "ãã¡ã¤ã«(&F)" { + MENUITEM "éã(&O)", MNID_FILE_OPEN MENUITEM SEPARATOR - MENUITEM "óü(&P)", MNID_FILE_PRINT - MENUITEM "v^ÌÝè(&S)...", MNID_FILE_SETUP + MENUITEM "å°å·(&P)", MNID_FILE_PRINT + MENUITEM "ããªã³ã¿ã®è¨å®(&S)...", MNID_FILE_SETUP MENUITEM SEPARATOR - MENUITEM "I¹(&X)", MNID_FILE_EXIT + MENUITEM "çµäº(&X)", MNID_FILE_EXIT } - POPUP "ÒW(&E)" { - MENUITEM "Rs[(&C)...", MNID_EDIT_COPYDLG + POPUP "ç·¨é(&E)" { + MENUITEM "ã³ãã¼(&C)...", MNID_EDIT_COPYDLG MENUITEM SEPARATOR - MENUITEM "Rg(&A)...", MNID_EDIT_ANNOTATE + MENUITEM "ã³ã¡ã³ã(&A)...", MNID_EDIT_ANNOTATE } - POPUP "µ¨è(&B)" { - MENUITEM "è`(&D)...", MNID_BKMK_DEFINE + POPUP "ããã(&B)" { + MENUITEM "å®ç¾©(&D)...", MNID_BKMK_DEFINE } - POPUP "IvV(&O)" { + POPUP "ãªãã·ã§ã³(&O)" { POPUP "Help always visible" BEGIN MENUITEM "Default", MNID_OPTS_HELP_DEFAULT MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE END - MENUITEM "ð", MNID_OPTS_HISTORY - POPUP "tHg" + MENUITEM "å±¥æ´", MNID_OPTS_HISTORY + POPUP "ãã©ã³ã" BEGIN - MENUITEM "¬", MNID_OPTS_FONTS_SMALL - MENUITEM "W", MNID_OPTS_FONTS_NORMAL - MENUITEM "å", MNID_OPTS_FONTS_LARGE + MENUITEM "å°", MNID_OPTS_FONTS_SMALL + MENUITEM "æ¨æº", MNID_OPTS_FONTS_NORMAL + MENUITEM "å¤§", MNID_OPTS_FONTS_LARGE END - MENUITEM "VXe J[ðg¤", MNID_OPTS_SYSTEM_COLORS + MENUITEM "ã·ã¹ãã ã«ã©ã¼ãä½¿ã", MNID_OPTS_SYSTEM_COLORS } - POPUP "wv(&H)" { - MENUITEM "wvÉÂ¢ÄÌwv(&O)", MNID_HELP_HELPON - MENUITEM "íÉèOÉ\\¦(&T)", MNID_HELP_HELPTOP + POPUP "ãã«ã(&H)" { + MENUITEM "ãã«ãã«ã¤ãã¦ã®ãã«ã(&O)", MNID_HELP_HELPON + MENUITEM "å¸¸ã«æåã«è¡¨ç¤º(&T)", MNID_HELP_HELPTOP MENUITEM SEPARATOR - MENUITEM "îñ(&I)...", MNID_HELP_ABOUT + MENUITEM "æå ±(&I)...", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "WINE ÉÂ¢Ä(&A)", MNID_HELP_WINE + MENUITEM "WINE ã«ã¤ãã¦(&A)", MNID_HELP_WINE #endif } } @@ -69,7 +72,7 @@ IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 9, "MS Shell Dlg" -CAPTION "õø" +CAPTION "ç´¢å¼" { LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } @@ -77,42 +80,42 @@ IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 9, "MS Shell Dlg" -CAPTION "õ" +CAPTION "æ¤ç´¢" { - LTEXT "¢À", -1, 10, 10, 180, 150 + LTEXT "æªå®è£", -1, 10, 10, 180, 150 } /* Strings */ STRINGTABLE DISCARDABLE LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT { -STID_WINE_HELP, "WINE wv" -STID_WHERROR, "G[" -STID_WARNING, "x" -STID_INFO, "îñ" -STID_NOT_IMPLEMENTED, "ñÀ" -STID_HLPFILE_ERROR_s, "wvt@C `%s' ðÇÝñÅ¢éÆ«ÉG[" -STID_INDEX, "õø(&I)" -STID_CONTENTS, "Tv" -STID_BACK, "ßé(&B)" -STID_ALL_FILES, "·×ÄÌt@C (*.*)" -STID_HELP_FILES_HLP, "wv t@C (*.hlp)" -STID_FILE_NOT_FOUND_s "'%s' ª©Â©èÜ¹ñB©ªÅ±Ìt@CðTµÜ·©?" -STID_NO_RICHEDIT "b`GfBbgÀª©Â©èÜ¹ñ... I¹µÜ·" -STID_PSH_INDEX, "wv gsbN: " +STID_WINE_HELP, "WINE ãã«ã" +STID_WHERROR, "ã¨ã©ã¼" +STID_WARNING, "è¦å" +STID_INFO, "æå ±" +STID_NOT_IMPLEMENTED, "éå®è£" +STID_HLPFILE_ERROR_s, "ãã«ããã¡ã¤ã« `%s' ãèªã¿è¾¼ãã§ããã¨ãã«ã¨ã©ã¼" +STID_INDEX, "ç´¢å¼(&I)" +STID_CONTENTS, "æ¦è¦" +STID_BACK, "æ»ã(&B)" +STID_ALL_FILES, "ãã¹ã¦ã®ãã¡ã¤ã« (*.*)" +STID_HELP_FILES_HLP, "ãã«ã ãã¡ã¤ã« (*.hlp)" +STID_FILE_NOT_FOUND_s "'%s' ãè¦ã¤ããã¾ãããèªåã§ãã®ãã¡ã¤ã«ãæ¢ãã¾ãã?" +STID_NO_RICHEDIT "ãªããã¨ãã£ããå®è£ãè¦ã¤ããã¾ãã... çµäºãã¾ã" +STID_PSH_INDEX, "ãã«ã ãããã¯: " } CONTEXT_MENU MENU LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT BEGIN POPUP "" BEGIN - MENUITEM "Rg...", MNID_CTXT_ANNOTATE - MENUITEM "Rs[", MNID_CTXT_COPY - MENUITEM "óü...", MNID_CTXT_PRINT - POPUP "tHg" + MENUITEM "ã³ã¡ã³ã...", MNID_CTXT_ANNOTATE + MENUITEM "ã³ãã¼", MNID_CTXT_COPY + MENUITEM "å°å·...", MNID_CTXT_PRINT + POPUP "ãã©ã³ã" BEGIN - MENUITEM "¬", MNID_CTXT_FONTS_SMALL - MENUITEM "W", MNID_CTXT_FONTS_NORMAL - MENUITEM "å", MNID_CTXT_FONTS_LARGE + MENUITEM "å°", MNID_CTXT_FONTS_SMALL + MENUITEM "æ¨æº", MNID_CTXT_FONTS_NORMAL + MENUITEM "å¤§", MNID_CTXT_FONTS_LARGE END POPUP "Help always visible" BEGIN @@ -120,6 +123,8 @@ MENUITEM "Visible", MNID_CTXT_HELP_VISIBLE MENUITEM "Non visible", MNID_CTXT_HELP_NONVISIBLE END - MENUITEM "VXe J[ðg¤", MNID_CTXT_SYSTEM_COLORS + MENUITEM "ã·ã¹ãã ã«ã©ã¼ãä½¿ã", MNID_CTXT_SYSTEM_COLORS END END + +#pragma code_page(default) Modified: trunk/reactos/base/applications/wordpad/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Da.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Da.rc [iso-8859-1] Tue Oct 14 08:47:07 2008 @@ -164,8 +164,9 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Liniebrydning", 0, 10, 10, 130, 85 - RADIOBUTTON "Bryd tekst efter v&indusbredden", IDC_PAGEFMT_WW, 18, 25, 117, 15 - RADIOBUTTON "Bryd tekst efter &margen", IDC_PAGEFMT_WM, 18, 45, 117, 15 + RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 + RADIOBUTTON "Bryd tekst efter v&indusbredden", IDC_PAGEFMT_WW, 18, 45, 117, 15 + RADIOBUTTON "Bryd tekst efter &margen", IDC_PAGEFMT_WM, 18, 65, 117, 15 GROUPBOX "Værktøjslinier", 0, 150, 10, 120, 85 CHECKBOX "&Værktøjslinie", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Formatteringlinie", IDC_PAGEFMT_FB, 160, 38, 80, 15 Modified: trunk/reactos/base/applications/wordpad/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/De.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/De.rc [iso-8859-1] Tue Oct 14 08:47:07 2008 @@ -166,8 +166,9 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Zeilenumbruch", 0, 10, 10, 130, 85 - RADIOBUTTON "&Am Fenster umbrechen", IDC_PAGEFMT_WW, 18, 25, 117, 15 - RADIOBUTTON "A&m Lineal umbrechen", IDC_PAGEFMT_WM, 18, 45, 117, 15 + RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 + RADIOBUTTON "&Am Fenster umbrechen", IDC_PAGEFMT_WW, 18, 45, 117, 15 + RADIOBUTTON "A&m Lineal umbrechen", IDC_PAGEFMT_WM, 18, 65, 117, 15 GROUPBOX "Symbolleisten", 0, 150, 10, 120, 85 CHECKBOX "&Symbolleiste", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Formatierungsleiste", IDC_PAGEFMT_FB, 160, 38, 80, 15 Modified: trunk/reactos/base/applications/wordpad/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/En.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/En.rc [iso-8859-1] Tue Oct 14 08:47:07 2008 @@ -164,8 +164,9 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Line wrapping", 0, 10, 10, 130, 85 - RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 25, 117, 15 - RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 45, 117, 15 + RADIOBUTTON "&No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 + RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 45, 117, 15 + RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 65, 117, 15 GROUPBOX "Toolbars", 0, 150, 10, 120, 85 CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 @@ -238,4 +239,5 @@ STRING_WRITE_ACCESS_DENIED, "You do not have access to save the file." STRING_OPEN_FAILED, "Could not open the file." STRING_OPEN_ACCESS_DENIED, "You do not have access to open the file." -END + STRING_PRINTING_NOT_IMPLEMENTED, "Printing not implemented" +END Modified: trunk/reactos/base/applications/wordpad/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Fr.rc [iso-8859-1] Tue Oct 14 08:47:07 2008 @@ -164,8 +164,9 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Enveloppement de ligne", 0, 10, 10, 170, 85 - RADIOBUTTON "Enveloppe le texte à partir de la bordure de fenêtre", IDC_PAGEFMT_WW, 18, 25, 145, 15 - RADIOBUTTON "Enveloppe le texte à partir de la &marge", IDC_PAGEFMT_WM, 18, 45, 145, 15 + RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 145, 15 + RADIOBUTTON "Enveloppe le texte à partir de la bordure de fenêtre", IDC_PAGEFMT_WW, 18, 45, 145, 15 + RADIOBUTTON "Enveloppe le texte à partir de la &marge", IDC_PAGEFMT_WM, 18, 65, 145, 15 GROUPBOX "Barres d'outils", 0, 170, 10, 120, 85 CHECKBOX "&Barre d'outils", IDC_PAGEFMT_TB, 180, 20, 80, 15 CHECKBOX "Barre de &format", IDC_PAGEFMT_FB, 180, 38, 80, 15 Modified: trunk/reactos/base/applications/wordpad/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Hu.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Hu.rc [iso-8859-1] Tue Oct 14 08:47:07 2008 @@ -164,8 +164,9 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Line wrapping", 0, 10, 10, 130, 85 - RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 25, 117, 15 - RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 45, 117, 15 + RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 + RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 45, 117, 15 + RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 65, 117, 15 GROUPBOX "Toolbars", 0, 150, 10, 120, 85 CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 Modified: trunk/reactos/base/applications/wordpad/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ja.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Ja.rc [iso-8859-1] Tue Oct 14 08:47:07 2008 @@ -16,40 +16,43 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDM_MAINMENU MENU DISCARDABLE BEGIN - POPUP "t@C(&F)" - BEGIN - MENUITEM "VKì¬(&N)...\tCtrl+N", ID_FILE_NEW - MENUITEM "J(&O)...\tCtrl+O", ID_FILE_OPEN - MENUITEM "ã«Û¶(&S)\tCtrl+S", ID_FILE_SAVE - MENUITEM "¼Oðt¯ÄÛ¶(&A)...", ID_FILE_SAVEAS - MENUITEM SEPARATOR - MENUITEM "óü(&P)...\tCtrl+P", ID_PRINT - MENUITEM "óüvr[(&W)...", ID_PREVIEW - MENUITEM "y[WÝè(&E)...", ID_PRINTSETUP - MENUITEM SEPARATOR - MENUITEM "I¹(&X)", ID_FILE_EXIT - END - POPUP "ÒW(&E)" - BEGIN - MENUITEM "³Éß·(&U)\tCtrl+Z", ID_EDIT_UNDO - MENUITEM "âè¼µ(&E)\tCtrl+Y", ID_EDIT_REDO - MENUITEM SEPARATOR - MENUITEM "Øèæè(&T)\tCtrl+X", ID_EDIT_CUT - MENUITEM "Rs[(&C)\tCtrl+C", ID_EDIT_COPY - MENUITEM "\\èt¯(&P)\tCtrl+V", ID_EDIT_PASTE - MENUITEM "NA(&C)\tDEL", ID_EDIT_CLEAR - MENUITEM "·×ÄIð(&S)\tCtrl+A", ID_EDIT_SELECTALL - MENUITEM SEPARATOR - MENUITEM "õ(&F)...\tCrtl+F", ID_FIND - MENUITEM "ðõ(&N)\tF3", ID_FIND_NEXT - MENUITEM "u·(&R)...\tCtrl+H", ID_REPLACE - MENUITEM SEPARATOR - MENUITEM "ÇÝæèêp(&O)", ID_EDIT_READONLY - MENUITEM "ÏX è(&M)", ID_EDIT_MODIFIED + POPUP "ãã¡ã¤ã«(&F)" + BEGIN + MENUITEM "æ°è¦ä½æ(&N)...\tCtrl+N", ID_FILE_NEW + MENUITEM "éã(&O)...\tCtrl+O", ID_FILE_OPEN + MENUITEM "ä¸æ¸ãä¿å(&S)\tCtrl+S", ID_FILE_SAVE + MENUITEM "ååãä»ãã¦ä¿å(&A)...", ID_FILE_SAVEAS + MENUITEM SEPARATOR + MENUITEM "å°å·(&P)...\tCtrl+P", ID_PRINT + MENUITEM "å°å·ãã¬ãã¥ã¼(&W)...", ID_PREVIEW + MENUITEM "ãã¼ã¸è¨å®(&E)...", ID_PRINTSETUP + MENUITEM SEPARATOR + MENUITEM "çµäº(&X)", ID_FILE_EXIT + END + POPUP "ç·¨é(&E)" + BEGIN + MENUITEM "åã«æ»ã(&U)\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "ããç´ã(&E)\tCtrl+Y", ID_EDIT_REDO + MENUITEM SEPARATOR + MENUITEM "åãåã(&T)\tCtrl+X", ID_EDIT_CUT + MENUITEM "ã³ãã¼(&C)\tCtrl+C", ID_EDIT_COPY + MENUITEM "è²¼ãä»ã(&P)\tCtrl+V", ID_EDIT_PASTE + MENUITEM "ã¯ãªã¢(&C)\tDEL", ID_EDIT_CLEAR + MENUITEM "ãã¹ã¦é¸æ(&S)\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "æ¤ç´¢(&F)...\tCrtl+F", ID_FIND + MENUITEM "æ¬¡ãæ¤ç´¢(&N)\tF3", ID_FIND_NEXT + MENUITEM "ç½®æ(&R)...\tCtrl+H", ID_REPLACE + MENUITEM SEPARATOR + MENUITEM "èªã¿åãå°ç¨(&O)", ID_EDIT_READONLY + MENUITEM "å¤æ´ãã(&M)", ID_EDIT_MODIFIED MENUITEM SEPARATOR POPUP "E&xtras" BEGIN @@ -60,34 +63,34 @@ MENUITEM "&Get text", ID_EDIT_GETTEXT END END - POPUP "\\¦(&V)" - BEGIN - MENUITEM "c[o[(&T)", ID_TOGGLE_TOOLBAR - MENUITEM "®o[(&F)", ID_TOGGLE_FORMATBAR - MENUITEM "[[(&R)", ID_TOGGLE_RULER - MENUITEM "Xe[^X o[(&S)", ID_TOGGLE_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "IvV(&O)...", ID_VIEWPROPERTIES - END - POPUP "}ü(&I)" - BEGIN - MENUITEM "útÆ(&D)...", ID_DATETIME - END - POPUP "®(&O)" - BEGIN - MENUITEM "tHg(&F)...", ID_FONTSETTINGS - MENUITEM "Óð«(&B)" ID_BULLET - MENUITEM "i(&P)..." ID_PARAFORMAT - MENUITEM "^u(&T)..." ID_TABSTOPS - POPUP "wi(&D)" + POPUP "è¡¨ç¤º(&V)" + BEGIN + MENUITEM "ãã¼ã«ãã¼(&T)", ID_TOGGLE_TOOLBAR + MENUITEM "æ¸å¼ãã¼(&F)", ID_TOGGLE_FORMATBAR + MENUITEM "ã«ã¼ã©ã¼(&R)", ID_TOGGLE_RULER + MENUITEM "ã¹ãã¼ã¿ã¹ ãã¼(&S)", ID_TOGGLE_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "ãªãã·ã§ã³(&O)...", ID_VIEWPROPERTIES + END + POPUP "æ¿å¥(&I)" + BEGIN + MENUITEM "æ¥ä»ã¨æå»(&D)...", ID_DATETIME + END + POPUP "æ¸å¼(&O)" + BEGIN + MENUITEM "ãã©ã³ã(&F)...", ID_FONTSETTINGS + MENUITEM "ç®æ¡æ¸ã(&B)" ID_BULLET + MENUITEM "æ®µè½(&P)..." ID_PARAFORMAT + MENUITEM "ã¿ã(&T)..." ID_TABSTOPS + POPUP "èæ¯(&D)" BEGIN - MENUITEM "VXe(&S)\tCtrl+1", ID_BACK_1 + MENUITEM "ã·ã¹ãã (&S)\tCtrl+1", ID_BACK_1 MENUITEM "&PostThat yellowish\tCtrl+2", ID_BACK_2 END END - POPUP "wv(&H)" - BEGIN - MENUITEM "Wine WordpadÉÂ¢Ä(&A)" ID_ABOUT + POPUP "ãã«ã(&H)" + BEGIN + MENUITEM "Wine Wordpadã«ã¤ãã¦(&A)" ID_ABOUT END END @@ -95,67 +98,67 @@ BEGIN POPUP "" BEGIN - MENUITEM "Øèæè(&T)", ID_EDIT_CUT - MENUITEM "Rs[(&C)", ID_EDIT_COPY - MENUITEM "\\èt¯(&P)", ID_EDIT_PASTE - MENUITEM SEPARATOR - MENUITEM "Óð«(&B)" ID_BULLET - MENUITEM "i(&P)..." ID_PARAFORMAT + MENUITEM "åãåã(&T)", ID_EDIT_CUT + MENUITEM "ã³ãã¼(&C)", ID_EDIT_COPY + MENUITEM "è²¼ãä»ã(&P)", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "ç®æ¡æ¸ã(&B)" ID_BULLET + MENUITEM "æ®µè½(&P)..." ID_PARAFORMAT END END IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "útÆ" -FONT 9, "MS Shell Dlg" -BEGIN - LTEXT "pÅ«é`®",0,3,2,100,15 +CAPTION "æ¥ä»ã¨æå»" +FONT 9, "MS Shell Dlg" +BEGIN + LTEXT "å©ç¨ã§ããå½¢å¼",0,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT|LBS_NOTIFY PUSHBUTTON "&OK",IDOK,87,12,40,12 - PUSHBUTTON "LZ(&C)",IDCANCEL,87,26,40,12 + PUSHBUTTON "ãã£ã³ã»ã«(&C)",IDCANCEL,87,26,40,12 END IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "VKì¬" -FONT 9, "MS Shell Dlg" -BEGIN - LTEXT "Vµ¢¶`®",0,3,2,100,15 +CAPTION "æ°è¦ä½æ" +FONT 9, "MS Shell Dlg" +BEGIN + LTEXT "æ°ããææ¸å½¢å¼",0,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT PUSHBUTTON "&OK",IDOK,97,12,40,12 - PUSHBUTTON "LZ(&C)",IDCANCEL,97,26,40,12 + PUSHBUTTON "ãã£ã³ã»ã«(&C)",IDCANCEL,97,26,40,12 END IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "iÌÝè" -FONT 9, "MS Shell Dlg" -BEGIN - GROUPBOX "Cfg", 0, 10, 10, 120, 68 - LTEXT "¶(&L)", 0, 15, 22, 40, 13 +CAPTION "æ®µè½ã®è¨å®" +FONT 9, "MS Shell Dlg" +BEGIN + GROUPBOX "ã¤ã³ãã³ã", 0, 10, 10, 120, 68 + LTEXT "å·¦(&L)", 0, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "E(&R)", 0, 15, 40, 40, 13 + LTEXT "å³(&R)", 0, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "ÅÌs(&F)", 0, 15, 58, 40, 13 + LTEXT "æåã®è¡(&F)", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 - LTEXT "®ñ(&A)", 0, 15, 87, 40, 13 + LTEXT "æ´å(&A)", 0, 15, 87, 40, 13 COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 - PUSHBUTTON "LZ(&C)", IDCANCEL, 137, 33, 50, 15 + PUSHBUTTON "ãã£ã³ã»ã«(&C)", IDCANCEL, 137, 33, 50, 15 END IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "^uÌÝè" -FONT 9, "MS Shell Dlg" -BEGIN - GROUPBOX "^uÌâ~Êu(&T)", 0, 10, 10, 120, 90 +CAPTION "ã¿ãã®è¨å®" +FONT 9, "MS Shell Dlg" +BEGIN + GROUPBOX "ã¿ãã®åæ¢ä½ç½®(&T)", 0, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT - DEFPUSHBUTTON "ÇÁ(&A)", ID_TAB_ADD, 20, 80, 45, 15 - PUSHBUTTON "í(&R)", ID_TAB_DEL, 72, 80, 45, 15 + DEFPUSHBUTTON "è¿½å (&A)", ID_TAB_ADD, 20, 80, 45, 15 + PUSHBUTTON "åé¤(&R)", ID_TAB_DEL, 72, 80, 45, 15 PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 - PUSHBUTTON "LZ(&C)", IDCANCEL, 137, 33, 50, 15 - PUSHBUTTON "·×Äí(&L)", ID_TAB_EMPTY, 137, 51, 50, 15 + PUSHBUTTON "ãã£ã³ã»ã«(&C)", IDCANCEL, 137, 33, 50, 15 + PUSHBUTTON "ãã¹ã¦åé¤(&L)", ID_TAB_EMPTY, 137, 51, 50, 15 END IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 @@ -163,59 +166,60 @@ CAPTION "" FONT 9, "MS Shell Dlg" BEGIN - GROUPBOX "sÌÜèÔµ", 0, 10, 10, 130, 85 - RADIOBUTTON "EBhEÌ«EÅÜèÔ·(&W)", IDC_PAGEFMT_WW, 18, 25, 117, 15 - RADIOBUTTON "}[WÅÜèÔ·(&M)", IDC_PAGEFMT_WM, 18, 45, 117, 15 - GROUPBOX "c[o[", 0, 150, 10, 120, 85 - CHECKBOX "c[o[(&T)", IDC_PAGEFMT_TB, 160, 20, 80, 15 - CHECKBOX "®o[(&F)", IDC_PAGEFMT_FB, 160, 38, 80, 15 - CHECKBOX "[[(&R)", IDC_PAGEFMT_RU, 160, 56, 80, 15 - CHECKBOX "Xe[^Xo[(&S)", IDC_PAGEFMT_SB, 160, 74, 80, 15 + GROUPBOX "è¡ã®æãè¿ã", 0, 10, 10, 130, 85 + RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 + RADIOBUTTON "ã¦ã£ã³ãã¦ã®å¢çã§æãè¿ã(&W)", IDC_PAGEFMT_WW, 18, 45, 117, 15 + RADIOBUTTON "ãã¼ã¸ã³ã§æãè¿ã(&M)", IDC_PAGEFMT_WM, 18, 65, 117, 15 + GROUPBOX "ãã¼ã«ãã¼", 0, 150, 10, 120, 85 + CHECKBOX "ãã¼ã«ãã¼(&T)", IDC_PAGEFMT_TB, 160, 20, 80, 15 + CHECKBOX "æ¸å¼ãã¼(&F)", IDC_PAGEFMT_FB, 160, 38, 80, 15 + CHECKBOX "ã«ã¼ã©ã¼(&R)", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "ã¹ãã¼ã¿ã¹ãã¼(&S)", IDC_PAGEFMT_SB, 160, 74, 80, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END STRINGTABLE DISCARDABLE BEGIN - STRING_RICHTEXT_FILES_RTF, "b`eLXg`® (*.rtf)" - STRING_TEXT_FILES_TXT, "eLXg¶ (*.txt)" - STRING_TEXT_FILES_UNICODE_TXT, "UnicodeeLXg¶(*.txt)" - STRING_ALL_FILES, "·×ÄÌt@C (*.*)" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_ALIGN_LEFT, "¶" - STRING_ALIGN_RIGHT, "E" - STRING_ALIGN_CENTER, "" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_NEWFILE_RICHTEXT, "b`eLXg¶" - STRING_NEWFILE_TXT, "eLXg¶" - STRING_NEWFILE_TXT_UNICODE, "UnicodeeLXg¶" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_PRINTER_FILES_PRN, "v^t@C (*.PRN)" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_VIEWPROPS_TITLE, "IvV" - STRING_VIEWPROPS_TEXT, "eLXg" - STRING_VIEWPROPS_RICHTEXT, "b`eLXg" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_PREVIEW_PRINT, "óü" - STRING_PREVIEW_NEXTPAGE, "Ìy[W" - STRING_PREVIEW_PREVPAGE, "OÌy[W" - STRING_PREVIEW_TWOPAGES, "2y[W" - STRING_PREVIEW_ONEPAGE, "1y[W" - STRING_PREVIEW_CLOSE, "Â¶é" + STRING_RICHTEXT_FILES_RTF, "ãªããããã¹ãå½¢å¼ (*.rtf)" + STRING_TEXT_FILES_TXT, "ããã¹ãææ¸ (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "Unicodeããã¹ãææ¸(*.txt)" + STRING_ALL_FILES, "ãã¹ã¦ã®ãã¡ã¤ã« (*.*)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_ALIGN_LEFT, "å·¦" + STRING_ALIGN_RIGHT, "å³" + STRING_ALIGN_CENTER, "ä¸å¤®" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_NEWFILE_RICHTEXT, "ãªããããã¹ãææ¸" + STRING_NEWFILE_TXT, "ããã¹ãææ¸" + STRING_NEWFILE_TXT_UNICODE, "Unicodeããã¹ãææ¸" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PRINTER_FILES_PRN, "ããªã³ã¿ãã¡ã¤ã« (*.PRN)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_VIEWPROPS_TITLE, "ãªãã·ã§ã³" + STRING_VIEWPROPS_TEXT, "ããã¹ã" + STRING_VIEWPROPS_RICHTEXT, "ãªããããã¹ã" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PREVIEW_PRINT, "å°å·" + STRING_PREVIEW_NEXTPAGE, "æ¬¡ã®ãã¼ã¸" + STRING_PREVIEW_PREVPAGE, "åã®ãã¼ã¸" + STRING_PREVIEW_TWOPAGES, "2ãã¼ã¸" + STRING_PREVIEW_ONEPAGE, "1ãã¼ã¸" + STRING_PREVIEW_CLOSE, "éãã" END STRINGTABLE DISCARDABLE @@ -225,17 +229,19 @@ STRINGTABLE DISCARDABLE BEGIN - STRING_DEFAULT_FILENAME, "¶" - STRING_PROMPT_SAVE_CHANGES, "'%s'ÖÌÏXðÛ¶µÜ·©?" - STRING_SEARCH_FINISHED, "¶Ìõð®¹B" - STRING_LOAD_RICHED_FAILED, "RichEditCuÌÇÝÝÉ¸sB" - STRING_SAVE_LOSEFORMATTING, "v[eLXg`®ÅÛ¶·éÆA" \ - "·×ÄÌ®ª¸íêÜ·B" \ - "»êÅàæ¢Å·©H" - STRING_INVALID_NUMBER, "Ì®ªs³" - STRING_OLE_STORAGE_NOT_SUPPORTED, "OLEXg[W¶ÍT|[g³êÄ¢Ü¹ñB" - STRING_WRITE_FAILED, "t@CðÛ¶Å«Ü¹ñB" - STRING_WRITE_ACCESS_DENIED, "t@CÉÛ¶·é Àª èÜ¹ñB" - STRING_OPEN_FAILED, "t@CðJ¯Ü¹ñB" - STRING_OPEN_ACCESS_DENIED, "t@CðJ Àª èÜ¹ñB" -END + STRING_DEFAULT_FILENAME, "ææ¸" + STRING_PROMPT_SAVE_CHANGES, "'%s'ã¸ã®å¤æ´ãä¿åãã¾ãã?" + STRING_SEARCH_FINISHED, "ææ¸ã®æ¤ç´¢ãå®äºã" + STRING_LOAD_RICHED_FAILED, "RichEditã©ã¤ãã©ãªã®èªã¿è¾¼ã¿ã«å¤±æã" + STRING_SAVE_LOSEFORMATTING, "ãã¬ã¼ã³ããã¹ãå½¢å¼ã§ä¿åããã¨ã" \ + "ãã¹ã¦ã®æ¸å¼ãå¤±ããã¾ãã" \ + "ããã§ãããã§ããï¼" + STRING_INVALID_NUMBER, "æ°ã®æ¸å¼ãä¸æ£" + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLEã¹ãã¬ã¼ã¸ææ¸ã¯ãµãã¼ãããã¦ãã¾ããã" + STRING_WRITE_FAILED, "ãã¡ã¤ã«ãä¿åã§ãã¾ããã" + STRING_WRITE_ACCESS_DENIED, "ãã¡ã¤ã«ã«ä¿åããæ¨©éãããã¾ããã" + STRING_OPEN_FAILED, "ãã¡ã¤ã«ãéãã¾ããã" + STRING_OPEN_ACCESS_DENIED, "ãã¡ã¤ã«ãéãæ¨©éãããã¾ããã" +END + +#pragma code_page(default) Modified: trunk/reactos/base/applications/wordpad/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Ko.rc [iso-8859-1] Tue Oct 14 08:47:07 2008 @@ -166,8 +166,9 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "ÁÙ ³Ñ±â±â", 0, 10, 10, 130, 85 - RADIOBUTTON "Ã¢ °¡ÀåÀÚ¸®¼ ±Û ³Ñ±â±â(&W)", IDC_PAGEFMT_WW, 18, 25, 117, 15 - RADIOBUTTON "°¡ÀåÀÚ¸®¿¡¼ ÁÙ ³Ñ±â±â(&M)", IDC_PAGEFMT_WM, 18, 45, 117, 15 + RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 + RADIOBUTTON "Ã¢ °¡ÀåÀÚ¸®¼ ±Û ³Ñ±â±â(&W)", IDC_PAGEFMT_WW, 18, 45, 117, 15 + RADIOBUTTON "°¡ÀåÀÚ¸®¿¡¼ ÁÙ ³Ñ±â±â(&M)", IDC_PAGEFMT_WM, 18, 65, 117, 15 GROUPBOX " µµ±¸¹Ù", 0, 150, 10, 120, 85 CHECKBOX "µµ±¸¹Ù(&T)", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "Çü½Ä¹Ù(&F)", IDC_PAGEFMT_FB, 160, 38, 80, 15 Modified: trunk/reactos/base/applications/wordpad/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Nl.rc [iso-8859-1] Tue Oct 14 08:47:07 2008 @@ -165,8 +165,9 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Regel afbreken", 0, 10, 10, 130, 85 - RADIOBUTTON "Breek tekst af bij &venster rand", IDC_PAGEFMT_WW, 18, 25, 117, 15 - RADIOBUTTON "Breek tekst af bij de &marge", IDC_PAGEFMT_WM, 18, 45, 117, 15 + RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 + RADIOBUTTON "Breek tekst af bij &venster rand", IDC_PAGEFMT_WW, 18, 45, 117, 15 + RADIOBUTTON "Breek tekst af bij de &marge", IDC_PAGEFMT_WM, 18, 65, 117, 15 GROUPBOX "Toolbars", 0, 150, 10, 120, 85 CHECKBOX "&Toolbalk", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Formaatbalk", IDC_PAGEFMT_FB, 160, 38, 80, 15 Modified: trunk/reactos/base/applications/wordpad/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/No.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/No.rc [iso-8859-1] Tue Oct 14 08:47:07 2008 @@ -164,8 +164,9 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Linjebryting", 0, 10, 10, 130, 85 - RADIOBUTTON "Bryt tekst etter v&indusbredden", IDC_PAGEFMT_WW, 18, 25, 117, 15 - RADIOBUTTON "Bryt tekst etter &margen", IDC_PAGEFMT_WM, 18, 45, 117, 15 + RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 + RADIOBUTTON "Bryt tekst etter v&indusbredden", IDC_PAGEFMT_WW, 18, 45, 117, 15 + RADIOBUTTON "Bryt tekst etter &margen", IDC_PAGEFMT_WM, 18, 65, 117, 15 GROUPBOX "Verktøylinjer", 0, 150, 10, 120, 85 CHECKBOX "&Verktøylinje", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Formatlinje", IDC_PAGEFMT_FB, 160, 38, 80, 15 Modified: trunk/reactos/base/applications/wordpad/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Pl.rc [iso-8859-1] Tue Oct 14 08:47:07 2008 @@ -165,8 +165,9 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Zawijanie wierszy", 0, 10, 10, 130, 85 - RADIOBUTTON "Zawijaj do &brzegu okna", IDC_PAGEFMT_WW, 18, 25, 117, 15 - RADIOBUTTON "Zawijaj do &marginesu", IDC_PAGEFMT_WM, 18, 45, 117, 15 + RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 + RADIOBUTTON "Zawijaj do &brzegu okna", IDC_PAGEFMT_WW, 18, 45, 117, 15 + RADIOBUTTON "Zawijaj do &marginesu", IDC_PAGEFMT_WM, 18, 65, 117, 15 GROUPBOX "Paski narzêdzi", 0, 150, 10, 120, 85 CHECKBOX "Pasek &narzêdzi", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "Pasek &formatu", IDC_PAGEFMT_FB, 160, 38, 80, 15 Modified: trunk/reactos/base/applications/wordpad/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Ru.rc [iso-8859-1] Tue Oct 14 08:47:07 2008 @@ -164,8 +164,9 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Ïåðåíîñ ïî ñëîâàì", 0, 10, 10, 130, 85 - RADIOBUTTON "Â ãðàíèöàõ &îêíà", IDC_PAGEFMT_WW, 18, 25, 117, 15 - RADIOBUTTON "Â ãðàíèöàõ &ïîëåé", IDC_PAGEFMT_WM, 18, 45, 117, 15 + RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 + RADIOBUTTON "Â ãðàíèöàõ &îêíà", IDC_PAGEFMT_WW, 18, 45, 117, 15 + RADIOBUTTON "Â ãðàíèöàõ &ïîëåé", IDC_PAGEFMT_WM, 18, 65, 117, 15 GROUPBOX "Ïàíåëè", 0, 150, 10, 120, 85 CHECKBOX "&Èíñòðóìåíòîâ", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Ôîðìàòèðîâàíèÿ", IDC_PAGEFMT_FB, 160, 38, 80, 15 @@ -234,4 +235,5 @@ "ýòîé îïåðàöèè?" STRING_INVALID_NUMBER, "Íåïðàâèëüíûé ÷èñëîâîé ôîðìàò" STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage äîêóìåíòû íå ïîääåðæèâàþòñÿ" -END + STRING_PRINTING_NOT_IMPLEMENTED, "Ïå÷àòü íå ïîääåðæèâàåòñÿ" +END Modified: trunk/reactos/base/applications/wordpad/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Si.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Si.rc [iso-8859-1] Tue Oct 14 08:47:07 2008 @@ -166,8 +166,9 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Prelom vrstic", 0, 10, 10, 130, 85 - RADIOBUTTON "Prelomi besedilo na robu o&kna", IDC_PAGEFMT_WW, 18, 25, 117, 15 - RADIOBUTTON "Prelomi besedilo na robu &papirja", IDC_PAGEFMT_WM, 18, 45, 117, 15 + RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 + RADIOBUTTON "Prelomi besedilo na robu o&kna", IDC_PAGEFMT_WW, 18, 45, 117, 15 + RADIOBUTTON "Prelomi besedilo na robu &papirja", IDC_PAGEFMT_WM, 18, 65, 117, 15 GROUPBOX "Orodne vrstice", 0, 150, 10, 120, 85 CHECKBOX "O&rodna vrstica", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "O&blikovna vrstica", IDC_PAGEFMT_FB, 160, 38, 80, 15 Modified: trunk/reactos/base/applications/wordpad/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Tr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Tr.rc [iso-8859-1] Tue Oct 14 08:47:07 2008 @@ -166,8 +166,9 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Line wrapping", 0, 10, 10, 130, 85 - RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 25, 117, 15 - RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 45, 117, 15 + RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 + RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 45, 117, 15 + RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 65, 117, 15 GROUPBOX "Toolbars", 0, 150, 10, 120, 85 CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 Modified: trunk/reactos/base/applications/wordpad/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Zh.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Zh.rc [iso-8859-1] Tue Oct 14 08:47:07 2008 @@ -169,8 +169,9 @@ FONT 9, "MS Song" BEGIN GROUPBOX "èªå¨æ¢è¡", 0, 10, 10, 130, 85 - RADIOBUTTON "æè§çªå®½åº¦(&W)", IDC_PAGEFMT_WW, 18, 25, 117, 15 - RADIOBUTTON "æçº¸å¼ å®½åº¦(&M)", IDC_PAGEFMT_WM, 18, 45, 117, 15 + RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 + RADIOBUTTON "æè§çªå®½åº¦(&W)", IDC_PAGEFMT_WW, 18, 45, 117, 15 + RADIOBUTTON "æçº¸å¼ å®½åº¦(&M)", IDC_PAGEFMT_WM, 18, 65, 117, 15 GROUPBOX "å·¥å·æ ", 0, 150, 10, 120, 85 CHECKBOX "å·¥å·æ (&T)", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "æ ¼å¼å·¥å·æ (&F)", IDC_PAGEFMT_FB, 160, 38, 80, 15 Modified: trunk/reactos/base/applications/wordpad/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] Tue Oct 14 08:47:07 2008 @@ -132,24 +132,22 @@ static LONG twips_to_centmm(int twips) { - return MulDiv(twips, 1000, TWIPS_PER_CM); -} - -LONG centmm_to_twips(int mm) -{ - return MulDiv(mm, TWIPS_PER_CM, 1000); + return MulDiv(twips, CENTMM_PER_INCH, TWIPS_PER_INCH); +} + +static LONG centmm_to_twips(int mm) +{ + return MulDiv(mm, TWIPS_PER_INCH, CENTMM_PER_INCH); } static LONG twips_to_pixels(int twips, int dpi) { - float ret = ((float)twips / ((float)TWIPS_PER_CM * 2.54)) * (float)dpi; - return (LONG)ret; + return MulDiv(twips, dpi, TWIPS_PER_INCH); } static LONG devunits_to_twips(int units, int dpi) { - float ret = ((float)units / (float)dpi) * (float)TWIPS_PER_CM * 2.54; - return (LONG)ret; + return MulDiv(units, TWIPS_PER_INCH, dpi); } @@ -181,25 +179,35 @@ void target_device(HWND hMainWnd, DWORD wordWrap) { HWND hEditorWnd = GetDlgItem(hMainWnd, IDC_EDITOR); - HDC hdc = make_dc(); - int width = 0; if(wordWrap == ID_WORDWRAP_MARGIN) { + int width = 0; + LRESULT result; + HDC hdc = make_dc(); RECT rc = get_print_rect(hdc); + width = rc.right - rc.left; - } - - if(!hdc) - { - HDC hMaindc = GetDC(hMainWnd); - hdc = CreateCompatibleDC(hMaindc); - ReleaseDC(hMainWnd, hMaindc); - } - - SendMessageW(hEditorWnd, EM_SETTARGETDEVICE, (WPARAM)hdc, width); - - DeleteDC(hdc); + if(!hdc) + { + HDC hMaindc = GetDC(hMainWnd); + hdc = CreateCompatibleDC(hMaindc); + ReleaseDC(hMainWnd, hMaindc); + } + result = SendMessageW(hEditorWnd, EM_SETTARGETDEVICE, (WPARAM)hdc, width); + DeleteDC(hdc); + if (result) + return; + /* otherwise EM_SETTARGETDEVICE failed, so fall back on wrapping + * to window using the NULL DC. */ + } + + if (wordWrap != ID_WORDWRAP_NONE) { + SendMessageW(hEditorWnd, EM_SETTARGETDEVICE, 0, 0); + } else { + SendMessageW(hEditorWnd, EM_SETTARGETDEVICE, 0, 1); + } + } static LPWSTR dialog_print_to_file(HWND hMainWnd) @@ -502,7 +510,7 @@ hdc = CreateCompatibleDC(0); - CmPixels = twips_to_pixels(TWIPS_PER_CM, GetDeviceCaps(hdc, LOGPIXELSX)); + CmPixels = twips_to_pixels(centmm_to_twips(1000), GetDeviceCaps(hdc, LOGPIXELSX)); QuarterCmPixels = (int)((float)CmPixels / 4.0); hBitmap = CreateCompatibleBitmap(hdc, drawRect->right, drawRect->bottom); @@ -620,7 +628,7 @@ return 0; } -void draw_preview_page(HDC hdc, HDC* hdcSized, FORMATRANGE* lpFr, float ratio, int bmNewWidth, int bmNewHeight, int bmWidth, int bmHeight) +static void draw_preview_page(HDC hdc, HDC* hdcSized, FORMATRANGE* lpFr, float ratio, int bmNewWidth, int bmNewHeight, int bmWidth, int bmHeight) { HBITMAP hBitmapScaled = CreateCompatibleBitmap(hdc, bmNewWidth, bmNewHeight); HPEN hPen; @@ -800,7 +808,7 @@ return 0; } -void update_preview(HWND hWnd) +static void update_preview(HWND hWnd) { RECT rc; Modified: trunk/reactos/base/applications/wordpad/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/registry.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/registry.c [iso-8859-1] Tue Oct 14 08:47:07 2008 @@ -81,7 +81,7 @@ HKEY hKey; DWORD action; - if(registry_get_handle(&hKey, &action, (LPWSTR)key_options) == ERROR_SUCCESS) + if(registry_get_handle(&hKey, &action, key_options) == ERROR_SUCCESS) { WINDOWPLACEMENT wp; DWORD isMaximized; @@ -104,7 +104,7 @@ HKEY hKey; DWORD size = sizeof(RECT); - if(registry_get_handle(&hKey, 0, (LPWSTR)key_options) != ERROR_SUCCESS || + if(registry_get_handle(&hKey, 0, key_options) != ERROR_SUCCESS || RegQueryValueExW(hKey, var_framerect, 0, NULL, (LPBYTE)rc, &size) != ERROR_SUCCESS || size != sizeof(RECT)) { @@ -122,7 +122,7 @@ HKEY hKey; DWORD size = sizeof(DWORD); - if(registry_get_handle(&hKey, 0, (LPWSTR)key_options) != ERROR_SUCCESS || + if(registry_get_handle(&hKey, 0, key_options) != ERROR_SUCCESS || RegQueryValueExW(hKey, var_maximized, 0, NULL, (LPBYTE)bMaximized, &size) != ERROR_SUCCESS || size != sizeof(DWORD)) { @@ -314,7 +314,7 @@ for(i = 0; pFiles[i] && i < FILELIST_ENTRIES; i++) { wsprintfW(buffer, var_file, i+1); - RegSetValueExW(hKey, (LPWSTR)&buffer, 0, REG_SZ, (LPBYTE)pFiles[i], + RegSetValueExW(hKey, (LPWSTR)&buffer, 0, REG_SZ, (const BYTE*)pFiles[i], (lstrlenW(pFiles[i])+1)*sizeof(WCHAR)); } } @@ -366,7 +366,7 @@ if(index == reg_formatindex(SF_RTF)) wordWrap[index] = ID_WORDWRAP_WINDOW; else if(index == reg_formatindex(SF_TEXT)) - wordWrap[index] = ID_WORDWRAP_WINDOW; /* FIXME: should be ID_WORDWRAP_NONE once we support it */ + wordWrap[index] = ID_WORDWRAP_NONE; RegCloseKey(hKey); } Modified: trunk/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Tue Oct 14 08:47:07 2008 @@ -36,6 +36,7 @@ #include <math.h> #include <errno.h> +#include "wine/unicode.h" #include "wordpad.h" #ifdef NONAMELESSUNION @@ -49,11 +50,10 @@ #endif /* use LoadString */ -static const WCHAR xszAppTitle[] = {'W','i','n','e',' ','W','o','r','d','p','a','d',0}; +static const WCHAR wszAppTitle[] = {'W','i','n','e',' ','W','o','r','d','p','a','d',0}; static const WCHAR wszRichEditClass[] = {'R','I','C','H','E','D','I','T','2','0','W',0}; static const WCHAR wszMainWndClass[] = {'W','O','R','D','P','A','D','T','O','P',0}; -static const WCHAR wszAppTitle[] = {'W','i','n','e',' ','W','o','r','d','p','a','d',0}; static const WCHAR stringFormat[] = {'%','2','d','\0'}; @@ -317,7 +317,7 @@ HDC hdc = GetDC(hMainWnd); static const unsigned choices[] = {8,9,10,11,12,14,16,18,20,22,24,26,28,36,48,72}; WCHAR buffer[3]; - int i; + size_t i; DWORD fontStyle; ZeroMemory(&fmt, sizeof(fmt)); @@ -440,7 +440,7 @@ populate_size_list(hSizeListWnd); - SendMessageW(hFontListEditWnd, WM_SETTEXT, 0, (LPARAM)(LPWSTR)wszFaceName); + SendMessageW(hFontListEditWnd, WM_SETTEXT, 0, (LPARAM)wszFaceName); } static void set_default_font(void) @@ -478,7 +478,7 @@ set_font((LPCWSTR) wszNewFaceName); } -static void add_font(LPCWSTR fontName, DWORD fontType, HWND hListWnd, NEWTEXTMETRICEXW *ntmc) +static void add_font(LPCWSTR fontName, DWORD fontType, HWND hListWnd, const NEWTEXTMETRICEXW *ntmc) { COMBOBOXEXITEMW cbItem; WCHAR buffer[MAX_PATH]; @@ -557,7 +557,7 @@ } -int CALLBACK enum_font_proc(const LOGFONTW *lpelfe, const TEXTMETRICW *lpntme, +static int CALLBACK enum_font_proc(const LOGFONTW *lpelfe, const TEXTMETRICW *lpntme, DWORD FontType, LPARAM lParam) { HWND hListWnd = (HWND) lParam; @@ -565,7 +565,7 @@ if(SendMessageW(hListWnd, CB_FINDSTRINGEXACT, -1, (LPARAM)lpelfe->lfFaceName) == CB_ERR) { - add_font((LPWSTR)lpelfe->lfFaceName, FontType, hListWnd, (NEWTEXTMETRICEXW*)lpntme); + add_font(lpelfe->lfFaceName, FontType, hListWnd, (const NEWTEXTMETRICEXW*)lpntme); } return 1; @@ -810,7 +810,10 @@ WriteFile(hFile, &unicode, sizeof(unicode), &writeOut, 0); if(writeOut != sizeof(unicode)) + { + CloseHandle(hFile); return; + } } stream.dwCookie = (DWORD_PTR)hFile; @@ -977,13 +980,15 @@ sprintf(id, "%d\n", (int)ps->lParam); SetWindowTextA(hIdWnd, id); - if(wordWrap[ps->lParam] == ID_WORDWRAP_WINDOW) + if(wordWrap[ps->lParam] == ID_WORDWRAP_NONE) + wrap = IDC_PAGEFMT_WN; + else if(wordWrap[ps->lParam] == ID_WORDWRAP_WINDOW) wrap = IDC_PAGEFMT_WW; else if(wordWrap[ps->lParam] == ID_WORDWRAP_MARGIN) wrap = IDC_PAGEFMT_WM; if(wrap != -1) - CheckRadioButton(hWnd, IDC_PAGEFMT_WW, + CheckRadioButton(hWnd, IDC_PAGEFMT_WN, IDC_PAGEFMT_WM, wrap); if(barState[ps->lParam] & (1 << BANDID_TOOLBAR)) @@ -1000,9 +1005,10 @@ case WM_COMMAND: switch(LOWORD(wParam)) { + case IDC_PAGEFMT_WN: case IDC_PAGEFMT_WW: case IDC_PAGEFMT_WM: - CheckRadioButton(hWnd, IDC_PAGEFMT_WW, IDC_PAGEFMT_WM, + CheckRadioButton(hWnd, IDC_PAGEFMT_WN, IDC_PAGEFMT_WM, LOWORD(wParam)); break; @@ -1026,7 +1032,9 @@ GetWindowTextA(hIdWnd, sid, 4); id = atoi(sid); - if(IsDlgButtonChecked(hWnd, IDC_PAGEFMT_WW)) + if(IsDlgButtonChecked(hWnd, IDC_PAGEFMT_WN)) + wordWrap[id] = ID_WORDWRAP_NONE; + else if(IsDlgButtonChecked(hWnd, IDC_PAGEFMT_WW)) wordWrap[id] = ID_WORDWRAP_WINDOW; else if(IsDlgButtonChecked(hWnd, IDC_PAGEFMT_WM)) wordWrap[id] = ID_WORDWRAP_MARGIN; @@ -1061,7 +1069,7 @@ { PROPSHEETPAGEW psp[2]; PROPSHEETHEADERW psh; - int i; + size_t i; HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hMainWnd, GWLP_HINSTANCE); LPCPROPSHEETPAGEW ppsp = (LPCPROPSHEETPAGEW)&psp; @@ -1153,7 +1161,7 @@ } if (opt_print) - MessageBox(hMainWnd, "Printing not implemented", "WordPad", MB_OK); + MessageBoxW(hMainWnd, MAKEINTRESOURCEW(STRING_PRINTING_NOT_IMPLEMENTED), wszAppTitle, MB_OK); } static LRESULT handle_findmsg(LPFINDREPLACEW pFr) @@ -1271,7 +1279,7 @@ static int current_units_to_twips(float number) { - int twips = (int)(number * TWIPS_PER_CM); + int twips = (int)(number * 1000.0 / (float)CENTMM_PER_INCH * (float)TWIPS_PER_INCH); return twips; } @@ -1284,22 +1292,19 @@ static void number_with_units(LPWSTR buffer, int number) { - float converted = (float)number / TWIPS_PER_CM; - char string[MAX_STRING_LEN]; - - sprintf(string, "%.2f ", converted); - lstrcatA(string, units_cmA); - MultiByteToWideChar(CP_ACP, 0, string, -1, buffer, MAX_STRING_LEN); + static const WCHAR fmt[] = {'%','.','2','f',' ','%','s','\0'}; + float converted = (float)number / (float)TWIPS_PER_INCH *(float)CENTMM_PER_INCH / 1000.0; + + wsprintfW(buffer, fmt, converted, units_cmW); } static BOOL get_comboexlist_selection(HWND hComboEx, LPWSTR wszBuffer, UINT bufferLength) { - HANDLE hHeap; - COMBOBOXEXITEM cbItem; + COMBOBOXEXITEMW cbItem; COMBOBOXINFO cbInfo; HWND hCombo, hList; int idx, result; - char *szBuffer; + hCombo = (HWND)SendMessage(hComboEx, CBEM_GETCOMBOCONTROL, 0, 0); if (!hCombo) return FALSE; @@ -1312,22 +1317,13 @@ if (idx < 0) return FALSE; - hHeap = GetProcessHeap(); - szBuffer = HeapAlloc(hHeap, HEAP_ZERO_MEMORY, bufferLength); ZeroMemory(&cbItem, sizeof(cbItem)); cbItem.mask = CBEIF_TEXT; cbItem.iItem = idx; - cbItem.pszText = szBuffer; + cbItem.pszText = wszBuffer; cbItem.cchTextMax = bufferLength-1; - result = SendMessage(hComboEx, CBEM_GETITEM, 0, (LPARAM)&cbItem); - if (!result) - { - HeapFree(hHeap, 0, szBuffer); - return FALSE; - } - - result = MultiByteToWideChar(CP_ACP, 0, szBuffer, -1, wszBuffer, bufferLength); - HeapFree(hHeap, 0, szBuffer); + result = SendMessageW(hComboEx, CBEM_GETITEM, 0, (LPARAM)&cbItem); + return result != 0; } @@ -1828,7 +1824,7 @@ hEditorWnd = CreateWindowExW(WS_EX_CLIENTEDGE, wszRichEditClass, NULL, WS_CHILD|WS_VISIBLE|ES_SELECTIONBAR|ES_MULTILINE|ES_AUTOVSCROLL - |ES_WANTRETURN|WS_VSCROLL|ES_NOHIDESEL, + |ES_WANTRETURN|WS_VSCROLL|ES_NOHIDESEL|WS_HSCROLL, 0, 0, 1000, 100, hWnd, (HMENU)IDC_EDITOR, hInstance, NULL); if (!hEditorWnd) @@ -1946,8 +1942,8 @@ sprintf( buf,"selection = %d..%d, line count=%ld", pSC->chrg.cpMin, pSC->chrg.cpMax, - SendMessage(hwndEditor, EM_GETLINECOUNT, 0, 0)); - SetWindowText(GetDlgItem(hWnd, IDC_STATUSBAR), buf); + SendMessage(hwndEditor, EM_GETLINECOUNT, 0, 0)); + SetWindowTextA(GetDlgItem(hWnd, IDC_STATUSBAR), buf); SendMessage(hWnd, WM_USER, 0, 0); return 1; } @@ -2136,7 +2132,7 @@ TEXTRANGEW tr; GetWindowTextW(hwndEditor, data, nLen+1); - MessageBoxW(NULL, data, xszAppTitle, MB_OK); + MessageBoxW(NULL, data, wszAppTitle, MB_OK); HeapFree( GetProcessHeap(), 0, data); data = HeapAlloc(GetProcessHeap(), 0, (nLen+1)*sizeof(WCHAR)); @@ -2144,7 +2140,7 @@ tr.chrg.cpMax = nLen; tr.lpstrText = data; SendMessage (hwndEditor, EM_GETTEXTRANGE, 0, (LPARAM)&tr); - MessageBoxW(NULL, data, xszAppTitle, MB_OK); + MessageBoxW(NULL, data, wszAppTitle, MB_OK); HeapFree( GetProcessHeap(), 0, data ); /* SendMessage(hwndEditor, EM_SETSEL, 0, -1); */ @@ -2184,7 +2180,7 @@ SendMessage(hwndEditor, EM_GETSELTEXT, 0, (LPARAM)data); sprintf(buf, "Start = %d, End = %d", range.cpMin, range.cpMax); MessageBoxA(hWnd, buf, "Editor", MB_OK); - MessageBoxW(hWnd, data, xszAppTitle, MB_OK); + MessageBoxW(hWnd, data, wszAppTitle, MB_OK); HeapFree( GetProcessHeap(), 0, data); /* SendMessage(hwndEditor, EM_SETSEL, 0, -1); */ return 0; Modified: trunk/reactos/base/applications/wordpad/wordpad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.h [iso-8859-1] Tue Oct 14 08:47:07 2008 @@ -19,7 +19,8 @@ #define MAX_STRING_LEN 255 -#define TWIPS_PER_CM 567 +#define TWIPS_PER_INCH 1440 +#define CENTMM_PER_INCH 2540 #define ID_FILE_EXIT 1000 #define ID_FILE_OPEN 1001 @@ -113,9 +114,10 @@ #define IDC_PAGEFMT_FB 101 #define IDC_PAGEFMT_RU 102 #define IDC_PAGEFMT_SB 103 -#define IDC_PAGEFMT_WW 104 -#define IDC_PAGEFMT_WM 105 -#define IDC_PAGEFMT_ID 106 +#define IDC_PAGEFMT_WN 104 +#define IDC_PAGEFMT_WW 105 +#define IDC_PAGEFMT_WM 106 +#define IDC_PAGEFMT_ID 107 #define ID_DATETIME 1600 #define ID_PARAFORMAT 1601 @@ -197,6 +199,7 @@ #define STRING_WRITE_ACCESS_DENIED 1708 #define STRING_OPEN_FAILED 1709 #define STRING_OPEN_ACCESS_DENIED 1710 +#define STRING_PRINTING_NOT_IMPLEMENTED 1711 LPWSTR file_basename(LPWSTR); Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Tue Oct 14 08:47:07 2008 @@ -343,7 +343,7 @@ { 0, 0, - " ENTER = Return", + " ENTER = § ©«¨¦ã", TEXT_TYPE_STATUS }, { @@ -545,7 +545,7 @@ { 8, 14, - "\x07 «ã©« «¦ §¢ã¡«¨¦ ESC ¤ § ©«¨â¯« ©«¤ §¦¨¦ç£¤", + "\x07 «ã©« «¦ §¢ã¡«¨¦ ESC ¤ § ©«¨â¯« ©«¤ §¨¦¦ç£¤", TEXT_STYLE_NORMAL }, { @@ -597,7 +597,7 @@ { 0, 0, - " ¡¡á¨© §¨¦©à¨ ¤é¤ ¨®åà¤...", + " ¡¡á¨ © §¨¦©à¨ ¤é¤ ¨®åà¤...", TEXT_TYPE_STATUS }, { @@ -826,7 +826,7 @@ { 8, 11, - "\x07 «ã©« ã ¤ § ¢â¥« â¤ ©«¦ ®â ¦ «ª ¢å©«ª.", + "\x07 «ã©« ã ¤ § ¢â¥« â¤ ©«¦ ®å¦ «ª ¢å©«ª.", TEXT_STYLE_NORMAL }, { @@ -912,7 +912,7 @@ { 6, 8, - " ¡«á©«© ¤« ¨á « ¨®å «¦¬ ReactOS ©«¦ § ¢£â¤¦ £â¨ ©£.", + " ¡«á©«© ¤« ¨á « ¨®å «¦¬ ReactOS ©«¦ § ¢£â¤¦ £â¨ ©£.", TEXT_STYLE_NORMAL }, { @@ -930,7 +930,7 @@ { 6, 15, - " ¨á¯« ®¨¡«ã¨ª ¡ £«á §¢¡«¨¦¢¦å©« «¦¤ á¡¢¦ ©«¦¤ ¦§¦å¦", + " ¨á¯« ®¨¡«ã¨ª ¡ £«á §¢¡«¨¦¢¦å©« «¦¤ á¡¢¦ ©«¦¤ ¦§¦å¦", TEXT_STYLE_NORMAL }, { @@ -970,7 +970,7 @@ { 0, 13, - "« ¨®å ©«¦¤ á¡¢¦ ¡«á©«©ª", + "« ¨®å ©«¦ á¡¢¦ ¡«á©«©ª", TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, { @@ -1074,7 +1074,7 @@ { 8, 14, - "\x07 «ã©« «¦ §¢ã¡«¨¦ ESC ¤ § ©«¨â¯« ©«¤ §¦¨¦ç£¤", + "\x07 «ã©« «¦ §¢ã¡«¨¦ ESC ¤ § ©«¨â¯« ©«¤ §¨¦¦ç£¤", TEXT_STYLE_NORMAL }, { @@ -1108,7 +1108,7 @@ { 6, 8, - "Please select a layout to be installed by default.", + "¨¡¢é § ¢â¥« £ á«¥ ¤ ¡«©«å àª §¨¦§ ¢£â¤.", TEXT_STYLE_NORMAL }, { @@ -1126,7 +1126,7 @@ { 8, 13, - "\x07 «ã©« «¦ §¢ã¡«¨¦ ESC ¤ § ©«¨â¯« ©«¤ §¦¨¦ç£¤", + "\x07 «ã©« «¦ §¢ã¡«¨¦ ESC ¤ § ©«¨â¯« ©«¤ §¨¦¦ç£¤", TEXT_STYLE_NORMAL }, { @@ -1261,7 +1261,7 @@ { 0, 0, - " D = ¨ã Partition ESC = ¡ç¨à© F3 = §¦®é¨©", + " D = ¨ã Partition ESC = ¡ç¨à© F3 = §¦®é¨©", TEXT_TYPE_STATUS }, { @@ -1421,7 +1421,7 @@ }, { //ERROR_FIND_REGISTRY - " ¡«á©© §â«¬® ¤ ¨ « ¨®å ¦£â¤à¤ «¦¬ £«¨é¦¬.", + " ¡«á©© §â«¬® ¤ ¨ « ¨®å ¦£â¤à¤ «¦¬ £«¨é¦¬.", "ENTER = §¤¡¡å¤© ¬§¦¢¦ ©«ã" }, { @@ -1431,7 +1431,7 @@ }, { //ERROR_INITIALIZE_REGISTRY, - "Setup failed to set the initialize the registry.", + " ¡«á©«© §â«¬® ¤ ¨® ¡¦§¦ ã© «¦ £«¨é¦.", "ENTER = §¤¡¡å¤© ¬§¦¢¦ ©«ã" }, { @@ -1499,7 +1499,7 @@ }, { //ERROR_ADDING_KBLAYOUTS, - " ¡«á©¬© §â«¬® ¤ §¨¦©â© « ª «á¥ ª §¢¡«¨¦¢¦åà¤ ©«¦ £«¨é¦.\n" + " ¡«á©«© §â«¬® ¤ §¨¦©â© « ª «á¥ ª §¢¡«¨¦¢¦åà¤ ©«¦ £«¨é¦.\n" "ENTER = §¤¡¡å¤© ¬§¦¢¦ ©«ã" }, { @@ -1612,73 +1612,73 @@ MUI_STRING elGRStrings[] = { {STRING_PLEASEWAIT, - " Please wait..."}, + " ¨¡¢é §¨ £â¤«..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Install C = Create Partition F3 = Quit"}, + " ENTER = ¡«á©«© C = £ ¦¬¨å Partition F3 = §¦®é¨©"}, {STRING_INSTALLDELETEPARTITION, - " ENTER = Install D = Delete Partition F3 = Quit"}, + " ENTER = ¡«á©«© D = ¨ã Partition F3 = §¦®é¨©"}, {STRING_PARTITIONSIZE, - "Size of new partition:"}, + "â¦ª «¦¬ ¤â¦¬ partition:"}, {STRING_CHOOSENEWPARTITION, - "You have chosen to create a new partition on"}, + "§ ¢â¥« ¤ £ ¦¬¨ã©« â¤ ¤â¦ partition on"}, {STRING_HDDSIZE, - "Please enter the size of the new partition in megabytes."}, + "¨¡¢é é©« «¦ £â¦ª «¦¬ partition © megabytes."}, {STRING_CREATEPARTITION, - " ENTER = Create Partition ESC = Cancel F3 = Quit"}, + " ENTER = £ ¦¬¨å Partition ESC = ¡ç¨à© F3 = §¦®é¨©"}, {STRING_PARTFORMAT, - "This Partition will be formatted next."}, + "¬«æ «¦ Partition £¦¨àå £«á."}, {STRING_NONFORMATTEDPART, - "You chose to install ReactOS on a new or unformatted Partition."}, + "§ ¢â¥« ¤ ¡«©«ã©« «¦ ReactOS © â¤ ¤â¦ ã £ £¦¨à£â¤¦ Partition."}, {STRING_INSTALLONPART, "Setup install ReactOS onto Partition"}, {STRING_CHECKINGPART, - "Setup is now checking the selected partition."}, + " ¡«á©«© ¢â® «é¨ «¦ § ¢£â¤¦ partition."}, {STRING_QUITCONTINUE, - "F3= Quit ENTER = Continue"}, + "F3= §¦®é¨© ENTER = ¬¤â® "}, {STRING_REBOOTCOMPUTER, - "ENTER = Reboot computer"}, + "ENTER = §¤¡¡å¤© ¬§¦¢¦ ©«ã"}, {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - "\xB3 Copying file: %S"}, + "\xB3 ¤« ¨á« «¦ ¨®å¦: %S"}, {STRING_SETUPCOPYINGFILES, - "Setup is copying files..."}, + " ¡«á©«© ¤« ¨á ¨®å..."}, {STRING_REGHIVEUPDATE, - " Updating registry hives..."}, + " å¤« ¤¤âà© «à¤ registry hives..."}, {STRING_IMPORTFILE, - " Importing %S..."}, + " å¤« ©àã «¦¬ %S..."}, {STRING_DISPLAYETTINGSUPDATE, - " Updating display registry settings..."}, + " å¤« ¤¤âà© «à¤ ¨¬£å©à¤ £á¤ ©ª «¦¬ £«¨é¦¬..."}, {STRING_LOCALESETTINGSUPDATE, - " Updating locale settings..."}, + " å¤« ¤¤âà© «à¤ ¨¬£å©à¤ ¢é©©ª..."}, {STRING_KEYBOARDSETTINGSUPDATE, - " Updating keyboard layout settings..."}, + " å¤« ¤¤âà© «à¤ ¨¬£å©à¤ á«¥ª §¢¡«¨¦¢¦å¦¬..."}, {STRING_CODEPAGEINFOUPDATE, " Adding codepage information to registry..."}, {STRING_DONE, - " Done..."}, + " ¢¦¡¢¨é¡..."}, {STRING_REBOOTCOMPUTER2, - " ENTER = Reboot computer"}, + " ENTER = §¤ ¡¡å¤© ¬§¦¢¦ ©«ã"}, {STRING_CONSOLEFAIL1, - "Unable to open the console\n\n"}, + "ç¤«¦ ¤ ¤¦ ®«å ¡¦¤©æ¢\n\n"}, {STRING_CONSOLEFAIL2, "The most common cause of this is using an USB keyboard\n"}, {STRING_CONSOLEFAIL3, - "USB keyboards are not fully supported yet\n"}, + " USB §¢¡«¨¦¢æ ¤ å¤ §¢ã¨àª ¬§¦©«¨ æ£¤ ¡æ£\n"}, {STRING_FORMATTINGDISK, - "Setup is formatting your disk"}, + " ¡«á©«© £¦¨é¤ «¦ å©¡¦ ©ª"}, {STRING_CHECKINGDISK, - "Setup is checking your disk"}, + " ¡«á©«© ¢â® «¦ å©¡¦ ©ª"}, {STRING_FORMATDISK1, - " Format partition as %S file system (quick format) "}, + " £æ¨à© «¦¬ partition àª %S ©ç©«£ ¨®åà¤ (¨ã¦¨ £æ¨à©) "}, {STRING_FORMATDISK2, - " Format partition as %S file system "}, + " £æ¨à© «¦¬ partition àª %S ©ç©«£ ¨®åà¤ "}, {STRING_KEEPFORMAT, - " Keep current file system (no changes) "}, + " §¨£å¤ «¦ ©ç©«£ ¨®åà¤ àª â® (¡£å ¢¢ã) "}, {STRING_HDINFOPARTCREATE, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + "%I64u %s ¡¢¨æª å©¡¦ª %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, {STRING_HDDINFOUNK1, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + "%I64u %s ¡¢¨æª å©¡¦ª %lu (Port=%hu, Bus=%hu, Id=%hu)."}, {STRING_HDDINFOUNK2, " %c%c Type %lu %I64u %s"}, {STRING_HDINFOPARTDELETE, @@ -1686,29 +1686,29 @@ {STRING_HDDINFOUNK3, "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, {STRING_HDINFOPARTZEROED, - "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + "¡¢¨æª å©¡¦ª %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, {STRING_HDDINFOUNK4, "%c%c Type %lu %I64u %s"}, {STRING_HDINFOPARTEXISTS, - "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + "©«¦ ©¡¢¨æ å©¡¦ %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, {STRING_HDDINFOUNK5, "%c%c Type %-3u %6lu %s"}, {STRING_HDINFOPARTSELECT, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + "%6lu %s ¡¢¨æª å©¡¦ª %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, {STRING_HDDINFOUNK6, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + "%6lu %s ¡¢¨æª å©¡¦ª %lu (Port=%hu, Bus=%hu, Id=%hu)"}, {STRING_NEWPARTITION, - "Setup created a new partition on"}, + " ¡«á©«© £ ¦ç¨© â¤ ¤â¦ partition ©«¦"}, {STRING_UNPSPACE, " Unpartitioned space %6lu %s"}, {STRING_MAXSIZE, - "MB (max. %lu MB)"}, + "MB (£. %lu MB)"}, {STRING_UNFORMATTED, - "New (Unformatted)"}, + "â¦ ( £¦¨à£â¤¦)"}, {STRING_FORMATUNUSED, - "Unused"}, + "®¨© £¦§¦å«¦"}, {STRING_FORMATUNKNOWN, - "Unknown"}, + "ê¤à©«¦"}, {STRING_KB, "KB"}, {STRING_MB, @@ -1716,7 +1716,7 @@ {STRING_GB, "GB"}, {STRING_ADDKBLAYOUTS, - "Adding keyboard layouts"}, + "å¤« §¨¦©ã¡ «à¤ «á¥à¤ §¢¡«¨¦¢¦å¦¬"}, {0, 0} }; Modified: trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc [iso-8859-1] Tue Oct 14 08:47:07 2008 @@ -22,48 +22,48 @@ CONTROL "",IDC_DNS1,"SysIPAddress32",0,150,171-2,80,12 LTEXT "Servidor DNS Alterno:", -1, 14, 186, 135, 8 CONTROL "",IDC_DNS2,"SysIPAddress32",0,150,186-2,80,12 - PUSHBUTTON "&Avanzado", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP + PUSHBUTTON "Opciones &avanzado", IDC_ADVANCED, 156, 209, 80, 14, WS_TABSTOP END IDD_TCPIP_ALTCF_DLG DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "Alternate Configuration" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20 - CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 +CAPTION "Configuración alternativa" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Escriba a continuación la configuración IP alternativa si este equipo se utiliza en más de una red.", -1, 9, 9, 220, 20 + CONTROL "&Dirección IP privada automática", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 - LTEXT "&IP address:", -1, 14, 75, 135, 8 + CONTROL "Configurada por el u&suario", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 90, 12 + LTEXT "Dire&cción IP:", -1, 14, 75, 135, 8 CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 150, 75, 80, 12 - LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8 + LTEXT "Máscara de s&ubred:", -1, 14, 95, 135, 8 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",WS_TABSTOP, 150, 95, 80, 12 - LTEXT "&Default gateway:", -1, 14, 115, 135, 8 + LTEXT "&Puerta de enlace predeterminada:", -1, 14, 115, 135, 8 CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",WS_TABSTOP, 150, 115, 80, 12 - LTEXT "&Preferred DNS server:", -1, 14, 150, 135, 8 + LTEXT "S&ervidor DNS preferido:", -1, 14, 150, 135, 8 CONTROL "",IDC_DNS1,"SysIPAddress32",WS_TABSTOP, 150, 150, 80, 12 - LTEXT "&Alternate DNS server:", -1, 14, 165, 180, 8 + LTEXT "Servidor DNS alternati&vo:", -1, 14, 165, 180, 8 CONTROL "",IDC_DNS2,"SysIPAddress32",WS_TABSTOP, 150, 165, 80, 12 END IDD_TCPIP_ADVIP_DLG DIALOGEX DISCARDABLE 0, 0, 247, 247 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "IP Settings" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "IP addressen", -1, 5, 5, 240, 90 +CAPTION "Configuración de IP" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Direcciones &IP ", -1, 5, 5, 240, 90 CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 210, 55 - PUSHBUTTON "Add...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP - PUSHBUTTON "Edit...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP - GROUPBOX "Default gateways:", -1, 5, 100, 240, 90 + PUSHBUTTON "Agregar...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP + PUSHBUTTON "Modificar...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP + PUSHBUTTON "Quitar", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP + GROUPBOX "Puertas de enlace predeterminadas:", -1, 5, 100, 240, 90 CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 210, 55 - PUSHBUTTON "Add...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP - PUSHBUTTON "Edit...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "Agregar...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "Modificar...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "Quitar", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP GROUPBOX "", -1, 5, 200, 240, 30 - CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP - LTEXT "Interface metric:", -1, 15, 215, 90, 12 + CHECKBOX "Métrica automática", IDC_AUTOMETRIC, 9, 200, 85, 12, BS_AUTOCHECKBOX | WS_TABSTOP + LTEXT "Métrica de la interfaz:", -1, 15, 215, 90, 12 EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER END @@ -73,158 +73,158 @@ FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY - LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12 - PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP - PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP - PUSHBUTTON "&Add...", IDC_DNSADDRADD, 30, 70, 50, 14, WS_TABSTOP - PUSHBUTTON "&Edit...", IDC_DNSADDRMOD, 100, 70, 50, 14, WS_TABSTOP - PUSHBUTTON "Remo&ve", IDC_DNSADDRDEL, 170, 70, 50, 14, WS_TABSTOP - LTEXT "The following three settings are applied to all connections with TCP/IP enabled. For resolution of unqualified names:", -1, 5, 90, 220, 24 - CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 - CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 + LTEXT "Direcciones de servidores DNS, por orden de utili&zación:", -1, 5, 5, 180, 12 + PUSHBUTTON "Subir", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP + PUSHBUTTON "Bajar", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "Agr&egar...", IDC_DNSADDRADD, 30, 70, 50, 14, WS_TABSTOP + PUSHBUTTON "Modifi&car...", IDC_DNSADDRMOD, 100, 70, 50, 14, WS_TABSTOP + PUSHBUTTON "&Quitar", IDC_DNSADDRDEL, 170, 70, 50, 14, WS_TABSTOP + LTEXT "Los siguientes tres parámetros se aplican a todas las conexiones que tienen habilitado TCP/IP. Para resolución de nombres no cualificados:", -1, 5, 90, 225, 24 + CONTROL "Anexar sufijos DNS principa&les y de conexiones específicas", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 210, 12 + CHECKBOX "Anexar sufijos primarios del su&fijo DNS principal", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CONTROL "A&nexar estos sufijos DNS (en este orden):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY - PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP - PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP - PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP - PUSHBUTTON "&Edit...", IDC_DNSSUFFIXMOD, 100, 210, 50, 14, WS_TABSTOP - PUSHBUTTON "Remo&ve", IDC_DNSSUFFIXDEL, 170, 210, 50, 14, WS_TABSTOP - LTEXT "DNS &suffix for this connection:", -1, 5, 225, 110, 14 + PUSHBUTTON "Subir", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "Bajar", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "Ag&regar...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP + PUSHBUTTON "Mo&dificar...", IDC_DNSSUFFIXMOD, 100, 210, 50, 14, WS_TABSTOP + PUSHBUTTON "Qui&tar", IDC_DNSSUFFIXDEL, 170, 210, 50, 14, WS_TABSTOP + LTEXT "&Sufijo DNS para esta conexión:", -1, 5, 227, 110, 14 EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP - CHECKBOX "&Register this connection's addresses in DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Use this connection's DNS suffix in DNS registration", IDC_USESUFFIX, 15, 255, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Registrar estas direcciones de cone&xiones en DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Utilizar este sufijo DNS de conexión para registro DNS", IDC_USESUFFIX, 15, 255, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP END IDD_TCPIP_ADVOPT_DLG DIALOGEX DISCARDABLE 0, 0, 247, 247 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "Options" +CAPTION "Opciones" FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_OPTLIST, 5, 30, 230, 70 - LTEXT "&Optional settings", -1, 5, 15, 130, 12 - PUSHBUTTON "&Properties", IDC_OPTPROP, 160, 100, 70, 14, WS_TABSTOP - GROUPBOX "Description:", -1, 5, 120, 240, 70 + LTEXT "&Configuración opcional", -1, 5, 15, 130, 12 + PUSHBUTTON "&Propiedades", IDC_OPTPROP, 160, 100, 70, 14, WS_TABSTOP + GROUPBOX "Descripción: ", -1, 5, 120, 240, 70 LTEXT "", IDC_OPTDESC, 15, 130, 220, 33 END IDD_TCPIPADDIP_DLG DIALOGEX DISCARDABLE 0, 0, 200, 70 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TCP/IP Address" +CAPTION "Dirección TCP/IP" FONT 8, "MS Shell Dlg" BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 100, 15, 80, 12 - LTEXT "IP address:", -1, 5, 15, 70, 12 - LTEXT "Subnet mask:", -1, 5, 30, 70, 12 + LTEXT "Dirección IP:", -1, 5, 15, 70, 12 + LTEXT "Máscara de subred:", -1, 5, 30, 70, 12 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END IDD_TCPIPGW_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TCP/IP Gateway Address" +CAPTION "Dirección TCP/IP de puerta de enlace" FONT 8, "MS Shell Dlg" BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 100, 15, 80, 12 - LTEXT "Gateway:", -1, 5, 15, 70, 12 - CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP - LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED + LTEXT "Puerta de enlace:", -1, 5, 15, 70, 12 + CHECKBOX "Métrica automática", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + LTEXT "&Métrica:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END IDD_TCPIPDNS_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TCP/IP DNS Server" +CAPTION "Servidor TCP/IP DNS" FONT 8, "MS Shell Dlg" BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 - LTEXT "DNS server:", -1, 5, 10, 120, 12 + LTEXT "Servidor DNS:", -1, 5, 10, 120, 12 PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END IDD_TCPIPSUFFIX_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TCP/IP Domain Suffix" +CAPTION "Sufijo del dominio TCP/IP" FONT 8, "MS Shell Dlg" BEGIN EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP - LTEXT "Domain suffix:", -1, 5, 10, 120, 12 + LTEXT "Sufijo del dominio:", -1, 5, 10, 120, 12 PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END IDD_TCPIP_FILTER_DLG DIALOGEX DISCARDABLE 0, 0, 305, 220 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TCP/IP Filtering" -FONT 8, "MS Shell Dlg" -BEGIN - CHECKBOX "Enable TCP/IP-Filtering (All adapters)", IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP +CAPTION "Filtrado TCP/IP" +FONT 8, "MS Shell Dlg" +BEGIN + CHECKBOX "Habilitar filtrado TCP/IP (todos los adaptadores)", IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "", -1, 5, 30, 90, 150 - CONTROL "Permit All", IDC_TCP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 70, 12 - CONTROL "Permit Only", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12 + CONTROL "Permitir todos", IDC_TCP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 60, 12 + CONTROL "Permitir sólo", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12 CONTROL "", IDC_TCP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 11, 62, 72, 75 - PUSHBUTTON "Add", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "Agregar", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Quitar", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP GROUPBOX "", -1, 105, 30, 90, 150 - CONTROL "Permit All", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12 - CONTROL "Permit Only", IDC_UDP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12 + CONTROL "Permitir todos", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 60, 12 + CONTROL "Permitir sólo", IDC_UDP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12 CONTROL "", IDC_UDP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 111, 62, 72, 75 - PUSHBUTTON "Add", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "Agregar", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Quitar", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP GROUPBOX "", -1, 205, 30, 90, 150 - CONTROL "Permit All", IDC_IP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 30, 70, 12 - CONTROL "Permit Only", IDC_IP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 44, 70, 12 + CONTROL "Permitir todos", IDC_IP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 30, 60, 12 + CONTROL "Permitir sólo", IDC_IP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 44, 70, 12 CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62, 72, 75 - PUSHBUTTON "Add", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP - PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "Agregar", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Quitar", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "Aceptar", IDC_OK, 150, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP END IDD_TCPIP_PORT_DLG DIALOGEX DISCARDABLE 0, 0, 200, 60 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Add Filter" +CAPTION "Agregar filtro" FONT 8, "MS Shell Dlg" BEGIN EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12 - PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP + PUSHBUTTON "Aceptar", IDC_OK, 120, 15, 50, 14, WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END STRINGTABLE BEGIN - IDS_NET_CONNECT "Network connection" - IDS_NO_IPADDR_SET "The adapter requires at least one IP address. Please enter one." - IDS_NO_SUBMASK_SET "You have entered an address that is missing its subnet mask. Please add a subnet mask." - IDS_TCPFILTERDESC "TCP/IP filtering allows you to control the type of TCP/IP network traffic that reaches your computer." - IDS_TCPFILTER "TCP/IP Filtering" - IDS_IPADDR "IP address" - IDS_SUBMASK "Subnet mask" - IDS_GATEWAY "Gateway" - IDS_METRIC "Metric" - IDS_DHCPACTIVE "DHCP Enabled" - IDS_AUTOMATIC "Automatic" - IDS_NOITEMSEL "You have not selected an item. Select one first." + IDS_NET_CONNECT "Conexión de red" + IDS_NO_IPADDR_SET "El adaptador requiere al menos una dirección IP. Escriba una." + IDS_NO_SUBMASK_SET "Ha introducido una dirección que esta pierdiendo su máscara de subred. Por favor,añada una máscara de subred." + IDS_TCPFILTERDESC "El filtro TCP/IP le permite controlar el tipo de tráfico de red TCP/IP que llega a su equipo." + IDS_TCPFILTER "Filtrado TCP/IP" + IDS_IPADDR "Dirección IP" + IDS_SUBMASK "Máscara de subred" + IDS_GATEWAY "Puerta de enlace" + IDS_METRIC "Métrica" + IDS_DHCPACTIVE "DHCP habilitado" + IDS_AUTOMATIC "Automático" + IDS_NOITEMSEL "No ha seleccionado ningún elemento. Seleccione uno primero." IDS_TCPIP "ReactOS-TCP/IP" - IDS_ADD "Add" - IDS_MOD "OK" - IDS_TCP_PORTS "TCP Ports" - IDS_UDP_PORTS "UDP Ports" - IDS_IP_PROTO "IP protocols" - IDS_PORT_RANGE "Port numbers must be greater than 0 and less than 65536. Please enter a number within this range." - IDS_PROT_RANGE "Protocol numbers must be greater than 0 and less than 256. Please enter a number within this range." - IDS_DUP_NUMBER "The number you are trying to add is already in the list. Please enter a different number." + IDS_ADD "Agregar" + IDS_MOD "Aceptar" + IDS_TCP_PORTS "Puertos TCP" + IDS_UDP_PORTS "Puertos UDP" + IDS_IP_PROTO "Protocolos IP" + IDS_PORT_RANGE "Los números de puerto deben ser mayores que 0 y menores que 65536. Escriba un número incluido en este intervalo." + IDS_PROT_RANGE "Los números de protocolo deben ser mayores que 0 y menores que 256. Escriba un número incluido en este intervalo." + IDS_DUP_NUMBER "El número que esta intentando agregar ya esta en la lista. Escriba un número diferente." IDS_DISABLE_FILTER "Disabling this global TCP/IP setting will affect all adapters." - IDS_NO_SUFFIX "The current setting of search method requires at least one DNS suffix. Please enter one or change the setting." - IDS_DOMAIN_SUFFIX "Domain suffix is not a valid suffix." - IDS_DNS_SUFFIX "The DNS domain name ""%s"" is not a valid DNS name." - IDS_DUP_SUFFIX "The DNS suffix is already on the list." - IDS_DUP_IPADDR "The IP address is already on the list." - IDS_DUP_GW "The default gateway is already on the list." -END - + IDS_NO_SUFFIX "La configuración actual del método de búsqueda requiere al menos un sufijo DNS. Escriba uno o cambie la configuración." + IDS_DOMAIN_SUFFIX "El sufijo del dominio no es un sufijo válido." + IDS_DNS_SUFFIX "El nombre de dominio DNS ""%s"" no es un nombre DNS válido." + IDS_DUP_SUFFIX "El sufijo DNS ya está en la lista." + IDS_DUP_IPADDR "La dirección IP ya está en la lista." + IDS_DUP_GW "La puerta de enlace predeterminada ya está en la lista." +END + Modified: trunk/reactos/dll/win32/netshell/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/es… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/es-ES.rc [iso-8859-1] Tue Oct 14 08:47:07 2008 @@ -92,7 +92,7 @@ IDS_FORMAT_KBIT "%u KBit/s" IDS_FORMAT_MBIT "%u MBit/s" IDS_FORMAT_GBIT "%u GBit/s" - IDS_DURATION_DAY "%d Day %s" - IDS_DURATION_DAYS "%d Days %s" + IDS_DURATION_DAY "%d Día %s" + IDS_DURATION_DAYS "%d Días %s" END

1 0

[dreimer] 36745: Sync winfile and write to wine HEAD.
by dreimer＠svn.reactos.org 14 Oct '08

14 Oct '08

Author: dreimer Date: Tue Oct 14 08:44:12 2008 New Revision: 36745 URL: http://svn.reactos.org/svn/reactos?rev=36745&view=rev Log: Sync winfile and write to wine HEAD. Modified: trunk/rosapps/applications/winfile/lang/ja-JP.rc trunk/rosapps/applications/winfile/winefile.c trunk/rosapps/applications/write/lang/ja-JP.rc Modified: trunk/rosapps/applications/winfile/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/lang/… ============================================================================== --- trunk/rosapps/applications/winfile/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/lang/ja-JP.rc [iso-8859-1] Tue Oct 14 08:44:12 2008 @@ -21,155 +21,158 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT /* Menu */ IDM_WINEFILE MENU FIXED IMPURE { - POPUP "t@C(&F)" { - MENUITEM "J(&O)\tEnter", ID_ACTIVATE - MENUITEM "Ú®(&M)...\tF7", ID_FILE_MOVE - MENUITEM "Rs[(&C)...\tF8", ID_FILE_COPY + POPUP "ãã¡ã¤ã«(&F)" { + MENUITEM "éã(&O)\tEnter", ID_ACTIVATE + MENUITEM "ç§»å(&M)...\tF7", ID_FILE_MOVE + MENUITEM "ã³ãã¼(&C)...\tF8", ID_FILE_COPY MENUITEM "&In Clipboard...\tF9", 118 - MENUITEM "í(&D)\tDel", ID_FILE_DELETE - MENUITEM "¼OÌÏX(&N)...", 109 - MENUITEM "vpeB(&I)...\tAlt+Enter", ID_EDIT_PROPERTIES - MENUITEM SEPARATOR - MENUITEM "³k(&O)...", 119 - MENUITEM "ð(&O)...", 120 - MENUITEM SEPARATOR - MENUITEM "Às(&R)...", ID_EXECUTE - MENUITEM "óü(&P)...", 102 - MENUITEM "ÖAt¯...", 103 - MENUITEM SEPARATOR - MENUITEM "fBNgðì¬(&E)...", 111 - MENUITEM "õ(&H)...", 104 - MENUITEM "t@CðIð(&S)...", 116 + MENUITEM "åé¤(&D)\tDel", ID_FILE_DELETE + MENUITEM "ååã®å¤æ´(&N)...", 109 + MENUITEM "ããããã£(&I)...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "å§ç¸®(&O)...", 119 + MENUITEM "è§£å(&O)...", 120 + MENUITEM SEPARATOR + MENUITEM "å®è¡(&R)...", ID_EXECUTE + MENUITEM "å°å·(&P)...", 102 + MENUITEM "é¢é£ä»ã...", 103 + MENUITEM SEPARATOR + MENUITEM "ãã£ã¬ã¯ããªãä½æ(&E)...", 111 + MENUITEM "æ¤ç´¢(&H)...", 104 + MENUITEM "ãã¡ã¤ã«ãé¸æ(&S)...", 116 MENUITEM SEPARATOR #ifndef _NO_EXTENSIONS - MENUITEM "I¹(&X)\tAlt+X", ID_FILE_EXIT + MENUITEM "çµäº(&X)\tAlt+X", ID_FILE_EXIT #else - MENUITEM "I¹(&X)", ID_FILE_EXIT -#endif - } - - POPUP "fBXN(&D)" { - MENUITEM "fBXNðRs[(&C)...", 201 + MENUITEM "çµäº(&X)", ID_FILE_EXIT +#endif + } + + POPUP "ãã£ã¹ã¯(&D)" { + MENUITEM "ãã£ã¹ã¯ãã³ãã¼(&C)...", 201 MENUITEM "&Label Disk...", 202 MENUITEM SEPARATOR - MENUITEM "fBXNðtH[}bg(&F)...", ID_FORMAT_DISK + MENUITEM "ãã£ã¹ã¯ããã©ã¼ããã(&F)...", ID_FORMAT_DISK #ifdef _WIN95 MENUITEM "&Make System Disk...", -1 /*TODO*/ #endif MENUITEM SEPARATOR - MENUITEM "lbg[NhCuÉÚ±(&N)", ID_CONNECT_NETWORK_DRIVE - MENUITEM "lbg[NhCuðØf(&D)", ID_DISCONNECT_NETWORK_DRIVE + MENUITEM "ãããã¯ã¼ã¯ãã©ã¤ãã«æ¥ç¶(&N)", ID_CONNECT_NETWORK_DRIVE + MENUITEM "ãããã¯ã¼ã¯ãã©ã¤ããåæ(&D)", ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "Share as...", 254 MENUITEM "&Remove Share...", 255 MENUITEM SEPARATOR - MENUITEM "hCuðIð(&S)...", 251 - } - - POPUP "fBNg(&R)" { + MENUITEM "ãã©ã¤ããé¸æ(&S)...", 251 + } + + POPUP "ãã£ã¬ã¯ããª(&R)" { MENUITEM "&Next Level\t+", 301 - MENUITEM "c[ðWJ(&T)\t*", 302 - MENUITEM "·×ÄðWJ(&A)\tStrg+*", 303 - MENUITEM "c[ðÜèôÞ(&T)\t-", 304 + MENUITEM "ããªã¼ãå±é(&T)\t*", 302 + MENUITEM "ãã¹ã¦ãå±é(&A)\tStrg+*", 303 + MENUITEM "ããªã¼ãæãç³ã(&T)\t-", 304 MENUITEM SEPARATOR MENUITEM "&Mark Children", 505 } - POPUP "\\¦(&V)" { - MENUITEM "c[ÆfBNg(&R)", 413 - MENUITEM "c[ÌÝ(&E)", 411 - MENUITEM "fBNgÌÝ(&O)", 412 - MENUITEM SEPARATOR - MENUITEM "ª(&L)", ID_VIEW_SPLIT - MENUITEM SEPARATOR - MENUITEM "¼O(&N)", ID_VIEW_NAME - MENUITEM "·×ÄÌt@CÚ×(&A)", ID_VIEW_ALL_ATTRIBUTES, CHECKED - MENUITEM "ªÚ×(&P)...", ID_VIEW_SELECTED_ATTRIBUTES - MENUITEM SEPARATOR - MENUITEM "¼OÅÀ×Ö¦(&S)", ID_VIEW_SORT_NAME - MENUITEM "íÞÅÀ×Ö¦(&B)", ID_VIEW_SORT_TYPE - MENUITEM "TCYÅÀ×Ö¦(&Z)", ID_VIEW_SORT_SIZE - MENUITEM "útÅÀ×Ö¦(&D)", ID_VIEW_SORT_DATE + POPUP "è¡¨ç¤º(&V)" { + MENUITEM "ããªã¼ã¨ãã£ã¬ã¯ããª(&R)", 413 + MENUITEM "ããªã¼ã®ã¿(&E)", 411 + MENUITEM "ãã£ã¬ã¯ããªã®ã¿(&O)", 412 + MENUITEM SEPARATOR + MENUITEM "åå²(&L)", ID_VIEW_SPLIT + MENUITEM SEPARATOR + MENUITEM "åå(&N)", ID_VIEW_NAME + MENUITEM "ãã¹ã¦ã®ãã¡ã¤ã«è©³ç´°(&A)", ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "é¨åè©³ç´°(&P)...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "ååã§ä¸¦ã¹æ¿ã(&S)", ID_VIEW_SORT_NAME + MENUITEM "ç¨®é¡ã§ä¸¦ã¹æ¿ã(&B)", ID_VIEW_SORT_TYPE + MENUITEM "ãµã¤ãºã§ä¸¦ã¹æ¿ã(&Z)", ID_VIEW_SORT_SIZE + MENUITEM "æ¥ä»ã§ä¸¦ã¹æ¿ã(&D)", ID_VIEW_SORT_DATE MENUITEM SEPARATOR MENUITEM "Filter by &...", ID_VIEW_FILTER } - POPUP "IvV(&O)" { - MENUITEM "mF(&C)...", 501 - MENUITEM "tHg(&F)...", ID_SELECT_FONT - MENUITEM "c[o[ðJX^}CY(&B)...", 512 - MENUITEM SEPARATOR - MENUITEM "c[o[(&T)", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "hCuo[(&D)", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "Xe[^Xo[(&S)", ID_VIEW_STATUSBAR, CHECKED + POPUP "ãªãã·ã§ã³(&O)" { + MENUITEM "ç¢ºèª(&C)...", 501 + MENUITEM "ãã©ã³ã(&F)...", ID_SELECT_FONT + MENUITEM "ãã¼ã«ãã¼ãã«ã¹ã¿ãã¤ãº(&B)...", 512 + MENUITEM SEPARATOR + MENUITEM "ãã¼ã«ãã¼(&T)", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "ãã©ã¤ããã¼(&D)", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "ã¹ãã¼ã¿ã¹ãã¼(&S)", ID_VIEW_STATUSBAR, CHECKED #ifndef _NO_EXTENSIONS - MENUITEM "SæÊ\\¦(&U)\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "å¨ç»é¢è¡¨ç¤º(&U)\tCtrl+Shift+S", ID_VIEW_FULLSCREEN #endif MENUITEM SEPARATOR MENUITEM "&Minimize on run", 504 - MENUITEM "I¹ÉÝèðÛ¶(&S)", ID_VIEW_SAVESETTINGS - } - - - POPUP "ZLeB(&S)" { + MENUITEM "çµäºæã«è¨å®ãä¿å(&S)", ID_VIEW_SAVESETTINGS + } + + + POPUP "ã»ãã¥ãªãã£(&S)" { MENUITEM "&Access...", 605 MENUITEM "&Logging...", 606 MENUITEM "&Owner...", 607 } - POPUP "EBhE(&W)" { - MENUITEM "VKEBhE(&W)", ID_WINDOW_NEW - MENUITEM "dËÄ\\¦\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "ãºÉÀ×Ä\\¦(&H)", ID_WINDOW_TILE_HORZ - MENUITEM "¶EÉÀ×Ä\\¦(&V)\tCtrl+F4", ID_WINDOW_TILE_VERT + POPUP "ã¦ã£ã³ãã¦(&W)" { + MENUITEM "æ°è¦ã¦ã£ã³ãã¦(&W)", ID_WINDOW_NEW + MENUITEM "éãã¦è¡¨ç¤º\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "ä¸ä¸ã«ä¸¦ã¹ã¦è¡¨ç¤º(&H)", ID_WINDOW_TILE_HORZ + MENUITEM "å·¦å³ã«ä¸¦ã¹ã¦è¡¨ç¤º(&V)\tCtrl+F4", ID_WINDOW_TILE_VERT #ifndef _NO_EXTENSIONS MENUITEM "Arrange Automatically", ID_WINDOW_AUTOSORT #endif MENUITEM "Arrange &Symbols", ID_WINDOW_ARRANGE - MENUITEM "XV(&R)\tF5", ID_REFRESH - } - - POPUP "wv(&H)" { - MENUITEM "wv gsbN(&H)\tF1", ID_HELP - MENUITEM "wvÌõ(&S)...\tF1", ID_HELP - MENUITEM "wvðg¤(&U)\tF1", ID_HELP_USING - MENUITEM SEPARATOR - MENUITEM "Winefile ÉÂ¢Ä(&A)...", ID_ABOUT + MENUITEM "æ´æ°(&R)\tF5", ID_REFRESH + } + + POPUP "ãã«ã(&H)" { + MENUITEM "ãã«ã ãããã¯(&H)\tF1", ID_HELP + MENUITEM "ãã«ãã®æ¤ç´¢(&S)...\tF1", ID_HELP + MENUITEM "ãã«ããä½¿ã(&U)\tF1", ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "Winefile ã«ã¤ãã¦(&A)...", ID_ABOUT } } IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Às" +CAPTION "å®è¡" FONT 9, "MS Shell Dlg" { CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "R}h(&C):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + CONTROL "ã³ãã³ã(&C):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL CONTROL "As &Symbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "LZ", 2, 158, 23, 47, 14 - PUSHBUTTON "wv(&H)", 254, 158, 43, 47, 14 + PUSHBUTTON "ãã£ã³ã»ã«", 2, 158, 23, 47, 14 + PUSHBUTTON "ãã«ã(&H)", 254, 158, 43, 47, 14 } IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ú®æðIð" +CAPTION "ç§»ååãé¸æ" FONT 9, "MS Shell Dlg" { CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "pX(&P):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + CONTROL "ãã¹(&P):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "LZ", 2, 158, 23, 47, 14 - PUSHBUTTON "QÆ(&B)", 254, 158, 43, 47, 14 + PUSHBUTTON "ãã£ã³ã»ã«", 2, 158, 23, 47, 14 + PUSHBUTTON "åç§(&B)", 254, 158, 43, 47, 14 } IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 @@ -233,28 +236,30 @@ STRINGTABLE { - IDS_WINEFILE "Wine t@C}l[W" + IDS_WINEFILE "Wine ãã¡ã¤ã«ããã¼ã¸ã£" IDS_ERROR "Error" IDS_ROOT_FS "root fs" IDS_UNIXFS "unixfs" IDS_DESKTOP "Desktop" - IDS_SHELL "VF" + IDS_SHELL "ã·ã§ã«" IDS_TITLEFMT "%s - %s" - IDS_NO_IMPL "¢À" + IDS_NO_IMPL "æªå®è£" IDS_WINE_FILE "Wine File" } STRINGTABLE { - IDS_COL_NAME "¼O" - IDS_COL_SIZE "TCY" + IDS_COL_NAME "åå" + IDS_COL_SIZE "ãµã¤ãº" IDS_COL_CDATE "CDate" IDS_COL_ADATE "ADate" IDS_COL_MDATE "MDate" IDS_COL_IDX "Index/Inode" - IDS_COL_LINKS "N" - IDS_COL_ATTR "®«" - IDS_COL_SEC "ZLeB" + IDS_COL_LINKS "ãªã³ã¯" + IDS_COL_ATTR "å±æ§" + IDS_COL_SEC "ã»ãã¥ãªãã£" IDS_FREE_SPACE_FMT "%s of %s free" } + +#pragma code_page(default) Modified: trunk/rosapps/applications/winfile/winefile.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/winef… ============================================================================== --- trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] Tue Oct 14 08:44:12 2008 @@ -964,7 +964,7 @@ ((LPITEMIDLIST)((LPBYTE)next_pidl+pidl->mkid.cb))->mkid.cb = 0; hr = IShellFolder_BindToObject(folder, next_pidl, 0, &IID_IShellFolder, (void**)&child); - if (!SUCCEEDED(hr)) + if (FAILED(hr)) break; read_directory(entry, NULL, sortOrder, hwnd); @@ -1070,7 +1070,7 @@ memset(pidls, 0, sizeof(pidls)); hr = IEnumIDList_Next(idlist, FETCH_ITEM_COUNT, pidls, &cnt); - if (!SUCCEEDED(hr)) + if (FAILED(hr)) break; if (hr == S_FALSE) Modified: trunk/rosapps/applications/write/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/write/lang/ja… ============================================================================== --- trunk/rosapps/applications/write/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/write/lang/ja-JP.rc [iso-8859-1] Tue Oct 14 08:44:12 2008 @@ -18,9 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STRINGTABLE { - IDS_FAILED, "Wordpad ÌN®É¸sµÜµ½" + IDS_FAILED, "Wordpad ã®èµ·åã«å¤±æãã¾ãã" } + +#pragma code_page(default)

1 0

[hyperion] 36744: Add ICU <URL: http://www.icu-project.org/> to credits
by hyperion＠svn.reactos.org 13 Oct '08

13 Oct '08

Author: hyperion Date: Mon Oct 13 16:35:25 2008 New Revision: 36744 URL: http://svn.reactos.org/svn/reactos?rev=36744&view=rev Log: Add ICU <URL: http://www.icu-project.org/> to credits Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.rc [iso-8859-1] Mon Oct 13 16:35:25 2008 @@ -29,7 +29,9 @@ "QEMU - http://fabrice.bellard.free.fr/qemu\n"\ "Mesa3D - http://www.mesa3d.org\n"\ "FreeBSD - http://www.freebsd.org\n"\ - "adns - http://adns.jgaa.com\n" + "adns - http://adns.jgaa.com\n"\ + "ICU - http://www.icu-project.org/\n"\ + "" END IDR_GPL RT_TEXT "COPYING"

1 0

[cgutman] 36743: - Fix build
by cgutman＠svn.reactos.org 13 Oct '08

13 Oct '08

Author: cgutman Date: Sun Oct 12 20:18:04 2008 New Revision: 36743 URL: http://svn.reactos.org/svn/reactos?rev=36743&view=rev Log: - Fix build Modified: trunk/reactos/drivers/network/ndis/include/miniport.h Modified: trunk/reactos/drivers/network/ndis/include/miniport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] Sun Oct 12 20:18:04 2008 @@ -159,6 +159,10 @@ VOID NdisStartDevices(); +VOID +NTAPI +MiniportWorker(IN PVOID WorkItem); + #endif /* __MINIPORT_H */ /* EOF */

1 0

[cgutman] 36742: - Fix branch build
by cgutman＠svn.reactos.org 13 Oct '08

13 Oct '08

Author: cgutman Date: Sun Oct 12 20:14:20 2008 New Revision: 36742 URL: http://svn.reactos.org/svn/reactos?rev=36742&view=rev Log: - Fix branch build Modified: branches/aicom-network-fixes/drivers/network/ndis/include/miniport.h Modified: branches/aicom-network-fixes/drivers/network/ndis/include/miniport.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/include/miniport.h [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/include/miniport.h [iso-8859-1] Sun Oct 12 20:14:20 2008 @@ -159,6 +159,10 @@ VOID NdisStartDevices(); +VOID +NTAPI +MiniportWorker(IN PVOID WorkItem); + #endif /* __MINIPORT_H */ /* EOF */

1 0

[cgutman] 36741: - Merge aicom-network-fixes up to r36740
by cgutman＠svn.reactos.org 13 Oct '08

13 Oct '08

Author: cgutman Date: Sun Oct 12 20:07:37 2008 New Revision: 36741 URL: http://svn.reactos.org/svn/reactos?rev=36741&view=rev Log: - Merge aicom-network-fixes up to r36740 Added: trunk/reactos/drivers/network/ndis/ndis/object.c - copied unchanged from r36740, branches/aicom-network-fixes/drivers/network/ndis/ndis/object.c trunk/reactos/drivers/network/ndis/ndis/workitem.c - copied unchanged from r36740, branches/aicom-network-fixes/drivers/network/ndis/ndis/workitem.c Modified: trunk/reactos/drivers/network/dd/ne2000/include/ne2000.h trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c trunk/reactos/drivers/network/dd/pcnet/pcnet.c trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/protocol.c trunk/reactos/drivers/network/tcpip/datalink/lan.c trunk/reactos/include/ddk/ndis.h trunk/reactos/lib/drivers/ip/network/neighbor.c trunk/reactos/lib/drivers/ip/network/transmit.c Modified: trunk/reactos/drivers/network/dd/ne2000/include/ne2000.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/… ============================================================================== --- trunk/reactos/drivers/network/dd/ne2000/include/ne2000.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/ne2000/include/ne2000.h [iso-8859-1] Sun Oct 12 20:07:37 2008 @@ -175,6 +175,7 @@ /* Flags used for driver cleanup */ BOOLEAN IOPortRangeRegistered; BOOLEAN InterruptRegistered; + BOOLEAN ShutdownHandlerRegistered; } NIC_ADAPTER, *PNIC_ADAPTER; /* Global driver information */ Modified: trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/… ============================================================================== --- trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] Sun Oct 12 20:07:37 2008 @@ -140,10 +140,13 @@ 0x20, Adapter->IOBase); + if (Adapter->ShutdownHandlerRegistered) + NdisMDeregisterAdapterShutdownHandler(Adapter->MiniportAdapterHandle); + /* Remove adapter from global adapter list */ if ((&Adapter->ListEntry)->Blink != NULL) { RemoveEntryList(&Adapter->ListEntry); - } + } /* Free adapter context area */ NdisFreeMemory(Adapter, sizeof(NIC_ADAPTER), 0); @@ -200,6 +203,14 @@ } } +VOID +STDCALL +MiniportShutdown(PVOID Context) +{ + #ifndef NOCARD + NICStop((PNIC_ADAPTER)Context); + #endif +} static NDIS_STATUS STDCALL MiniportInitialize( OUT PNDIS_STATUS OpenErrorStatus, @@ -411,6 +422,12 @@ /* Start the NIC */ NICStart(Adapter); #endif + + /* Register the shutdown handler */ + NdisMRegisterAdapterShutdownHandler(MiniportAdapterHandle, Adapter, MiniportShutdown); + + Adapter->ShutdownHandlerRegistered = TRUE; + /* Add adapter to the global adapter list */ InsertTailList(&DriverInfo.AdapterListHead, &Adapter->ListEntry); Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/p… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] Sun Oct 12 20:07:37 2008 @@ -573,6 +573,9 @@ /* deregister i/o port range */ NdisMDeregisterIoPortRange(Adapter->MiniportAdapterHandle, Adapter->IoBaseAddress, NUMBER_OF_PORTS, (PVOID)Adapter->PortOffset); + /* deregister the shutdown routine */ + NdisMDeregisterAdapterShutdownHandler(Adapter->MiniportAdapterHandle); + /* free shared memory */ MiFreeSharedMemory(Adapter); @@ -780,6 +783,18 @@ return TRUE; } #endif + +VOID +STDCALL +MiniportShutdown( PVOID Context ) +{ + PADAPTER Adapter = Context; + + DPRINT("Stopping the chip\n"); + + NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR0); + NdisRawWritePortUshort(Adapter->PortOffset + RDP, CSR0_STOP); +} static NDIS_STATUS STDCALL @@ -952,6 +967,8 @@ ASSERT(0); #endif + NdisMRegisterAdapterShutdownHandler(Adapter->MiniportAdapterHandle, Adapter, MiniportShutdown); + DPRINT("returning 0x%x\n", Status); *OpenErrorStatus = Status; return Status; Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sun Oct 12 20:07:37 2008 @@ -182,26 +182,6 @@ AdapterBinding = CONTAINING_RECORD(CurrentEntry, ADAPTER_BINDING, AdapterListEntry); NDIS_DbgPrint(DEBUG_MINIPORT, ("AdapterBinding = %x\n", AdapterBinding)); -#ifdef DBG - if(!AdapterBinding) - { - NDIS_DbgPrint(MIN_TRACE, ("AdapterBinding was null\n")); - break; - } - - if(!AdapterBinding->ProtocolBinding) - { - NDIS_DbgPrint(MIN_TRACE, ("AdapterBinding->ProtocolBinding was null\n")); - break; - } - - if(!AdapterBinding->ProtocolBinding->Chars.ReceiveHandler) - { - NDIS_DbgPrint(MIN_TRACE, ("AdapterBinding->ProtocolBinding->Chars.ReceiveHandler was null\n")); - break; - } -#endif - NDIS_DbgPrint (MID_TRACE, ("XXX (%x) %x %x %x %x %x %x %x XXX\n", @@ -235,60 +215,46 @@ VOID NTAPI MiniIndicateReceivePacket( - IN NDIS_HANDLE Miniport, + IN NDIS_HANDLE MiniportAdapterHandle, IN PPNDIS_PACKET PacketArray, IN UINT NumberOfPackets) /* * FUNCTION: receives miniport packet array indications * ARGUMENTS: - * Miniport: Miniport handle for the adapter + * MiniportAdapterHandle: Miniport handle for the adapter * PacketArray: pointer to a list of packet pointers to indicate * NumberOfPackets: number of packets to indicate - * NOTES: - * - This currently is a big temporary hack. In the future this should - * call ProtocolReceivePacket() on each bound protocol if it exists. - * For now it just mimics NdisMEthIndicateReceive. - */ -{ + * + */ +{ + PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; + PLIST_ENTRY CurrentEntry; + PADAPTER_BINDING AdapterBinding; + KIRQL OldIrql; UINT i; - for(i = 0; i < NumberOfPackets; i++) - { - PCHAR PacketBuffer = 0; - UINT PacketLength = 0; - PNDIS_BUFFER NdisBuffer = 0; - -#define PACKET_TAG (('k' << 24) + ('P' << 16) + ('D' << 8) + 'N') - - NdisAllocateMemoryWithTag((PVOID)&PacketBuffer, 1518, PACKET_TAG); - if(!PacketBuffer) - { - NDIS_DbgPrint(MIN_TRACE, ("insufficient resources\n")); - return; - } - - NdisQueryPacket(PacketArray[i], NULL, NULL, &NdisBuffer, NULL); - - while(NdisBuffer) - { - PNDIS_BUFFER CurrentBuffer; - PVOID BufferVa; - UINT BufferLen; - - NdisQueryBuffer(NdisBuffer, &BufferVa, &BufferLen); - memcpy(PacketBuffer + PacketLength, BufferVa, BufferLen); - PacketLength += BufferLen; - - CurrentBuffer = NdisBuffer; - NdisGetNextBuffer(CurrentBuffer, &NdisBuffer); - } - - NDIS_DbgPrint(MID_TRACE, ("indicating a %d-byte packet\n", PacketLength)); - - MiniIndicateData(Miniport, NULL, PacketBuffer, 14, PacketBuffer+14, PacketLength-14, PacketLength-14); - - NdisFreeMemory(PacketBuffer, 0, 0); - } + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + + CurrentEntry = Adapter->ProtocolListHead.Flink; + + while (CurrentEntry != &Adapter->ProtocolListHead) + { + AdapterBinding = CONTAINING_RECORD(CurrentEntry, ADAPTER_BINDING, AdapterListEntry); + + if (AdapterBinding->ProtocolBinding->Chars.ReceivePacketHandler) + { + for (i = 0; i < NumberOfPackets; i++) + { + (*AdapterBinding->ProtocolBinding->Chars.ReceivePacketHandler)( + AdapterBinding->NdisOpenBlock.ProtocolBindingContext, + PacketArray[i]); + } + } + + CurrentEntry = CurrentEntry->Flink; + } + + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } @@ -298,7 +264,13 @@ IN NDIS_STATUS Status, IN BOOLEAN AddressingReset) { - UNIMPLEMENTED + PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; + KIRQL OldIrql; + NDIS_DbgPrint(MIN_TRACE, ("FIXME: MiniResetComplete is partially implemented\n")); + NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_END, NULL, 0); + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + Adapter->MiniportBusy = FALSE; + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } @@ -631,11 +603,23 @@ return NDIS_STATUS_PENDING; } + NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_START, NULL, 0); + NdisMIndicateStatusComplete(Adapter); + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); Status = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ResetHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, AddressingReset); KeLowerIrql(OldIrql); + + if (Status != NDIS_STATUS_PENDING) { + NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_END, NULL, 0); + NdisMIndicateStatusComplete(Adapter); + } else { + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + Adapter->MiniportBusy = TRUE; + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + } return Status; } @@ -678,37 +662,52 @@ * Status of operation */ { - PNDIS_MINIPORT_WORK_ITEM Item; + PNDIS_MINIPORT_WORK_ITEM MiniportWorkItem; + PNDIS_WORK_ITEM NdisWorkItem; + PWORK_QUEUE_ITEM WorkQueueItem; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); ASSERT(Adapter); ASSERT(KeGetCurrentIrql() >= DISPATCH_LEVEL); - Item = ExAllocatePool(NonPagedPool, sizeof(NDIS_MINIPORT_WORK_ITEM)); - if (Item == NULL) + MiniportWorkItem = ExAllocatePool(NonPagedPool, sizeof(NDIS_MINIPORT_WORK_ITEM)); + if (!MiniportWorkItem) { NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); return NDIS_STATUS_RESOURCES; } - Item->WorkItemType = WorkItemType; - Item->WorkItemContext = WorkItemContext; + NdisWorkItem = ExAllocatePool(NonPagedPool, sizeof(NDIS_WORK_ITEM)); + if (!NdisWorkItem) + { + ExFreePool(MiniportWorkItem); + return NDIS_STATUS_RESOURCES; + } + + MiniportWorkItem->WorkItemType = WorkItemType; + MiniportWorkItem->WorkItemContext = WorkItemContext; /* safe due to adapter lock held */ - Item->Link.Next = NULL; + MiniportWorkItem->Link.Next = NULL; if (!Adapter->WorkQueueHead) { - Adapter->WorkQueueHead = Item; - Adapter->WorkQueueTail = Item; + Adapter->WorkQueueHead = MiniportWorkItem; + Adapter->WorkQueueTail = MiniportWorkItem; } else { - Adapter->WorkQueueTail->Link.Next = (PSINGLE_LIST_ENTRY)Item; - Adapter->WorkQueueTail = Item; - } - - KeInsertQueueDpc(&Adapter->NdisMiniportBlock.DeferredDpc, NULL, NULL); + Adapter->WorkQueueTail->Link.Next = (PSINGLE_LIST_ENTRY)MiniportWorkItem; + Adapter->WorkQueueTail = MiniportWorkItem; + } + + WorkQueueItem = (PWORK_QUEUE_ITEM)NdisWorkItem->WrapperReserved; + + NdisWorkItem->Context = Adapter; + + ExInitializeWorkItem(WorkQueueItem, MiniportWorker, NdisWorkItem); + + ExQueueWorkItem(WorkQueueItem, CriticalWorkQueue); return NDIS_STATUS_SUCCESS; } @@ -733,30 +732,38 @@ * Status of operation */ { - PNDIS_MINIPORT_WORK_ITEM Item; + PNDIS_MINIPORT_WORK_ITEM MiniportWorkItem; + PNDIS_WORK_ITEM NdisWorkItem; + PWORK_QUEUE_ITEM WorkQueueItem; + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); if (Adapter->MiniportBusy) { NDIS_DbgPrint(MID_TRACE, ("Waiting for miniport to become free.\n")); - KeInsertQueueDpc(&Adapter->NdisMiniportBlock.DeferredDpc, NULL, NULL); + NdisWorkItem = ExAllocatePool(NonPagedPool, sizeof(NDIS_WORK_ITEM)); + if (!NdisWorkItem) return NDIS_STATUS_RESOURCES; + WorkQueueItem = (PWORK_QUEUE_ITEM)NdisWorkItem->WrapperReserved; + NdisWorkItem->Context = Adapter; + ExInitializeWorkItem(WorkQueueItem, MiniportWorker, NdisWorkItem); + ExQueueWorkItem(WorkQueueItem, CriticalWorkQueue); return NDIS_STATUS_FAILURE; } - Item = Adapter->WorkQueueHead; - - if (Item) + MiniportWorkItem = Adapter->WorkQueueHead; + + if (MiniportWorkItem) { /* safe due to adapter lock held */ - Adapter->WorkQueueHead = (PNDIS_MINIPORT_WORK_ITEM)Item->Link.Next; - - if (Item == Adapter->WorkQueueTail) + Adapter->WorkQueueHead = (PNDIS_MINIPORT_WORK_ITEM)MiniportWorkItem->Link.Next; + + if (MiniportWorkItem == Adapter->WorkQueueTail) Adapter->WorkQueueTail = NULL; - *WorkItemType = Item->WorkItemType; - *WorkItemContext = Item->WorkItemContext; - - ExFreePool(Item); + *WorkItemType = MiniportWorkItem->WorkItemType; + *WorkItemContext = MiniportWorkItem->WorkItemContext; + + ExFreePool(MiniportWorkItem); Adapter->MiniportBusy = TRUE; @@ -953,6 +960,9 @@ break; case NdisWorkItemResetRequested: + NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_START, NULL, 0); + NdisMIndicateStatusComplete(Adapter); + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ResetHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, @@ -1010,38 +1020,6 @@ ExFreePool(WorkItem); } - - -VOID NTAPI MiniportDpc( - IN PKDPC Dpc, - IN PVOID DeferredContext, - IN PVOID SystemArgument1, - IN PVOID SystemArgument2) -/* - * FUNCTION: Deferred routine to handle serialization - * ARGUMENTS: - * Dpc = Pointer to DPC object - * DeferredContext = Pointer to context information (LOGICAL_ADAPTER) - * SystemArgument1 = Unused - * SystemArgument2 = Unused - */ -{ - PNDIS_WORK_ITEM NdisWorkItem; - PWORK_QUEUE_ITEM WorkItem; - - NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); - - NdisWorkItem = ExAllocatePool(NonPagedPool, sizeof(NDIS_WORK_ITEM)); - if (!NdisWorkItem) return; - - WorkItem = (PWORK_QUEUE_ITEM)NdisWorkItem->WrapperReserved; - - NdisWorkItem->Context = DeferredContext; - - ExInitializeWorkItem(WorkItem, MiniportWorker, NdisWorkItem); - - ExQueueWorkItem(WorkItem, CriticalWorkQueue); -} VOID @@ -1150,8 +1128,10 @@ NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); - if(Adapter->BugcheckContext->ShutdownHandler) + if(Adapter->BugcheckContext->ShutdownHandler) { KeDeregisterBugCheckCallback(Adapter->BugcheckContext->CallbackRecord); + IoUnregisterShutdownNotification(Adapter->NdisMiniportBlock.DeviceObject); + } } @@ -1319,12 +1299,9 @@ */ { PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportHandle; - PMINIPORT_BUGCHECK_CONTEXT BugcheckContext = Adapter->BugcheckContext; + PMINIPORT_BUGCHECK_CONTEXT BugcheckContext; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); - - if(BugcheckContext) - return; BugcheckContext = ExAllocatePool(NonPagedPool, sizeof(MINIPORT_BUGCHECK_CONTEXT)); if(!BugcheckContext) @@ -1337,11 +1314,19 @@ BugcheckContext->DriverContext = ShutdownContext; BugcheckContext->CallbackRecord = ExAllocatePool(NonPagedPool, sizeof(KBUGCHECK_CALLBACK_RECORD)); + if (!BugcheckContext->CallbackRecord) { + ExFreePool(BugcheckContext); + return; + } + + Adapter->BugcheckContext = BugcheckContext; KeInitializeCallbackRecord(BugcheckContext->CallbackRecord); KeRegisterBugCheckCallback(BugcheckContext->CallbackRecord, NdisIBugcheckCallback, BugcheckContext, sizeof(BugcheckContext), (PUCHAR)"Ndis Miniport"); + + IoRegisterShutdownNotification(Adapter->NdisMiniportBlock.DeviceObject); } @@ -1671,13 +1656,18 @@ ZwClose(WrapperContext.RegistryHandle); - if (NdisStatus != NDIS_STATUS_SUCCESS || - SelectedMediumIndex >= MEDIA_ARRAY_SIZE) + if (NdisStatus != NDIS_STATUS_SUCCESS) { NDIS_DbgPrint(MIN_TRACE, ("MiniportInitialize() failed for an adapter.\n")); ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); - if (NdisStatus == NDIS_STATUS_SUCCESS) NdisStatus = NDIS_STATUS_FAILURE; return NdisStatus; + } + + if (SelectedMediumIndex >= MEDIA_ARRAY_SIZE) + { + NDIS_DbgPrint(MIN_TRACE, ("MiniportInitialize() failed for an adapter\n")); + ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); + return NDIS_STATUS_UNSUPPORTED_MEDIA; } Adapter->NdisMiniportBlock.MediaType = MediaArray[SelectedMediumIndex]; @@ -1768,6 +1758,8 @@ RemoveEntryList(&Adapter->ListEntry); KeReleaseSpinLock(&AdapterListLock, OldIrql); + KeCancelTimer(&Adapter->NdisMiniportBlock.WakeUpDpcTimer.Timer); + (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.HaltHandler)(Adapter); if (Adapter->LookaheadBuffer) @@ -1789,7 +1781,27 @@ Adapter->NdisMiniportBlock.OldPnPDeviceState = Adapter->NdisMiniportBlock.PnPDeviceState; Adapter->NdisMiniportBlock.PnPDeviceState = NdisPnPDeviceStopped; - KeCancelTimer(&Adapter->NdisMiniportBlock.WakeUpDpcTimer.Timer); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +NdisIShutdown( + IN PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PLOGICAL_ADAPTER Adapter = DeviceObject->DeviceExtension; + PMINIPORT_BUGCHECK_CONTEXT Context = Adapter->BugcheckContext; + ADAPTER_SHUTDOWN_HANDLER ShutdownHandler = Context->ShutdownHandler; + + ASSERT(ShutdownHandler); + + ShutdownHandler(Context->DriverContext); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } @@ -1979,7 +1991,6 @@ KeInitializeTimer(&Adapter->NdisMiniportBlock.WakeUpDpcTimer.Timer); KeInitializeDpc(&Adapter->NdisMiniportBlock.WakeUpDpcTimer.Dpc, MiniportHangDpc, Adapter); - KeInitializeDpc(&Adapter->NdisMiniportBlock.DeferredDpc, MiniportDpc, Adapter); DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; @@ -2088,6 +2099,7 @@ *MiniportPtr = Miniport; Miniport->DriverObject->MajorFunction[IRP_MJ_PNP] = NdisIDispatchPnp; + Miniport->DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = NdisIShutdown; Miniport->DriverObject->DriverExtension->AddDevice = NdisIAddDevice; return NDIS_STATUS_SUCCESS; Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Sun Oct 12 20:07:37 2008 @@ -215,14 +215,18 @@ if ((Adapter->NdisMiniportBlock.MacOptions & NDIS_MAC_OPTION_NO_LOOPBACK) && MiniAdapterHasAddress(Adapter, Packet)) { - NDIS_DbgPrint(MID_TRACE, ("Queuing packet.\n")); - - MiniQueueWorkItem(Adapter, NdisWorkItemSendLoopback, (PVOID)Packet); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); - return NDIS_STATUS_PENDING; + if(Adapter->MiniportBusy) { + MiniQueueWorkItem(Adapter, NdisWorkItemSendLoopback, Packet); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); + return NDIS_STATUS_PENDING; + } + + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); + + return ProIndicatePacket(Adapter, Packet); } else { if(Adapter->MiniportBusy) { - MiniQueueWorkItem(Adapter, NdisWorkItemSend, (PVOID)Packet); + MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet); KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); return NDIS_STATUS_PENDING; } @@ -794,13 +798,13 @@ /* Put protocol binding struct on global list */ ExInterlockedInsertTailList(&ProtocolListHead, &Protocol->ListEntry, &ProtocolListLock); } - - /* else if(*Status != NDIS_STATUS_PENDING) { - // what to do here? + ExFreePool(Protocol); + ExFreePool(KeyInformation); + *NdisProtocolHandle = NULL; + return; } - */ } ExFreePool(KeyInformation); Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Sun Oct 12 20:07:37 2008 @@ -201,6 +201,8 @@ TI_DbgPrint(DEBUG_DATALINK, ("Called.\n")); + Adapter->NdisStatus = Status; + KeSetEvent(&Adapter->Event, 0, FALSE); } @@ -235,7 +237,13 @@ * Status = Status of the operation */ { - TI_DbgPrint(MID_TRACE, ("Called.\n")); + PLAN_ADAPTER Adapter = (PLAN_ADAPTER)BindingContext; + + TI_DbgPrint(DEBUG_DATALINK, ("Called.\n")); + + Adapter->NdisStatus = Status; + + KeSetEvent(&Adapter->Event, 0, FALSE); } @@ -517,19 +525,44 @@ VOID STDCALL ProtocolStatus( NDIS_HANDLE BindingContext, - NDIS_STATUS GenerelStatus, + NDIS_STATUS GeneralStatus, PVOID StatusBuffer, UINT StatusBufferSize) /* * FUNCTION: Called by NDIS when the underlying driver has changed state * ARGUMENTS: * BindingContext = Pointer to a device context (LAN_ADAPTER) - * GenerelStatus = A generel status code + * GeneralStatus = A general status code * StatusBuffer = Pointer to a buffer with medium-specific data * StatusBufferSize = Number of bytes in StatusBuffer */ { + PLAN_ADAPTER Adapter = BindingContext; + TI_DbgPrint(DEBUG_DATALINK, ("Called.\n")); + + switch(GeneralStatus) + { + case NDIS_STATUS_MEDIA_CONNECT: + DbgPrint("NDIS_STATUS_MEDIA_CONNECT\n"); + break; + + case NDIS_STATUS_MEDIA_DISCONNECT: + DbgPrint("NDIS_STATUS_MEDIA_DISCONNECT\n"); + break; + + case NDIS_STATUS_RESET_START: + Adapter->State = LAN_STATE_RESETTING; + break; + + case NDIS_STATUS_RESET_END: + Adapter->State = LAN_STATE_STARTED; + break; + + default: + DbgPrint("Unhandled status: %x", GeneralStatus); + break; + } } Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=367… ============================================================================== --- trunk/reactos/include/ddk/ndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndis.h [iso-8859-1] Sun Oct 12 20:07:37 2008 @@ -841,6 +841,19 @@ typedef struct _NDIS_PACKET_EXTENSION { PVOID NdisPacketInfo[MaxPerPacketInfo]; } NDIS_PACKET_EXTENSION, *PNDIS_PACKET_EXTENSION; + +typedef struct _NDIS_OBJECT_HEADER { + UCHAR Type; + UCHAR Revision; + USHORT Size; +} NDIS_OBJECT_HEADER, *PNDIS_OBJECT_HEADER; + +typedef struct _NDIS_GENERIC_OBJECT { + NDIS_OBJECT_HEADER Header; + PVOID Caller; + PVOID CallersCaller; + PDRIVER_OBJECT DriverObject; +} NDIS_GENERIC_OBJECT, *PNDIS_GENERIC_OBJECT; /* * PNDIS_PACKET 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 Oct 12 20:07:37 2008 @@ -412,11 +412,13 @@ TI_DbgPrint(MID_TRACE,("Packet targeted at broadcast addr\n")); NCE = NBAddNeighbor(Interface, Address, NULL, Interface->AddressLength, NUD_CONNECTED); + if (!NCE) return NULL; NCE->EventTimer = 0; NCE->EventCount = 0; } else { NCE = NBAddNeighbor(Interface, Address, NULL, Interface->AddressLength, NUD_INCOMPLETE); + if (!NCE) return NULL; NCE->EventTimer = 1; NCE->EventCount = 0; } Modified: trunk/reactos/lib/drivers/ip/network/transmit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/tra… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/transmit.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/transmit.c [iso-8859-1] Sun Oct 12 20:07:37 2008 @@ -204,9 +204,7 @@ /* Prepare next fragment for transmission and send it */ PrepareNextFragment(IFC); - IPSendFragment(IFC->NdisPacket, NCE, IFC); - - return STATUS_SUCCESS; + return IPSendFragment(IFC->NdisPacket, NCE, IFC); } NTSTATUS IPSendDatagram(PIP_PACKET IPPacket, PNEIGHBOR_CACHE_ENTRY NCE,

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
52
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2008