[ros-diffs] [cwittich] 63481: [setupapi] sync setupapi\dirid.c with wine patch by Samuel Serapion CORE-7663

Author: cwittich
Date: Tue May 27 20:33:21 2014
New Revision: 63481

URL: http://svn.reactos.org/svn/reactos?rev=63481&view=rev
Log:
[setupapi]
sync setupapi\dirid.c with wine 
patch by Samuel Serapion
CORE-7663
 

Modified:
    trunk/reactos/dll/win32/setupapi/CMakeLists.txt
    trunk/reactos/dll/win32/setupapi/dirid.c
    trunk/reactos/dll/win32/setupapi/setupapi_private.h

Modified: trunk/reactos/dll/win32/setupapi/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/setupapi/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/CMakeLists.txt	[iso-8859-1] Tue May 27 20:33:21 2014
@@ -40,7 +40,7 @@
 
 set_module_type(setupapi win32dll UNICODE)
 target_link_libraries(setupapi uuid wine ${PSEH_LIB})
-add_delay_importlibs(setupapi shell32 wintrust)
+add_delay_importlibs(setupapi shell32 winspool wintrust)
 
 add_importlibs(setupapi
     msvcrt

Modified: trunk/reactos/dll/win32/setupapi/dirid.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/dirid.c…
==============================================================================
--- trunk/reactos/dll/win32/setupapi/dirid.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/dirid.c	[iso-8859-1] Tue May 27 20:33:21 2014
@@ -70,6 +70,7 @@
 
     WCHAR buffer[MAX_PATH+32], *str;
     int len;
+    DWORD needed;
 
     switch(dirid)
     {
@@ -122,8 +123,14 @@
         return get_csidl_dir(CSIDL_PROFILE);
     case DIRID_LOADER:
         return C_Root;  /* FIXME */
+    case DIRID_PRINTPROCESSOR:
+        if (!GetPrintProcessorDirectoryW(NULL, NULL, 1, (LPBYTE)buffer, sizeof(buffer),
&needed))
+        {
+            WARN( "cannot retrieve print processor directory\n" );
+            return get_unknown_dirid();
+        }
+        break;
     case DIRID_COLOR:  /* FIXME */
-    case DIRID_PRINTPROCESSOR:  /* FIXME */
     default:
         FIXME( "unknown dirid %d\n", dirid );
         return get_unknown_dirid();

Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap…
==============================================================================
--- trunk/reactos/dll/win32/setupapi/setupapi_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/setupapi_private.h	[iso-8859-1] Tue May 27 20:33:21
2014
@@ -31,6 +31,8 @@
 #include <windef.h>
 #include <winbase.h>
 #include <winreg.h>
+#include <wingdi.h>
+#include <winspool.h>
 #include <wincon.h>
 #include <objbase.h>
 #include <cfgmgr32.h>