[ros-diffs] [akhaldi] 70085: [DEVENUM] Sync with Wine Staging 1.7.55. CORE-10536

Author: akhaldi
Date: Tue Nov 24 10:48:09 2015
New Revision: 70085
URL: http://svn.reactos.org/svn/reactos?rev=70085&view=rev
Log:
[DEVENUM] Sync with Wine Staging 1.7.55. CORE-10536
Modified:
    trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt
    trunk/reactos/dll/directx/wine/devenum/createdevenum.c
    trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/C…
==============================================================================
--- trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt       [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt       [iso-8859-1] Tue Nov 24
10:48:09 2015
@@ -1,3 +1,6 @@
+
+remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502)
+add_definitions(-D_WIN32_WINNT=0x600 -DWINVER=0x600)
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
@@ -19,7 +22,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 shlwapi msvcrt
kernel32 ntdll)
+add_importlibs(devenum advapi32 advapi32_vista ole32 oleaut32 winmm user32 avicap32
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/c…
==============================================================================
--- trunk/reactos/dll/directx/wine/devenum/createdevenum.c      [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/devenum/createdevenum.c      [iso-8859-1] Tue Nov 24
10:48:09 2015
@@ -676,15 +676,15 @@
      * or switched from pulseaudio to alsa, delete all old devices first
      */
     if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_AudioRendererCategory, &basekey,
path, MAX_PATH)))
-        SHDeleteKeyW(basekey, path);
+        RegDeleteTreeW(basekey, path);
     if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_AudioInputDeviceCategory,
&basekey, path, MAX_PATH)))
-        SHDeleteKeyW(basekey, path);
+        RegDeleteTreeW(basekey, path);
     if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_VideoInputDeviceCategory,
&basekey, path, MAX_PATH)))
-        SHDeleteKeyW(basekey, path);
+        RegDeleteTreeW(basekey, path);
     if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_MidiRendererCategory, &basekey,
path, MAX_PATH)))
-        SHDeleteKeyW(basekey, path);
+        RegDeleteTreeW(basekey, path);
     if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_VideoCompressorCategory,
&basekey, path, MAX_PATH)))
-        SHDeleteKeyW(basekey, path);
+        RegDeleteTreeW(basekey, path);
     rf2.dwVersion = 2;
     rf2.dwMerit = MERIT_PREFERRED;
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Nov 24 10:48:09 2015
@@ -29,7 +29,7 @@
 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-1.7.55
 reactos/dll/directx/wine/d3dxof         # Synced to WineStaging-1.7.47
 reactos/dll/directx/wine/ddraw          # Synced to WineStaging-1.7.55
-reactos/dll/directx/wine/devenum        # Synced to WineStaging-1.7.47
+reactos/dll/directx/wine/devenum        # Synced to WineStaging-1.7.55
 reactos/dll/directx/wine/dinput         # Synced to WineStaging-1.7.47
 reactos/dll/directx/wine/dinput8        # Synced to WineStaging-1.7.47
 reactos/dll/directx/wine/dmusic         # Synced to WineStaging-1.7.47