[ros-diffs] [akhaldi] 63552: [QUARTZ] * Do not rely on RegDeleteTree{A, W} which shouldn't be exported. * Move shlwapi.h inclusion to the PCH. * We no longer need to define _WIN32_WINNT as 0x600. CORE-8174

Author: akhaldi
Date: Sun Jun  8 12:14:06 2014
New Revision: 63552

URL: http://svn.reactos.org/svn/reactos?rev=63552&view=rev
Log:
[QUARTZ]
* Do not rely on RegDeleteTree{A,W} which shouldn't be exported.
* Move shlwapi.h inclusion to the PCH.
* We no longer need to define _WIN32_WINNT as 0x600.
CORE-8174

Modified:
    trunk/reactos/dll/directx/wine/quartz/CMakeLists.txt
    trunk/reactos/dll/directx/wine/quartz/filesource.c
    trunk/reactos/dll/directx/wine/quartz/filtermapper.c
    trunk/reactos/dll/directx/wine/quartz/quartz_private.h
    trunk/reactos/dll/directx/wine/quartz/regsvr.c

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

Modified: trunk/reactos/dll/directx/wine/quartz/filesource.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/filesource.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/filesource.c	[iso-8859-1] Sun Jun  8 12:14:06
2014
@@ -19,8 +19,6 @@
  */
 
 #include "quartz_private.h"
-
-#include <shlwapi.h>
 
 static const WCHAR wszOutputPinName[] = {
'O','u','t','p','u','t',0 };
 

Modified: trunk/reactos/dll/directx/wine/quartz/filtermapper.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/filtermapper.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/filtermapper.c	[iso-8859-1] Sun Jun  8 12:14:06
2014
@@ -1513,7 +1513,7 @@
         if (lRet != ERROR_SUCCESS)
             hr = HRESULT_FROM_WIN32(lRet);
 
-        lRet = RegDeleteTreeW(hKey, wszPins);
+        lRet = SHDeleteKeyW(hKey, wszPins);
         if (lRet != ERROR_SUCCESS)
             hr = HRESULT_FROM_WIN32(lRet);
 
@@ -1572,7 +1572,7 @@
         strcatW(wszPinNameKey, wszSlash);
         strcatW(wszPinNameKey, Name);
 
-        lRet = RegDeleteTreeW(hKey, wszPinNameKey);
+        lRet = SHDeleteKeyW(hKey, wszPinNameKey);
         hr = HRESULT_FROM_WIN32(lRet);
         CoTaskMemFree(wszPinNameKey);
     }

Modified: trunk/reactos/dll/directx/wine/quartz/quartz_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/qu…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/quartz_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/quartz_private.h	[iso-8859-1] Sun Jun  8
12:14:06 2014
@@ -41,6 +41,7 @@
 #include <dvdmedia.h>
 #include <vfw.h>
 #include <aviriff.h>
+#include <shlwapi.h>
 
 #include <wine/strmbase.h>
 #include <wine/unicode.h>

Modified: trunk/reactos/dll/directx/wine/quartz/regsvr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/re…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/regsvr.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/regsvr.c	[iso-8859-1] Sun Jun  8 12:14:06 2014
@@ -240,7 +240,7 @@
 	WCHAR buf[39];
 
 	StringFromGUID2(list->iid, buf, 39);
-	res = RegDeleteTreeW(interface_key, buf);
+	res = SHDeleteKeyW(interface_key, buf);
 	if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
     }
 
@@ -346,18 +346,18 @@
 	WCHAR buf[39];
 
 	StringFromGUID2(list->clsid, buf, 39);
-	res = RegDeleteTreeW(coclass_key, buf);
+	res = SHDeleteKeyW(coclass_key, buf);
 	if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
 	if (res != ERROR_SUCCESS) goto error_close_coclass_key;
 
 	if (list->progid) {
-	    res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid);
+	    res = SHDeleteKeyA(HKEY_CLASSES_ROOT, list->progid);
 	    if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
 	    if (res != ERROR_SUCCESS) goto error_close_coclass_key;
 	}
 
 	if (list->viprogid) {
-	    res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid);
+	    res = SHDeleteKeyA(HKEY_CLASSES_ROOT, list->viprogid);
 	    if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
 	    if (res != ERROR_SUCCESS) goto error_close_coclass_key;
 	}
@@ -500,7 +500,7 @@
 	if (res != ERROR_SUCCESS) break;
 
 	StringFromGUID2(list->subtype, buf, 39);
-	res = RegDeleteTreeW(majortype_key, buf);
+	res = SHDeleteKeyW(majortype_key, buf);
     	if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
 
 	/* Removed majortype key if there is no more subtype key */
@@ -535,7 +535,7 @@
 	res = ERROR_SUCCESS;
     else if (res == ERROR_SUCCESS)
 	for (; res == ERROR_SUCCESS && list->majortype; ++list) {
-	    res = RegDeleteTreeA(extensions_root_key, list->extension);
+	    res = SHDeleteKeyA(extensions_root_key, list->extension);
 	    if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
 	}