Ros-diffs January 2014

ros-diffs@reactos.org

14 participants
426 discussions

[akhaldi] 61485: [KDCOM] * Do not include debug.h into the main header. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jan 1 22:24:17 2014 New Revision: 61485 URL: http://svn.reactos.org/svn/reactos?rev=61485&view=rev Log: [KDCOM] * Do not include debug.h into the main header. CORE-7716 Modified: trunk/reactos/drivers/base/kdcom/kdcom.c trunk/reactos/drivers/base/kdcom/kddll.c trunk/reactos/drivers/base/kdcom/kddll.h trunk/reactos/drivers/base/kdcom/kdserial.c Modified: trunk/reactos/drivers/base/kdcom/kdcom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom.c… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kdcom.c [iso-8859-1] Wed Jan 1 22:24:17 2014 @@ -10,6 +10,8 @@ #include <cportlib/cportlib.h> #include <stdlib.h> +#define NDEBUG +#include <debug.h> /* Serial debug connection */ #define DEFAULT_DEBUG_PORT 2 /* COM2 */ Modified: trunk/reactos/drivers/base/kdcom/kddll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kddll.c… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kddll.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kddll.c [iso-8859-1] Wed Jan 1 22:24:17 2014 @@ -7,6 +7,9 @@ */ #include "kddll.h" + +#define NDEBUG +#include <debug.h> /* GLOBALS ********************************************************************/ Modified: trunk/reactos/drivers/base/kdcom/kddll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kddll.h… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kddll.h [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kddll.h [iso-8859-1] Wed Jan 1 22:24:17 2014 @@ -15,9 +15,6 @@ #include <windbgkd.h> #include <wdbgexts.h> #include <ioaccess.h> /* port intrinsics */ - -#define NDEBUG -#include <debug.h> //#define KDDEBUG /* uncomment to enable debugging this dll */ Modified: trunk/reactos/drivers/base/kdcom/kdserial.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdseria… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdserial.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kdserial.c [iso-8859-1] Wed Jan 1 22:24:17 2014 @@ -7,6 +7,9 @@ */ #include "kddll.h" + +#define NDEBUG +#include <debug.h> /* FUNCTIONS ******************************************************************/

10 years, 11 months

[akhaldi] 61484: [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...

by akhaldi＠svn.reactos.org

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/CMakeLis… ============================================================================== --- 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?r… ============================================================================== --- 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_… ============================================================================== --- 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_… ============================================================================== --- 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) {

10 years, 11 months

[akhaldi] 61483: [WUAPI] * 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 t...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jan 1 22:17:11 2014 New Revision: 61483 URL: http://svn.reactos.org/svn/reactos?rev=61483&view=rev Log: [WUAPI] * 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. CORE-7716 Modified: trunk/reactos/dll/win32/wuapi/downloader.c trunk/reactos/dll/win32/wuapi/installer.c trunk/reactos/dll/win32/wuapi/main.c trunk/reactos/dll/win32/wuapi/searcher.c trunk/reactos/dll/win32/wuapi/session.c trunk/reactos/dll/win32/wuapi/systeminfo.c trunk/reactos/dll/win32/wuapi/updates.c trunk/reactos/dll/win32/wuapi/wuapi_private.h Modified: trunk/reactos/dll/win32/wuapi/downloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/downloader… ============================================================================== --- trunk/reactos/dll/win32/wuapi/downloader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/downloader.c [iso-8859-1] Wed Jan 1 22:17:11 2014 @@ -18,24 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -//#include "initguid.h" -#include <wuapi.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wuapi); +#include "wuapi_private.h" typedef struct _update_downloader { Modified: trunk/reactos/dll/win32/wuapi/installer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/installer.… ============================================================================== --- trunk/reactos/dll/win32/wuapi/installer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/installer.c [iso-8859-1] Wed Jan 1 22:17:11 2014 @@ -18,23 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <wuapi.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wuapi); +#include "wuapi_private.h" typedef struct _update_installer { Modified: trunk/reactos/dll/win32/wuapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/main.c?rev… ============================================================================== --- trunk/reactos/dll/win32/wuapi/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/main.c [iso-8859-1] Wed Jan 1 22:17:11 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 COBJMACROS - -#include <config.h> -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "ole2.h" -#include <objbase.h> -#include <rpcproxy.h> -#include <wuapi.h> - -#include <wine/debug.h> #include "wuapi_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(wuapi); +#include <rpcproxy.h> typedef HRESULT (*fnCreateInstance)( IUnknown *pUnkOuter, LPVOID *ppObj ); Modified: trunk/reactos/dll/win32/wuapi/searcher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/searcher.c… ============================================================================== --- trunk/reactos/dll/win32/wuapi/searcher.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/searcher.c [iso-8859-1] Wed Jan 1 22:17:11 2014 @@ -18,23 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <wuapi.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wuapi); +#include "wuapi_private.h" typedef struct _update_searcher { Modified: trunk/reactos/dll/win32/wuapi/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/session.c?… ============================================================================== --- trunk/reactos/dll/win32/wuapi/session.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/session.c [iso-8859-1] Wed Jan 1 22:17:11 2014 @@ -18,24 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <wuapi.h> - -#include <wine/debug.h> #include "wuapi_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wuapi); typedef struct _update_session { Modified: trunk/reactos/dll/win32/wuapi/systeminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/systeminfo… ============================================================================== --- trunk/reactos/dll/win32/wuapi/systeminfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/systeminfo.c [iso-8859-1] Wed Jan 1 22:17:11 2014 @@ -19,23 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <wuapi.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wuapi); +#include "wuapi_private.h" typedef struct _systeminfo { Modified: trunk/reactos/dll/win32/wuapi/updates.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/updates.c?… ============================================================================== --- trunk/reactos/dll/win32/wuapi/updates.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/updates.c [iso-8859-1] Wed Jan 1 22:17:11 2014 @@ -18,23 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <wuapi.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wuapi); +#include "wuapi_private.h" typedef struct _automatic_updates { Modified: trunk/reactos/dll/win32/wuapi/wuapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/wuapi_priv… ============================================================================== --- trunk/reactos/dll/win32/wuapi/wuapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/wuapi_private.h [iso-8859-1] Wed Jan 1 22:17:11 2014 @@ -16,6 +16,23 @@ * 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 COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <wuapi.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(wuapi); + extern HRESULT AutomaticUpdates_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; extern HRESULT UpdateSession_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; extern HRESULT UpdateSearcher_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN;

10 years, 11 months

[akhaldi] 61482: [WLDAP32] * 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...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jan 1 22:14:20 2014 New Revision: 61482 URL: http://svn.reactos.org/svn/reactos?rev=61482&view=rev Log: [WLDAP32] * 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/resource file. CORE-7716 Modified: trunk/reactos/dll/win32/wldap32/add.c trunk/reactos/dll/win32/wldap32/ber.c trunk/reactos/dll/win32/wldap32/bind.c trunk/reactos/dll/win32/wldap32/compare.c trunk/reactos/dll/win32/wldap32/control.c trunk/reactos/dll/win32/wldap32/delete.c trunk/reactos/dll/win32/wldap32/dn.c trunk/reactos/dll/win32/wldap32/error.c trunk/reactos/dll/win32/wldap32/extended.c trunk/reactos/dll/win32/wldap32/init.c trunk/reactos/dll/win32/wldap32/lang/wldap32_Da.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_De.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_En.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Es.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Fr.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_He.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Hu.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_It.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Ko.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Lt.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Nl.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_No.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Pl.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Pt.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Ro.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Sv.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Uk.rc trunk/reactos/dll/win32/wldap32/main.c trunk/reactos/dll/win32/wldap32/misc.c trunk/reactos/dll/win32/wldap32/modify.c trunk/reactos/dll/win32/wldap32/modrdn.c trunk/reactos/dll/win32/wldap32/option.c trunk/reactos/dll/win32/wldap32/page.c trunk/reactos/dll/win32/wldap32/parse.c trunk/reactos/dll/win32/wldap32/rename.c trunk/reactos/dll/win32/wldap32/search.c trunk/reactos/dll/win32/wldap32/value.c trunk/reactos/dll/win32/wldap32/winldap_private.h trunk/reactos/dll/win32/wldap32/wldap32.rc Modified: trunk/reactos/dll/win32/wldap32/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/add.c?re… ============================================================================== --- trunk/reactos/dll/win32/wldap32/add.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/add.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - -//#include "wine/port.h" -#include <wine/debug.h> - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" - -#ifdef HAVE_LDAP_H -#include <ldap.h> -#endif - #include "winldap_private.h" -//#include "wldap32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); #ifdef HAVE_LDAP static LDAPMod *nullattrs[] = { NULL }; Modified: trunk/reactos/dll/win32/wldap32/ber.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/ber.c?re… ============================================================================== --- trunk/reactos/dll/win32/wldap32/ber.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/ber.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -21,11 +21,12 @@ #include <config.h> #include <stdarg.h> + #include <windef.h> #include <winbase.h> -#include "winldap.h" +#include <winldap.h> + #include <wine/debug.h> - WINE_DEFAULT_DEBUG_CHANNEL(wldap32); #ifndef LBER_ERROR Modified: trunk/reactos/dll/win32/wldap32/bind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/bind.c?r… ============================================================================== --- trunk/reactos/dll/win32/wldap32/bind.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/bind.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - -//#include "wine/port.h" -#include <wine/debug.h> - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" - -#ifdef HAVE_LDAP_H -#include <ldap.h> -#endif - #include "winldap_private.h" -//#include "wldap32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** * ldap_bindA (WLDAP32.@) Modified: trunk/reactos/dll/win32/wldap32/compare.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/compare.… ============================================================================== --- trunk/reactos/dll/win32/wldap32/compare.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/compare.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - -//#include "wine/port.h" -#include <wine/debug.h> - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" - -#ifdef HAVE_LDAP_H -#include <ldap.h> -#endif - #include "winldap_private.h" -//#include "wldap32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** * ldap_compareA (WLDAP32.@) Modified: trunk/reactos/dll/win32/wldap32/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/control.… ============================================================================== --- trunk/reactos/dll/win32/wldap32/control.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/control.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - -//#include "wine/port.h" -#include <wine/debug.h> - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" - -#ifdef HAVE_LDAP_H -#include <ldap.h> -#endif - #include "winldap_private.h" -//#include "wldap32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** * ldap_control_freeA (WLDAP32.@) Modified: trunk/reactos/dll/win32/wldap32/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/delete.c… ============================================================================== --- trunk/reactos/dll/win32/wldap32/delete.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/delete.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - -//#include "wine/port.h" -#include <wine/debug.h> - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" - -#ifdef HAVE_LDAP_H -#include <ldap.h> -#endif - #include "winldap_private.h" -//#include "wldap32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** * ldap_deleteA (WLDAP32.@) Modified: trunk/reactos/dll/win32/wldap32/dn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/dn.c?rev… ============================================================================== --- trunk/reactos/dll/win32/wldap32/dn.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/dn.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - -//#include "wine/port.h" -#include <wine/debug.h> - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" - -#ifdef HAVE_LDAP_H -#include <ldap.h> -#endif - #include "winldap_private.h" -//#include "wldap32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** * ldap_dn2ufnA (WLDAP32.@) Modified: trunk/reactos/dll/win32/wldap32/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/error.c?… ============================================================================== --- trunk/reactos/dll/win32/wldap32/error.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/error.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,28 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - -//#include "wine/port.h" -#include <wine/debug.h> - -//#include <stdarg.h> - -//#include "windef.h" -#include <winbase.h> +#include "winldap_private.h" + #include <winuser.h> -//#include "winnls.h" - -#ifdef HAVE_LDAP_H -#include <ldap.h> -#endif - -#include "winldap_private.h" -//#include "wldap32.h" extern HINSTANCE hwldap32; - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); ULONG map_error( int error ) { Modified: trunk/reactos/dll/win32/wldap32/extended.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/extended… ============================================================================== --- trunk/reactos/dll/win32/wldap32/extended.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/extended.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - -//#include "wine/port.h" -#include <wine/debug.h> - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" - -#ifdef HAVE_LDAP_H -#include <ldap.h> -#endif - #include "winldap_private.h" -//#include "wldap32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** * ldap_close_extended_op (WLDAP32.@) Modified: trunk/reactos/dll/win32/wldap32/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/init.c?r… ============================================================================== --- trunk/reactos/dll/win32/wldap32/init.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/init.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,22 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include "wine/port.h" - -//#include <stdio.h> -//#include <stdarg.h> -#ifdef HAVE_LDAP_H -#include <ldap.h> -#endif - -#include <windef.h> -//#include "winbase.h" -//#include "winnls.h" - #include "winldap_private.h" -//#include "wldap32.h" -#include <wine/debug.h> #ifdef HAVE_LDAP /* Should eventually be determined by the algorithm documented on MSDN. */ @@ -205,8 +190,6 @@ } #endif -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); - /*********************************************************************** * cldap_openA (WLDAP32.@) * Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Da.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -17,8 +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 "windef.h" LANGUAGE LANG_DANISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_De.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -17,8 +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 "windef.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_En.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -17,8 +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 "windef.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Es.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -17,8 +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 "windef.h" LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Fr.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,8 +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 "windef.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_He.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -19,8 +19,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 "windef.h" LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Hu.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -17,8 +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 "windef.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_It.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -17,8 +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 "windef.h" /*UTF-8*/ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Ko.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -17,8 +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 "windef.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Lt.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -17,8 +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 "windef.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Nl.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -17,8 +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 "windef.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_No.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -17,8 +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 "windef.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Pl.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,8 +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 "windef.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Pt.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,8 +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 "windef.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Ro.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -17,8 +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 "windef.h" LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Ru.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -17,8 +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 "windef.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Sv.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -17,8 +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 "windef.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -17,8 +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 "windef.h" LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… ============================================================================== --- trunk/reactos/dll/win32/wldap32/lang/wldap32_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/lang/wldap32_Uk.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -19,8 +19,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 "windef.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/wldap32/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/wldap32/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/main.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,17 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - -#include <wine/debug.h> -//#include <stdarg.h> - -//#include "windef.h" -#include <winbase.h> +#include "winldap_private.h" HINSTANCE hwldap32; - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { Modified: trunk/reactos/dll/win32/wldap32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/misc.c?r… ============================================================================== --- trunk/reactos/dll/win32/wldap32/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/misc.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,26 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - -//#include "wine/port.h" -#include <wine/debug.h> - -//#include <stdarg.h> +#include "winldap_private.h" + #include <stdio.h> - -//#include "windef.h" -#include <winbase.h> -#include <winnls.h> - -#ifdef HAVE_LDAP_H -#include <ldap.h> -#endif - -#include "winldap_private.h" -#include "wldap32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** * ldap_abandon (WLDAP32.@) Modified: trunk/reactos/dll/win32/wldap32/modify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/modify.c… ============================================================================== --- trunk/reactos/dll/win32/wldap32/modify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/modify.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - -//#include "wine/port.h" -#include <wine/debug.h> - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" - -#ifdef HAVE_LDAP_H -#include <ldap.h> -#endif - #include "winldap_private.h" -//#include "wldap32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); #ifdef HAVE_LDAP static LDAPMod *nullmods[] = { NULL }; Modified: trunk/reactos/dll/win32/wldap32/modrdn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/modrdn.c… ============================================================================== --- trunk/reactos/dll/win32/wldap32/modrdn.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/modrdn.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - -//#include "wine/port.h" -#include <wine/debug.h> - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" - -#ifdef HAVE_LDAP_H -#include <ldap.h> -#endif - #include "winldap_private.h" -//#include "wldap32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** * ldap_modrdnA (WLDAP32.@) Modified: trunk/reactos/dll/win32/wldap32/option.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/option.c… ============================================================================== --- trunk/reactos/dll/win32/wldap32/option.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/option.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - -//#include "wine/port.h" -#include <wine/debug.h> - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" - -#ifdef HAVE_LDAP_H -#include <ldap.h> -#endif - #include "winldap_private.h" -//#include "wldap32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** * ldap_get_optionA (WLDAP32.@) Modified: trunk/reactos/dll/win32/wldap32/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/page.c?r… ============================================================================== --- trunk/reactos/dll/win32/wldap32/page.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/page.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,29 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - -//#include "wine/port.h" -#include <wine/debug.h> - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" - -#ifdef HAVE_LDAP_H -#include <ldap.h> -#endif - #include "winldap_private.h" -//#include "wldap32.h" #ifndef LDAP_MAXINT #define LDAP_MAXINT 2147483647 #endif - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** * ldap_create_page_controlA (WLDAP32.@) Modified: trunk/reactos/dll/win32/wldap32/parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/parse.c?… ============================================================================== --- trunk/reactos/dll/win32/wldap32/parse.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/parse.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - -//#include "wine/port.h" -#include <wine/debug.h> - -//#include <stdarg.h> - -//#include "windef.h" -#include <winbase.h> -#include <winnls.h> - -#ifdef HAVE_LDAP_H -#include <ldap.h> -#endif - #include "winldap_private.h" -#include "wldap32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** * ldap_parse_extended_resultA (WLDAP32.@) Modified: trunk/reactos/dll/win32/wldap32/rename.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/rename.c… ============================================================================== --- trunk/reactos/dll/win32/wldap32/rename.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/rename.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - -//#include "wine/port.h" -#include <wine/debug.h> - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" - -#ifdef HAVE_LDAP_H -#include <ldap.h> -#endif - #include "winldap_private.h" -//#include "wldap32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** * ldap_rename_extA (WLDAP32.@) Modified: trunk/reactos/dll/win32/wldap32/search.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/search.c… ============================================================================== --- trunk/reactos/dll/win32/wldap32/search.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/search.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - -//#include "wine/port.h" -#include <wine/debug.h> - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" - -#ifdef HAVE_LDAP_H -#include <ldap.h> -#endif - #include "winldap_private.h" -//#include "wldap32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** * ldap_searchA (WLDAP32.@) Modified: trunk/reactos/dll/win32/wldap32/value.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/value.c?… ============================================================================== --- trunk/reactos/dll/win32/wldap32/value.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/value.c [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> - -//#include "wine/port.h" -#include <wine/debug.h> - -//#include <stdarg.h> - -//#include "windef.h" -#include <winbase.h> -#include <winnls.h> - -#ifdef HAVE_LDAP_H -#include <ldap.h> -#endif - #include "winldap_private.h" -#include "wldap32.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wldap32); /*********************************************************************** * ldap_count_values_len (WLDAP32.@) Modified: trunk/reactos/dll/win32/wldap32/winldap_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/winldap_… ============================================================================== --- trunk/reactos/dll/win32/wldap32/winldap_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/winldap_private.h [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -21,6 +21,27 @@ * functions are prefixed with WLDAP32_ whenever they conflict with * native headers. */ + +#include <config.h> + +#include <stdarg.h> + +#ifdef HAVE_LDAP_H +#include <ldap.h> +#endif + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <winnls.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(wldap32); + +#include "wldap32.h" typedef enum { WLDAP32_LDAP_SUCCESS = 0x00, Modified: trunk/reactos/dll/win32/wldap32/wldap32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32.… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32.rc [iso-8859-1] Wed Jan 1 22:14:20 2014 @@ -18,9 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" +#include <windef.h> #ifdef LANGUAGE_DA_DK #include "lang/wldap32_Da.rc"

10 years, 11 months

[akhaldi] 61481: [WINTRUST] * 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 22:11:43 2014 New Revision: 61481 URL: http://svn.reactos.org/svn/reactos?rev=61481&view=rev Log: [WINTRUST] * 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/wintrust/asn.c trunk/reactos/dll/win32/wintrust/crypt.c trunk/reactos/dll/win32/wintrust/register.c trunk/reactos/dll/win32/wintrust/softpub.c trunk/reactos/dll/win32/wintrust/wintrust_main.c trunk/reactos/dll/win32/wintrust/wintrust_priv.h Modified: trunk/reactos/dll/win32/wintrust/asn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/asn.c?r… ============================================================================== --- trunk/reactos/dll/win32/wintrust/asn.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/asn.c [iso-8859-1] Wed Jan 1 22:11:43 2014 @@ -18,21 +18,10 @@ * */ -#include <config.h> -//#include "wine/port.h" - -//#include <stdarg.h> -#include <stdio.h> +#include "wintrust_priv.h" + #include <assert.h> -#define NONAMELESSUNION -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" -//#include "wincrypt.h" -#include <wintrust.h> #include <snmp.h> -#include <winternl.h> -#include <wine/debug.h> #include <wine/exception.h> WINE_DEFAULT_DEBUG_CHANNEL(cryptasn); Modified: trunk/reactos/dll/win32/wintrust/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/crypt.c… ============================================================================== --- trunk/reactos/dll/win32/wintrust/crypt.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/crypt.c [iso-8859-1] Wed Jan 1 22:11:43 2014 @@ -22,18 +22,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdarg.h> -#include <stdio.h> -#include <windef.h> -#include <winbase.h> -#include <wintrust.h> -#include <mscat.h> -//#include "mssip.h" +#include "wintrust_priv.h" + #include <imagehlp.h> -#include <winternl.h> - -#include <wine/debug.h> -#include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(wintrust); Modified: trunk/reactos/dll/win32/wintrust/register.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/registe… ============================================================================== --- trunk/reactos/dll/win32/wintrust/register.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/register.c [iso-8859-1] Wed Jan 1 22:11:43 2014 @@ -18,22 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" -#include <winuser.h> -#include <winreg.h> -#include <winnls.h> -//#include "objbase.h" - -//#include "guiddef.h" -//#include "wintrust.h" -#include <softpub.h> -#include <mssip.h> #include "wintrust_priv.h" -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(wintrust); Modified: trunk/reactos/dll/win32/wintrust/softpub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/softpub… ============================================================================== --- trunk/reactos/dll/win32/wintrust/softpub.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/softpub.c [iso-8859-1] Wed Jan 1 22:11:43 2014 @@ -15,17 +15,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 */ -#include <stdarg.h> - -#define NONAMELESSUNION - -#include <windef.h> -#include <winbase.h> -#include <wintrust.h> -#include <mssip.h> -#include <softpub.h> -#include <winnls.h> -#include <wine/debug.h> + +#include "wintrust_priv.h" WINE_DEFAULT_DEBUG_CHANNEL(wintrust); Modified: trunk/reactos/dll/win32/wintrust/wintrust_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… ============================================================================== --- trunk/reactos/dll/win32/wintrust/wintrust_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/wintrust_main.c [iso-8859-1] Wed Jan 1 22:11:43 2014 @@ -17,30 +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 <config.h> - -#include <stdarg.h> - -#define NONAMELESSUNION - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" -#include <winreg.h> -//#include "guiddef.h" -//#include "wintrust.h" -#include <softpub.h> -#include <mscat.h> -#include <objbase.h> -#include <winuser.h> +#include "wintrust_priv.h" + #include <cryptdlg.h> #include <cryptuiapi.h> -//#include "wintrust_priv.h" -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(wintrust); Modified: trunk/reactos/dll/win32/wintrust/wintrust_priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… ============================================================================== --- trunk/reactos/dll/win32/wintrust/wintrust_priv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/wintrust_priv.h [iso-8859-1] Wed Jan 1 22:11:43 2014 @@ -18,6 +18,29 @@ #ifndef __WINTRUST_PRIV_H__ #define __WINTRUST_PRIV_H__ +#include <config.h> + +#include <stdarg.h> +#include <stdio.h> + +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define NONAMELESSUNION + +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <winreg.h> +#include <winternl.h> +#include <wintrust.h> +#include <softpub.h> +#include <mscat.h> +#include <mssip.h> + +#include <wine/debug.h> +#include <wine/unicode.h> + void * WINAPI WINTRUST_Alloc(DWORD cb) __WINE_ALLOC_SIZE(1) DECLSPEC_HIDDEN; void WINAPI WINTRUST_Free(void *p) DECLSPEC_HIDDEN; BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store) DECLSPEC_HIDDEN;

10 years, 11 months

[akhaldi] 61480: [WINMM] * 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 21:54:58 2014 New Revision: 61480 URL: http://svn.reactos.org/svn/reactos?rev=61480&view=rev Log: [WINMM] * 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/winmm/driver.c trunk/reactos/dll/win32/winmm/joystick.c trunk/reactos/dll/win32/winmm/lolvldrv.c trunk/reactos/dll/win32/winmm/mci.c trunk/reactos/dll/win32/winmm/mmio.c trunk/reactos/dll/win32/winmm/playsound.c trunk/reactos/dll/win32/winmm/registry.c trunk/reactos/dll/win32/winmm/time.c trunk/reactos/dll/win32/winmm/winemm.h trunk/reactos/dll/win32/winmm/winmm.c trunk/reactos/dll/win32/winmm/winmm_res.rc Modified: trunk/reactos/dll/win32/winmm/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/driver.c?r… ============================================================================== --- trunk/reactos/dll/win32/winmm/driver.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/driver.c [iso-8859-1] Wed Jan 1 21:54:58 2014 @@ -20,23 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include "wine/port.h" - -//#include <string.h> -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -//#include "wingdi.h" -#include <winuser.h> -//#include "winnls.h" -#include <winreg.h> -//#include "mmddk.h" #include "winemm.h" -#include <wine/debug.h> -#include <wine/unicode.h> -//#include "excpt.h" -#include <wine/exception.h> WINE_DEFAULT_DEBUG_CHANNEL(driver); Modified: trunk/reactos/dll/win32/winmm/joystick.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/joystick.c… ============================================================================== --- trunk/reactos/dll/win32/winmm/joystick.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/joystick.c [iso-8859-1] Wed Jan 1 21:54:58 2014 @@ -21,31 +21,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> +#include "winemm.h" #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -//#include <stdarg.h> -//#include <stdio.h> + #include <stdlib.h> -//#include <string.h> -//#include <fcntl.h> + #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif - -#include "winemm.h" -//#include "windef.h" -//#include "winbase.h" -//#include "mmsystem.h" -//#include "wingdi.h" -#include <winuser.h> -#include <winnls.h> - -//#include "mmddk.h" - -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(winmm); Modified: trunk/reactos/dll/win32/winmm/lolvldrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/lolvldrv.c… ============================================================================== --- trunk/reactos/dll/win32/winmm/lolvldrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/lolvldrv.c [iso-8859-1] Wed Jan 1 21:54:58 2014 @@ -21,19 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include "wine/port.h" - -//#include <string.h> -//#include <stdarg.h> -//#include <stdio.h> -#include <assert.h> -//#include "windef.h" -//#include "winbase.h" -//#include "winreg.h" #include "winemm.h" -#include <wine/debug.h> -#include <wine/exception.h> WINE_DEFAULT_DEBUG_CHANNEL(winmm); Modified: trunk/reactos/dll/win32/winmm/mci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/mci.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/winmm/mci.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/mci.c [iso-8859-1] Wed Jan 1 21:54:58 2014 @@ -42,28 +42,11 @@ * - size of string in WCHAR or bytes? (#chars for MCI_INFO, #bytes for MCI_SYSINFO) */ -#include <config.h> -//#include "wine/port.h" - -//#include <stdlib.h> -//#include <stdarg.h> -#include <stdio.h> -//#include <string.h> - -#include <windef.h> -//#include "winbase.h" -//#include "wingdi.h" +#include "winemm.h" + #include <mmsystem.h> -#include <winuser.h> -//#include "winnls.h" -#include <winreg.h> #include <wownt32.h> - #include <digitalv.h> -#include "winemm.h" - -#include <wine/debug.h> -#include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(mci); Modified: trunk/reactos/dll/win32/winmm/mmio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/mmio.c?rev… ============================================================================== --- trunk/reactos/dll/win32/winmm/mmio.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/mmio.c [iso-8859-1] Wed Jan 1 21:54:58 2014 @@ -27,21 +27,7 @@ * + 32 A <=> W message mapping */ - -//#include <ctype.h> -#include <stdarg.h> -//#include <stdlib.h> -//#include <string.h> -//#include <errno.h> -#include <assert.h> - -#include <windef.h> -#include <winbase.h> -#include <winnls.h> -//#include "mmsystem.h" #include "winemm.h" - -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(mmio); Modified: trunk/reactos/dll/win32/winmm/playsound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/playsound.… ============================================================================== --- trunk/reactos/dll/win32/winmm/playsound.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/playsound.c [iso-8859-1] Wed Jan 1 21:54:58 2014 @@ -21,19 +21,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdarg.h> -//#include <string.h> - -#include <windef.h> -//#include "winbase.h" -//#include "mmsystem.h" -//#include "wingdi.h" -//#include "winuser.h" -#include <winreg.h> #include "winemm.h" + #include <winternl.h> - -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(winmm); Modified: trunk/reactos/dll/win32/winmm/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/registry.c… ============================================================================== --- trunk/reactos/dll/win32/winmm/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/registry.c [iso-8859-1] Wed Jan 1 21:54:58 2014 @@ -16,10 +16,7 @@ TODO: Handle system.ini */ -#include <windef.h> -#include <winreg.h> #include "winemm.h" -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(winmm); Modified: trunk/reactos/dll/win32/winmm/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/time.c?rev… ============================================================================== --- trunk/reactos/dll/win32/winmm/time.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/time.c [iso-8859-1] Wed Jan 1 21:54:58 2014 @@ -20,25 +20,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <config.h> -//#include "wine/port.h" - -//#include <stdarg.h> -//#include <time.h> +#include "winemm.h" + #ifdef HAVE_SYS_TIME_H # include <sys/time.h> #endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif - -//#include "windef.h" -//#include "winbase.h" -//#include "mmsystem.h" - -#include "winemm.h" - -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(mmtime); Modified: trunk/reactos/dll/win32/winmm/winemm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winemm.h?r… ============================================================================== --- trunk/reactos/dll/win32/winmm/winemm.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/winemm.h [iso-8859-1] Wed Jan 1 21:54:58 2014 @@ -19,11 +19,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <config.h> + +#include <assert.h> #include <stdarg.h> +#include <stdio.h> + +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #include <windef.h> -//#include "winbase.h" +#include <winbase.h> +#include <winuser.h> +#include <winreg.h> #include <mmddk.h> + +#include <wine/debug.h> +#include <wine/exception.h> +#include <wine/unicode.h> #define WINE_DEFAULT_WINMM_DRIVER "alsa,oss,coreaudio,esd" #define WINE_DEFAULT_WINMM_MAPPER "msacm32.drv" Modified: trunk/reactos/dll/win32/winmm/winmm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm.c?re… ============================================================================== --- trunk/reactos/dll/win32/winmm/winmm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/winmm.c [iso-8859-1] Wed Jan 1 21:54:58 2014 @@ -39,21 +39,7 @@ * midi, mixer and aux */ -#include <stdio.h> -//#include <stdarg.h> -//#include <string.h> - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include <windef.h> -#include <winbase.h> -//#include "mmsystem.h" -#include <winuser.h> -#include <winnls.h> -//#include "winternl.h" #include "winemm.h" - -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(winmm); Modified: trunk/reactos/dll/win32/winmm/winmm_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm_res.… ============================================================================== --- trunk/reactos/dll/win32/winmm/winmm_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/winmm_res.rc [iso-8859-1] Wed Jan 1 21:54:58 2014 @@ -22,10 +22,8 @@ * MMSYSTEM...) */ -#include "windef.h" -#include "winbase.h" -#include "mmddk.h" -#include "winnls.h" +#include <windef.h> +#include <mmddk.h> /* Add your language specific defines here */ #ifdef LANGUAGE_PT_BR

10 years, 11 months

[akhaldi] 61479: [WININET] * 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...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jan 1 21:52:15 2014 New Revision: 61479 URL: http://svn.reactos.org/svn/reactos?rev=61479&view=rev Log: [WININET] * 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/resource file. CORE-7716 Modified: trunk/reactos/dll/win32/wininet/cookie.c trunk/reactos/dll/win32/wininet/dialogs.c trunk/reactos/dll/win32/wininet/ftp.c trunk/reactos/dll/win32/wininet/gopher.c trunk/reactos/dll/win32/wininet/http.c trunk/reactos/dll/win32/wininet/internet.c trunk/reactos/dll/win32/wininet/internet.h trunk/reactos/dll/win32/wininet/lang/wininet_Bg.rc trunk/reactos/dll/win32/wininet/lang/wininet_Cs.rc trunk/reactos/dll/win32/wininet/lang/wininet_Da.rc trunk/reactos/dll/win32/wininet/lang/wininet_De.rc trunk/reactos/dll/win32/wininet/lang/wininet_En.rc trunk/reactos/dll/win32/wininet/lang/wininet_Eo.rc trunk/reactos/dll/win32/wininet/lang/wininet_Es.rc trunk/reactos/dll/win32/wininet/lang/wininet_Fi.rc trunk/reactos/dll/win32/wininet/lang/wininet_Fr.rc trunk/reactos/dll/win32/wininet/lang/wininet_He.rc trunk/reactos/dll/win32/wininet/lang/wininet_Hu.rc trunk/reactos/dll/win32/wininet/lang/wininet_It.rc trunk/reactos/dll/win32/wininet/lang/wininet_Ja.rc trunk/reactos/dll/win32/wininet/lang/wininet_Ko.rc trunk/reactos/dll/win32/wininet/lang/wininet_Lt.rc trunk/reactos/dll/win32/wininet/lang/wininet_Nl.rc trunk/reactos/dll/win32/wininet/lang/wininet_No.rc trunk/reactos/dll/win32/wininet/lang/wininet_Pl.rc trunk/reactos/dll/win32/wininet/lang/wininet_Pt.rc trunk/reactos/dll/win32/wininet/lang/wininet_Ro.rc trunk/reactos/dll/win32/wininet/lang/wininet_Ru.rc trunk/reactos/dll/win32/wininet/lang/wininet_Si.rc trunk/reactos/dll/win32/wininet/lang/wininet_Sr.rc trunk/reactos/dll/win32/wininet/lang/wininet_Sv.rc trunk/reactos/dll/win32/wininet/lang/wininet_Tr.rc trunk/reactos/dll/win32/wininet/lang/wininet_Uk.rc trunk/reactos/dll/win32/wininet/lang/wininet_Zh.rc trunk/reactos/dll/win32/wininet/netconnection.c trunk/reactos/dll/win32/wininet/resource.h trunk/reactos/dll/win32/wininet/rsrc.rc trunk/reactos/dll/win32/wininet/urlcache.c trunk/reactos/dll/win32/wininet/utility.c trunk/reactos/dll/win32/wininet/wininet_main.c Modified: trunk/reactos/dll/win32/wininet/cookie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/cookie.c… ============================================================================== --- trunk/reactos/dll/win32/wininet/cookie.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/cookie.c [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -20,38 +20,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 - -#include <config.h> -//#include "wine/port.h" - -#include <stdarg.h> -#include <stdio.h> -//#include <stdlib.h> -//#include <string.h> -#include <assert.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif - -#include <windef.h> -#include <winbase.h> -#include <wininet.h> -//#include "winerror.h" - -#if defined(__MINGW32__) || defined (_MSC_VER) -#include <ws2tcpip.h> -#endif - -#include <wine/debug.h> #include "internet.h" #define RESPONSE_TIMEOUT 30 /* FROM internet.c */ - - -WINE_DEFAULT_DEBUG_CHANNEL(wininet); /* FIXME * Cookies could use A LOT OF MEMORY. We need some kind of memory management here! Modified: trunk/reactos/dll/win32/wininet/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/dialogs.… ============================================================================== --- trunk/reactos/dll/win32/wininet/dialogs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/dialogs.c [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -18,41 +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 - -#include <config.h> -//#include "wine/port.h" - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -//#include "winreg.h" -#include <wininet.h> +#include "internet.h" + #include <winnetwk.h> -#include <wine/debug.h> -//#include "winerror.h" -#define NO_SHLWAPI_STREAM -//#include "shlwapi.h" - -#if defined(__MINGW32__) || defined (_MSC_VER) -#include <ws2tcpip.h> -#endif - #include <cryptuiapi.h> -#include "internet.h" - -//#include "wine/unicode.h" - -#include "resource.h" - #define MAX_STRING_LEN 1024 - -WINE_DEFAULT_DEBUG_CHANNEL(wininet); struct WININET_ErrorDlgParams { Modified: trunk/reactos/dll/win32/wininet/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/ftp.c?re… ============================================================================== --- trunk/reactos/dll/win32/wininet/ftp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/ftp.c [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -27,53 +27,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 "wine/port.h" - -//#include <errno.h> -//#include <stdarg.h> -#include <stdio.h> -//#include <stdlib.h> -//#include <string.h> -//#include <sys/types.h> -#ifdef HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif -#ifdef HAVE_ARPA_INET_H -# include <arpa/inet.h> -#endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -#ifdef HAVE_SYS_IOCTL_H -# include <sys/ioctl.h> -#endif -//#include <time.h> -#include <assert.h> - -#include <windef.h> -#include <winbase.h> -//#include "wingdi.h" -//#include "winuser.h" -#include <wininet.h> -//#include "winnls.h" -//#include "winerror.h" -#include <winreg.h> -//#include "winternl.h" -#include <shlwapi.h> - -#if defined(__MINGW32__) || defined (_MSC_VER) -#include <ws2tcpip.h> -#endif - -#include <wine/debug.h> #include "internet.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wininet); typedef struct _ftp_session_t ftp_session_t; Modified: trunk/reactos/dll/win32/wininet/gopher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/gopher.c… ============================================================================== --- trunk/reactos/dll/win32/wininet/gopher.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/gopher.c [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -18,17 +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 <wininet.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wininet); +#include "internet.h" /*********************************************************************** * GopherCreateLocatorA (WININET.@) Modified: trunk/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/http.c?r… ============================================================================== --- trunk/reactos/dll/win32/wininet/http.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/http.c [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -27,59 +27,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> -//#include "wine/port.h" - -//#include <sys/types.h> -#ifdef HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif -#ifdef HAVE_ARPA_INET_H -# include <arpa/inet.h> -#endif -//#include <stdarg.h> -#include <stdio.h> -//#include <stdlib.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -//#include <time.h> -#include <assert.h> +#include "internet.h" + #ifdef HAVE_ZLIB # include <zlib.h> #endif -#include <windef.h> -#include <winbase.h> -#include <wininet.h> -//#include "winerror.h" #include <winternl.h> -#define NO_SHLWAPI_STREAM -#define NO_SHLWAPI_REG -#define NO_SHLWAPI_STRFCNS -#define NO_SHLWAPI_GDI -#include <shlwapi.h> -#include <sspi.h> -//#include "wincrypt.h" -#include <winuser.h> -#include <cryptuiapi.h> - -#if defined(__MINGW32__) || defined (_MSC_VER) -#include <ws2tcpip.h> -#endif - -#include "internet.h" -#include <wine/debug.h> + #include <wine/exception.h> -//#include "wine/unicode.h" // ReactOS #include "inet_ntop.c" - -WINE_DEFAULT_DEBUG_CHANNEL(wininet); static const WCHAR g_szHttp1_0[] = {'H','T','T','P','/','1','.','0',0}; static const WCHAR g_szHttp1_1[] = {'H','T','T','P','/','1','.','1',0}; Modified: trunk/reactos/dll/win32/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… ============================================================================== --- trunk/reactos/dll/win32/wininet/internet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/internet.c [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -26,60 +26,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 "wine/port.h" - -//#include <string.h> -//#include <stdarg.h> -#include <stdio.h> -//#include <sys/types.h> -#ifdef HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif -#ifdef HAVE_POLL_H -#include <poll.h> -#endif -#ifdef HAVE_SYS_POLL_H -# include <sys/poll.h> -#endif -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif -//#include <stdlib.h> -//#include <ctype.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -//#include <assert.h> - -#include <windef.h> -#include <winbase.h> -#include <winreg.h> -#include <winuser.h> -#include <wininet.h> -//#include "winineti.h" -//#include "winnls.h" -#include <wine/debug.h> -//#include "winerror.h" -#define NO_SHLWAPI_STREAM -#include <shlwapi.h> - -#if defined(__MINGW32__) || defined (_MSC_VER) -#include <ws2tcpip.h> -#endif - -//#include "wine/exception.h" - #include "internet.h" -#include "resource.h" - -//#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wininet); #define RESPONSE_TIMEOUT 30 Modified: trunk/reactos/dll/win32/wininet/internet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… ============================================================================== --- trunk/reactos/dll/win32/wininet/internet.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/internet.h [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -23,14 +23,36 @@ #ifndef _WINE_INTERNET_H_ #define _WINE_INTERNET_H_ -#ifndef __WINE_CONFIG_H -# error You must include config.h to use this header -#endif - -#include "wine/unicode.h" -#include "wine/list.h" +#include <wine/config.h> + +#include <assert.h> +#include <stdarg.h> +#include <stdio.h> + +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <winuser.h> +#include <wininet.h> +#define NO_SHLWAPI_STREAM +#define NO_SHLWAPI_REG +#define NO_SHLWAPI_GDI +#include <shlwapi.h> + +#include <wine/unicode.h> +#include <wine/list.h> #include <time.h> + +#ifdef HAVE_ARPA_INET_H +# include <arpa/inet.h> +#endif #ifdef HAVE_NETDB_H # include <netdb.h> #endif @@ -38,16 +60,35 @@ # include <sys/types.h> # include <netinet/in.h> #endif +#ifdef HAVE_SYS_IOCTL_H +# include <sys/ioctl.h> +#endif +#ifdef HAVE_SYS_POLL_H +# include <sys/poll.h> +#endif #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif - -#if !defined(__MINGW32__) && !defined(_MSC_VER) +#ifdef HAVE_SYS_TIME_H +# include <sys/time.h> +#endif +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif + +#if defined(__MINGW32__) || defined (_MSC_VER) +#include <ws2tcpip.h> +#else #define closesocket close #define ioctlsocket ioctl #endif /* __MINGW32__ */ #include <winineti.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(wininet); + +#include "resource.h" extern HMODULE WININET_hModule DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… ============================================================================== --- trunk/reactos/dll/win32/wininet/lang/wininet_Bg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/lang/wininet_Bg.rc [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -15,8 +15,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 "resource.h" LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… ============================================================================== --- trunk/reactos/dll/win32/wininet/lang/wininet_Cs.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/lang/wininet_Cs.rc [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -18,8 +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 "resource.h" LANGUAGE LANG_CZECH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… ============================================================================== --- trunk/reactos/dll/win32/wininet/lang/wininet_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/lang/wininet_Da.rc [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -16,8 +16,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 "resource.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/wininet/lang/wininet_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… ============================================================================== --- trunk/reactos/dll/win32/wininet/lang/wininet_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/lang/wininet_De.rc [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -16,8 +16,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 "resource.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/wininet/lang/wininet_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… ============================================================================== --- trunk/reactos/dll/win32/wininet/lang/wininet_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/lang/wininet_En.rc [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -15,8 +15,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 "resource.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… ============================================================================== --- trunk/reactos/dll/win32/wininet/lang/wininet_Eo.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/lang/wininet_Eo.rc [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -17,8 +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 "resource.h" LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… ============================================================================== --- trunk/reactos/dll/win32/wininet/lang/wininet_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/lang/wininet_Es.rc [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -15,8 +15,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 "resource.h" LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… ============================================================================== --- trunk/reactos/dll/win32/wininet/lang/wininet_Fi.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/lang/wininet_Fi.rc [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -15,8 +15,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 "resource.h" LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… ============================================================================== --- trunk/reactos/dll/win32/wininet/lang/wininet_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/lang/wininet_Fr.rc [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -21,8 +21,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 "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/wininet/lang/wininet_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… ============================================================================== --- trunk/reactos/dll/win32/wininet/lang/wininet_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/lang/wininet_He.rc [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -16,8 +16,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 "resource.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… ============================================================================== --- trunk/reactos/dll/win32/wininet/lang/wininet_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/lang/wininet_Hu.rc [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -15,8 +15,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 "resource.h" LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/wininet/lang/wininet_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… ============================================================================== --- trunk/reactos/dll/win32/wininet/lang/wininet_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/lang/wininet_It.rc [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -18,8 +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 "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… ============================================================================== --- trunk/reactos/dll/win32/wininet/lang/wininet_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/lang/wininet_Ja.rc [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -15,8 +15,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 "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… ============================================================================== --- trunk/reactos/dll/win32/wininet/lang/wininet_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/lang/wininet_Ko.rc [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -16,8 +16,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 "resource.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… ============================================================================== --- trunk/reactos/dll/win32/wininet/lang/wininet_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/lang/wininet_Lt.rc [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -15,8 +15,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 "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… ============================================================================== --- trunk/reactos/dll/win32/wininet/lang/wininet_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/lang/wininet_Nl.rc [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -17,8 +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 "resource.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/wininet/lang/wininet_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… ============================================================================== --- trunk/reactos/dll/win32/wininet/lang/wininet_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/lang/wininet_No.rc [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -15,8 +15,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 "resource.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… ============================================================================== --- trunk/reactos/dll/win32/wininet/lang/wininet_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/lang/wininet_Pl.rc [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -17,8 +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 "resource.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… ============================================================================== --- trunk/reactos/dll/win32/wininet/lang/wininet_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/lang/wininet_Pt.rc [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -18,8 +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 "resource.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… ============================================================================== --- trunk/reactos/dll/win32/wininet/lang/wininet_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/lang/wininet_Ro.rc [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -16,8 +16,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 "resource.h" LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… ============================================================================== --- trunk/reactos/dll/win32/wininet/lang/wininet_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/lang/wininet_Ru.rc [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -17,8 +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 "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… ============================================================================== --- trunk/reactos/dll/win32/wininet/lang/wininet_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/lang/wininet_Si.rc [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -15,8 +15,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 "resource.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… ============================================================================== --- trunk/reactos/dll/win32/wininet/lang/wininet_Sr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/lang/wininet_Sr.rc [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -16,8 +16,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 "resource.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… ============================================================================== --- trunk/reactos/dll/win32/wininet/lang/wininet_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/lang/wininet_Sv.rc [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -15,8 +15,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 "resource.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… ============================================================================== --- trunk/reactos/dll/win32/wininet/lang/wininet_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/lang/wininet_Tr.rc [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -17,8 +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 "resource.h" LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… ============================================================================== --- trunk/reactos/dll/win32/wininet/lang/wininet_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/lang/wininet_Uk.rc [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -18,8 +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 "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… ============================================================================== --- trunk/reactos/dll/win32/wininet/lang/wininet_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/lang/wininet_Zh.rc [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -18,8 +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 "resource.h" /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/wininet/netconnection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/netconne… ============================================================================== --- trunk/reactos/dll/win32/wininet/netconnection.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/netconnection.c [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -21,78 +21,21 @@ * 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 "wine/port.h" - -#define NONAMELESSUNION +#include "internet.h" #include <sys/types.h> #ifdef HAVE_POLL_H #include <poll.h> #endif -#ifdef HAVE_SYS_POLL_H -# include <sys/poll.h> -#endif -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif -#ifdef HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif #ifdef HAVE_SYS_FILIO_H # include <sys/filio.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -#ifdef HAVE_SYS_IOCTL_H -# include <sys/ioctl.h> -#endif #include <time.h> -#ifdef HAVE_NETDB_H -# include <netdb.h> -#endif -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif #ifdef HAVE_NETINET_TCP_H # include <netinet/tcp.h> #endif -#include <stdarg.h> -//#include <stdlib.h> -//#include <string.h> -//#include <stdio.h> -//#include <errno.h> -#include <assert.h> - -//#include "wine/library.h" -#include <windef.h> -#include <winbase.h> -#include <wininet.h> -//#include "winerror.h" -//#include "wincrypt.h" - -#if defined(__MINGW32__) || defined (_MSC_VER) -#include <ws2tcpip.h> -#endif - -#include <wine/debug.h> -#include "internet.h" - -/* To avoid conflicts with the Unix socket headers. we only need it for - * the error codes anyway. */ -#define USE_WS_PREFIX -//#include "winsock2.h" - #define RESPONSE_TIMEOUT 30 /* FROM internet.c */ - - -WINE_DEFAULT_DEBUG_CHANNEL(wininet); /* FIXME!!!!!! * This should use winsock - To use winsock the functions will have to change a bit Modified: trunk/reactos/dll/win32/wininet/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/resource… ============================================================================== --- trunk/reactos/dll/win32/wininet/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/resource.h [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -18,8 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <windef.h> -//#include <winuser.h> +#pragma once #define IDD_INVCERTDLG 0x398 #define IDD_AUTHDLG 0x399 Modified: trunk/reactos/dll/win32/wininet/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/wininet/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/rsrc.rc [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -19,9 +19,7 @@ */ #include <windef.h> -//#include "winbase.h" #include <winuser.h> -//#include "winnls.h" #include "resource.h" Modified: trunk/reactos/dll/win32/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/urlcache… ============================================================================== --- trunk/reactos/dll/win32/wininet/urlcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/urlcache.c [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -22,47 +22,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 <config.h> -//#include "wine/port.h" - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <stdarg.h> -//#include <stdio.h> -//#include <stdlib.h> -//#include <string.h> -//#include <sys/types.h> -#ifdef HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif -//#include <time.h> - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <wininet.h> -#include <winineti.h> -//#include "winerror.h" -#include <winreg.h> -#include <shlwapi.h> +#include "internet.h" + #include <shlobj.h> #include <shellapi.h> - -#if defined(__MINGW32__) || defined (_MSC_VER) -#include <ws2tcpip.h> -#endif - -#include "internet.h" - -//#include "wine/unicode.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wininet); static const char urlcache_ver_prefix[] = "WINE URLCache Ver "; static const char urlcache_ver[] = "0.2012001"; Modified: trunk/reactos/dll/win32/wininet/utility.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/utility.… ============================================================================== --- trunk/reactos/dll/win32/wininet/utility.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/utility.c [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -22,31 +22,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 "wine/port.h" - -#include <stdarg.h> -//#include <stdlib.h> -//#include <string.h> -//#include <time.h> - -#include <windef.h> -#include <winbase.h> -#include <wininet.h> -//#include "winnls.h" - -#if defined(__MINGW32__) || defined (_MSC_VER) -#include <ws2tcpip.h> -#endif - -#include <wine/debug.h> #include "internet.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wininet); #ifndef HAVE_GETADDRINFO Modified: trunk/reactos/dll/win32/wininet/wininet_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/wininet_main.c [iso-8859-1] Wed Jan 1 21:52:15 2014 @@ -18,17 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -//#include "winreg.h" -//#include "shlwapi.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wininet); +#include "internet.h" /*********************************************************************** * DllInstall (WININET.@)

10 years, 11 months

[akhaldi] 61478: [WINHTTP] * 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...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jan 1 21:42:31 2014 New Revision: 61478 URL: http://svn.reactos.org/svn/reactos?rev=61478&view=rev Log: [WINHTTP] * 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. CORE-7716 Modified: trunk/reactos/dll/win32/winhttp/cookie.c trunk/reactos/dll/win32/winhttp/handle.c trunk/reactos/dll/win32/winhttp/main.c trunk/reactos/dll/win32/winhttp/net.c trunk/reactos/dll/win32/winhttp/request.c trunk/reactos/dll/win32/winhttp/session.c trunk/reactos/dll/win32/winhttp/url.c trunk/reactos/dll/win32/winhttp/winhttp_private.h Modified: trunk/reactos/dll/win32/winhttp/cookie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/cookie.c… ============================================================================== --- trunk/reactos/dll/win32/winhttp/cookie.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/cookie.c [iso-8859-1] Wed Jan 1 21:42:31 2014 @@ -16,23 +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 - -#include <config.h> -//#include <stdarg.h> - -#include <wine/debug.h> -//#include "wine/list.h" - -//#include "windef.h" -#include <winbase.h> -#include <winhttp.h> - #include "winhttp_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(winhttp); static domain_t *add_domain( session_t *session, WCHAR *name ) { Modified: trunk/reactos/dll/win32/winhttp/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/handle.c… ============================================================================== --- trunk/reactos/dll/win32/winhttp/handle.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/handle.c [iso-8859-1] Wed Jan 1 21:42:31 2014 @@ -18,23 +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 - -#include <config.h> -//#include "wine/port.h" -#include <wine/debug.h> - -//#include <stdarg.h> - -//#include "windef.h" -#include <winbase.h> -#include <winhttp.h> - #include "winhttp_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(winhttp); #define HANDLE_CHUNK_SIZE 0x10 Modified: trunk/reactos/dll/win32/winhttp/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/winhttp/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/main.c [iso-8859-1] Wed Jan 1 21:42:31 2014 @@ -16,27 +16,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 +#include "winhttp_private.h" -#define COBJMACROS -#include <config.h> -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> #include <rpcproxy.h> #include <httprequest.h> -#include <winhttp.h> - -#include <wine/debug.h> -#include "winhttp_private.h" static HINSTANCE instance; - -WINE_DEFAULT_DEBUG_CHANNEL(winhttp); /****************************************************************** * DllMain (winhttp.@) Modified: trunk/reactos/dll/win32/winhttp/net.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/net.c?re… ============================================================================== --- trunk/reactos/dll/win32/winhttp/net.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/net.c [iso-8859-1] Wed Jan 1 21:42:31 2014 @@ -17,19 +17,11 @@ * 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 <wine/port.h> - -//#include <stdarg.h> -//#include <stdio.h> -//#include <errno.h> +#include "winhttp_private.h" + #include <assert.h> - -//#include <sys/types.h> +#include <schannel.h> + #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif @@ -42,25 +34,6 @@ #ifdef HAVE_POLL_H # include <poll.h> #endif - -#define NONAMELESSUNION - -#include <wine/debug.h> -#include <wine/library.h> - -//#include "windef.h" -//#include "winbase.h" -#include <winhttp.h> -//#include "wincrypt.h" -#include <schannel.h> - -#include "winhttp_private.h" - -/* to avoid conflicts with the Unix socket headers */ -#define USE_WS_PREFIX -//#include "winsock2.h" - -WINE_DEFAULT_DEBUG_CHANNEL(winhttp); #ifndef HAVE_GETADDRINFO Modified: trunk/reactos/dll/win32/winhttp/request.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/request.… ============================================================================== --- trunk/reactos/dll/win32/winhttp/request.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/request.c [iso-8859-1] Wed Jan 1 21:42:31 2014 @@ -19,32 +19,16 @@ * 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 "wine/port.h" -#include <wine/debug.h> - -#include <stdarg.h> +#include "winhttp_private.h" + #ifdef HAVE_ARPA_INET_H # include <arpa/inet.h> #endif -#include <windef.h> -#include <winbase.h> -#include <ole2.h> -//#include "initguid.h" +#include <winuser.h> #include <httprequest.h> -#include <winhttp.h> - -#include "winhttp_private.h" #include "inet_ntop.c" - -WINE_DEFAULT_DEBUG_CHANNEL(winhttp); static const WCHAR attr_accept[] = {'A','c','c','e','p','t',0}; static const WCHAR attr_accept_charset[] = {'A','c','c','e','p','t','-','C','h','a','r','s','e','t', 0}; Modified: trunk/reactos/dll/win32/winhttp/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/session.… ============================================================================== --- trunk/reactos/dll/win32/winhttp/session.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/session.c [iso-8859-1] Wed Jan 1 21:42:31 2014 @@ -16,31 +16,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 - -#include <config.h> -//#include "wine/port.h" -#include <wine/debug.h> - -//#include <stdarg.h> -//#include <stdlib.h> - -#include <windef.h> -#include <winbase.h> -#include <winsock2.h> -#include <winhttp.h> +#include "winhttp_private.h" + #include <wincrypt.h> #include <winreg.h> -#define COBJMACROS -#include <ole2.h> #include <dispex.h> #include <activscp.h> - -#include "winhttp_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(winhttp); #define DEFAULT_RESOLVE_TIMEOUT 0 #define DEFAULT_CONNECT_TIMEOUT 20000 Modified: trunk/reactos/dll/win32/winhttp/url.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/url.c?re… ============================================================================== --- trunk/reactos/dll/win32/winhttp/url.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/url.c [iso-8859-1] Wed Jan 1 21:42:31 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 - -#include <config.h> -//#include <stdarg.h> - -#include <wine/debug.h> - -//#include "windef.h" -#include <winbase.h> -//#include "winreg.h" -#include <winhttp.h> -//#include "shlwapi.h" - #include "winhttp_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(winhttp); static const WCHAR scheme_http[] = {'h','t','t','p',0}; static const WCHAR scheme_https[] = {'h','t','t','p','s',0}; Modified: trunk/reactos/dll/win32/winhttp/winhttp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/winhttp_… ============================================================================== --- trunk/reactos/dll/win32/winhttp/winhttp_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/winhttp_private.h [iso-8859-1] Wed Jan 1 21:42:31 2014 @@ -19,14 +19,27 @@ #ifndef _WINE_WINHTTP_PRIVATE_H_ #define _WINE_WINHTTP_PRIVATE_H_ -#ifndef __WINE_CONFIG_H -# error You must include config.h to use this header -#endif +#include <wine/config.h> + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define NONAMELESSUNION + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <oleauto.h> +#include <winsock2.h> +#include <winhttp.h> #include <wine/list.h> #include <wine/unicode.h> -//#include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif @@ -42,8 +55,11 @@ # define closesocket close # define ioctlsocket ioctl #endif -#include <ole2.h> + #include <sspi.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(winhttp); static const WCHAR getW[] = {'G','E','T',0}; static const WCHAR postW[] = {'P','O','S','T',0};

10 years, 11 months

[akhaldi] 61477: [WINDOWSCODECS] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already ex...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jan 1 21:40:23 2014 New Revision: 61477 URL: http://svn.reactos.org/svn/reactos?rev=61477&view=rev Log: [WINDOWSCODECS] * 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/windowscodecs/guid.c (with props) Modified: trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt trunk/reactos/dll/win32/windowscodecs/bitmap.c trunk/reactos/dll/win32/windowscodecs/bmpdecode.c trunk/reactos/dll/win32/windowscodecs/bmpencode.c trunk/reactos/dll/win32/windowscodecs/clipper.c trunk/reactos/dll/win32/windowscodecs/clsfactory.c trunk/reactos/dll/win32/windowscodecs/colorcontext.c trunk/reactos/dll/win32/windowscodecs/colortransform.c trunk/reactos/dll/win32/windowscodecs/converter.c trunk/reactos/dll/win32/windowscodecs/fliprotate.c trunk/reactos/dll/win32/windowscodecs/gifformat.c trunk/reactos/dll/win32/windowscodecs/icnsformat.c trunk/reactos/dll/win32/windowscodecs/icoformat.c trunk/reactos/dll/win32/windowscodecs/imgfactory.c trunk/reactos/dll/win32/windowscodecs/info.c trunk/reactos/dll/win32/windowscodecs/jpegformat.c trunk/reactos/dll/win32/windowscodecs/main.c trunk/reactos/dll/win32/windowscodecs/metadatahandler.c trunk/reactos/dll/win32/windowscodecs/palette.c trunk/reactos/dll/win32/windowscodecs/pngformat.c trunk/reactos/dll/win32/windowscodecs/propertybag.c trunk/reactos/dll/win32/windowscodecs/proxy.c trunk/reactos/dll/win32/windowscodecs/regsvr.c trunk/reactos/dll/win32/windowscodecs/scaler.c trunk/reactos/dll/win32/windowscodecs/stream.c trunk/reactos/dll/win32/windowscodecs/tgaformat.c trunk/reactos/dll/win32/windowscodecs/tiffformat.c trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h Modified: trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/CM… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -51,6 +51,7 @@ tgaformat.c tiffformat.c ungif.c + guid.c ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs.def Modified: trunk/reactos/dll/win32/windowscodecs/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/bi… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/bitmap.c [iso-8859-1] Wed Jan 1 21:40: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 - -#include <config.h> - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <wincodec.h> - #include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct BitmapImpl { IWICBitmap IWICBitmap_iface; Modified: trunk/reactos/dll/win32/windowscodecs/bmpdecode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/bm… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/bmpdecode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/bmpdecode.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -16,29 +16,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 <config.h> +#include "wincodecs_private.h" #include <assert.h> -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winreg.h" #include <wingdi.h> -#include <objbase.h> -#include <wincodec.h> - -#include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct { DWORD bc2Size; Modified: trunk/reactos/dll/win32/windowscodecs/bmpencode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/bm… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/bmpencode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/bmpencode.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -16,28 +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 - -#include <config.h> - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winreg.h" +#include "wincodecs_private.h" + #include <wingdi.h> -#include <objbase.h> -#include <wincodec.h> - -#include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); struct bmp_pixelformat { const WICPixelFormatGUID *guid; Modified: trunk/reactos/dll/win32/windowscodecs/clipper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/cl… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/clipper.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/clipper.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -16,20 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "wincodec.h" - #include "wincodecs_private.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct BitmapClipper { IWICBitmapClipper IWICBitmapClipper_iface; Modified: trunk/reactos/dll/win32/windowscodecs/clsfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/cl… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/clsfactory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/clsfactory.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -16,30 +16,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 <config.h> - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winreg.h" -#include <objbase.h> -//#include "ocidl.h" -#include <initguid.h> -//#include "wincodec.h" -#include <wincodecsdk.h> - #include "wincodecs_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +#include <initguid.h> +#include <wincodecsdk.h> extern HRESULT WINAPI WIC_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/windowscodecs/colorcontext.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/co… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/colorcontext.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/colorcontext.c [iso-8859-1] Wed Jan 1 21:40: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 - -#include <config.h> - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <wincodec.h> - -//#include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +#include "wincodecs_private.h" typedef struct ColorContext { IWICColorContext IWICColorContext_iface; Modified: trunk/reactos/dll/win32/windowscodecs/colortransform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/co… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/colortransform.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/colortransform.c [iso-8859-1] Wed Jan 1 21:40: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 - -#include <config.h> - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <wincodec.h> - -//#include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +#include "wincodecs_private.h" typedef struct ColorTransform { IWICColorTransform IWICColorTransform_iface; Modified: trunk/reactos/dll/win32/windowscodecs/converter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/co… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/converter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/converter.c [iso-8859-1] Wed Jan 1 21:40: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 - -#include <config.h> - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <wincodec.h> - #include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); struct FormatConverter; Modified: trunk/reactos/dll/win32/windowscodecs/fliprotate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/fl… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/fliprotate.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/fliprotate.c [iso-8859-1] Wed Jan 1 21:40: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 - -#include <config.h> - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <wincodec.h> - -//#include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +#include "wincodecs_private.h" typedef struct FlipRotator { IWICBitmapFlipRotator IWICBitmapFlipRotator_iface; Modified: trunk/reactos/dll/win32/windowscodecs/gifformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/gi… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/gifformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/gifformat.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -17,31 +17,13 @@ * 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> - -#define COBJMACROS -#define NONAMELESSUNION - -#include <windef.h> -#include <winbase.h> +#include "wincodecs_private.h" + #include <winnls.h> #include <ole2.h> -//#include "wincodec.h" #include <wincodecsdk.h> #include "ungif.h" - -#include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); static LPWSTR strdupAtoW(const char *src) { Added: trunk/reactos/dll/win32/windowscodecs/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/gu… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/guid.c (added) +++ trunk/reactos/dll/win32/windowscodecs/guid.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -0,0 +1,20 @@ +/* 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 <wincodec.h> + +DEFINE_GUID(CLSID_WineTgaDecoder, 0xb11fc79a,0x67cc,0x43e6,0xa9,0xce,0xe3,0xd5,0x49,0x45,0xd3,0x04); +DEFINE_GUID(CLSID_WICIcnsEncoder, 0x312fb6f1,0xb767,0x409d,0x8a,0x6d,0x0f,0xc1,0x54,0xd4,0xf0,0x5c); +DEFINE_GUID(GUID_WineContainerFormatTga, 0x0c44fda1,0xa5c5,0x4298,0x96,0x85,0x47,0x3f,0xc1,0x7c,0xd3,0x22); +DEFINE_GUID(GUID_VendorWine, 0xddf46da1,0x7dc1,0x404e,0x98,0xf2,0xef,0xa4,0x8d,0xfc,0x95,0x0a); + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/win32/windowscodecs/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/windowscodecs/icnsformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ic… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/icnsformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/icnsformat.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -15,15 +15,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 */ - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> -//#include "wine/port.h" - -#include <stdarg.h> #ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H #define GetCurrentProcess GetCurrentProcess_Mac @@ -82,19 +73,7 @@ #undef DPRINTF #endif -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -//#include "wincodec.h" - -//#include "wincodecs_private.h" - -#include <wine/debug.h> -//#include "wine/library.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +#include "wincodecs_private.h" #if defined(HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H) && \ MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4 Modified: trunk/reactos/dll/win32/windowscodecs/icoformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ic… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/icoformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/icoformat.c [iso-8859-1] Wed Jan 1 21:40: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 -#include <config.h> - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> +#include "wincodecs_private.h" + #include <wingdi.h> -#include <objbase.h> -#include <wincodec.h> - -#include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); #include <pshpack1.h> Modified: trunk/reactos/dll/win32/windowscodecs/imgfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/im… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/imgfactory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/imgfactory.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -17,30 +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 <config.h> - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> +#include "wincodecs_private.h" + #include <wingdi.h> -//#include "winreg.h" -#include <objbase.h> -//#include "shellapi.h" -//#include "wincodec.h" #include <wincodecsdk.h> - -#include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct { IWICComponentFactory IWICComponentFactory_iface; Modified: trunk/reactos/dll/win32/windowscodecs/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/in… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/info.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/info.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -17,30 +17,13 @@ * 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> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> +#include "wincodecs_private.h" + #include <winreg.h> -#include <objbase.h> -//#include "wincodec.h" #include <wincodecsdk.h> -//#include "wincodecs_private.h" - -#include <wine/debug.h> #include <wine/unicode.h> #include <wine/list.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); static const WCHAR mimetypes_valuename[] = {'M','i','m','e','T','y','p','e','s',0}; static const WCHAR author_valuename[] = {'A','u','t','h','o','r',0}; Modified: trunk/reactos/dll/win32/windowscodecs/jpegformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/jp… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/jpegformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/jpegformat.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -16,19 +16,13 @@ * 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 <wine/port.h> +#include "wincodecs_private.h" #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -//#include <stdarg.h> + #include <stdio.h> -//#include <string.h> #include <setjmp.h> #ifdef SONAME_LIBJPEG @@ -46,19 +40,7 @@ #undef boolean #endif -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <wincodec.h> - -#include "wincodecs_private.h" - -#include <wine/debug.h> #include <wine/library.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); #ifdef SONAME_LIBJPEG WINE_DECLARE_DEBUG_CHANNEL(jpeg); Modified: trunk/reactos/dll/win32/windowscodecs/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ma… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/main.c [iso-8859-1] Wed Jan 1 21:40: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 <wincodec.h> - #include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); extern BOOL WINAPI WIC_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/windowscodecs/metadatahandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/me… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/metadatahandler.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/metadatahandler.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -17,30 +17,11 @@ * 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 "wincodecs_private.h" + #include <stdio.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include <windef.h> -#include <winbase.h> #include <winternl.h> -#include <objbase.h> -//#include "wincodec.h" #include <wincodecsdk.h> - -#include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct MetadataHandler { IWICMetadataWriter IWICMetadataWriter_iface; Modified: trunk/reactos/dll/win32/windowscodecs/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/pa… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/palette.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/palette.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -17,27 +17,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> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winreg.h" -#include <objbase.h> -#include <wincodec.h> - -//#include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +#include "wincodecs_private.h" typedef struct { IWICPalette IWICPalette_iface; Modified: trunk/reactos/dll/win32/windowscodecs/pngformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/pn… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/pngformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/pngformat.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -16,34 +16,15 @@ * 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 <wine/port.h> - -//#include <stdarg.h> +#include "wincodecs_private.h" #ifdef HAVE_PNG_H #include <png.h> #endif -#define NONAMELESSUNION -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -//#include "wincodec.h" #include <wincodecsdk.h> -#include "wincodecs_private.h" - -#include <wine/debug.h> #include <wine/library.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); static HRESULT read_png_chunk(IStream *stream, BYTE *type, BYTE **data, ULONG *data_size) { Modified: trunk/reactos/dll/win32/windowscodecs/propertybag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/pr… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/propertybag.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/propertybag.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -17,27 +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 <config.h> - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> +#include "wincodecs_private.h" + #include <ole2.h> -#include <wincodec.h> #include <wine/unicode.h> - -//#include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct PropertyBag { IPropertyBag2 IPropertyBag2_iface; Modified: trunk/reactos/dll/win32/windowscodecs/proxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/pr… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/proxy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/proxy.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -18,28 +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 - -#include <config.h> - -#include <stdarg.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -//#include "wincodec.h" +#include "wincodecs_private.h" + #include <wincodecsdk.h> - -#include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); HRESULT WINAPI IWICBitmapClipper_Initialize_Proxy_W(IWICBitmapClipper *iface, IWICBitmapSource *pISource, const WICRect *prc) Modified: trunk/reactos/dll/win32/windowscodecs/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/re… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/regsvr.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -16,34 +16,13 @@ * 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 NONAMELESSUNION -#define NONAMELESSSTRUCT -#define COBJMACROS -#include <stdarg.h> -//#include <string.h> - -#include <windef.h> -#include <winbase.h> -//#include "wingdi.h" -//#include "winuser.h" +#include "wincodecs_private.h" + #include <winreg.h> -//#include "winerror.h" - #include <objbase.h> -//#include "ocidl.h" -//#include "wincodec.h" #include <wincodecsdk.h> -#include <wine/debug.h> #include <wine/unicode.h> - -#include "wincodecs_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); /*********************************************************************** * interface for self-registering Modified: trunk/reactos/dll/win32/windowscodecs/scaler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/sc… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/scaler.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/scaler.c [iso-8859-1] Wed Jan 1 21:40: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 - -#include <config.h> - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <wincodec.h> - #include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct BitmapScaler { IWICBitmapScaler IWICBitmapScaler_iface; Modified: trunk/reactos/dll/win32/windowscodecs/stream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/st… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/stream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/stream.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -16,22 +16,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 <wine/debug.h> - -#define COBJMACROS -#include <windef.h> -#include <winbase.h> +#include "wincodecs_private.h" + #include <winreg.h> -#include <objbase.h> #include <shlwapi.h> -#include <wincodec.h> -#include "wincodecs_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); /****************************************** * StreamOnMemory implementation Modified: trunk/reactos/dll/win32/windowscodecs/tgaformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/tg… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/tgaformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/tgaformat.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -16,28 +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 - -#include <config.h> -//#include "wine/port.h" - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <wincodec.h> - #include "wincodecs_private.h" - -#include <wine/debug.h> -//#include "wine/library.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); #include "pshpack1.h" Modified: trunk/reactos/dll/win32/windowscodecs/tiffformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ti… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/tiffformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/tiffformat.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -16,14 +16,8 @@ * 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 <wine/port.h> - -#include <stdarg.h> +#include "wincodecs_private.h" + #ifdef HAVE_UNISTD_H #include <unistd.h> #endif @@ -31,21 +25,10 @@ #include <tiffio.h> #endif -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> #include <oleauto.h> -//#include "wincodec.h" #include <wincodecsdk.h> -#include "wincodecs_private.h" - -#include <wine/debug.h> #include <wine/library.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); #ifdef SONAME_LIBTIFF Modified: trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/wi… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -18,6 +18,27 @@ #ifndef WINCODECS_PRIVATE_H #define WINCODECS_PRIVATE_H + +#include <wine/config.h> +#include <wine/port.h> + +#include <stdarg.h> + +#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 <objbase.h> +#include <wincodec.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); DEFINE_GUID(CLSID_WineTgaDecoder, 0xb11fc79a,0x67cc,0x43e6,0xa9,0xce,0xe3,0xd5,0x49,0x45,0xd3,0x04);

10 years, 11 months

[akhaldi] 61476: [WDMAUD.DRV] * Do not define NDEBUG globally. Fixes build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jan 1 18:55:10 2014 New Revision: 61476 URL: http://svn.reactos.org/svn/reactos?rev=61476&view=rev Log: [WDMAUD.DRV] * Do not define NDEBUG globally. Fixes build. Modified: trunk/reactos/dll/win32/wdmaud.drv/CMakeLists.txt Modified: trunk/reactos/dll/win32/wdmaud.drv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/CMake… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] Wed Jan 1 18:55:10 2014 @@ -1,6 +1,5 @@ -add_definitions(-DNDEBUG=1) include_directories( ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound

10 years, 11 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