mirror of
https://github.com/reactos/reactos.git
synced 2024-08-08 12:18:13 +00:00
[WBEMDISP]
* Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. * Improve the GUIDs situation. CORE-7716 svn path=/trunk/; revision=61473
This commit is contained in:
parent
d02c7df84f
commit
4be5b0fc34
|
@ -6,6 +6,7 @@ spec2def(wbemdisp.dll wbemdisp.spec)
|
|||
list(APPEND SOURCE
|
||||
locator.c
|
||||
main.c
|
||||
guid.c
|
||||
${CMAKE_CURRENT_BINARY_DIR}/wbemdisp.def)
|
||||
|
||||
add_idl_headers(wbemdisp_idlheader wbemdisp_classes.idl)
|
||||
|
@ -20,7 +21,7 @@ set_source_files_properties(wbemdisp.rc PROPERTIES OBJECT_DEPENDS "${wbemdisp_rc
|
|||
|
||||
add_library(wbemdisp SHARED ${SOURCE} wbemdisp.rc)
|
||||
set_module_type(wbemdisp win32dll)
|
||||
target_link_libraries(wbemdisp wine)
|
||||
target_link_libraries(wbemdisp uuid wine)
|
||||
add_dependencies(wbemdisp wbemdisp_idlheader)
|
||||
add_importlibs(wbemdisp oleaut32 msvcrt kernel32 ntdll)
|
||||
add_cd_file(TARGET wbemdisp DESTINATION reactos/system32/wbem FOR all)
|
||||
|
|
16
reactos/dll/win32/wbemdisp/guid.c
Normal file
16
reactos/dll/win32/wbemdisp/guid.c
Normal file
|
@ -0,0 +1,16 @@
|
|||
/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
#define WIN32_NO_STATUS
|
||||
#define _INC_WINDOWS
|
||||
#define COM_NO_WINDOWS_H
|
||||
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
#include <objbase.h>
|
||||
#include <initguid.h>
|
||||
#include <wbemdisp_classes.h>
|
||||
#include <wbemdisp.h>
|
||||
|
||||
/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */
|
|
@ -16,21 +16,10 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#define COBJMACROS
|
||||
|
||||
#include "config.h"
|
||||
#include <stdarg.h>
|
||||
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "objbase.h"
|
||||
#include "wbemdisp.h"
|
||||
|
||||
#include "wine/debug.h"
|
||||
#include "wine/unicode.h"
|
||||
#include "wbemdisp_private.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp);
|
||||
#include <winnls.h>
|
||||
#include <oleauto.h>
|
||||
|
||||
struct locator
|
||||
{
|
||||
|
|
|
@ -16,23 +16,10 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include <stdarg.h>
|
||||
|
||||
#define COBJMACROS
|
||||
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "initguid.h"
|
||||
#include "objbase.h"
|
||||
#include "wbemdisp.h"
|
||||
#include "rpcproxy.h"
|
||||
|
||||
#include "wine/debug.h"
|
||||
#include "wbemdisp_private.h"
|
||||
#include "wbemdisp_classes.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp);
|
||||
#include <rpcproxy.h>
|
||||
#include <wbemdisp_classes.h>
|
||||
|
||||
static HINSTANCE instance;
|
||||
|
||||
|
|
|
@ -16,6 +16,24 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
#define WIN32_NO_STATUS
|
||||
#define _INC_WINDOWS
|
||||
#define COM_NO_WINDOWS_H
|
||||
|
||||
#define COBJMACROS
|
||||
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
#include <objbase.h>
|
||||
#include <wbemdisp.h>
|
||||
|
||||
#include <wine/debug.h>
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp);
|
||||
|
||||
HRESULT SWbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
|
||||
|
||||
static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1);
|
||||
|
|
Loading…
Reference in a new issue