[HHCTRL.OCX]

* Improve the GUIDs situation.
CORE-7716

svn path=/trunk/; revision=61403

diff --git a/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt b/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt
index 7346565..e48f0a6 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt
+++ b/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt
@@ -15,6 +15,7 @@ add_library(hhctrl SHARED
     search.c
     stream.c
     webbrowser.c
+    guid.c
     hhctrl.rc
     ${CMAKE_CURRENT_BINARY_DIR}/hhctrl.def)
 
@@ -30,7 +31,7 @@ set_source_files_properties(hhctrl.rc PROPERTIES OBJECT_DEPENDS "${hhctrl_rc_dep
 add_dependencies(hhctrl stdole2)
 
 set_module_type(hhctrl win32ocx)
-target_link_libraries(hhctrl uuid wine itss_guid)
+target_link_libraries(hhctrl uuid wine)
 add_importlibs(hhctrl advapi32 comctl32 shlwapi ole32 oleaut32 user32 gdi32 msvcrt kernel32 ntdll)
 add_dependencies(hhctrl wineheaders)
 add_pch(hhctrl hhctrl.h)

diff --git a/reactos/dll/win32/hhctrl.ocx/guid.c b/reactos/dll/win32/hhctrl.ocx/guid.c
new file mode 100644 (file)
index 0000000..72b2847
--- /dev/null
+++ b/reactos/dll/win32/hhctrl.ocx/guid.c
@@ -0,0 +1,34 @@
+/*
+ * ReactOS Access Control List Editor
+ * Copyright (C) 2004-2005 ReactOS Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#include <windef.h>
+#include <winbase.h>
+#include <objbase.h>
+#include <initguid.h>
+#include <wine/itss.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

diff --git a/reactos/dll/win32/hhctrl.ocx/hhctrl.h b/reactos/dll/win32/hhctrl.ocx/hhctrl.h
index 8fe5c64..4600b79 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/hhctrl.h
+++ b/reactos/dll/win32/hhctrl.ocx/hhctrl.h
@@ -31,8 +31,6 @@
 
 #define COBJMACROS
 
-#include <initguid.h>
-
 #include <windef.h>
 #include <winbase.h>
 #include <winuser.h>