[SETUPAPI] - Add missing error checks in do_file_copyW. Patch by Carlo Bramini. CORE...

[reactos.git] / reactos / dll / win32 / setupapi / queue.c

diff --git a/reactos/dll/win32/setupapi/queue.c b/reactos/dll/win32/setupapi/queue.c
index 9d1e5b2..5f53d98 100644 (file)
--- a/reactos/dll/win32/setupapi/queue.c
+++ b/reactos/dll/win32/setupapi/queue.c
@@ -994,16 +994,42 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
 
     TRACE("copy %s to %s style 0x%x\n",debugstr_w(source),debugstr_w(target),style);
 
+    /* Get a temp file name */
+    if (!GetTempPathW(sizeof(TempPath) / sizeof(WCHAR), TempPath))
+    {
+        ERR("GetTempPathW error\n");
+        return FALSE;
+    }
+    if (!GetTempFileNameW(TempPath, L"", 0, TempFile))
+    {
+        ERR("GetTempFileNameW(%s) error\n", debugstr_w(TempPath));
+        return FALSE;
+    }
+
+    /* Try to open the source file */
     hSource = LZOpenFileW((LPWSTR)source, &OfStruct, OF_READ);
     if (hSource < 0)
+    {
+        ERR("LZOpenFileW(1) error %d %s\n", (int)hSource, debugstr_w(source));
         return FALSE;
-
-    /* Get a temp file name */
-    GetTempPathW(sizeof(TempPath) / sizeof(WCHAR), TempPath);
-    GetTempFileNameW(TempPath, L"", 0, TempFile);
+    }
 
     /* Extract the compressed file to a temp location */
     hTemp = LZOpenFileW(TempFile, &OfStruct, OF_CREATE);
+    if (hTemp < 0)
+    {
+        DWORD dwLastError = GetLastError();
+
+        ERR("LZOpenFileW(2) error %d %s\n", (int)hTemp, debugstr_w(TempFile));
+
+        /* Close the source handle */
+        LZClose(hSource);
+
+        /* Restore error condition triggered by LZOpenFileW */
+        SetLastError(dwLastError);
+        return FALSE;
+    }
+
     LZCopy(hSource, hTemp);
     LZClose(hSource);
     LZClose(hTemp);