Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 93 insertions, 0 deletions

diff --git a/epan/dissectors/pidl/iwbemloginclientidex/iwbemloginclientidex.cnf b/epan/dissectors/pidl/iwbemloginclientidex/iwbemloginclientidex.cnf
new file mode 100644
index 00000000..1664269c
--- /dev/null
+++ b/epan/dissectors/pidl/iwbemloginclientidex/iwbemloginclientidex.cnf
@@ -0,0 +1,42 @@
+# Conformance file for iwbemloginclientidex
+
+MANUAL IWbemLoginClientIDEx_dissect_element_SetClientInfoEx_orpcthis
+MANUAL IWbemLoginClientIDEx_dissect_element_SetClientInfoEx_orpcthat_
+
+ETT_FIELD ett_IWbemLoginClientIDEx_SetClientInfoEx_orpcthis
+ETT_FIELD ett_IWbemLoginClientIDEx_SetClientInfoEx_orpcthat
+
+CODE START
+
+	#include "packet-dcom.h"
+
+/* SetClientInfoEx */
+static int
+IWbemLoginClientIDEx_dissect_element_SetClientInfoEx_orpcthis(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, uint8_t *drep _U_)
+{
+	proto_item *sub_item;
+	proto_tree *sub_tree;
+
+	sub_item = proto_tree_add_item(tree, hf_IWbemLoginClientIDEx_SetClientInfoEx_orpcthis, tvb, offset, 0, ENC_NA);
+	sub_tree = proto_item_add_subtree(sub_item, ett_IWbemLoginClientIDEx_SetClientInfoEx_orpcthis);
+
+	offset = dissect_dcom_this(tvb, offset, pinfo, sub_tree, di, drep);
+
+	return offset;
+}
+
+static int
+IWbemLoginClientIDEx_dissect_element_SetClientInfoEx_orpcthat_(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, uint8_t *drep _U_)
+{
+	proto_item *sub_item;
+	proto_tree *sub_tree;
+
+	sub_item = proto_tree_add_item(tree, hf_IWbemLoginClientIDEx_SetClientInfoEx_orpcthat, tvb, offset, 0, ENC_NA);
+	sub_tree = proto_item_add_subtree(sub_item, ett_IWbemLoginClientIDEx_SetClientInfoEx_orpcthat);
+
+	offset = dissect_dcom_that(tvb, offset, pinfo, sub_tree, di, drep);
+
+	return offset;
+}
+
+CODE END
\ No newline at end of file
diff --git a/epan/dissectors/pidl/iwbemloginclientidex/iwbemloginclientidex.idl b/epan/dissectors/pidl/iwbemloginclientidex/iwbemloginclientidex.idl
new file mode 100644
index 00000000..f39a586c
--- /dev/null
+++ b/epan/dissectors/pidl/iwbemloginclientidex/iwbemloginclientidex.idl
@@ -0,0 +1,51 @@
+#include "idl_types.h"
+
+/*
+  IWbemLoginClientIDEx interface definitions
+*/
+[ uuid("9f6c78ef-fce5-42fa-abea-3e7df91921dc"),
+  restricted, 
+  pointer_default(unique)
+]
+interface IWbemLoginClientIDEx
+{
+  /*****************/
+  /* Function 0x00 */
+  [todo] WERROR iwbemloginclientidex_opnum0(
+  );
+
+  /*****************/
+  /* Function 0x01 */
+  [todo] WERROR iwbemloginclientidex_opnum1(
+  );
+
+  /*****************/
+  /* Function 0x02 */
+  [todo] WERROR iwbemloginclientidex_opnum2(
+  );
+
+  typedef [public] struct
+  {
+  } ORPCTHIS;
+
+  typedef [public] struct
+  {
+  } ORPCTHAT;
+
+  typedef struct {
+    uint32 dwLowDateTime;
+    uint32 dwHighDateTime;
+  } FILETIME;
+
+  /*****************/
+  /* Function 0x03 */
+  WERROR SetClientInfoEx(
+   [in] ORPCTHIS orpcthis,
+   [in, unique, string, charset(UTF16)] uint16* ClientMachine,
+   [in, unique, string, charset(UTF16)] uint16* ClientMachineFQDN,
+   [in] uint32 ClientProcId,
+   [in] FILETIME ClientProcessCreationTime,
+   [in] uint32 Reserved,
+   [out] ORPCTHAT* orpcthat
+  );
+};
\ No newline at end of file