Ros-diffs January 2014

ros-diffs@reactos.org

14 participants
426 discussions

[akhaldi] 61475: [WDMAUD.DRV] * Do not include debug.h into the main header. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jan 1 18:50:14 2014 New Revision: 61475 URL: http://svn.reactos.org/svn/reactos?rev=61475&view=rev Log: [WDMAUD.DRV] * Do not include debug.h into the main header. CORE-7716 Modified: trunk/reactos/dll/win32/wdmaud.drv/legacy.c trunk/reactos/dll/win32/wdmaud.drv/mixer.c trunk/reactos/dll/win32/wdmaud.drv/mmixer.c trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h Modified: trunk/reactos/dll/win32/wdmaud.drv/legacy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/legac… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/legacy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/legacy.c [iso-8859-1] Wed Jan 1 18:50:14 2014 @@ -14,6 +14,9 @@ */ #include "wdmaud.h" + +#define NDEBUG +#include <debug.h> #define KERNEL_DEVICE_NAME L"\\\\.\\wdmaud" Modified: trunk/reactos/dll/win32/wdmaud.drv/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/mixer… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/mixer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/mixer.c [iso-8859-1] Wed Jan 1 18:50:14 2014 @@ -8,6 +8,9 @@ */ #include "wdmaud.h" + +#define NDEBUG +#include <debug.h> extern HANDLE KernelHandle; Modified: trunk/reactos/dll/win32/wdmaud.drv/mmixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/mmixe… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] Wed Jan 1 18:50:14 2014 @@ -8,6 +8,9 @@ */ #include "wdmaud.h" + +#define NDEBUG +#include <debug.h> typedef struct { Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] Wed Jan 1 18:50:14 2014 @@ -14,6 +14,8 @@ #include "wdmaud.h" +#define NDEBUG +#include <debug.h> #ifndef USE_MMIXER_LIB #define FUNC_NAME(x) x##ByLegacy Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h [iso-8859-1] Wed Jan 1 18:50:14 2014 @@ -15,7 +15,6 @@ #include <float_cast.h> #include <interface.h> #include <mmixer.h> -#include <debug.h> BOOL WdmAudInitUserModeMixer(VOID);

10 years, 8 months

[akhaldi] 61474: [WBEMPROX] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist i...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jan 1 18:41:23 2014 New Revision: 61474 URL: http://svn.reactos.org/svn/reactos?rev=61474&view=rev Log: [WBEMPROX] * 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/wbemprox/guid.c (with props) Modified: trunk/reactos/dll/win32/wbemprox/CMakeLists.txt trunk/reactos/dll/win32/wbemprox/builtin.c trunk/reactos/dll/win32/wbemprox/class.c trunk/reactos/dll/win32/wbemprox/main.c trunk/reactos/dll/win32/wbemprox/process.c trunk/reactos/dll/win32/wbemprox/qualifier.c trunk/reactos/dll/win32/wbemprox/query.c trunk/reactos/dll/win32/wbemprox/reg.c trunk/reactos/dll/win32/wbemprox/service.c trunk/reactos/dll/win32/wbemprox/services.c trunk/reactos/dll/win32/wbemprox/table.c trunk/reactos/dll/win32/wbemprox/wbemlocator.c trunk/reactos/dll/win32/wbemprox/wbemprox_private.h trunk/reactos/dll/win32/wbemprox/wql.tab.c Modified: trunk/reactos/dll/win32/wbemprox/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/CMakeLists.txt [iso-8859-1] Wed Jan 1 18:41:23 2014 @@ -19,12 +19,13 @@ table.c wbemlocator.c wql.tab.c + guid.c ${CMAKE_CURRENT_BINARY_DIR}/wbemprox.def) add_library(wbemprox SHARED ${SOURCE} wbemprox.rc) set_source_files_properties(wbemprox.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/wbemprox.rgs) set_module_type(wbemprox win32dll) -target_link_libraries(wbemprox wine) +target_link_libraries(wbemprox uuid wine) add_importlibs(wbemprox iphlpapi dxgi oleaut32 advapi32 user32 gdi32 version msvcrt kernel32 ntdll) add_dependencies(wbemprox d3d_idl_headers) add_cd_file(TARGET wbemprox DESTINATION reactos/system32/wbem FOR all) Modified: trunk/reactos/dll/win32/wbemprox/builtin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/builtin… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/builtin.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/builtin.c [iso-8859-1] Wed Jan 1 18:41:23 2014 @@ -16,39 +16,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include "config.h" -#include <stdarg.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "initguid.h" -#include "objbase.h" -#include "oleauto.h" -#include "wbemcli.h" -#include "wbemprov.h" -#include "winsock2.h" -#include "iphlpapi.h" -#include "tlhelp32.h" -#include "d3d10.h" -#include "winternl.h" -#include "winioctl.h" -#include "winsvc.h" -#include "winver.h" - -#include "wine/debug.h" #include "wbemprox_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); +#include <wingdi.h> +#include <winsock2.h> +#include <iphlpapi.h> +#include <tlhelp32.h> +#include <winternl.h> +#include <winioctl.h> +#include <winver.h> + +#include <initguid.h> +#include <d3d10.h> static const WCHAR class_baseboardW[] = {'W','i','n','3','2','_','B','a','s','e','B','o','a','r','d',0}; Modified: trunk/reactos/dll/win32/wbemprox/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/class.c… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/class.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/class.c [iso-8859-1] Wed Jan 1 18:41:23 2014 @@ -16,24 +16,7 @@ * 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 "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "ole2.h" -#include "wbemcli.h" - -#include "wine/debug.h" #include "wbemprox_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); struct enum_class_object { Added: trunk/reactos/dll/win32/wbemprox/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/guid.c?… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/guid.c (added) +++ trunk/reactos/dll/win32/wbemprox/guid.c [iso-8859-1] Wed Jan 1 18:41:23 2014 @@ -0,0 +1,16 @@ +/* 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 <wbemcli.h> +#include <wbemprov.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/win32/wbemprox/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/wbemprox/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/main.c?… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/main.c [iso-8859-1] Wed Jan 1 18:41:23 2014 @@ -17,28 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H +#include "wbemprox_private.h" -#include "config.h" - -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "oleauto.h" -#include "wbemcli.h" -#include "wbemprov.h" -#include "rpcproxy.h" - -#include "wbemprox_private.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); +#include <wbemprov.h> +#include <rpcproxy.h> static HINSTANCE instance; Modified: trunk/reactos/dll/win32/wbemprox/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/process… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/process.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/process.c [iso-8859-1] Wed Jan 1 18:41:23 2014 @@ -18,25 +18,7 @@ * 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 "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "oleauto.h" -#include "wbemcli.h" - -#include "wine/debug.h" #include "wbemprox_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); static HRESULT get_owner( VARIANT *user, VARIANT *domain, VARIANT *retval ) { Modified: trunk/reactos/dll/win32/wbemprox/qualifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/qualifi… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/qualifier.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/qualifier.c [iso-8859-1] Wed Jan 1 18:41:23 2014 @@ -16,25 +16,7 @@ * 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 "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "oleauto.h" -#include "wbemcli.h" - -#include "wine/debug.h" #include "wbemprox_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); struct qualifier_set { Modified: trunk/reactos/dll/win32/wbemprox/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/query.c… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/query.c [iso-8859-1] Wed Jan 1 18:41:23 2014 @@ -16,25 +16,7 @@ * 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 "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "oleauto.h" -#include "wbemcli.h" - -#include "wine/debug.h" #include "wbemprox_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); HRESULT create_view( const struct property *proplist, const WCHAR *class, const struct expr *cond, struct view **ret ) Modified: trunk/reactos/dll/win32/wbemprox/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/reg.c?r… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/reg.c [iso-8859-1] Wed Jan 1 18:41:23 2014 @@ -18,26 +18,9 @@ * 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 "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "objbase.h" -#include "oleauto.h" -#include "wbemcli.h" - -#include "wine/debug.h" #include "wbemprox_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); +#include <winreg.h> static HRESULT to_bstr_array( BSTR *strings, DWORD count, VARIANT *var ) { Modified: trunk/reactos/dll/win32/wbemprox/service.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/service… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/service.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/service.c [iso-8859-1] Wed Jan 1 18:41:23 2014 @@ -18,26 +18,7 @@ * 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 "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "oleauto.h" -#include "wbemcli.h" -#include "winsvc.h" - -#include "wine/debug.h" #include "wbemprox_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); static UINT map_error( DWORD error ) { Modified: trunk/reactos/dll/win32/wbemprox/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/service… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/services.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/services.c [iso-8859-1] Wed Jan 1 18:41:23 2014 @@ -16,26 +16,7 @@ * 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 "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "oleauto.h" -#include "wbemcli.h" - -#include "wine/debug.h" -#include "wine/unicode.h" #include "wbemprox_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); struct client_security { Modified: trunk/reactos/dll/win32/wbemprox/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/table.c… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/table.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/table.c [iso-8859-1] Wed Jan 1 18:41:23 2014 @@ -16,26 +16,9 @@ * 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 "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "objbase.h" -#include "oleauto.h" -#include "wbemcli.h" - -#include "wine/debug.h" #include "wbemprox_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); +#include <winuser.h> HRESULT get_column_index( const struct table *table, const WCHAR *name, UINT *column ) { Modified: trunk/reactos/dll/win32/wbemprox/wbemlocator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/wbemloc… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/wbemlocator.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/wbemlocator.c [iso-8859-1] Wed Jan 1 18:41:23 2014 @@ -16,26 +16,7 @@ * 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 "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "oleauto.h" -#include "wbemcli.h" - -#include "wine/debug.h" -#include "wine/unicode.h" #include "wbemprox_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); typedef struct { Modified: trunk/reactos/dll/win32/wbemprox/wbemprox_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/wbempro… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/wbemprox_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/wbemprox_private.h [iso-8859-1] Wed Jan 1 18:41:23 2014 @@ -16,9 +16,31 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" -#include "wine/list.h" -#include "wine/unicode.h" +#include <config.h> + +#include <stdarg.h> + +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include <ntstatus.h> +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <winsvc.h> +#include <objbase.h> +#include <oleauto.h> +#include <wbemcli.h> + +#include <wine/debug.h> +#include <wine/list.h> +#include <wine/unicode.h> + +WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); IClientSecurity client_security; struct list *table_list; Modified: trunk/reactos/dll/win32/wbemprox/wql.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/wql.tab… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/wql.tab.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/wql.tab.c [iso-8859-1] Wed Jan 1 18:41:23 2014 @@ -95,25 +95,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "oleauto.h" -#include "wbemcli.h" #include "wbemprox_private.h" - -#include "wine/list.h" -#include "wine/debug.h" -#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); struct parser {

10 years, 8 months

[akhaldi] 61473: [WBEMDISP] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist i...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jan 1 18:35:06 2014 New Revision: 61473 URL: http://svn.reactos.org/svn/reactos?rev=61473&view=rev Log: [WBEMDISP] * 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/wbemdisp/guid.c (with props) Modified: trunk/reactos/dll/win32/wbemdisp/CMakeLists.txt trunk/reactos/dll/win32/wbemdisp/locator.c trunk/reactos/dll/win32/wbemdisp/main.c trunk/reactos/dll/win32/wbemdisp/wbemdisp_private.h Modified: trunk/reactos/dll/win32/wbemdisp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/wbemdisp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemdisp/CMakeLists.txt [iso-8859-1] Wed Jan 1 18:35:06 2014 @@ -6,6 +6,7 @@ list(APPEND SOURCE locator.c main.c + guid.c ${CMAKE_CURRENT_BINARY_DIR}/wbemdisp.def) add_idl_headers(wbemdisp_idlheader wbemdisp_classes.idl) @@ -20,7 +21,7 @@ add_library(wbemdisp SHARED ${SOURCE} wbemdisp.rc) set_module_type(wbemdisp win32dll) -target_link_libraries(wbemdisp wine) +target_link_libraries(wbemdisp uuid wine) add_dependencies(wbemdisp wbemdisp_idlheader) add_importlibs(wbemdisp oleaut32 msvcrt kernel32 ntdll) add_cd_file(TARGET wbemdisp DESTINATION reactos/system32/wbem FOR all) Added: trunk/reactos/dll/win32/wbemdisp/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/guid.c?… ============================================================================== --- trunk/reactos/dll/win32/wbemdisp/guid.c (added) +++ trunk/reactos/dll/win32/wbemdisp/guid.c [iso-8859-1] Wed Jan 1 18:35:06 2014 @@ -0,0 +1,16 @@ +/* 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 <wbemdisp_classes.h> +#include <wbemdisp.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/win32/wbemdisp/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/wbemdisp/locator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/locator… ============================================================================== --- trunk/reactos/dll/win32/wbemdisp/locator.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemdisp/locator.c [iso-8859-1] Wed Jan 1 18:35:06 2014 @@ -16,21 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "wbemdisp.h" - -#include "wine/debug.h" -#include "wine/unicode.h" #include "wbemdisp_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp); +#include <winnls.h> +#include <oleauto.h> struct locator { Modified: trunk/reactos/dll/win32/wbemdisp/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/main.c?… ============================================================================== --- trunk/reactos/dll/win32/wbemdisp/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemdisp/main.c [iso-8859-1] Wed Jan 1 18:35:06 2014 @@ -16,23 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "initguid.h" -#include "objbase.h" -#include "wbemdisp.h" -#include "rpcproxy.h" - -#include "wine/debug.h" #include "wbemdisp_private.h" -#include "wbemdisp_classes.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp); + +#include <rpcproxy.h> +#include <wbemdisp_classes.h> static HINSTANCE instance; Modified: trunk/reactos/dll/win32/wbemdisp/wbemdisp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/wbemdis… ============================================================================== --- trunk/reactos/dll/win32/wbemdisp/wbemdisp_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemdisp/wbemdisp_private.h [iso-8859-1] Wed Jan 1 18:35:06 2014 @@ -16,6 +16,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#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 <wbemdisp.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp); + HRESULT SWbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1);

10 years, 8 months

[akhaldi] 61472: [VDMDBG] * We don't need a PCH for one source file. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jan 1 18:31:40 2014 New Revision: 61472 URL: http://svn.reactos.org/svn/reactos?rev=61472&view=rev Log: [VDMDBG] * We don't need a PCH for one source file. CORE-7716 Modified: trunk/reactos/dll/win32/vdmdbg/CMakeLists.txt Modified: trunk/reactos/dll/win32/vdmdbg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vdmdbg/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/vdmdbg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vdmdbg/CMakeLists.txt [iso-8859-1] Wed Jan 1 18:31:40 2014 @@ -1,4 +1,3 @@ - spec2def(vdmdbg.dll vdmdbg.spec) @@ -10,5 +9,4 @@ set_module_type(vdmdbg win32dll UNICODE) add_importlibs(vdmdbg msvcrt kernel32 ntdll) -add_pch(vdmdbg vdmdbg.h) add_cd_file(TARGET vdmdbg DESTINATION reactos/system32 FOR all)

10 years, 8 months

[akhaldi] 61471: [VBSCRIPT] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist i...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jan 1 18:29:51 2014 New Revision: 61471 URL: http://svn.reactos.org/svn/reactos?rev=61471&view=rev Log: [VBSCRIPT] * 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 Modified: trunk/reactos/dll/win32/vbscript/CMakeLists.txt trunk/reactos/dll/win32/vbscript/compile.c trunk/reactos/dll/win32/vbscript/error.c trunk/reactos/dll/win32/vbscript/global.c trunk/reactos/dll/win32/vbscript/interp.c trunk/reactos/dll/win32/vbscript/lex.c trunk/reactos/dll/win32/vbscript/parser.tab.c trunk/reactos/dll/win32/vbscript/regexp.c trunk/reactos/dll/win32/vbscript/vbdisp.c trunk/reactos/dll/win32/vbscript/vbregexp.c trunk/reactos/dll/win32/vbscript/vbscript.c trunk/reactos/dll/win32/vbscript/vbscript.h trunk/reactos/dll/win32/vbscript/vbscript_main.c Modified: trunk/reactos/dll/win32/vbscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/vbscript/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/CMakeLists.txt [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -31,7 +31,7 @@ add_typelib(vbsglobal.idl vbsregexp10.idl vbsregexp55.idl) add_library(vbscript SHARED ${SOURCE} vbscript.rc) set_module_type(vbscript win32dll) -target_link_libraries(vbscript wine) +target_link_libraries(vbscript uuid wine) add_importlibs(vbscript oleaut32 ole32 user32 msvcrt kernel32 ntdll) add_dependencies(vbscript vbscript_idlheader stdole2) add_cd_file(TARGET vbscript DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/vbscript/compile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/compile… ============================================================================== --- trunk/reactos/dll/win32/vbscript/compile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/compile.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -16,15 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> - #include "vbscript.h" -#include "parse.h" -//#include "parser.tab.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(vbscript); + WINE_DECLARE_DEBUG_CHANNEL(vbscript_disas); typedef struct _statement_ctx_t { Modified: trunk/reactos/dll/win32/vbscript/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/error.c… ============================================================================== --- trunk/reactos/dll/win32/vbscript/error.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/error.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -17,11 +17,6 @@ */ #include "vbscript.h" -#include "vbscript_defs.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(vbscript); static HRESULT Err_Description(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { Modified: trunk/reactos/dll/win32/vbscript/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/global.… ============================================================================== --- trunk/reactos/dll/win32/vbscript/global.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/global.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -16,18 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> +#include "vbscript.h" + #include <math.h> - -#include "vbscript.h" -#include "vbscript_defs.h" - -#include <mshtmhst.h> -#include <objsafe.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(vbscript); #define round(x) (((x) < 0) ? (int)((x) - 0.5) : (int)((x) + 0.5)) Modified: trunk/reactos/dll/win32/vbscript/interp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/interp.… ============================================================================== --- trunk/reactos/dll/win32/vbscript/interp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/interp.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -16,13 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> - #include "vbscript.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(vbscript); static DISPID propput_dispid = DISPID_PROPERTYPUT; Modified: trunk/reactos/dll/win32/vbscript/lex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/lex.c?r… ============================================================================== --- trunk/reactos/dll/win32/vbscript/lex.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/lex.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -16,15 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <assert.h> - #include "vbscript.h" -#include "parse.h" #include "parser.tab.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(vbscript); static const WCHAR andW[] = {'a','n','d',0}; static const WCHAR byrefW[] = {'b','y','r','e','f',0}; Modified: trunk/reactos/dll/win32/vbscript/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/parser.… ============================================================================== --- trunk/reactos/dll/win32/vbscript/parser.tab.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/parser.tab.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -76,13 +76,7 @@ /* Line 268 of yacc.c */ #line 19 "parser.y" - #include "vbscript.h" -#include "parse.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(vbscript); static int parser_error(parser_ctx_t *,const char*); Modified: trunk/reactos/dll/win32/vbscript/regexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/regexp.… ============================================================================== --- trunk/reactos/dll/win32/vbscript/regexp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/regexp.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -31,14 +31,7 @@ * the Initial Developer. All Rights Reserved. */ -#include <assert.h> - #include "vbscript.h" -#include "regexp.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(vbscript); /* FIXME: Better error handling */ #define ReportRegExpError(a,b,c) Modified: trunk/reactos/dll/win32/vbscript/vbdisp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbdisp.… ============================================================================== --- trunk/reactos/dll/win32/vbscript/vbdisp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/vbdisp.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -16,13 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> - #include "vbscript.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(vbscript); #define FDEX_VERSION_MASK 0xf0000000 Modified: trunk/reactos/dll/win32/vbscript/vbregexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbregex… ============================================================================== --- trunk/reactos/dll/win32/vbscript/vbregexp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/vbregexp.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -17,12 +17,9 @@ */ #include "vbscript.h" -#include "regexp.h" -#include "vbsregexp55.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(vbscript); + +#include <initguid.h> +#include <vbsregexp55.h> #define REGEXP_TID_LIST \ XDIID(RegExp2), \ Modified: trunk/reactos/dll/win32/vbscript/vbscript.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscrip… ============================================================================== --- trunk/reactos/dll/win32/vbscript/vbscript.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/vbscript.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -16,15 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -//#include <assert.h> - #include "vbscript.h" -#include <objsafe.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(vbscript); + +#include <vbscript_classes.h> #ifdef _WIN64 Modified: trunk/reactos/dll/win32/vbscript/vbscript.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscrip… ============================================================================== --- trunk/reactos/dll/win32/vbscript/vbscript.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/vbscript.h [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #include <stdarg.h> #define WIN32_NO_STATUS @@ -27,13 +28,16 @@ #include <windef.h> #include <winbase.h> #include <ole2.h> +#include <objsafe.h> #include <dispex.h> #include <activscp.h> - -#include <vbscript_classes.h> +#include <mshtmhst.h> #include <wine/list.h> #include <wine/unicode.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(vbscript); typedef struct { void **blocks; @@ -410,3 +414,7 @@ return ret; } + +#include "parse.h" +#include "regexp.h" +#include "vbscript_defs.h" Modified: trunk/reactos/dll/win32/vbscript/vbscript_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscrip… ============================================================================== --- trunk/reactos/dll/win32/vbscript/vbscript_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/vbscript_main.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -16,22 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "vbscript.h" + +#include <rpcproxy.h> #include <initguid.h> - -#include <vbscript.h> -#include <objsafe.h> -#include <mshtmhst.h> -#include <rpcproxy.h> -//#include "vbscript_classes.h" -#include "vbsglobal.h" -#include "vbsregexp55.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(vbscript); +#include <vbscript_classes.h> +#include <vbsglobal.h> + WINE_DECLARE_DEBUG_CHANNEL(heap); - -DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static HINSTANCE vbscript_hinstance;

10 years, 8 months

[akhaldi] 61470: [RICHED20] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jan 1 18:22:31 2014 New Revision: 61470 URL: http://svn.reactos.org/svn/reactos?rev=61470&view=rev Log: [RICHED20] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Modified: trunk/reactos/dll/win32/riched20/caret.c trunk/reactos/dll/win32/riched20/editor.c trunk/reactos/dll/win32/riched20/editor.h trunk/reactos/dll/win32/riched20/editstr.h trunk/reactos/dll/win32/riched20/list.c trunk/reactos/dll/win32/riched20/msvc-thiscall.c trunk/reactos/dll/win32/riched20/reader.c trunk/reactos/dll/win32/riched20/res.h trunk/reactos/dll/win32/riched20/richole.c trunk/reactos/dll/win32/riched20/row.c trunk/reactos/dll/win32/riched20/rtf.h trunk/reactos/dll/win32/riched20/txthost.c trunk/reactos/dll/win32/riched20/txtsrv.c trunk/reactos/dll/win32/riched20/wrap.c trunk/reactos/dll/win32/riched20/writer.c Modified: trunk/reactos/dll/win32/riched20/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/caret.c… ============================================================================== --- trunk/reactos/dll/win32/riched20/caret.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/caret.c [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -18,7 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - #include "editor.h" Modified: trunk/reactos/dll/win32/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… ============================================================================== --- trunk/reactos/dll/win32/riched20/editor.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editor.c [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -225,12 +225,10 @@ */ #include "editor.h" + #include <commdlg.h> -//#include "winreg.h" -#define NO_SHLWAPI_STREAM -//#include "shlwapi.h" + #include "rtf.h" -//#include "imm.h" #include "res.h" #define STACK_SIZE_DEFAULT 100 Modified: trunk/reactos/dll/win32/riched20/editor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… ============================================================================== --- trunk/reactos/dll/win32/riched20/editor.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editor.h [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -18,8 +18,38 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <config.h> + +#include <assert.h> +#include <stdio.h> + +#ifndef _WIN32_IE +#define _WIN32_IE 0x0400 +#endif + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winuser.h> +#include <richedit.h> +#include <ole2.h> +#include <richole.h> +#include <imm.h> +#include <textserv.h> + +#include <wine/debug.h> +#include <wine/list.h> +#include <wine/unicode.h> + #include "editstr.h" -#include <wine/unicode.h> struct _RTF_Info; Modified: trunk/reactos/dll/win32/riched20/editstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editstr… ============================================================================== --- trunk/reactos/dll/win32/riched20/editstr.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editstr.h [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -20,40 +20,6 @@ #ifndef __EDITSTR_H #define __EDITSTR_H - -#ifndef _WIN32_IE -#define _WIN32_IE 0x0400 -#endif - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <assert.h> -//#include <stdarg.h> -#include <stdio.h> -//#include <stdlib.h> -//#include <limits.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -//#include <winnls.h> -//#include <winnt.h> -#include <wingdi.h> -#include <winuser.h> -#include <richedit.h> -//#include <commctrl.h> -#include <ole2.h> -#include <richole.h> -#include <imm.h> -#include <textserv.h> - -#include <wine/debug.h> -#include <wine/list.h> #ifdef __i386__ extern const struct ITextHostVtbl itextHostStdcallVtbl; Modified: trunk/reactos/dll/win32/riched20/list.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/list.c?… ============================================================================== --- trunk/reactos/dll/win32/riched20/list.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/list.c [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -17,7 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - #include "editor.h" Modified: trunk/reactos/dll/win32/riched20/msvc-thiscall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/msvc-th… ============================================================================== --- trunk/reactos/dll/win32/riched20/msvc-thiscall.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/msvc-thiscall.c [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -1,4 +1,3 @@ -#include "config.h" #include "editor.h" #define DEFINE_THISCALL_WRAPPER(func,args) \ Modified: trunk/reactos/dll/win32/riched20/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/reader.… ============================================================================== --- trunk/reactos/dll/win32/riched20/reader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/reader.c [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -35,17 +35,6 @@ * This software may be redistributed without restriction and used for * any purpose whatsoever. */ - -//#include <stdio.h> -//#include <ctype.h> -//#include <string.h> -//#include <stdarg.h> -//#include <stdlib.h> -//#include <assert.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wine/debug.h" #include "editor.h" #include "rtf.h" Modified: trunk/reactos/dll/win32/riched20/res.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/res.h?r… ============================================================================== --- trunk/reactos/dll/win32/riched20/res.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/res.h [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -18,4 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma once + #define OCR_REVERSE 107 Modified: trunk/reactos/dll/win32/riched20/richole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/richole… ============================================================================== --- trunk/reactos/dll/win32/riched20/richole.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/richole.c [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -19,27 +19,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdarg.h> - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#define COBJMACROS - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "ole2.h" -//#include "richole.h" #include "editor.h" + #include <tom.h> -//#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(richedit); /* there is no way to be consistent across different sets of headers - mingw, Wine, Win32 SDK*/ -#include "initguid.h" +#include <initguid.h> DEFINE_GUID(IID_ITextServices, 0x8d33f740, 0xcf58, 0x11ce, 0xa8, 0x9d, 0x00, 0xaa, 0x00, 0x6c, 0xad, 0xc5); DEFINE_GUID(IID_ITextHost, 0x13e670f4,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0xb6,0x5e,0xa1); DEFINE_GUID(IID_ITextHost2, 0x13e670f5,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0xb6,0x5e,0xa1); Modified: trunk/reactos/dll/win32/riched20/row.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/row.c?r… ============================================================================== --- trunk/reactos/dll/win32/riched20/row.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/row.c [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -20,7 +20,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - #include "editor.h" Modified: trunk/reactos/dll/win32/riched20/rtf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/rtf.h?r… ============================================================================== --- trunk/reactos/dll/win32/riched20/rtf.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/rtf.h [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -1,15 +1,5 @@ #ifndef _RTF #define _RTF - -//#include <stdarg.h> -//#include <stdio.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "richedit.h" - /* * rtf.h - RTF document processing stuff. Release 1.10. Modified: trunk/reactos/dll/win32/riched20/txthost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/txthost… ============================================================================== --- trunk/reactos/dll/win32/riched20/txthost.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/txthost.c [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -18,20 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include "wine/port.h" - -#define NONAMELESSSTRUCT -#define NONAMELESSUNION -#define COBJMACROS - #include "editor.h" -//#include "ole2.h" -//#include "richole.h" -//#include "imm.h" -//#include "textserv.h" -//#include "wine/debug.h" -//#include "editstr.h" WINE_DEFAULT_DEBUG_CHANNEL(richedit); Modified: trunk/reactos/dll/win32/riched20/txtsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/txtsrv.… ============================================================================== --- trunk/reactos/dll/win32/riched20/txtsrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/txtsrv.c [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -18,21 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include "wine/port.h" - -#define NONAMELESSSTRUCT -#define NONAMELESSUNION -#define COBJMACROS - #include "editor.h" -//#include "ole2.h" -//#include "oleauto.h" -//#include "richole.h" -//#include "imm.h" -//#include "textserv.h" -//#include "wine/debug.h" -//#include "editstr.h" #ifdef __i386__ /* thiscall functions are i386-specific */ Modified: trunk/reactos/dll/win32/riched20/wrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/wrap.c?… ============================================================================== --- trunk/reactos/dll/win32/riched20/wrap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/wrap.c [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - #include "editor.h" WINE_DEFAULT_DEBUG_CHANNEL(richedit); Modified: trunk/reactos/dll/win32/riched20/writer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/writer.… ============================================================================== --- trunk/reactos/dll/win32/riched20/writer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/writer.c [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -18,14 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include "wine/port.h" - #include "editor.h" #include "rtf.h" WINE_DEFAULT_DEBUG_CHANNEL(richedit); - static BOOL ME_StreamOutRTFText(ME_OutStream *pStream, const WCHAR *text, LONG nChars);

10 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2014