1 files changed, 12 insertions, 8 deletions
diff --git a/api/resource.c b/api/resource.c
index a73e9fc..9a7379c 100644
--- a/api/resource.c
+++ b/api/resource.c
@@ -14,25 +14,25 @@ _Return_type_success_(return != NULL) _Ret_bytecount_(*Size) const
     HRSRC FoundResource = FindResourceW(ResourceModule, ResourceName, RT_RCDATA);
     if (!FoundResource)
     {
-        LOG_LAST_ERROR(L"Failed to find resource");
+        LOG_LAST_ERROR(L"Failed to find resource %s", ResourceName);
         return NULL;
     }
     *Size = SizeofResource(ResourceModule, FoundResource);
     if (!*Size)
     {
-        LOG_LAST_ERROR(L"Failed to query resource size");
+        LOG_LAST_ERROR(L"Failed to query resource %s size", ResourceName);
         return NULL;
     }
     HGLOBAL LoadedResource = LoadResource(ResourceModule, FoundResource);
     if (!LoadedResource)
     {
-        LOG_LAST_ERROR(L"Failed to load resource");
+        LOG_LAST_ERROR(L"Failed to load resource %s", ResourceName);
         return NULL;
     }
     BYTE *Address = LockResource(LoadedResource);
     if (!Address)
     {
-        LOG(WINTUN_LOG_ERR, L"Failed to lock resource");
+        LOG(WINTUN_LOG_ERR, L"Failed to lock resource %s", ResourceName);
         SetLastError(ERROR_LOCK_FAILED);
         return NULL;
     }
@@ -46,7 +46,7 @@ _Return_type_success_(return != FALSE) BOOL
     const void *LockedResource = ResourceGetAddress(ResourceName, &SizeResource);
     if (!LockedResource)
     {
-        LOG(WINTUN_LOG_ERR, L"Failed to locate resource");
+        LOG(WINTUN_LOG_ERR, L"Failed to locate resource %s", ResourceName);
         return FALSE;
     }
     HANDLE DestinationHandle = CreateFileW(
@@ -59,19 +59,23 @@ _Return_type_success_(return != FALSE) BOOL
         NULL);
     if (DestinationHandle == INVALID_HANDLE_VALUE)
     {
-        LOG_LAST_ERROR(L"Failed to create file");
+        LOG_LAST_ERROR(L"Failed to create file %s", DestinationPath);
         return FALSE;
     }
     DWORD BytesWritten;
     DWORD LastError;
     if (!WriteFile(DestinationHandle, LockedResource, SizeResource, &BytesWritten, NULL))
     {
-        LastError = LOG_LAST_ERROR(L"Failed to write file");
+        LastError = LOG_LAST_ERROR(L"Failed to write file %s", DestinationPath);
         goto cleanupDestinationHandle;
     }
     if (BytesWritten != SizeResource)
     {
-        LOG(WINTUN_LOG_ERR, L"Incomplete write");
+        LOG(WINTUN_LOG_ERR,
+            L"Incomplete write to %s (written: %u, expected: %u)",
+            DestinationPath,
+            BytesWritten,
+            SizeResource);
         LastError = ERROR_WRITE_FAULT;
         goto cleanupDestinationHandle;
     }