fix: print full paths in error messages (#85)

malept · zcbenz · commit 9243fe7b1b7b · 2019-05-01T08:56:14.000+09:00
* Use fwprintf instead of fprintf * Need a commit * try %S * Back to fwprintf, cast the format * WCHAR, not wchar_t * Use @MarshallOfSound's suggestion
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,5 +1,4 @@
-image:
-  - Visual Studio 2017
+image: Visual Studio 2017
 
 configuration: Default
 
diff --git a/src/rescle.cc b/src/rescle.cc
@@ -587,24 +587,24 @@ bool ResourceUpdater::SetIcon(const WCHAR* path, const LANGID& langId,
 
   ScopedFile file(path);
   if (file == INVALID_HANDLE_VALUE) {
-    fprintf(stderr, "Cannot open icon file '%s'\n", path);
+    fwprintf(stderr, L"Cannot open icon file '%ls'\n", path);
     return false;
   }
 
   IconsValue::ICONHEADER& header = icon.header;
   if (!ReadFile(file, &header, 3 * sizeof(WORD), &bytes, NULL)) {
-    fprintf(stderr, "Cannot read icon header for '%s'\n", path);
+    fwprintf(stderr, L"Cannot read icon header for '%ls'\n", path);
     return false;
   }
 
   if (header.reserved != 0 || header.type != 1) {
-    fprintf(stderr, "Reserved header is not 0 or image type is not icon for '%s'\n", path);
+    fwprintf(stderr, L"Reserved header is not 0 or image type is not icon for '%ls'\n", path);
     return false;
   }
 
   header.entries.resize(header.count);
   if (!ReadFile(file, header.entries.data(), header.count * sizeof(IconsValue::ICONENTRY), &bytes, NULL)) {
-    fprintf(stderr, "Cannot read icon metadata for '%s'\n", path);
+    fwprintf(stderr, L"Cannot read icon metadata for '%ls'\n", path);
     return false;
   }
 
@@ -613,7 +613,7 @@ bool ResourceUpdater::SetIcon(const WCHAR* path, const LANGID& langId,
     icon.images[i].resize(header.entries[i].bytesInRes);
     SetFilePointer(file, header.entries[i].imageOffset, NULL, FILE_BEGIN);
     if (!ReadFile(file, icon.images[i].data(), icon.images[i].size(), &bytes, NULL)) {
-      fprintf(stderr, "Cannot read icon data for '%s'\n", path);
+      fwprintf(stderr, L"Cannot read icon data for '%ls'\n", path);
       return false;
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -587,24 +587,24 @@ bool ResourceUpdater::SetIcon(const WCHAR* path, const LANGID& langId,`
`587`	`587`
`588`	`588`	`ScopedFile file(path);`
`589`	`589`	`if (file == INVALID_HANDLE_VALUE) {`
`590`		`- fprintf(stderr, "Cannot open icon file '%s'\n", path);`
	`590`	`+ fwprintf(stderr, L"Cannot open icon file '%ls'\n", path);`
`591`	`591`	`return false;`
`592`	`592`	`}`
`593`	`593`
`594`	`594`	`IconsValue::ICONHEADER& header = icon.header;`
`595`	`595`	`if (!ReadFile(file, &header, 3 * sizeof(WORD), &bytes, NULL)) {`
`596`		`- fprintf(stderr, "Cannot read icon header for '%s'\n", path);`
	`596`	`+ fwprintf(stderr, L"Cannot read icon header for '%ls'\n", path);`
`597`	`597`	`return false;`
`598`	`598`	`}`
`599`	`599`
`600`	`600`	`if (header.reserved != 0 \|\| header.type != 1) {`
`601`		`- fprintf(stderr, "Reserved header is not 0 or image type is not icon for '%s'\n", path);`
	`601`	`+ fwprintf(stderr, L"Reserved header is not 0 or image type is not icon for '%ls'\n", path);`
`602`	`602`	`return false;`
`603`	`603`	`}`
`604`	`604`
`605`	`605`	`header.entries.resize(header.count);`
`606`	`606`	`if (!ReadFile(file, header.entries.data(), header.count * sizeof(IconsValue::ICONENTRY), &bytes, NULL)) {`
`607`		`- fprintf(stderr, "Cannot read icon metadata for '%s'\n", path);`
	`607`	`+ fwprintf(stderr, L"Cannot read icon metadata for '%ls'\n", path);`
`608`	`608`	`return false;`
`609`	`609`	`}`
`610`	`610`
`@@ -613,7 +613,7 @@ bool ResourceUpdater::SetIcon(const WCHAR* path, const LANGID& langId,`
`613`	`613`	`icon.images[i].resize(header.entries[i].bytesInRes);`
`614`	`614`	`SetFilePointer(file, header.entries[i].imageOffset, NULL, FILE_BEGIN);`
`615`	`615`	`if (!ReadFile(file, icon.images[i].data(), icon.images[i].size(), &bytes, NULL)) {`
`616`		`- fprintf(stderr, "Cannot read icon data for '%s'\n", path);`
	`616`	`+ fwprintf(stderr, L"Cannot read icon data for '%ls'\n", path);`
`617`	`617`	`return false;`
`618`	`618`	`}`
`619`	`619`	`}`