Author: akhaldi Date: Wed Jan 1 22:20:28 2014 New Revision: 61484
URL: http://svn.reactos.org/svn/reactos?rev=61484&view=rev Log: [XMLLITE] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. * Improve the GUIDs situation. CORE-7716
Added: trunk/reactos/dll/win32/xmllite/guid.c (with props) Modified: trunk/reactos/dll/win32/xmllite/CMakeLists.txt trunk/reactos/dll/win32/xmllite/reader.c trunk/reactos/dll/win32/xmllite/writer.c trunk/reactos/dll/win32/xmllite/xmllite_main.c trunk/reactos/dll/win32/xmllite/xmllite_private.h
Modified: trunk/reactos/dll/win32/xmllite/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/CMakeList... ============================================================================== --- trunk/reactos/dll/win32/xmllite/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/CMakeLists.txt [iso-8859-1] Wed Jan 1 22:20:28 2014 @@ -7,11 +7,12 @@ reader.c writer.c xmllite_main.c + guid.c ${CMAKE_CURRENT_BINARY_DIR}/xmllite_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/xmllite.def)
add_library(xmllite SHARED ${SOURCE}) set_module_type(xmllite win32dll) -target_link_libraries(xmllite wine) +target_link_libraries(xmllite uuid wine) add_importlibs(xmllite msvcrt kernel32 ntdll) add_cd_file(TARGET xmllite DESTINATION reactos/system32 FOR all)
Added: trunk/reactos/dll/win32/xmllite/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/guid.c?re... ============================================================================== --- trunk/reactos/dll/win32/xmllite/guid.c (added) +++ trunk/reactos/dll/win32/xmllite/guid.c [iso-8859-1] Wed Jan 1 22:20:28 2014 @@ -0,0 +1,17 @@ +/* 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 <xmllite.h> + +DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda); + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */
Propchange: trunk/reactos/dll/win32/xmllite/guid.c ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/dll/win32/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/reader.c?... ============================================================================== --- trunk/reactos/dll/win32/xmllite/reader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/reader.c [iso-8859-1] Wed Jan 1 22:20:28 2014 @@ -18,26 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS +#include "xmllite_private.h"
#include <stdio.h> -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <initguid.h> -#include <objbase.h> -#include <xmllite.h> -#include "xmllite_private.h" - -#include <wine/debug.h> + #include <wine/list.h> #include <wine/unicode.h> - -WINE_DEFAULT_DEBUG_CHANNEL(xmllite);
/* not defined in public headers */ DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda);
Modified: trunk/reactos/dll/win32/xmllite/writer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/writer.c?... ============================================================================== --- trunk/reactos/dll/win32/xmllite/writer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/writer.c [iso-8859-1] Wed Jan 1 22:20:28 2014 @@ -17,21 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS - -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <xmllite.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(xmllite); + +#include "xmllite_private.h"
typedef struct _xmlwriter {
Modified: trunk/reactos/dll/win32/xmllite/xmllite_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/xmllite_m... ============================================================================== --- trunk/reactos/dll/win32/xmllite/xmllite_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/xmllite_main.c [iso-8859-1] Wed Jan 1 22:20:28 2014 @@ -18,15 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <config.h> - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(xmllite); +#include "xmllite_private.h"
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
Modified: trunk/reactos/dll/win32/xmllite/xmllite_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/xmllite_p... ============================================================================== --- trunk/reactos/dll/win32/xmllite/xmllite_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/xmllite_private.h [iso-8859-1] Wed Jan 1 22:20:28 2014 @@ -21,6 +21,24 @@ #ifndef __XMLLITE_PRIVATE__ #define __XMLLITE_PRIVATE__
+#include <config.h> + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <xmllite.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(xmllite); + /* memory allocation functions */ static inline void *heap_alloc(size_t len) {