commit 9eaea34e041671fa63095a825c32978d1a9780d5
author James Hawkins <truiken@gmail.com> Mon Mar 26 18:35:16 2007 -0500
committer Alexandre Julliard <julliard@winehq.org> Tue Mar 27 13:22:31 2007 +0200
tree 7fbcfce09fe2f27403ab062423ebb449995b6650
parent da85c0905d26ddc31a8deb7b426b41e75fac2b44

setupapi: Add several tests for SetupCopyOEMInf, with fixes so the tests don't crash.

dlls/setupapi/misc.c

diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c
index 4689647..677a0ea 100644
--- a/dlls/setupapi/misc.c
+++ b/dlls/setupapi/misc.c
@@ -886,13 +886,14 @@
                               DWORD buffer_size, PDWORD required_size, PSTR *component )
 {
     BOOL ret = FALSE;
-    WCHAR destW[MAX_PATH], *sourceW = NULL, *locationW = NULL;
-    INT size = sizeof(destW);
+    LPWSTR destW = NULL, sourceW = NULL, locationW = NULL;
+    INT size = MAX_PATH;
 
     TRACE("%s, %s, %d, %d, %p, %d, %p, %p\n", debugstr_a(source), debugstr_a(location),
           media_type, style, dest, buffer_size, required_size, component);
 
-    if (source && !(sourceW = strdupAtoW( source ))) return FALSE;
+    if (dest && !(destW = MyMalloc( MAX_PATH * sizeof(WCHAR) ))) return FALSE;
+    if (source && !(sourceW = strdupAtoW( source ))) goto done;
     if (location && !(locationW = strdupAtoW( location ))) goto done;
 
     if (!(ret = SetupCopyOEMInfW( sourceW, locationW, media_type, style, destW, size, NULL, NULL )))
@@ -916,6 +917,7 @@
     }
 
 done:
+    MyFree( destW );
     HeapFree( GetProcessHeap(), 0, sourceW );
     HeapFree( GetProcessHeap(), 0, locationW );
     return ret;
@@ -936,11 +938,17 @@
     TRACE("%s, %s, %d, %d, %p, %d, %p, %p\n", debugstr_w(source), debugstr_w(location),
           media_type, style, dest, buffer_size, required_size, component);
 
+    if (!source)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+    }
+
     if (!GetWindowsDirectoryW( target, sizeof(target)/sizeof(WCHAR) )) return FALSE;
 
     strcatW( target, inf_oem );
-    p = strrchrW( source, '\\' ) + 1;
-    strcatW( target, p );
+    if ((p = strrchrW( source, '\\' )))
+        strcatW( target, p + 1 );
 
     size = strlenW( target ) + 1;
     if (dest)