Zebediah Figura : devenum: Merge the property bag object into the moniker object.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e3cf3823f899ce90af996c720b743c80a46603e8
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=e3cf3823f899ce90af996c720b743c80a46603e8

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Tue Apr 14 00:16:04 2020 -0500

devenum: Merge the property bag object into the moniker object.

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/devenum/devenum_private.h |   2 +
 dlls/devenum/mediacatenum.c    | 401 +++++++++++++++++------------------------
 2 files changed, 170 insertions(+), 233 deletions(-)

Diff:   https://source.winehq.org/git/wine.git/?a=commitdiff;h=e3cf3823f899ce90af996c720b743c80a46603e8