[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...
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.c... ============================================================================== --- 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?r... ============================================================================== --- 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?r... ============================================================================== --- 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_priva... ============================================================================== --- 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;
-
akhaldi＠svn.reactos.org