Ros-diffs September 2022

ros-diffs@reactos.org

21 participants
142 discussions

[reactos] 01/01: [FS_REC][VFATFS] Update headers per our current coding style

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=542e9f2ba0ad2b1ffabcd… commit 542e9f2ba0ad2b1ffabcdeef638e7b4dacfdd180 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Sep 24 16:24:08 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Sep 24 16:24:08 2022 +0300 [FS_REC][VFATFS] Update headers per our current coding style No code changes. Addendum to 14c39362 and 6d65da93. --- drivers/filesystems/fs_rec/fatx.c | 2 +- drivers/filesystems/vfatfs/CMakeLists.txt | 4 ++-- drivers/filesystems/vfatfs/blockdev.c | 10 ++++------ drivers/filesystems/vfatfs/cleanup.c | 11 +++++------ drivers/filesystems/vfatfs/close.c | 11 +++++------ drivers/filesystems/vfatfs/create.c | 28 +++++----------------------- drivers/filesystems/vfatfs/dir.c | 15 +++++++-------- drivers/filesystems/vfatfs/direntry.c | 13 ++++++------- drivers/filesystems/vfatfs/dirwr.c | 14 ++++++-------- drivers/filesystems/vfatfs/ea.c | 26 ++++---------------------- drivers/filesystems/vfatfs/fastio.c | 11 +++++------ drivers/filesystems/vfatfs/fat.c | 12 +++++------- drivers/filesystems/vfatfs/fcb.c | 17 ++++++++--------- drivers/filesystems/vfatfs/finfo.c | 14 ++++++-------- drivers/filesystems/vfatfs/flush.c | 10 +++++----- drivers/filesystems/vfatfs/fsctl.c | 27 +++++---------------------- drivers/filesystems/vfatfs/iface.c | 28 +++++----------------------- drivers/filesystems/vfatfs/kdbg.c | 11 +++++------ drivers/filesystems/vfatfs/misc.c | 11 +++++------ drivers/filesystems/vfatfs/pnp.c | 10 ++++------ drivers/filesystems/vfatfs/rw.c | 12 +++++------- drivers/filesystems/vfatfs/shutdown.c | 9 ++++----- drivers/filesystems/vfatfs/string.c | 12 +++++------- drivers/filesystems/vfatfs/volume.c | 11 +++++------ 24 files changed, 117 insertions(+), 212 deletions(-) diff --git a/drivers/filesystems/fs_rec/fatx.c b/drivers/filesystems/fs_rec/fatx.c index 165cac292e1..86cce338c8e 100644 --- a/drivers/filesystems/fs_rec/fatx.c +++ b/drivers/filesystems/fs_rec/fatx.c @@ -2,7 +2,7 @@ * PROJECT: ReactOS File System Recognizer * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: FATX Recognizer - * COPYRIGHT: Copyright 2022 Hervé Poussineau + * COPYRIGHT: Copyright 2022 Hervé Poussineau <hpoussin(a)reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/CMakeLists.txt b/drivers/filesystems/vfatfs/CMakeLists.txt index 7e0c7d56ee4..cc577e84369 100644 --- a/drivers/filesystems/vfatfs/CMakeLists.txt +++ b/drivers/filesystems/vfatfs/CMakeLists.txt @@ -33,6 +33,6 @@ target_link_libraries(vfatfs ${PSEH_LIB}) add_importlibs(vfatfs ntoskrnl hal) add_pch(vfatfs vfat.h SOURCE) if(SARCH STREQUAL "xbox") - add_cd_file(TARGET vfatfs DESTINATION reactos/system32/drivers NO_CAB FOR all) - add_registry_inf(vfatfs_reg.inf) + add_cd_file(TARGET vfatfs DESTINATION reactos/system32/drivers NO_CAB FOR all) + add_registry_inf(vfatfs_reg.inf) endif() diff --git a/drivers/filesystems/vfatfs/blockdev.c b/drivers/filesystems/vfatfs/blockdev.c index 33bbb0b16ea..451861e4d65 100644 --- a/drivers/filesystems/vfatfs/blockdev.c +++ b/drivers/filesystems/vfatfs/blockdev.c @@ -1,10 +1,8 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/fs/vfat/blockdev.c - * PURPOSE: Temporary sector reading support - * PROGRAMMER: David Welch (welch(a)cwcom.net) - * UPDATE HISTORY: + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Temporary sector reading support + * COPYRIGHT: Copyright 1999-2001 David Welch <welch(a)cwcom.net> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/cleanup.c b/drivers/filesystems/vfatfs/cleanup.c index ad5f120d914..3844c6f5f0c 100644 --- a/drivers/filesystems/vfatfs/cleanup.c +++ b/drivers/filesystems/vfatfs/cleanup.c @@ -1,10 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/fs/vfat/cleanup.c - * PURPOSE: VFAT Filesystem - * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Pierre Schweitzer (pierre(a)reactos.org) + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Cleanup routines + * COPYRIGHT: Copyright 1998 Jason Filby <jasonfilby(a)yahoo.com> + * Copyright 2014-2018 Pierre Schweitzer <pierre(a)reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/close.c b/drivers/filesystems/vfatfs/close.c index aa19c1ed505..e3419632c56 100644 --- a/drivers/filesystems/vfatfs/close.c +++ b/drivers/filesystems/vfatfs/close.c @@ -1,10 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/vfatfs/close.c - * PURPOSE: VFAT Filesystem - * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Pierre Schweitzer (pierre(a)reactos.org) + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: File close routines + * COPYRIGHT: Copyright 1998 Jason Filby <jasonfilby(a)yahoo.com> + * Copyright 2014-2018 Pierre Schweitzer <pierre(a)reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/create.c b/drivers/filesystems/vfatfs/create.c index 32c39f11361..3cd0c3c8ea2 100644 --- a/drivers/filesystems/vfatfs/create.c +++ b/drivers/filesystems/vfatfs/create.c @@ -1,27 +1,9 @@ /* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/vfatfs/create.c - * PURPOSE: VFAT Filesystem - * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Pierre Schweitzer (pierre(a)reactos.org) + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: File creation routines + * COPYRIGHT: Copyright 1998 Jason Filby <jasonfilby(a)yahoo.com> + * Copyright 2010-2019 Pierre Schweitzer <pierre(a)reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/dir.c b/drivers/filesystems/vfatfs/dir.c index 6f82f65c93d..f943f5f7837 100644 --- a/drivers/filesystems/vfatfs/dir.c +++ b/drivers/filesystems/vfatfs/dir.c @@ -1,12 +1,11 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/fs/vfat/dir.c - * PURPOSE: VFAT Filesystem : directory control - * UPDATE HISTORY: - 19-12-1998 : created - -*/ + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Directory control + * COPYRIGHT: Copyright 1998 Jason Filby <jasonfilby(a)yahoo.com> + * Copyright 2004-2005 Hervé Poussineau <hpoussin(a)reactos.org> + * Copyright 2012-2018 Pierre Schweitzer <pierre(a)reactos.org> + */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/direntry.c b/drivers/filesystems/vfatfs/direntry.c index 8b5f8757319..91d115c1eb0 100644 --- a/drivers/filesystems/vfatfs/direntry.c +++ b/drivers/filesystems/vfatfs/direntry.c @@ -1,11 +1,10 @@ /* - * FILE: DirEntry.c - * PURPOSE: Routines to manipulate directory entries. - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Rex Jolliff (rex(a)lvcablemodem.com) - * Herve Poussineau (reactos(a)poussine.freesurf.fr) + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Routines to manipulate directory entries + * COPYRIGHT: Copyright 1998 Jason Filby <jasonfilby(a)yahoo.com> + * Copyright 2001 Rex Jolliff <rex(a)lvcablemodem.com> + * Copyright 2004-2022 Hervé Poussineau <hpoussin(a)reactos.org> */ /* ------------------------------------------------------- INCLUDES */ diff --git a/drivers/filesystems/vfatfs/dirwr.c b/drivers/filesystems/vfatfs/dirwr.c index 99d4f8946a0..3de2d6d3fd9 100644 --- a/drivers/filesystems/vfatfs/dirwr.c +++ b/drivers/filesystems/vfatfs/dirwr.c @@ -1,12 +1,10 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/vfatfs/dirwr.c - * PURPOSE: VFAT Filesystem : write in directory - * PROGRAMMER: Rex Jolliff (rex(a)lvcablemodem.com) - * Herve Poussineau (reactos(a)poussine.freesurf.fr) - * Pierre Schweitzer (pierre(a)reactos.org) - * + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Write in directory + * COPYRIGHT: Copyright 1999-2001 Rex Jolliff <rex(a)lvcablemodem.com> + * Copyright 2004-2008 Hervé Poussineau <hpoussin(a)reactos.org> + * Copyright 2010-2018 Pierre Schweitzer <pierre(a)reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/ea.c b/drivers/filesystems/vfatfs/ea.c index d2b92a49a6a..8db876fb2fd 100644 --- a/drivers/filesystems/vfatfs/ea.c +++ b/drivers/filesystems/vfatfs/ea.c @@ -1,26 +1,8 @@ /* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * PROJECT: ReactOS kernel - * FILE: drivers/fs/vfat/ea.c - * PURPOSE: VFAT Filesystem - * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Extended attributes handlers + * COPYRIGHT: Copyright 1998 Jason Filby <jasonfilby(a)yahoo.com> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/fastio.c b/drivers/filesystems/vfatfs/fastio.c index 5db742b3a7c..519a9e1b923 100644 --- a/drivers/filesystems/vfatfs/fastio.c +++ b/drivers/filesystems/vfatfs/fastio.c @@ -1,10 +1,9 @@ /* - * FILE: drivers/filesystems/vfatfs/fastio.c - * PURPOSE: Fast IO routines. - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PROGRAMMER: Herve Poussineau (hpoussin(a)reactos.org) - * Pierre Schweitzer (pierre(a)reactos.org) + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Fast IO routines + * COPYRIGHT: Copyright 2005 Hervé Poussineau <hpoussin(a)reactos.org> + * Copyright 2015-2018 Pierre Schweitzer <pierre(a)reactos.org> */ #include "vfat.h" diff --git a/drivers/filesystems/vfatfs/fat.c b/drivers/filesystems/vfatfs/fat.c index e32f279991f..186c5d1c361 100644 --- a/drivers/filesystems/vfatfs/fat.c +++ b/drivers/filesystems/vfatfs/fat.c @@ -1,11 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/vfatfs/fat.c - * PURPOSE: VFAT Filesystem - * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Pierre Schweitzer (pierre(a)reactos.org) - * + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: File Allocation Table routines + * COPYRIGHT: Copyright 1998 Jason Filby <jasonfilby(a)yahoo.com> + * Copyright 2015-2018 Pierre Schweitzer <pierre(a)reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/fcb.c b/drivers/filesystems/vfatfs/fcb.c index 696184ec627..7fd1789b60e 100644 --- a/drivers/filesystems/vfatfs/fcb.c +++ b/drivers/filesystems/vfatfs/fcb.c @@ -1,13 +1,12 @@ /* -* FILE: drivers/filesystems/vfatfs/fcb.c -* PURPOSE: Routines to manipulate FCBs. -* COPYRIGHT: See COPYING in the top level directory -* PROJECT: ReactOS kernel -* PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) -* Rex Jolliff (rex(a)lvcablemodem.com) -* Herve Poussineau (reactos(a)poussine.freesurf.fr) -* Pierre Schweitzer (pierre(a)reactos.org) -*/ + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Routines to manipulate FCBs + * COPYRIGHT: Copyright 1998 Jason Filby <jasonfilby(a)yahoo.com> + * Copyright 2001 Rex Jolliff <rex(a)lvcablemodem.com> + * Copyright 2005-2022 Hervé Poussineau <hpoussin(a)reactos.org> + * Copyright 2008-2018 Pierre Schweitzer <pierre(a)reactos.org> + */ /* ------------------------------------------------------- INCLUDES */ diff --git a/drivers/filesystems/vfatfs/finfo.c b/drivers/filesystems/vfatfs/finfo.c index a4ddc72f6bb..906ca4e361b 100644 --- a/drivers/filesystems/vfatfs/finfo.c +++ b/drivers/filesystems/vfatfs/finfo.c @@ -1,12 +1,10 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/vfatfs/finfo.c - * PURPOSE: VFAT Filesystem - * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Herve Poussineau (reactos(a)poussine.freesurf.fr) - * Pierre Schweitzer (pierre(a)reactos.org) - * + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: File information routines + * COPYRIGHT: Copyright 1998 Jason Filby <jasonfilby(a)yahoo.com> + * Copyright 2005 Hervé Poussineau <hpoussin(a)reactos.org> + * Copyright 2008-2018 Pierre Schweitzer <pierre(a)reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/flush.c b/drivers/filesystems/vfatfs/flush.c index 2861998420b..2f9aadbba8d 100644 --- a/drivers/filesystems/vfatfs/flush.c +++ b/drivers/filesystems/vfatfs/flush.c @@ -1,9 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/fs/vfat/flush.c - * PURPOSE: VFAT Filesystem - * PROGRAMMER: + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Flushing routines + * COPYRIGHT: Copyright 2004-2013 Eric Kohl <eric.kohl(a)reactos.org> + * Copyright 2014-2018 Pierre Schweitzer <pierre(a)reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/fsctl.c b/drivers/filesystems/vfatfs/fsctl.c index 9b4018097d6..84d9b6aec5c 100644 --- a/drivers/filesystems/vfatfs/fsctl.c +++ b/drivers/filesystems/vfatfs/fsctl.c @@ -1,26 +1,9 @@ /* - * ReactOS kernel - * Copyright (C) 2002 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/fs/vfat/fsctl.c - * PURPOSE: VFAT Filesystem + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Filesystem routines + * COPYRIGHT: Copyright 2002-2013 Eric Kohl <eric.kohl(a)reactos.org> + * Copyright 2008-2018 Pierre Schweitzer <pierre(a)reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/iface.c b/drivers/filesystems/vfatfs/iface.c index 6ed08d0ab1f..234dbc008f5 100644 --- a/drivers/filesystems/vfatfs/iface.c +++ b/drivers/filesystems/vfatfs/iface.c @@ -1,27 +1,9 @@ /* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -/* - * PROJECT: ReactOS kernel - * FILE: drivers/fs/vfat/iface.c - * PURPOSE: VFAT Filesystem - * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Pierre Schweitzer (pierre(a)reactos.org) + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Driver entry interface + * COPYRIGHT: Copyright 1998 Jason Filby <jasonfilby(a)yahoo.com> + * Copyright 2010-2018 Pierre Schweitzer <pierre(a)reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/kdbg.c b/drivers/filesystems/vfatfs/kdbg.c index 3582c7dcdae..2a03b75120f 100644 --- a/drivers/filesystems/vfatfs/kdbg.c +++ b/drivers/filesystems/vfatfs/kdbg.c @@ -1,10 +1,9 @@ /* -* FILE: drivers/filesystems/vfatfs/kdbg.c -* PURPOSE: KDBG extension. -* COPYRIGHT: See COPYING in the top level directory -* PROJECT: ReactOS kernel -* PROGRAMMER: Pierre Schweitzer (pierre(a)reactos.org) -*/ + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: KDBG extension + * COPYRIGHT: Copyright 2018 Pierre Schweitzer <pierre(a)reactos.org> + */ /* ------------------------------------------------------- INCLUDES */ diff --git a/drivers/filesystems/vfatfs/misc.c b/drivers/filesystems/vfatfs/misc.c index 127851ba9bf..35c66e23440 100644 --- a/drivers/filesystems/vfatfs/misc.c +++ b/drivers/filesystems/vfatfs/misc.c @@ -1,10 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/fs/vfat/misc.c - * PURPOSE: VFAT Filesystem - * PROGRAMMER: - * + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Misc routines + * COPYRIGHT: Copyright 1998 Jason Filby <jasonfilby(a)yahoo.com> + * Copyright 2015-2018 Pierre Schweitzer <pierre(a)reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/pnp.c b/drivers/filesystems/vfatfs/pnp.c index 6a07e7e90a2..ea788149dec 100644 --- a/drivers/filesystems/vfatfs/pnp.c +++ b/drivers/filesystems/vfatfs/pnp.c @@ -1,10 +1,8 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/vfatfs/pnp.c - * PURPOSE: VFAT Filesystem - * PROGRAMMER: Pierre Schweitzer - * + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Plug & Play handlers + * COPYRIGHT: Copyright 2010-2015 Pierre Schweitzer <pierre(a)reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/rw.c b/drivers/filesystems/vfatfs/rw.c index 66caebdc850..709b199e824 100644 --- a/drivers/filesystems/vfatfs/rw.c +++ b/drivers/filesystems/vfatfs/rw.c @@ -1,11 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/vfatfs/rw.c - * PURPOSE: VFAT Filesystem - * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Pierre Schweitzer (pierre(a)reactos.org) - * + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Reading and writing routines + * COPYRIGHT: Copyright 1998 Jason Filby <jasonfilby(a)yahoo.com> + * Copyright 2008-2018 Pierre Schweitzer <pierre(a)reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/shutdown.c b/drivers/filesystems/vfatfs/shutdown.c index 8e367453357..db047b87366 100644 --- a/drivers/filesystems/vfatfs/shutdown.c +++ b/drivers/filesystems/vfatfs/shutdown.c @@ -1,9 +1,8 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/fs/vfat/shutdown.c - * PURPOSE: VFAT Filesystem - * PROGRAMMER: Eric Kohl + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Shutdown handlers + * COPYRIGHT: Copyright 2000-2013 Eric Kohl <eric.kohl(a)reactos.org> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/string.c b/drivers/filesystems/vfatfs/string.c index 00b3271c921..a824a39f526 100644 --- a/drivers/filesystems/vfatfs/string.c +++ b/drivers/filesystems/vfatfs/string.c @@ -1,11 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/fs/vfat/string.c - * PURPOSE: VFAT Filesystem - * PROGRAMMERS: Jason Filby (jasonfilby(a)yahoo.com) - * Doug Lyons (douglyons at douglyons dot com) - * + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Volume routines + * COPYRIGHT: Copyright 1998 Jason Filby <jasonfilby(a)yahoo.com> + * Copyright 2020 Doug Lyons <douglyons(a)douglyons.com> */ /* INCLUDES *****************************************************************/ diff --git a/drivers/filesystems/vfatfs/volume.c b/drivers/filesystems/vfatfs/volume.c index d1f10d05646..d3fb63d5933 100644 --- a/drivers/filesystems/vfatfs/volume.c +++ b/drivers/filesystems/vfatfs/volume.c @@ -1,10 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/fs/vfat/volume.c - * PURPOSE: VFAT Filesystem - * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Herve Poussineau (reactos(a)poussine.freesurf.fr) + * PROJECT: VFAT Filesystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Volume routines + * COPYRIGHT: Copyright 1998 Jason Filby <jasonfilby(a)yahoo.com> + * Copyright 2004-2022 Hervé Poussineau <hpoussin(a)reactos.org> */ /* INCLUDES *****************************************************************/

1 year, 11 months

[reactos] 06/06: [FS_REC] Add FATX recognizer

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d65da93e3c5d9c934dc5… commit 6d65da93e3c5d9c934dc5d4ae03b95d7609b2198 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Sep 13 23:46:04 2022 +0200 Commit: hpoussin <32227662+hpoussin(a)users.noreply.github.com> CommitDate: Sat Sep 24 12:12:33 2022 +0200 [FS_REC] Add FATX recognizer CORE-16373 --- drivers/filesystems/fs_rec/CMakeLists.txt | 1 + drivers/filesystems/fs_rec/fatx.c | 130 ++++++++++++++++++++++++++++++ drivers/filesystems/fs_rec/fs_rec.c | 17 ++++ drivers/filesystems/fs_rec/fs_rec.h | 8 ++ 4 files changed, 156 insertions(+) diff --git a/drivers/filesystems/fs_rec/CMakeLists.txt b/drivers/filesystems/fs_rec/CMakeLists.txt index 2d309ef7447..c231d3d378d 100644 --- a/drivers/filesystems/fs_rec/CMakeLists.txt +++ b/drivers/filesystems/fs_rec/CMakeLists.txt @@ -4,6 +4,7 @@ list(APPEND SOURCE cdfs.c ext2.c fat.c + fatx.c ffs.c fs_rec.c ntfs.c diff --git a/drivers/filesystems/fs_rec/fatx.c b/drivers/filesystems/fs_rec/fatx.c new file mode 100644 index 00000000000..165cac292e1 --- /dev/null +++ b/drivers/filesystems/fs_rec/fatx.c @@ -0,0 +1,130 @@ +/* + * PROJECT: ReactOS File System Recognizer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: FATX Recognizer + * COPYRIGHT: Copyright 2022 Hervé Poussineau + */ + +/* INCLUDES *****************************************************************/ + +#include "fs_rec.h" + +#define NDEBUG +#include <debug.h> + +/* TYPES ****************************************************************/ + +#include <pshpack1.h> +typedef struct _FATX_BOOT_SECTOR +{ + UCHAR SysType[4]; + ULONG VolumeId; + ULONG SectorsPerCluster; + USHORT FatCount; + ULONG Reserved; + UCHAR Unused[4078]; +} FATX_BOOT_SECTOR, *PFATX_BOOT_SECTOR; +#include <poppack.h> + +/* FUNCTIONS ****************************************************************/ + +BOOLEAN +NTAPI +FsRecIsFatxVolume(IN PFATX_BOOT_SECTOR BootSector) +{ + BOOLEAN Result = TRUE; + + PAGED_CODE(); + + if (BootSector->SysType[0] != 'F' || + BootSector->SysType[1] != 'A' || + BootSector->SysType[2] != 'T' || + BootSector->SysType[3] != 'X') + { + /* Fail */ + Result = FALSE; + } + else if (BootSector->SectorsPerCluster != 1 && + BootSector->SectorsPerCluster != 2 && + BootSector->SectorsPerCluster != 4 && + BootSector->SectorsPerCluster != 8 && + BootSector->SectorsPerCluster != 16 && + BootSector->SectorsPerCluster != 32 && + BootSector->SectorsPerCluster != 64 && + BootSector->SectorsPerCluster != 128) + { + /* Fail */ + Result = FALSE; + } + + /* Return the result */ + return Result; +} + +NTSTATUS +NTAPI +FsRecFatxFsControl(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION Stack; + NTSTATUS Status; + PDEVICE_OBJECT MountDevice; + PFATX_BOOT_SECTOR Bpb = NULL; + ULONG SectorSize; + LARGE_INTEGER Offset = {{0, 0}}; + BOOLEAN DeviceError = FALSE; + PAGED_CODE(); + + /* Get the I/O Stack and check the function type */ + Stack = IoGetCurrentIrpStackLocation(Irp); + switch (Stack->MinorFunction) + { + case IRP_MN_MOUNT_VOLUME: + + /* Assume failure */ + Status = STATUS_UNRECOGNIZED_VOLUME; + + /* Get the device object and request the sector size */ + MountDevice = Stack->Parameters.MountVolume.DeviceObject; + if (FsRecGetDeviceSectorSize(MountDevice, &SectorSize)) + { + /* Try to read the BPB */ + if (FsRecReadBlock(MountDevice, + &Offset, + 512, + SectorSize, + (PVOID)&Bpb, + &DeviceError)) + { + /* Check if it's an actual FAT volume */ + if (FsRecIsFatxVolume(Bpb)) + { + /* It is! */ + Status = STATUS_FS_DRIVER_REQUIRED; + } + } + + /* Free the boot sector if we have one */ + ExFreePool(Bpb); + } + + break; + + case IRP_MN_LOAD_FILE_SYSTEM: + + /* Load the file system */ + Status = FsRecLoadFileSystem(DeviceObject, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\vfatfs"); + break; + + default: + + /* Invalid request */ + Status = STATUS_INVALID_DEVICE_REQUEST; + } + + /* Return Status */ + return Status; +} + +/* EOF */ diff --git a/drivers/filesystems/fs_rec/fs_rec.c b/drivers/filesystems/fs_rec/fs_rec.c index e350fac5ceb..1dd5b4d2697 100644 --- a/drivers/filesystems/fs_rec/fs_rec.c +++ b/drivers/filesystems/fs_rec/fs_rec.c @@ -182,6 +182,12 @@ FsRecFsControl(IN PDEVICE_OBJECT DeviceObject, Status = FsRecFfsFsControl(DeviceObject, Irp); break; + case FS_TYPE_FATX: + + /* Send FATX command */ + Status = FsRecFatxFsControl(DeviceObject, Irp); + break; + default: /* Unrecognized FS */ @@ -468,6 +474,17 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, 0); if (NT_SUCCESS(Status)) DeviceCount++; + /* Register FATX */ + Status = FsRecRegisterFs(DriverObject, + NULL, + NULL, + L"\\FatX", + L"\\FileSystem\\FatXRecognizer", + FS_TYPE_FATX, + FILE_DEVICE_DISK_FILE_SYSTEM, + 0); + if (NT_SUCCESS(Status)) DeviceCount++; + /* Return appropriate Status */ return (DeviceCount > 0) ? STATUS_SUCCESS : STATUS_IMAGE_ALREADY_LOADED; } diff --git a/drivers/filesystems/fs_rec/fs_rec.h b/drivers/filesystems/fs_rec/fs_rec.h index 4e062e2ff4b..fe56d1ac18f 100644 --- a/drivers/filesystems/fs_rec/fs_rec.h +++ b/drivers/filesystems/fs_rec/fs_rec.h @@ -177,6 +177,7 @@ typedef enum _FILE_SYSTEM_TYPE FS_TYPE_BTRFS, FS_TYPE_REISERFS, FS_TYPE_FFS, + FS_TYPE_FATX, } FILE_SYSTEM_TYPE, *PFILE_SYSTEM_TYPE; /* FS Recognizer State */ @@ -252,6 +253,13 @@ FsRecFfsFsControl( IN PIRP Irp ); +NTSTATUS +NTAPI +FsRecFatxFsControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp +); + BOOLEAN NTAPI FsRecGetDeviceSectors(

1 year, 11 months

[reactos] 05/06: [VFATFS] Correctly init dirIndex/startIndex on FATX subdirectories

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fa809fd2feb93d4d65cc9… commit fa809fd2feb93d4d65cc94436bdd5024bc8be667 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Sep 13 23:32:01 2022 +0200 Commit: hpoussin <32227662+hpoussin(a)users.noreply.github.com> CommitDate: Sat Sep 24 12:12:33 2022 +0200 [VFATFS] Correctly init dirIndex/startIndex on FATX subdirectories '.' and '..' entries do not exist on FATX subdirectories. We have to fake them when enumerating the directory, and ignore them when creating a FCB from a directory entry. CORE-16373 --- drivers/filesystems/vfatfs/fcb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/filesystems/vfatfs/fcb.c b/drivers/filesystems/vfatfs/fcb.c index 6fd76071678..696184ec627 100644 --- a/drivers/filesystems/vfatfs/fcb.c +++ b/drivers/filesystems/vfatfs/fcb.c @@ -428,6 +428,7 @@ static VOID vfatInitFCBFromDirEntry( PDEVICE_EXTENSION Vcb, + PVFATFCB ParentFcb, PVFATFCB Fcb, PVFAT_DIRENTRY_CONTEXT DirContext) { @@ -476,7 +477,8 @@ vfatInitFCBFromDirEntry( } Fcb->dirIndex = DirContext->DirIndex; Fcb->startIndex = DirContext->StartIndex; - if (vfatVolumeIsFatX(Vcb) && !vfatFCBIsRoot(Fcb)) + Fcb->parentFcb = ParentFcb; + if (vfatVolumeIsFatX(Vcb) && !vfatFCBIsRoot(ParentFcb)) { ASSERT(DirContext->DirIndex >= 2 && DirContext->StartIndex >= 2); Fcb->dirIndex = DirContext->DirIndex-2; @@ -572,13 +574,12 @@ vfatUpdateFCB( RemoveEntryList(&Fcb->ParentListEntry); /* Reinit FCB */ - vfatInitFCBFromDirEntry(pVCB, Fcb, DirContext); + vfatInitFCBFromDirEntry(pVCB, ParentFcb, Fcb, DirContext); if (vfatFCBIsDirectory(Fcb)) { CcFlushCache(&Fcb->SectionObjectPointers, NULL, 0, NULL); } - Fcb->parentFcb = ParentFcb; InsertTailList(&ParentFcb->ParentListHead, &Fcb->ParentListEntry); vfatAddFCBToTable(pVCB, Fcb); @@ -739,10 +740,9 @@ vfatMakeFCBFromDirEntry( } rcFCB = vfatNewFCB(vcb, &NameU); - vfatInitFCBFromDirEntry(vcb, rcFCB, DirContext); + vfatInitFCBFromDirEntry(vcb, directoryFCB, rcFCB, DirContext); rcFCB->RefCount = 1; - rcFCB->parentFcb = directoryFCB; InsertTailList(&directoryFCB->ParentListHead, &rcFCB->ParentListEntry); vfatAddFCBToTable(vcb, rcFCB); *fileFCB = rcFCB;

1 year, 11 months

[reactos] 04/06: [VFATFS] Always provide a short name for FATX files (equal to long name)

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0979fb29e2647a607c404… commit 0979fb29e2647a607c40497f743cd6958931517c Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Sep 13 23:24:39 2022 +0200 Commit: hpoussin <32227662+hpoussin(a)users.noreply.github.com> CommitDate: Sat Sep 24 12:12:33 2022 +0200 [VFATFS] Always provide a short name for FATX files (equal to long name) If no short name is provided, driver will think that the partition is corrupted. CORE-16373 --- drivers/filesystems/vfatfs/direntry.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/filesystems/vfatfs/direntry.c b/drivers/filesystems/vfatfs/direntry.c index 2247637c8b3..8b5f8757319 100644 --- a/drivers/filesystems/vfatfs/direntry.c +++ b/drivers/filesystems/vfatfs/direntry.c @@ -497,10 +497,9 @@ FATXGetNextDirEntry( switch (DirContext->DirIndex) { case 0: /* entry . */ - DirContext->ShortNameU.Buffer[0] = 0; - DirContext->ShortNameU.Length = 0; wcscpy(DirContext->LongNameU.Buffer, L"."); DirContext->LongNameU.Length = sizeof(WCHAR); + DirContext->ShortNameU = DirContext->LongNameU; RtlCopyMemory(&DirContext->DirEntry.FatX, &pDirFcb->entry.FatX, sizeof(FATX_DIR_ENTRY)); DirContext->DirEntry.FatX.Filename[0] = '.'; DirContext->DirEntry.FatX.FilenameLength = 1; @@ -508,10 +507,9 @@ FATXGetNextDirEntry( return STATUS_SUCCESS; case 1: /* entry .. */ - DirContext->ShortNameU.Buffer[0] = 0; - DirContext->ShortNameU.Length = 0; wcscpy(DirContext->LongNameU.Buffer, L".."); DirContext->LongNameU.Length = 2 * sizeof(WCHAR); + DirContext->ShortNameU = DirContext->LongNameU; RtlCopyMemory(&DirContext->DirEntry.FatX, &pDirFcb->entry.FatX, sizeof(FATX_DIR_ENTRY)); DirContext->DirEntry.FatX.Filename[0] = DirContext->DirEntry.FatX.Filename[1] = '.'; DirContext->DirEntry.FatX.FilenameLength = 2; @@ -603,10 +601,9 @@ FATXGetNextDirEntry( fatxDirEntry++; } } - DirContext->ShortNameU.Buffer[0] = 0; - DirContext->ShortNameU.Length = 0; StringO.Buffer = (PCHAR)fatxDirEntry->Filename; StringO.Length = StringO.MaximumLength = fatxDirEntry->FilenameLength; RtlOemStringToUnicodeString(&DirContext->LongNameU, &StringO, FALSE); + DirContext->ShortNameU = DirContext->LongNameU; return STATUS_SUCCESS; }

1 year, 11 months

[reactos] 03/06: [VFATFS] Return 'FATX' as FsType for FATX volumes

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b935bfe6cb4b675af10d3… commit b935bfe6cb4b675af10d39835db8bcae7a5d41d8 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Sep 13 23:15:27 2022 +0200 Commit: hpoussin <32227662+hpoussin(a)users.noreply.github.com> CommitDate: Sat Sep 24 12:12:33 2022 +0200 [VFATFS] Return 'FATX' as FsType for FATX volumes CORE-16373 --- drivers/filesystems/vfatfs/volume.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/filesystems/vfatfs/volume.c b/drivers/filesystems/vfatfs/volume.c index e1eba1fd2a7..d1f10d05646 100644 --- a/drivers/filesystems/vfatfs/volume.c +++ b/drivers/filesystems/vfatfs/volume.c @@ -100,13 +100,14 @@ FsdGetFsAttributeInformation( ASSERT(*BufferLength >= sizeof(FILE_FS_ATTRIBUTE_INFORMATION)); *BufferLength -= FIELD_OFFSET(FILE_FS_ATTRIBUTE_INFORMATION, FileSystemName); - if (DeviceExt->FatInfo.FatType == FAT32) + switch (DeviceExt->FatInfo.FatType) { - pName = L"FAT32"; - } - else - { - pName = L"FAT"; + case FAT12: pName = L"FAT"; break; + case FAT16: pName = L"FAT"; break; + case FAT32: pName = L"FAT32"; break; + case FATX16: pName = L"FATX"; break; + case FATX32: pName = L"FATX"; break; + default: return STATUS_NOT_SUPPORTED; } Length = wcslen(pName) * sizeof(WCHAR);

1 year, 11 months

[reactos] 02/06: [VFATFS] Use device name FatX, to not collide with fastfat.sys

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=15ea99777455b66042d70… commit 15ea99777455b66042d708ea0eb794891eb536a9 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Sep 13 22:37:04 2022 +0200 Commit: hpoussin <32227662+hpoussin(a)users.noreply.github.com> CommitDate: Sat Sep 24 12:12:33 2022 +0200 [VFATFS] Use device name FatX, to not collide with fastfat.sys CORE-16373 --- drivers/filesystems/vfatfs/iface.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/drivers/filesystems/vfatfs/iface.c b/drivers/filesystems/vfatfs/iface.c index d09365d09f5..6ed08d0ab1f 100644 --- a/drivers/filesystems/vfatfs/iface.c +++ b/drivers/filesystems/vfatfs/iface.c @@ -52,7 +52,7 @@ DriverEntry( IN PUNICODE_STRING RegistryPath) { PDEVICE_OBJECT DeviceObject; - UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Fat"); + UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\FatX"); NTSTATUS Status; UNREFERENCED_PARAMETER(RegistryPath); @@ -64,20 +64,6 @@ DriverEntry( 0, FALSE, &DeviceObject); - if (Status == STATUS_OBJECT_NAME_EXISTS || - Status == STATUS_OBJECT_NAME_COLLISION) - { - /* Try an other name, if 'Fat' is already in use. 'Fat' is also used by fastfat.sys on W2K */ - RtlInitUnicodeString(&DeviceName, L"\\RosFat"); - Status = IoCreateDevice(DriverObject, - sizeof(VFAT_GLOBAL_DATA), - &DeviceName, - FILE_DEVICE_DISK_FILE_SYSTEM, - 0, - FALSE, - &DeviceObject); - } - if (!NT_SUCCESS(Status)) { return Status;

1 year, 11 months

[reactos] 01/06: [VFATFS] Add it back to build on XBOX, with the name vfatfs.sys

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=14c39362513da8bd064a4… commit 14c39362513da8bd064a4816cb1fe5209398a881 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Sep 13 22:31:22 2022 +0200 Commit: hpoussin <32227662+hpoussin(a)users.noreply.github.com> CommitDate: Sat Sep 24 12:12:33 2022 +0200 [VFATFS] Add it back to build on XBOX, with the name vfatfs.sys Adapt some comments to new name. CORE-16373 --- drivers/filesystems/CMakeLists.txt | 2 +- drivers/filesystems/fastfat/CMakeLists.txt | 35 -------------------- drivers/filesystems/vfatfs/CMakeLists.txt | 38 ++++++++++++++++++++++ drivers/filesystems/{fastfat => vfatfs}/blockdev.c | 0 drivers/filesystems/{fastfat => vfatfs}/cleanup.c | 0 drivers/filesystems/{fastfat => vfatfs}/close.c | 2 +- drivers/filesystems/{fastfat => vfatfs}/create.c | 2 +- drivers/filesystems/{fastfat => vfatfs}/dir.c | 0 drivers/filesystems/{fastfat => vfatfs}/direntry.c | 0 drivers/filesystems/{fastfat => vfatfs}/dirwr.c | 2 +- drivers/filesystems/{fastfat => vfatfs}/ea.c | 0 drivers/filesystems/{fastfat => vfatfs}/fastio.c | 2 +- drivers/filesystems/{fastfat => vfatfs}/fat.c | 4 +-- drivers/filesystems/{fastfat => vfatfs}/fcb.c | 2 +- drivers/filesystems/{fastfat => vfatfs}/finfo.c | 2 +- drivers/filesystems/{fastfat => vfatfs}/flush.c | 0 drivers/filesystems/{fastfat => vfatfs}/fsctl.c | 0 drivers/filesystems/{fastfat => vfatfs}/iface.c | 2 +- drivers/filesystems/{fastfat => vfatfs}/kdbg.c | 2 +- drivers/filesystems/{fastfat => vfatfs}/misc.c | 2 +- drivers/filesystems/{fastfat => vfatfs}/pnp.c | 2 +- drivers/filesystems/{fastfat => vfatfs}/rw.c | 2 +- drivers/filesystems/{fastfat => vfatfs}/shutdown.c | 0 drivers/filesystems/{fastfat => vfatfs}/string.c | 0 drivers/filesystems/{fastfat => vfatfs}/vfat.h | 6 ++-- .../filesystems/{fastfat => vfatfs}/vfat005.1st | 0 .../filesystems/{fastfat => vfatfs}/vfat_fr.txt | 0 drivers/filesystems/{fastfat => vfatfs}/vfatfs.rc | 0 drivers/filesystems/vfatfs/vfatfs_reg.inf | 7 ++++ drivers/filesystems/{fastfat => vfatfs}/volume.c | 0 30 files changed, 62 insertions(+), 52 deletions(-) diff --git a/drivers/filesystems/CMakeLists.txt b/drivers/filesystems/CMakeLists.txt index 471a7d873f5..05add682ad3 100644 --- a/drivers/filesystems/CMakeLists.txt +++ b/drivers/filesystems/CMakeLists.txt @@ -2,7 +2,6 @@ add_subdirectory(btrfs) add_subdirectory(cdfs) add_subdirectory(ext2) -#add_subdirectory(fastfat) add_subdirectory(fastfat_new) add_subdirectory(fs_rec) add_subdirectory(msfs) @@ -11,3 +10,4 @@ add_subdirectory(nfs) add_subdirectory(npfs) add_subdirectory(ntfs) add_subdirectory(udfs) +add_subdirectory(vfatfs) diff --git a/drivers/filesystems/fastfat/CMakeLists.txt b/drivers/filesystems/fastfat/CMakeLists.txt deleted file mode 100644 index 4eb78bf29a6..00000000000 --- a/drivers/filesystems/fastfat/CMakeLists.txt +++ /dev/null @@ -1,35 +0,0 @@ - -list(APPEND SOURCE - blockdev.c - cleanup.c - close.c - create.c - dir.c - direntry.c - dirwr.c - ea.c - fat.c - fastio.c - fcb.c - finfo.c - flush.c - fsctl.c - iface.c - kdbg.c - misc.c - pnp.c - rw.c - shutdown.c - string.c - volume.c - vfat.h) - -if(KDBG) - add_definitions(-DKDBG) -endif() -add_library(fastfat MODULE ${SOURCE} vfatfs.rc) -set_module_type(fastfat kernelmodedriver) -target_link_libraries(fastfat ${PSEH_LIB}) -add_importlibs(fastfat ntoskrnl hal) -add_pch(fastfat vfat.h SOURCE) -add_cd_file(TARGET fastfat DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/filesystems/vfatfs/CMakeLists.txt b/drivers/filesystems/vfatfs/CMakeLists.txt new file mode 100644 index 00000000000..7e0c7d56ee4 --- /dev/null +++ b/drivers/filesystems/vfatfs/CMakeLists.txt @@ -0,0 +1,38 @@ + +list(APPEND SOURCE + blockdev.c + cleanup.c + close.c + create.c + dir.c + direntry.c + dirwr.c + ea.c + fat.c + fastio.c + fcb.c + finfo.c + flush.c + fsctl.c + iface.c + kdbg.c + misc.c + pnp.c + rw.c + shutdown.c + string.c + volume.c + vfat.h) + +if(KDBG) + add_definitions(-DKDBG) +endif() +add_library(vfatfs MODULE ${SOURCE} vfatfs.rc) +set_module_type(vfatfs kernelmodedriver) +target_link_libraries(vfatfs ${PSEH_LIB}) +add_importlibs(vfatfs ntoskrnl hal) +add_pch(vfatfs vfat.h SOURCE) +if(SARCH STREQUAL "xbox") + add_cd_file(TARGET vfatfs DESTINATION reactos/system32/drivers NO_CAB FOR all) + add_registry_inf(vfatfs_reg.inf) +endif() diff --git a/drivers/filesystems/fastfat/blockdev.c b/drivers/filesystems/vfatfs/blockdev.c similarity index 100% rename from drivers/filesystems/fastfat/blockdev.c rename to drivers/filesystems/vfatfs/blockdev.c diff --git a/drivers/filesystems/fastfat/cleanup.c b/drivers/filesystems/vfatfs/cleanup.c similarity index 100% rename from drivers/filesystems/fastfat/cleanup.c rename to drivers/filesystems/vfatfs/cleanup.c diff --git a/drivers/filesystems/fastfat/close.c b/drivers/filesystems/vfatfs/close.c similarity index 99% rename from drivers/filesystems/fastfat/close.c rename to drivers/filesystems/vfatfs/close.c index 57efdad97a6..aa19c1ed505 100644 --- a/drivers/filesystems/fastfat/close.c +++ b/drivers/filesystems/vfatfs/close.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/fastfat/close.c + * FILE: drivers/filesystems/vfatfs/close.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) * Pierre Schweitzer (pierre(a)reactos.org) diff --git a/drivers/filesystems/fastfat/create.c b/drivers/filesystems/vfatfs/create.c similarity index 99% rename from drivers/filesystems/fastfat/create.c rename to drivers/filesystems/vfatfs/create.c index 0de08a9dd78..32c39f11361 100644 --- a/drivers/filesystems/fastfat/create.c +++ b/drivers/filesystems/vfatfs/create.c @@ -18,7 +18,7 @@ */ /* * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/fastfat/create.c + * FILE: drivers/filesystems/vfatfs/create.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) * Pierre Schweitzer (pierre(a)reactos.org) diff --git a/drivers/filesystems/fastfat/dir.c b/drivers/filesystems/vfatfs/dir.c similarity index 100% rename from drivers/filesystems/fastfat/dir.c rename to drivers/filesystems/vfatfs/dir.c diff --git a/drivers/filesystems/fastfat/direntry.c b/drivers/filesystems/vfatfs/direntry.c similarity index 100% rename from drivers/filesystems/fastfat/direntry.c rename to drivers/filesystems/vfatfs/direntry.c diff --git a/drivers/filesystems/fastfat/dirwr.c b/drivers/filesystems/vfatfs/dirwr.c similarity index 99% rename from drivers/filesystems/fastfat/dirwr.c rename to drivers/filesystems/vfatfs/dirwr.c index e7a260422ce..99d4f8946a0 100644 --- a/drivers/filesystems/fastfat/dirwr.c +++ b/drivers/filesystems/vfatfs/dirwr.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/fastfat/dirwr.c + * FILE: drivers/filesystems/vfatfs/dirwr.c * PURPOSE: VFAT Filesystem : write in directory * PROGRAMMER: Rex Jolliff (rex(a)lvcablemodem.com) * Herve Poussineau (reactos(a)poussine.freesurf.fr) diff --git a/drivers/filesystems/fastfat/ea.c b/drivers/filesystems/vfatfs/ea.c similarity index 100% rename from drivers/filesystems/fastfat/ea.c rename to drivers/filesystems/vfatfs/ea.c diff --git a/drivers/filesystems/fastfat/fastio.c b/drivers/filesystems/vfatfs/fastio.c similarity index 99% rename from drivers/filesystems/fastfat/fastio.c rename to drivers/filesystems/vfatfs/fastio.c index 6404ab448ae..5db742b3a7c 100644 --- a/drivers/filesystems/fastfat/fastio.c +++ b/drivers/filesystems/vfatfs/fastio.c @@ -1,5 +1,5 @@ /* - * FILE: drivers/filesystems/fastfat/fastio.c + * FILE: drivers/filesystems/vfatfs/fastio.c * PURPOSE: Fast IO routines. * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel diff --git a/drivers/filesystems/fastfat/fat.c b/drivers/filesystems/vfatfs/fat.c similarity index 99% rename from drivers/filesystems/fastfat/fat.c rename to drivers/filesystems/vfatfs/fat.c index b6e62c68fcc..e32f279991f 100644 --- a/drivers/filesystems/fastfat/fat.c +++ b/drivers/filesystems/vfatfs/fat.c @@ -1,8 +1,8 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/fastfat/fat.c - * PURPOSE: FastFAT Filesystem + * FILE: drivers/filesystems/vfatfs/fat.c + * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) * Pierre Schweitzer (pierre(a)reactos.org) * diff --git a/drivers/filesystems/fastfat/fcb.c b/drivers/filesystems/vfatfs/fcb.c similarity index 99% rename from drivers/filesystems/fastfat/fcb.c rename to drivers/filesystems/vfatfs/fcb.c index a791c27a40d..6fd76071678 100644 --- a/drivers/filesystems/fastfat/fcb.c +++ b/drivers/filesystems/vfatfs/fcb.c @@ -1,5 +1,5 @@ /* -* FILE: drivers/filesystems/fastfat/fcb.c +* FILE: drivers/filesystems/vfatfs/fcb.c * PURPOSE: Routines to manipulate FCBs. * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel diff --git a/drivers/filesystems/fastfat/finfo.c b/drivers/filesystems/vfatfs/finfo.c similarity index 99% rename from drivers/filesystems/fastfat/finfo.c rename to drivers/filesystems/vfatfs/finfo.c index ab5591e4b12..a4ddc72f6bb 100644 --- a/drivers/filesystems/fastfat/finfo.c +++ b/drivers/filesystems/vfatfs/finfo.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/fastfat/finfo.c + * FILE: drivers/filesystems/vfatfs/finfo.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) * Herve Poussineau (reactos(a)poussine.freesurf.fr) diff --git a/drivers/filesystems/fastfat/flush.c b/drivers/filesystems/vfatfs/flush.c similarity index 100% rename from drivers/filesystems/fastfat/flush.c rename to drivers/filesystems/vfatfs/flush.c diff --git a/drivers/filesystems/fastfat/fsctl.c b/drivers/filesystems/vfatfs/fsctl.c similarity index 100% rename from drivers/filesystems/fastfat/fsctl.c rename to drivers/filesystems/vfatfs/fsctl.c diff --git a/drivers/filesystems/fastfat/iface.c b/drivers/filesystems/vfatfs/iface.c similarity index 98% rename from drivers/filesystems/fastfat/iface.c rename to drivers/filesystems/vfatfs/iface.c index 9b3294211f3..d09365d09f5 100644 --- a/drivers/filesystems/fastfat/iface.c +++ b/drivers/filesystems/vfatfs/iface.c @@ -154,7 +154,7 @@ DriverEntry( BOOLEAN Registered; Registered = KdRosRegisterCliCallback(vfatKdbgHandler); - DPRINT1("FastFAT KDBG extension registered: %s\n", (Registered ? "yes" : "no")); + DPRINT1("VFATFS KDBG extension registered: %s\n", (Registered ? "yes" : "no")); } #endif diff --git a/drivers/filesystems/fastfat/kdbg.c b/drivers/filesystems/vfatfs/kdbg.c similarity index 98% rename from drivers/filesystems/fastfat/kdbg.c rename to drivers/filesystems/vfatfs/kdbg.c index ef2ded50de4..3582c7dcdae 100644 --- a/drivers/filesystems/fastfat/kdbg.c +++ b/drivers/filesystems/vfatfs/kdbg.c @@ -1,5 +1,5 @@ /* -* FILE: drivers/filesystems/fastfat/kdbg.c +* FILE: drivers/filesystems/vfatfs/kdbg.c * PURPOSE: KDBG extension. * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel diff --git a/drivers/filesystems/fastfat/misc.c b/drivers/filesystems/vfatfs/misc.c similarity index 99% rename from drivers/filesystems/fastfat/misc.c rename to drivers/filesystems/vfatfs/misc.c index 76b17f1db36..127851ba9bf 100644 --- a/drivers/filesystems/fastfat/misc.c +++ b/drivers/filesystems/vfatfs/misc.c @@ -518,7 +518,7 @@ VfatCheckForDismount( * It seems to be related to the fact that the volume root directory as * well as auxiliary data stream(s) are still opened, and only these are * allowed to be opened at that moment. After analysis it appears that for - * the ReactOS' fastfat, this number is equal to "2". + * the ReactOS' vfatfs, this number is equal to "2". */ UnCleanCount = 2; diff --git a/drivers/filesystems/fastfat/pnp.c b/drivers/filesystems/vfatfs/pnp.c similarity index 95% rename from drivers/filesystems/fastfat/pnp.c rename to drivers/filesystems/vfatfs/pnp.c index afc02f9c89a..6a07e7e90a2 100644 --- a/drivers/filesystems/fastfat/pnp.c +++ b/drivers/filesystems/vfatfs/pnp.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/fastfat/pnp.c + * FILE: drivers/filesystems/vfatfs/pnp.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Pierre Schweitzer * diff --git a/drivers/filesystems/fastfat/rw.c b/drivers/filesystems/vfatfs/rw.c similarity index 99% rename from drivers/filesystems/fastfat/rw.c rename to drivers/filesystems/vfatfs/rw.c index 0afebafe893..66caebdc850 100644 --- a/drivers/filesystems/fastfat/rw.c +++ b/drivers/filesystems/vfatfs/rw.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: drivers/filesystems/fastfat/rw.c + * FILE: drivers/filesystems/vfatfs/rw.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) * Pierre Schweitzer (pierre(a)reactos.org) diff --git a/drivers/filesystems/fastfat/shutdown.c b/drivers/filesystems/vfatfs/shutdown.c similarity index 100% rename from drivers/filesystems/fastfat/shutdown.c rename to drivers/filesystems/vfatfs/shutdown.c diff --git a/drivers/filesystems/fastfat/string.c b/drivers/filesystems/vfatfs/string.c similarity index 100% rename from drivers/filesystems/fastfat/string.c rename to drivers/filesystems/vfatfs/string.c diff --git a/drivers/filesystems/fastfat/vfat.h b/drivers/filesystems/vfatfs/vfat.h similarity index 99% rename from drivers/filesystems/fastfat/vfat.h rename to drivers/filesystems/vfatfs/vfat.h index 4e51b5ce34a..a40fcd82cf3 100644 --- a/drivers/filesystems/fastfat/vfat.h +++ b/drivers/filesystems/vfatfs/vfat.h @@ -1,5 +1,5 @@ -#ifndef _FASTFAT_PCH_ -#define _FASTFAT_PCH_ +#ifndef _VFATFS_PCH_ +#define _VFATFS_PCH_ #include <ntifs.h> #include <ntdddisk.h> @@ -1241,4 +1241,4 @@ NTSTATUS VfatSetVolumeInformation( PVFAT_IRP_CONTEXT IrpContext); -#endif /* _FASTFAT_PCH_ */ +#endif /* _VFATFS_PCH_ */ diff --git a/drivers/filesystems/fastfat/vfat005.1st b/drivers/filesystems/vfatfs/vfat005.1st similarity index 100% rename from drivers/filesystems/fastfat/vfat005.1st rename to drivers/filesystems/vfatfs/vfat005.1st diff --git a/drivers/filesystems/fastfat/vfat_fr.txt b/drivers/filesystems/vfatfs/vfat_fr.txt similarity index 100% rename from drivers/filesystems/fastfat/vfat_fr.txt rename to drivers/filesystems/vfatfs/vfat_fr.txt diff --git a/drivers/filesystems/fastfat/vfatfs.rc b/drivers/filesystems/vfatfs/vfatfs.rc similarity index 100% rename from drivers/filesystems/fastfat/vfatfs.rc rename to drivers/filesystems/vfatfs/vfatfs.rc diff --git a/drivers/filesystems/vfatfs/vfatfs_reg.inf b/drivers/filesystems/vfatfs/vfatfs_reg.inf new file mode 100644 index 00000000000..ffa46498522 --- /dev/null +++ b/drivers/filesystems/vfatfs/vfatfs_reg.inf @@ -0,0 +1,7 @@ +; Virtual FATX filesystem driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\vfatfs","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\vfatfs","Group",0x00000000,"Boot File System" +HKLM,"SYSTEM\CurrentControlSet\Services\vfatfs","ImagePath",0x00020000,"system32\drivers\vfatfs.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\vfatfs","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\vfatfs","Type",0x00010001,0x00000002 diff --git a/drivers/filesystems/fastfat/volume.c b/drivers/filesystems/vfatfs/volume.c similarity index 100% rename from drivers/filesystems/fastfat/volume.c rename to drivers/filesystems/vfatfs/volume.c

1 year, 11 months

[reactos] 01/01: [CPL][OPENGLCFG] Add Japanese translation (ja-JP)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=555bec6a49dffd2594257… commit 555bec6a49dffd2594257604269c7a08e3058cf0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 24 13:15:51 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Sep 24 13:15:51 2022 +0900 [CPL][OPENGLCFG] Add Japanese translation (ja-JP) --- dll/cpl/openglcfg/lang/ja-JP.rc | 28 ++++++++++++++++++++++++++++ dll/cpl/openglcfg/openglcfg.rc | 3 +++ 2 files changed, 31 insertions(+) diff --git a/dll/cpl/openglcfg/lang/ja-JP.rc b/dll/cpl/openglcfg/lang/ja-JP.rc new file mode 100644 index 00000000000..c4b4d950aa5 --- /dev/null +++ b/dll/cpl/openglcfg/lang/ja-JP.rc @@ -0,0 +1,28 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "��ʐݒ�" +FONT 9, "MS UI Gothic" +BEGIN + ICON IDI_CPLICON, IDI_CPLICON, 8, 0, 21, 20 + GROUPBOX "��_��[�ݒ�", -1, 5, 25, 230, 90 + LTEXT "��_��[(&R):", -1, 15, 42, 37, 10 + COMBOBOX IDC_RENDERER, 55, 40, 160, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "��ɂ��A�O��t�B�b�N �h��C�o�[�̃f�t�H��g�ݒ肪�㏑��܂��B�u�f�t�H��g�v��I��ƁA��̐ݒ�ɖ߂�܂��B", -1, 15, 60, 210, 40 + GROUPBOX "�f�o�b�O", -1, 5, 125, 230, 90 + LTEXT "DEBUGCHANNEL:", -1, 15, 142, 65, 10 + COMBOBOX IDC_DEBUG_OUTPUT, 80, 140, 135, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "opengl32 ��̃f�o�b�O�o�͂�L��/��ɂ��܂��B\n\n�x��: �u�ݒ�v�܂��́u�N��A�v��I��ƁADEBUGCHANNEL ��ϐ��̓�e��㏑��܂��B", -1, 15, 165, 210, 40 +END + +STRINGTABLE +BEGIN + IDS_RENDERER_DEFAULT "�V�X�e�� f�t�H��g" + IDS_RENDERER_RSWR "ReactOS �\�t�g�E�F�A��" + IDS_CPLNAME "OpenGL �ݒ�" + IDS_CPLDESCRIPTION "OpenGL ��_��[�̐ݒ��ύX��܂�" + IDS_DEBUG_SET "�ݒ�" + IDS_DEBUG_CLEAR "�N��A" + IDS_DEBUG_DNM "�ύX��Ȃ�" +END diff --git a/dll/cpl/openglcfg/openglcfg.rc b/dll/cpl/openglcfg/openglcfg.rc index 4e2b1292b98..01d9ac887cd 100644 --- a/dll/cpl/openglcfg/openglcfg.rc +++ b/dll/cpl/openglcfg/openglcfg.rc @@ -30,6 +30,9 @@ IDI_CPLICON ICON "resources/openglcfg.ico" #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif

1 year, 11 months

[reactos] 01/01: [CPL][MMSYS] Improve Japanese translation (ja-JP)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b77b7919a123a0667e687… commit b77b7919a123a0667e687a8b1824c37b981a6932 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 24 13:12:08 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Sep 24 13:12:08 2022 +0900 [CPL][MMSYS] Improve Japanese translation (ja-JP) --- dll/cpl/mmsys/lang/ja-JP.rc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dll/cpl/mmsys/lang/ja-JP.rc b/dll/cpl/mmsys/lang/ja-JP.rc index cedeb2a05fb..55b6bbea673 100644 --- a/dll/cpl/mmsys/lang/ja-JP.rc +++ b/dll/cpl/mmsys/lang/ja-JP.rc @@ -234,13 +234,13 @@ BEGIN IDS_CPLDESCRIPTION "コンピューターの音声スキームを変更するか、スピーカーと録音デバイスの設定を変更します。" IDS_NO_SOUND "(なし)" IDS_NO_DEVICES "デバイスがありません" - IDS_SPEAKER_VOLUME "Speaker Volume" - IDS_SPEAKER_LEFT "&Left:" - IDS_SPEAKER_RIGHT "&Right:" - IDS_SPEAKER_CENTER "&Center:" - IDS_SPEAKER_BACK_LEFT "&Back left:" - IDS_SPEAKER_BACK_RIGHT "B&ack right:" - IDS_SPEAKER_LOW_FREQUENCY "Low &Frequency:" + IDS_SPEAKER_VOLUME "スピーカー音量" + IDS_SPEAKER_LEFT "左(&L):" + IDS_SPEAKER_RIGHT "右(&R):" + IDS_SPEAKER_CENTER "中央(&C):" + IDS_SPEAKER_BACK_LEFT "左後ろ(&B):" + IDS_SPEAKER_BACK_RIGHT "右後ろ(&A):" + IDS_SPEAKER_LOW_FREQUENCY "低周波数(&F):" 5825 "プログラムエラー" 5826 "プログラムを閉じる" 5827 "重大なバッテリー警告音" @@ -271,6 +271,6 @@ BEGIN IDS_REACTOS_LOGOFF "ReactOSログオフ" IDS_REACTOS_LOGON "ReactOSログオン" 5854 "ReactOSエクスプローラー" - IDS_BROWSE_FOR_SOUND "Search for new sounds" - IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|" + IDS_BROWSE_FOR_SOUND "新しい音声を探す" + IDS_WAVE_FILES_FILTER "音声ファイル (*.wav)|*.wav|" END

1 year, 11 months

[reactos] 01/01: [CPL][LICCPA] Improve Japanese translation (ja-JP)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ee308d700b1b793d9b6a… commit 8ee308d700b1b793d9b6a720b2bf18b842ae378c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 24 13:09:12 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Sep 24 13:09:12 2022 +0900 [CPL][LICCPA] Improve Japanese translation (ja-JP) --- dll/cpl/liccpa/lang/ja-JP.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/liccpa/lang/ja-JP.rc b/dll/cpl/liccpa/lang/ja-JP.rc index 72e5fef8d55..08eec4db16d 100644 --- a/dll/cpl/liccpa/lang/ja-JP.rc +++ b/dll/cpl/liccpa/lang/ja-JP.rc @@ -23,5 +23,5 @@ STRINGTABLE BEGIN IDS_CPLNAME_1 "ライセンスマネージャ" IDS_CPLDESCRIPTION_1 "ライセンスマネージャ" - IDS_REACTOS "ReactOS - FreeSoftware" + IDS_REACTOS "ReactOS - フリーソフト" END

1 year, 11 months

← Newer
1
2
3
4
5
6
7
...
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2022