sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

Fix compilation issues in the WMI code.

Browse Source
This commit is contained in:
Jelmer Vernooij
2008-05-09 13:44:58 +02:00
parent e1deb404eb
commit 22cd65b16f
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source4/lib/wmi/config.mk
View File

@ -1,4 +1,5 @@
[SUBSYSTEM::WMI] [SUBSYSTEM::WMI]
PRIVATE_PROTO_HEADER = proto.h
PUBLIC_DEPENDENCIES = RPC_NDR_OXIDRESOLVER \ PUBLIC_DEPENDENCIES = RPC_NDR_OXIDRESOLVER \
NDR_DCOM \ NDR_DCOM \
RPC_NDR_REMACT \ RPC_NDR_REMACT \
@ -6,12 +7,11 @@ PUBLIC_DEPENDENCIES = RPC_NDR_OXIDRESOLVER \
DCOM_PROXY_DCOM \ DCOM_PROXY_DCOM \
DCOM DCOM
WMI_OBJ_FILES = $(addprefix lib/wmi/, wmicore.o wbemdata.o ../librpc/gen_ndr/dcom_p.o) WMI_OBJ_FILES = $(addprefix lib/wmi/, wmicore.o wbemdata.o ../../librpc/gen_ndr/dcom_p.o)
################################# #################################
# Start BINARY wmic # Start BINARY wmic
[BINARY::wmic] [BINARY::wmic]
PRIVATE_PROTO_HEADER = proto.h
INSTALLDIR = BINDIR INSTALLDIR = BINDIR
PRIVATE_DEPENDENCIES = \ PRIVATE_DEPENDENCIES = \
POPT_SAMBA \ POPT_SAMBA \
@ -34,10 +34,7 @@ PRIVATE_DEPENDENCIES = \
WMI WMI
wmis_OBJ_FILES = \ wmis_OBJ_FILES = \
wmis.o \ lib/wmi/tools/wmis.o
wmicore.o \
wbemdata.o \
../librpc/gen_ndr/dcom_p.o
# End BINARY wmis # End BINARY wmis
################################# #################################

8
source4/lib/wmi/tools/wmis.c
View File

@ -29,16 +29,14 @@
#include "librpc/gen_ndr/ndr_remact_c.h" #include "librpc/gen_ndr/ndr_remact_c.h"
#include "librpc/gen_ndr/ndr_epmapper_c.h" #include "librpc/gen_ndr/ndr_epmapper_c.h"
#include "librpc/gen_ndr/com_dcom.h" #include "librpc/gen_ndr/com_dcom.h"
#include "librpc/rpc/dcerpc_table.h"
#include "lib/com/dcom/dcom.h" #include "lib/com/dcom/dcom.h"
#include "lib/com/proto.h" #include "librpc/gen_ndr/com_wmi.h"
#include "lib/com/dcom/proto.h" #include "librpc/ndr/ndr_table.h"
struct WBEMCLASS; struct WBEMCLASS;
struct WBEMOBJECT; struct WBEMOBJECT;
enum CIMTYPE_ENUMERATION; enum CIMTYPE_ENUMERATION;
NTSTATUS dcom_proxy_IWbemClassObject_init();
#include "wmi/proto.h" #include "wmi/proto.h"
@ -188,7 +186,7 @@ int main(int argc, char **argv)
parse_args(argc, argv, &args); parse_args(argc, argv, &args);
dcerpc_init(); dcerpc_init();
dcerpc_table_init(); ndr_table_init();
dcom_proxy_IUnknown_init(); dcom_proxy_IUnknown_init();
dcom_proxy_IWbemLevel1Login_init(); dcom_proxy_IWbemLevel1Login_init();

2
source4/lib/wmi/wbemdata.c
View File

@ -673,7 +673,7 @@ struct composite_context *dcom_proxy_IEnumWbemClassObject_Release_send(struct IU
return c; return c;
} }
NTSTATUS dcom_proxy_IWbemClassObject_init() NTSTATUS dcom_proxy_IWbemClassObject_init(void)
{ {
struct GUID clsid; struct GUID clsid;
GUID_from_string("4590f812-1d3a-11d0-891f-00aa004b2e24", &clsid); GUID_from_string("4590f812-1d3a-11d0-891f-00aa004b2e24", &clsid);