[akhaldi] 63550: [DEVENUM] * Do not rely on RegDeleteTreeW which shouldn't be exported. * We no longer need to define _WIN32_WINNT as 0x600. CORE-8174

Author: akhaldi
Date: Sun Jun  8 12:02:59 2014
New Revision: 63550

URL: http://svn.reactos.org/svn/reactos?rev=63550&view=rev
Log:
[DEVENUM]
* Do not rely on RegDeleteTreeW which shouldn't be exported.
* We no longer need to define _WIN32_WINNT as 0x600.
CORE-8174

Modified:
    trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt
    trunk/reactos/dll/directx/wine/devenum/createdevenum.c

Modified: trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/CM...
==============================================================================
--- trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt	[iso-8859-1] Sun Jun  8 12:02:59 2014
@@ -1,6 +1,3 @@
-
-remove_definitions(-D_WIN32_WINNT=0x502)
-add_definitions(-D_WIN32_WINNT=0x600)

add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
@@ -22,7 +19,7 @@
 set_source_files_properties(devenum.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/devenum_classes.rgs)
 set_module_type(devenum win32dll UNICODE)
 target_link_libraries(devenum strmiids uuid wine)
-add_importlibs(devenum advapi32 ole32 oleaut32 winmm user32 avicap32 msvcrt kernel32 ntdll)
+add_importlibs(devenum advapi32 ole32 oleaut32 winmm user32 avicap32 shlwapi msvcrt kernel32 ntdll)
 add_delay_importlibs(devenum msvfw32)
 add_pch(devenum devenum_private.h SOURCE)
 add_cd_file(TARGET devenum DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/directx/wine/devenum/createdevenum.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/cr...
==============================================================================
--- trunk/reactos/dll/directx/wine/devenum/createdevenum.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/devenum/createdevenum.c	[iso-8859-1] Sun Jun  8 12:02:59 2014
@@ -27,6 +27,7 @@

#include <vfw.h>
 #include <aviriff.h>
+#include <shlwapi.h>

#include "resource.h"

@@ -675,15 +676,15 @@
      * or switched from pulseaudio to alsa, delete all old devices first
      */
     if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_AudioRendererCategory, &basekey, path, MAX_PATH)))
-        RegDeleteTreeW(basekey, path);
+        SHDeleteKeyW(basekey, path);
     if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_AudioInputDeviceCategory, &basekey, path, MAX_PATH)))
-        RegDeleteTreeW(basekey, path);
+        SHDeleteKeyW(basekey, path);
     if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_VideoInputDeviceCategory, &basekey, path, MAX_PATH)))
-        RegDeleteTreeW(basekey, path);
+        SHDeleteKeyW(basekey, path);
     if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_MidiRendererCategory, &basekey, path, MAX_PATH)))
-        RegDeleteTreeW(basekey, path);
+        SHDeleteKeyW(basekey, path);
     if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_VideoCompressorCategory, &basekey, path, MAX_PATH)))
-        RegDeleteTreeW(basekey, path);
+        SHDeleteKeyW(basekey, path);

rf2.dwVersion = 2;
     rf2.dwMerit = MERIT_PREFERRED;