setupapi: Don't clobber the original filename if .inf is found.

35ac0e7a · Rémi Bernon · Alexandre Julliard · dd44e2e6 · 35ac0e7a
Commit 35ac0e7a authored Jan 22, 2024 by Rémi Bernon Committed by Alexandre Julliard Jan 22, 2024
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 13 deletions

misc.c dlls/setupapi/misc.c +10 -13

No files found.
--- a/dlls/setupapi/misc.c
+++ b/dlls/setupapi/misc.c
@@ -1068,23 +1068,20 @@ BOOL WINAPI SetupCopyOEMInfW( PCWSTR source, PCWSTR location,
    if (!(ret = CopyFileW( source, target, TRUE )))
        return ret;

+    wcscpy(pnf_path, target);
+    PathRemoveExtensionW(pnf_path);
+    PathAddExtensionW(pnf_path, L".pnf");
+    if ((pnf_file = _wfopen(pnf_path, L"w")))
+    {
+        fputws(PNF_HEADER, pnf_file);
+        fputws(source, pnf_file);
+        fclose(pnf_file);
+    }
+
 done:
    if (style & SP_COPY_DELETESOURCE)
        DeleteFileW( source );

-    if (ret)
-    {
-        wcscpy(pnf_path, target);
-        PathRemoveExtensionW(pnf_path);
-        PathAddExtensionW(pnf_path, L".pnf");
-        if ((pnf_file = _wfopen(pnf_path, L"w")))
-        {
-            fputws(PNF_HEADER, pnf_file);
-            fputws(source, pnf_file);
-            fclose(pnf_file);
-        }
-    }
-
    size = lstrlenW( target ) + 1;
    if (dest)
    {