Changeset 133

Legend:

Unmodified

Added

Removed

• branches/fat32-0.10/src/ufat32/format.c

  r130	r133
  148	148	ret = write_file ( hDevice, pZeroSect, WriteSize * BytesPerSect, &dwWritten );
  149	149
  150	(削除) // (削除ここまで)if ( !ret )
  151	(削除) // (削除ここまで) die ( "Failed to write", ret );
  150	(追記) (追記ここまで)if ( !ret )
  151	(追記) (追記ここまで) die ( "Failed to write", ret );
  152	152
  153	153	qBytesWritten += dwWritten;

• branches/fat32-0.10/src/ufat32/makefile.wcc

  r126	r133
  1	(追記) !include ..\makefile.mk (追記ここまで)
  2	(追記) (追記ここまで)
  1	3	CC=wcc386
  2	4	LNK=wlink op q
  3	5	MAPCNV=..\mapsym.awk
  4	(削除) _VENDOR=Netlabs (削除ここまで)
  5	(削除) _VERSION=0.10a6 (削除ここまで)
  6	(削除) FILEVER=@$#$(_VENDOR):$(_VERSION)$#@ (削除ここまで)
  7	6	DESC="UFAT32 Helper DLL, Henk Kelder & Netlabs"
  8	7	DESC2="Fat32Format, standalone version"

• branches/fat32-0.10/src/ufat32/os2.c

  r129	r133
  7	7	#include <stdarg.h>
  8	8	#include <conio.h>
  9	(追記) #include <assert.h> (追記ここまで)
  9	10	#include <string.h>
  10	11
  …	…
  302	303	ULONG rc = 0;
  303	304
  304	if ( rc = DosWrite ( hDevice, pData, (ULONG)ulNumBytes, (PULONG)dwWritten ) )
  305	assert(! (ulNumBytes % 512));
  306
  307	if ( rc = DosWrite ( hDevice, pData, (ULONG)ulNumBytes >> 9, (PULONG)dwWritten ) )
  305	308	ret = FALSE;
  309	(追記) (追記ここまで)
  310	(追記) //printf("write_file: ulNumBytes=%lu, rc=%lu\n", ulNumBytes, rc); (追記ここまで)
  306	311
  307	312	//printf("write_file: hDevice=%lu, pData=0x%lx, ulNumBytes=%lu, dwWritten=0x%lx\n",
  …	…
  334	339	OPEN_FLAGS_FAIL_ON_ERROR | // OPEN_FLAGS_WRITE_THROUGH |
  335	340	OPEN_SHARE_DENYREADWRITE | // OPEN_FLAGS_NO_CACHE |
  336	OPEN_ACCESS_READWRITE (削除) (削除ここまで)| OPEN_FLAGS_DASD,
  341	OPEN_ACCESS_READWRITE (追記) (追記ここまで)| OPEN_FLAGS_DASD,
  337	342	NULL); // peaop2
  338	343
  …	…
  354	359
  355	360	if ( rc != 0 || hDevice == 0 )
  356	die( "Failed to open device - close any files before formatting,(削除) (削除ここまで)"
  357	"and make sure you have Admin rights when using fat32format(削除) (削除ここまで)"
  361	die( "Failed to open device - close any files before formatting,(追記) \n (追記ここまで)"
  362	"and make sure you have Admin rights when using fat32format(追記) \n (追記ここまで)"
  358	363	"Are you SURE you're formatting the RIGHT DRIVE!!!", rc );
  359	364

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