Changeset 321

Legend:

Unmodified

Added

Removed

• trunk/src/ifs/fat32b.c

  r317	r321
  1421	1421	{
  1422	1422	usMode = MODIFY_DIR_INSERT;
  1423	(追記) pszLongNameOld = pszLongNameNew; (追記ここまで)
  1423	1424	ulCluster = ulDirCluster;
  1424	1425	ulBytesRemained = pVolInfo->BootSect.bpb.RootDirEntries * sizeof(DIRENTRY);

• trunk/src/ufat32/fatfunc.c

  r319	r321
  1197	1197	*
  1198	1198	************************************************************************/
  1199	APIRET ModifyDirectory0(PCDINFO pCD, ULONG ulDirCluster, USHORT usMode, PDIRENTRY pOld, PDIRENTRY pNew, PSZ pszLongName(削除) (削除ここまで))
  1199	APIRET ModifyDirectory0(PCDINFO pCD, ULONG ulDirCluster, USHORT usMode, PDIRENTRY pOld, PDIRENTRY pNew, PSZ pszLongName(追記) Old, PSZ pszLongNameNew (追記ここまで))
  1200	1200	{
  1201	1201	PDIRENTRY pDirectory;
  …	…
  1223	1223	usMode == MODIFY_DIR_INSERT)
  1224	1224	{
  1225	if (!pNew || !pszLongName(削除) (削除ここまで))
  1225	if (!pNew || !pszLongName(追記) Old (追記ここまで))
  1226	1226	return ERROR_INVALID_PARAMETER;
  1227	1227
  …	…
  1229	1229	if ((pNew->bAttr & 0x0F) != FILE_VOLID)
  1230	1230	{
  1231	rc = MakeShortName(pCD, ulDirCluster, pszLongName(削除) (削除ここまで), DirNew.bFileName);
  1231	rc = MakeShortName(pCD, ulDirCluster, pszLongName(追記) Old (追記ここまで), DirNew.bFileName);
  1232	1232	if (rc == LONGNAME_ERROR)
  1233	1233	return ERROR_FILE_EXISTS;
  …	…
  1236	1236
  1237	1237	if (rc == LONGNAME_OFF)
  1238	pszLongName(削除) (削除ここまで) = NULL;
  1238	pszLongName(追記) Old (追記ここまで) = NULL;
  1239	1239	}
  1240	1240	else
  1241	pszLongName(削除) (削除ここまで) = NULL;
  1241	pszLongName(追記) Old (追記ここまで) = NULL;
  1242	1242
  1243	1243	usEntriesNeeded = 1;
  1244	if (pszLongName(削除) (削除ここまで))
  1244	if (pszLongName(追記) Old (追記ここまで))
  1245	1245	{
  1246	1246	#if 0
  1247	usEntriesNeeded += strlen(pszLongName(削除) (削除ここまで)) / 13 +
  1248	(strlen(pszLongName(削除) (削除ここまで)) % 13 ? 1 : 0);
  1247	usEntriesNeeded += strlen(pszLongName(追記) Old (追記ここまで)) / 13 +
  1248	(strlen(pszLongName(追記) Old (追記ここまで)) % 13 ? 1 : 0);
  1249	1249	#else
  1250	usEntriesNeeded += ( DBCSStrlen( pszLongName(削除) (削除ここまで) ) + 12 ) / 13;
  1250	usEntriesNeeded += ( DBCSStrlen( pszLongName(追記) Old (追記ここまで) ) + 12 ) / 13;
  1251	1251	#endif
  1252	1252	}
  …	…
  1434	1434	{
  1435	1435	usMode = MODIFY_DIR_INSERT;
  1436	(追記) pszLongNameOld = pszLongNameNew; (追記ここまで)
  1436	1437	ulCluster = ulDirCluster;
  1437	1438	ulBytesRemained = pCD->BootSect.bpb.RootDirEntries * sizeof(DIRENTRY);
  …	…
  1454	1455
  1455	1456	pWork = (PDIRENTRY)CompactDir(pDirectory, ulPrevBytesToRead + ulBytesToRead, usEntriesNeeded);
  1456	pWork = (PDIRENTRY)fSetLongName(pWork, pszLongName(削除) (削除ここまで), bCheck);
  1457	pWork = (PDIRENTRY)fSetLongName(pWork, pszLongName(追記) Old (追記ここまで), bCheck);
  1457	1458	memcpy(pWork, &DirNew, sizeof (DIRENTRY));
  1458	1459	if (ulPrevCluster == 1)
  …	…
  1487	1488
  1488	1489	pWork = (PDIRENTRY)CompactDir(pDir2, ulBytesToRead, usEntriesNeeded);
  1489	pWork = (PDIRENTRY)fSetLongName(pWork, pszLongName(削除) (削除ここまで), bCheck);
  1490	pWork = (PDIRENTRY)fSetLongName(pWork, pszLongName(追記) Old (追記ここまで), bCheck);
  1490	1491	memcpy(pWork, &DirNew, sizeof (DIRENTRY));
  1491	1492	if (ulCluster == 1)
  …	…
  2153	2154	#endif
  2154	2155	rc = ModifyDirectory0(pCD, ulDirCluster, usMode, pOld, pNew,
  2155	pszLongNameOld(削除) (削除ここまで));
  2156	pszLongNameOld(追記) , pszLongNameNew (追記ここまで));
  2156	2157	#ifdef EXFAT
  2157	2158	else

Note: See TracChangeset for help on using the changeset viewer.