March 2010 - Wine-commits - list.winehq.org

Rob Shearman : widl: Make write_pointer_tfs more readable.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 08126d7483bf798e692edec9b8320ad10bbf433c URL: http://source.winehq.org/git/wine.git/?a=commit;h=08126d7483bf798e692edec9b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Mar 15 19:29:38 2010 +0000 widl: Make write_pointer_tfs more readable. Change write_pointer_tfs to rely on the detected type of the type to determine when to write a simple pointer rather than relying on typestring_offset not being set anywhere else. --- tools/widl/typegen.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 60668dd..19f66c0 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1404,15 +1404,21 @@ static unsigned int write_pointer_tfs(FILE *file, const attr_list_t *attrs, print_start_tfs_comment(file, type, offset); update_tfsoff(type, offset, file); - if (ref->typestring_offset) - write_nonsimple_pointer(file, attrs, type, - toplevel_param, - type_pointer_get_ref(type)->typestring_offset, - typestring_offset); - else if (type_get_type(ref) == TYPE_BASIC || - type_get_type(ref) == TYPE_ENUM) + switch (typegen_detect_type(ref, attrs, TDT_ALL_TYPES)) + { + case TGT_BASIC: + case TGT_ENUM: *typestring_offset += write_simple_pointer(file, attrs, type, toplevel_param); + break; + default: + if (ref->typestring_offset) + write_nonsimple_pointer(file, attrs, type, + toplevel_param, + type_pointer_get_ref(type)->typestring_offset, + typestring_offset); + break; + } return offset; }

1 0

Rob Shearman : widl: Simplify write_typeformatstring_var.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 7a69fcabacb8c88aaee615629f51b9181975d5e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a69fcabacb8c88aaee615629… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Mar 15 19:29:43 2010 +0000 widl: Simplify write_typeformatstring_var. The check for whether a pointer is the last one is redundant since typegen_detect_type does a stricter check on the ref type. Replace one other instance of last_ptr with a more readable equivalent. --- tools/widl/typegen.c | 62 ++++++++++++++++++++++++------------------------- 1 files changed, 30 insertions(+), 32 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 19f66c0..b0c2c20 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1339,7 +1339,7 @@ static unsigned int write_nonsimple_pointer(FILE *file, const attr_list_t *attrs if (out_attr && !in_attr && pointer_type == RPC_FC_RP) flags |= RPC_FC_P_ONSTACK; - if (is_ptr(type) && !last_ptr(type)) + if (is_ptr(type) && is_declptr(type_pointer_get_ref(type))) flags |= RPC_FC_P_DEREF; print_file(file, 2, "0x%x, 0x%x,\t\t/* %s", @@ -2794,50 +2794,48 @@ static unsigned int write_typeformatstring_var(FILE *file, int indent, const var case TGT_IFACE_POINTER: return write_ip_tfs(file, var->attrs, type, typeformat_offset); case TGT_POINTER: - if (last_ptr(type)) + { + type_t *ref = type_pointer_get_ref(type); + + switch (typegen_detect_type(ref, NULL, TDT_ALL_TYPES)) { + /* special case for pointers to base types */ + case TGT_BASIC: + case TGT_ENUM: + { + unsigned char fc; size_t start_offset = *typeformat_offset; int in_attr = is_attr(var->attrs, ATTR_IN); int out_attr = is_attr(var->attrs, ATTR_OUT); - const type_t *ref = type_pointer_get_ref(type); - - switch (typegen_detect_type(ref, NULL, TDT_ALL_TYPES)) - { - /* special case for pointers to base types */ - case TGT_BASIC: - case TGT_ENUM: - { - unsigned char fc; - if (type_get_type(ref) == TYPE_ENUM) - fc = get_enum_fc(ref); - else - fc = get_basic_fc(ref); - - print_file(file, indent, "0x%x, 0x%x, /* %s %s[simple_pointer] */\n", - get_pointer_fc(type, var->attrs, toplevel_param), - (!in_attr && out_attr) ? 0x0C : 0x08, - string_of_type(get_pointer_fc(type, var->attrs, toplevel_param)), - (!in_attr && out_attr) ? "[allocated_on_stack] " : ""); - print_file(file, indent, "0x%02x, /* %s */\n", - fc, string_of_type(fc)); - print_file(file, indent, "0x5c, /* FC_PAD */\n"); - *typeformat_offset += 4; - return start_offset; - } - default: - break; - } + if (type_get_type(ref) == TYPE_ENUM) + fc = get_enum_fc(ref); + else + fc = get_basic_fc(ref); + + print_file(file, indent, "0x%x, 0x%x, /* %s %s[simple_pointer] */\n", + get_pointer_fc(type, var->attrs, toplevel_param), + (!in_attr && out_attr) ? 0x0C : 0x08, + string_of_type(get_pointer_fc(type, var->attrs, toplevel_param)), + (!in_attr && out_attr) ? "[allocated_on_stack] " : ""); + print_file(file, indent, "0x%02x, /* %s */\n", + fc, string_of_type(fc)); + print_file(file, indent, "0x5c, /* FC_PAD */\n"); + *typeformat_offset += 4; + return start_offset; + } + default: + break; } - offset = write_typeformatstring_var(file, indent, func, - type_pointer_get_ref(type), var, + offset = write_typeformatstring_var(file, indent, func, ref, var, FALSE, typeformat_offset); if (file) fprintf(file, "/* %2u */\n", *typeformat_offset); return write_nonsimple_pointer(file, var->attrs, type, toplevel_param, offset, typeformat_offset); + } case TGT_INVALID: break; }

1 0

Rob Shearman : widl: Write pointers in write_typeformatstring_var using write_pointer_tfs.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 484fe1cff30fafcf21c0f8b5b2d41caefbc57909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=484fe1cff30fafcf21c0f8b5b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Mar 15 19:29:48 2010 +0000 widl: Write pointers in write_typeformatstring_var using write_pointer_tfs. Avoid duplicating the pointer writing code. --- tools/widl/typegen.c | 71 +++++++++++++++---------------------------------- 1 files changed, 22 insertions(+), 49 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index b0c2c20..0316531 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1366,6 +1366,9 @@ static unsigned int write_simple_pointer(FILE *file, const attr_list_t *attrs, c unsigned char fc; unsigned char pointer_fc; const type_t *ref; + int in_attr = is_attr(attrs, ATTR_IN); + int out_attr = is_attr(attrs, ATTR_OUT); + unsigned char flags = RPC_FC_P_SIMPLEPOINTER; /* for historical reasons, write_simple_pointer also handled string types, * but no longer does. catch bad uses of the function with this check */ @@ -1380,8 +1383,12 @@ static unsigned int write_simple_pointer(FILE *file, const attr_list_t *attrs, c else fc = get_basic_fc(ref); - print_file(file, 2, "0x%02x, 0x%x,\t/* %s [simple_pointer] */\n", - pointer_fc, RPC_FC_P_SIMPLEPOINTER, string_of_type(pointer_fc)); + if (out_attr && !in_attr) + flags |= RPC_FC_P_ONSTACK; + + print_file(file, 2, "0x%02x, 0x%x,\t/* %s %s[simple_pointer] */\n", + pointer_fc, flags, string_of_type(pointer_fc), + flags & RPC_FC_P_ONSTACK ? "[allocated_on_stack] " : ""); print_file(file, 2, "0x%02x,\t/* %s */\n", fc, string_of_type(fc)); print_file(file, 2, "0x5c,\t/* FC_PAD */\n"); return 4; @@ -1395,7 +1402,8 @@ static void print_start_tfs_comment(FILE *file, type_t *t, unsigned int tfsoff) } static unsigned int write_pointer_tfs(FILE *file, const attr_list_t *attrs, - type_t *type, int toplevel_param, + type_t *type, unsigned int ref_offset, + int toplevel_param, unsigned int *typestring_offset) { unsigned int offset = *typestring_offset; @@ -1412,10 +1420,10 @@ static unsigned int write_pointer_tfs(FILE *file, const attr_list_t *attrs, toplevel_param); break; default: - if (ref->typestring_offset) + if (ref_offset) write_nonsimple_pointer(file, attrs, type, toplevel_param, - type_pointer_get_ref(type)->typestring_offset, + ref_offset, typestring_offset); break; } @@ -2412,7 +2420,9 @@ static unsigned int write_struct_tfs(FILE *file, type_t *type, if (is_string_type(f->attrs, ft)) write_string_tfs(file, f->attrs, ft, FALSE, f->name, tfsoff); else - write_pointer_tfs(file, f->attrs, ft, FALSE, tfsoff); + write_pointer_tfs(file, f->attrs, ft, + type_pointer_get_ref(ft)->typestring_offset, + FALSE, tfsoff); } else if (type_get_type(ft) == TYPE_ARRAY && type_array_is_decl_as_ptr(ft)) { @@ -2794,48 +2804,11 @@ static unsigned int write_typeformatstring_var(FILE *file, int indent, const var case TGT_IFACE_POINTER: return write_ip_tfs(file, var->attrs, type, typeformat_offset); case TGT_POINTER: - { - type_t *ref = type_pointer_get_ref(type); - - switch (typegen_detect_type(ref, NULL, TDT_ALL_TYPES)) - { - /* special case for pointers to base types */ - case TGT_BASIC: - case TGT_ENUM: - { - unsigned char fc; - size_t start_offset = *typeformat_offset; - int in_attr = is_attr(var->attrs, ATTR_IN); - int out_attr = is_attr(var->attrs, ATTR_OUT); - - if (type_get_type(ref) == TYPE_ENUM) - fc = get_enum_fc(ref); - else - fc = get_basic_fc(ref); - - print_file(file, indent, "0x%x, 0x%x, /* %s %s[simple_pointer] */\n", - get_pointer_fc(type, var->attrs, toplevel_param), - (!in_attr && out_attr) ? 0x0C : 0x08, - string_of_type(get_pointer_fc(type, var->attrs, toplevel_param)), - (!in_attr && out_attr) ? "[allocated_on_stack] " : ""); - print_file(file, indent, "0x%02x, /* %s */\n", - fc, string_of_type(fc)); - print_file(file, indent, "0x5c, /* FC_PAD */\n"); - *typeformat_offset += 4; - return start_offset; - } - default: - break; - } - - offset = write_typeformatstring_var(file, indent, func, ref, var, - FALSE, typeformat_offset); - if (file) - fprintf(file, "/* %2u */\n", *typeformat_offset); - return write_nonsimple_pointer(file, var->attrs, type, - toplevel_param, - offset, typeformat_offset); - } + offset = write_typeformatstring_var(file, indent, func, + type_pointer_get_ref(type), var, + FALSE, typeformat_offset); + return write_pointer_tfs(file, var->attrs, type, offset, + toplevel_param, typeformat_offset); case TGT_INVALID: break; } @@ -2867,7 +2840,7 @@ static int write_embedded_types(FILE *file, const attr_list_t *attrs, type_t *ty retmask |= write_embedded_types(file, NULL, ref, name, TRUE, tfsoff); if (write_ptr) - write_pointer_tfs(file, attrs, type, FALSE, tfsoff); + write_pointer_tfs(file, attrs, type, type_pointer_get_ref(type)->typestring_offset, FALSE, tfsoff); retmask |= 1; break;

1 0

Rob Shearman : widl: Don' t use the return value of write_embedded_types to determine whether a type contains pointers or not .
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 2fd6be54bee3c639bdeb0754eddd085ec0a6191f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fd6be54bee3c639bdeb0754e… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Mar 15 19:29:53 2010 +0000 widl: Don't use the return value of write_embedded_types to determine whether a type contains pointers or not. It isn't correct in all situations, so type_has_pointer has to be used anyway so using the return value of write_embedded_types just clutters the code. --- tools/widl/typegen.c | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 0316531..78fe60c 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2137,7 +2137,6 @@ static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t unsigned int size; unsigned int start_offset; unsigned char fc; - int has_pointer; int pointer_type = get_attrv(attrs, ATTR_POINTERTYPE); unsigned int baseoff = !type_array_is_decl_as_ptr(type) && current_structure @@ -2147,10 +2146,7 @@ static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t if (!pointer_type) pointer_type = RPC_FC_RP; - if (write_embedded_types(file, attrs, type_array_get_element(type), name, FALSE, typestring_offset)) - has_pointer = TRUE; - else - has_pointer = type_has_pointers(type_array_get_element(type)); + write_embedded_types(file, attrs, type_array_get_element(type), name, FALSE, typestring_offset); align = 0; size = type_memsize((is_conformant_array(type) ? type_array_get_element(type) : type), &align); @@ -2208,7 +2204,8 @@ static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t += write_conf_or_var_desc(file, current_structure, baseoff, type, length_is); - if (has_pointer && (type_array_is_decl_as_ptr(type) || !current_structure)) + if (type_has_pointers(type_array_get_element(type)) && + (type_array_is_decl_as_ptr(type) || !current_structure)) { print_file(file, 2, "0x%x, /* FC_PP */\n", RPC_FC_PP); print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD); @@ -2328,7 +2325,6 @@ static unsigned int write_struct_tfs(FILE *file, type_t *type, const var_t *array; unsigned int start_offset; unsigned int array_offset; - int has_pointers = 0; unsigned int align = 0; unsigned int corroff; var_t *f; @@ -2344,9 +2340,7 @@ static unsigned int write_struct_tfs(FILE *file, type_t *type, name, USHRT_MAX, total_size - USHRT_MAX); if (fields) LIST_FOR_EACH_ENTRY(f, fields, var_t, entry) - has_pointers |= write_embedded_types(file, f->attrs, f->type, f->name, - FALSE, tfsoff); - if (!has_pointers) has_pointers = type_has_pointers(type); + write_embedded_types(file, f->attrs, f->type, f->name, FALSE, tfsoff); array = find_array_or_string_in_struct(type); if (array && !processed(array->type)) @@ -2394,7 +2388,7 @@ static unsigned int write_struct_tfs(FILE *file, type_t *type, } else if ((fc == RPC_FC_PSTRUCT) || (fc == RPC_FC_CPSTRUCT) || - (fc == RPC_FC_CVSTRUCT && has_pointers)) + (fc == RPC_FC_CVSTRUCT && type_has_pointers(type))) { print_file(file, 2, "0x%x, /* FC_PP */\n", RPC_FC_PP); print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD);

1 0

Rob Shearman : widl: Merge write_typeformatstring_var and write_embedded_types into one function , write_type_tfs.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 06e7eb5c98d473cf1edc828c67f6a6586a94e2f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06e7eb5c98d473cf1edc828c6… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Mar 15 19:29:57 2010 +0000 widl: Merge write_typeformatstring_var and write_embedded_types into one function, write_type_tfs. --- tools/widl/typegen.c | 191 ++++++++++++++++++++++---------------------------- 1 files changed, 84 insertions(+), 107 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06e7eb5c98d473cf1edc8…

1 0

Juan Lang : rsaenh: Add support for SHA-256, SHA-384, and SHA-512.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 311d839dec7591515463696fa389fe4d0e48e3f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=311d839dec7591515463696fa… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Mar 15 12:04:29 2010 -0700 rsaenh: Add support for SHA-256, SHA-384, and SHA-512. --- dlls/rsaenh/Makefile.in | 3 +- dlls/rsaenh/implglue.c | 36 ++ dlls/rsaenh/implglue.h | 4 + dlls/rsaenh/rsaenh.c | 3 + dlls/rsaenh/sha2.c | 1003 ++++++++++++++++++++++++++++++++++++++++++++ dlls/rsaenh/sha2.h | 89 ++++ dlls/rsaenh/tests/rsaenh.c | 3 - 7 files changed, 1137 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=311d839dec75915154636…

1 0

Maarten Lankhorst : mmdevapi: Implement MMDeviceCollection methods.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: d53dc08ec5c9ab39e97d5e33c71f30658c663e3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d53dc08ec5c9ab39e97d5e33c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Feb 21 14:24:42 2010 +0100 mmdevapi: Implement MMDeviceCollection methods. --- dlls/mmdevapi/devenum.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index b711db2..cbe4ab0 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -468,20 +468,45 @@ static ULONG WINAPI MMDevCol_Release(IMMDeviceCollection *iface) static HRESULT WINAPI MMDevCol_GetCount(IMMDeviceCollection *iface, UINT *numdevs) { MMDevColImpl *This = (MMDevColImpl*)iface; + DWORD i; TRACE("(%p)->(%p)\n", This, numdevs); if (!numdevs) return E_POINTER; + *numdevs = 0; + for (i = 0; i < MMDevice_count; ++i) + { + MMDevice *cur = MMDevice_head[i]; + if ((cur->flow == This->flow || This->flow == eAll) + && (cur->state & This->state)) + ++(*numdevs); + } return S_OK; } -static HRESULT WINAPI MMDevCol_Item(IMMDeviceCollection *iface, UINT i, IMMDevice **dev) +static HRESULT WINAPI MMDevCol_Item(IMMDeviceCollection *iface, UINT n, IMMDevice **dev) { MMDevColImpl *This = (MMDevColImpl*)iface; - TRACE("(%p)->(%u, %p)\n", This, i, dev); + DWORD i = 0, j = 0; + + TRACE("(%p)->(%u, %p)\n", This, n, dev); if (!dev) return E_POINTER; + + for (j = 0; j < MMDevice_count; ++j) + { + MMDevice *cur = MMDevice_head[j]; + if ((cur->flow == This->flow || This->flow == eAll) + && (cur->state & This->state) + && i++ == n) + { + *dev = (IMMDevice *)cur; + IMMDevice_AddRef(*dev); + return S_OK; + } + } + WARN("Could not obtain item %u\n", n); *dev = NULL; return E_INVALIDARG; }

1 0

Maarten Lankhorst : mmdevapi: Implement IMMDeviceEnumerator::GetDevice.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 55b48ff66299a07d41756c1b199806846d4fc415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b48ff66299a07d41756c1b1… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Feb 21 14:26:43 2010 +0100 mmdevapi: Implement IMMDeviceEnumerator::GetDevice. --- dlls/mmdevapi/devenum.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index cbe4ab0..f39fe97 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -809,9 +809,31 @@ static HRESULT WINAPI MMDevEnum_GetDefaultAudioEndpoint(IMMDeviceEnumerator *ifa static HRESULT WINAPI MMDevEnum_GetDevice(IMMDeviceEnumerator *iface, const WCHAR *name, IMMDevice **device) { MMDevEnumImpl *This = (MMDevEnumImpl*)iface; + DWORD i=0; + IMMDevice *dev = NULL; + TRACE("(%p)->(%s,%p)\n", This, debugstr_w(name), device); - FIXME("stub\n"); - return E_NOTIMPL; + for (i = 0; i < MMDevice_count; ++i) + { + WCHAR *str; + dev = (IMMDevice*)MMDevice_head[i]; + IMMDevice_GetId(dev, &str); + + if (str && !lstrcmpW(str, name)) + { + CoTaskMemFree(str); + break; + } + CoTaskMemFree(str); + } + if (dev) + { + IUnknown_AddRef(dev); + *device = dev; + return S_OK; + } + WARN("Could not find device %s\n", debugstr_w(name)); + return E_NOTFOUND; } static HRESULT WINAPI MMDevEnum_RegisterEndpointNotificationCallback(IMMDeviceEnumerator *iface, IMMNotificationClient *client)

1 0

Maarten Lankhorst : mmdevapi: Pass a property bag to IBaseFilter in IMMDevice::Activate.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 693c991626cce42f824f1c75227df46333ce1a8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=693c991626cce42f824f1c752… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Feb 21 14:31:24 2010 +0100 mmdevapi: Pass a property bag to IBaseFilter in IMMDevice::Activate. --- dlls/mmdevapi/devenum.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 79 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index f39fe97..9d1adb1 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -94,6 +94,12 @@ typedef struct MMDevColImpl DWORD state; } MMDevColImpl; +typedef struct IPropertyBagImpl { + const IPropertyBagVtbl *lpVtbl; + GUID devguid; +} IPropertyBagImpl; +static const IPropertyBagVtbl PB_Vtbl; + static HRESULT MMDevPropStore_Create(MMDevice *This, DWORD access, IPropertyStore **ppv); /* Creates or updates the state of a device @@ -275,6 +281,26 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls hr = CoCreateInstance(&CLSID_DSoundRender, NULL, clsctx, riid, ppv); else ERR("Not supported for recording?\n"); + if (SUCCEEDED(hr)) + { + IPersistPropertyBag *ppb; + hr = IUnknown_QueryInterface((IUnknown*)*ppv, &IID_IPersistPropertyBag, (void*)&ppb); + if (SUCCEEDED(hr)) + { + /* ::Load cannot assume the interface stays alive after the function returns, + * so just create the interface on the stack, saves a lot of complicated code */ + IPropertyBagImpl bag = { &PB_Vtbl, This->devguid }; + hr = IPersistPropertyBag_Load(ppb, (IPropertyBag*)&bag, NULL); + IPersistPropertyBag_Release(ppb); + if (FAILED(hr)) + IBaseFilter_Release((IBaseFilter*)*ppv); + } + else + { + FIXME("Wine doesn't support IPersistPropertyBag on DSoundRender yet, ignoring..\n"); + hr = S_OK; + } + } } else if (IsEqualIID(riid, &IID_IDeviceTopology)) { @@ -1035,3 +1061,56 @@ static const IPropertyStoreVtbl MMDevPropVtbl = MMDevPropStore_SetValue, MMDevPropStore_Commit }; + + +/* Property bag for IBaseFilter activation */ +static HRESULT WINAPI PB_QueryInterface(IPropertyBag *iface, REFIID riid, void **ppv) +{ + ERR("Should not be called\n"); + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI PB_AddRef(IPropertyBag *iface) +{ + ERR("Should not be called\n"); + return 2; +} + +static ULONG WINAPI PB_Release(IPropertyBag *iface) +{ + ERR("Should not be called\n"); + return 1; +} + +static HRESULT WINAPI PB_Read(IPropertyBag *iface, LPCOLESTR name, VARIANT *var, IErrorLog *log) +{ + static const WCHAR dsguid[] = { 'D','S','G','u','i','d', 0 }; + IPropertyBagImpl *This = (IPropertyBagImpl*)iface; + TRACE("Trying to read %s, type %u\n", debugstr_w(name), var->n1.n2.vt); + if (!lstrcmpW(name, dsguid)) + { + WCHAR guidstr[39]; + StringFromGUID2(&This->devguid, guidstr,sizeof(guidstr)/sizeof(*guidstr)); + var->n1.n2.vt = VT_BSTR; + var->n1.n2.n3.bstrVal = SysAllocString(guidstr); + return S_OK; + } + ERR("Unknown property '%s' queried\n", debugstr_w(name)); + return E_FAIL; +} + +static HRESULT WINAPI PB_Write(IPropertyBag *iface, LPCOLESTR name, VARIANT *var) +{ + ERR("Should not be called\n"); + return E_FAIL; +} + +static const IPropertyBagVtbl PB_Vtbl = +{ + PB_QueryInterface, + PB_AddRef, + PB_Release, + PB_Read, + PB_Write +};

1 0

Maarten Lankhorst : mmdevapi: Implement some methods in IMMDevice.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 9371fd5f95ec8402b9984beb9596b1c1d7aebcfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9371fd5f95ec8402b9984beb9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Feb 21 14:19:57 2010 +0100 mmdevapi: Implement some methods in IMMDevice. --- dlls/mmdevapi/devenum.c | 73 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 68 insertions(+), 5 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 32a337a..b711db2 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -256,8 +256,60 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls if (!ppv) return E_POINTER; - FIXME("stub\n"); - hr = E_NOTIMPL; + if (IsEqualIID(riid, &IID_IAudioClient)) + { + FIXME("IID_IAudioClient unsupported\n"); + } + else if (IsEqualIID(riid, &IID_IAudioEndpointVolume)) + { + FIXME("IID_IAudioEndpointVolume unsupported\n"); + } + else if (IsEqualIID(riid, &IID_IAudioSessionManager) + || IsEqualIID(riid, &IID_IAudioSessionManager2)) + { + FIXME("IID_IAudioSessionManager unsupported\n"); + } + else if (IsEqualIID(riid, &IID_IBaseFilter)) + { + if (This->flow == eRender) + hr = CoCreateInstance(&CLSID_DSoundRender, NULL, clsctx, riid, ppv); + else + ERR("Not supported for recording?\n"); + } + else if (IsEqualIID(riid, &IID_IDeviceTopology)) + { + FIXME("IID_IDeviceTopology unsupported\n"); + } + else if (IsEqualIID(riid, &IID_IDirectSound) + || IsEqualIID(riid, &IID_IDirectSound8)) + { + if (This->flow == eRender) + hr = CoCreateInstance(&CLSID_DirectSound8, NULL, clsctx, riid, ppv); + if (SUCCEEDED(hr)) + { + hr = IDirectSound_Initialize((IDirectSound*)*ppv, &This->devguid); + if (FAILED(hr)) + IDirectSound_Release((IDirectSound*)*ppv); + } + } + else if (IsEqualIID(riid, &IID_IDirectSoundCapture) + || IsEqualIID(riid, &IID_IDirectSoundCapture8)) + { + if (This->flow == eCapture) + hr = CoCreateInstance(&CLSID_DirectSoundCapture8, NULL, clsctx, riid, ppv); + if (SUCCEEDED(hr)) + { + hr = IDirectSoundCapture_Initialize((IDirectSoundCapture*)*ppv, &This->devguid); + if (FAILED(hr)) + IDirectSoundCapture_Release((IDirectSoundCapture*)*ppv); + } + } + else + ERR("Invalid/unknown iid %s\n", debugstr_guid(riid)); + + if (FAILED(hr)) + *ppv = NULL; + TRACE("Returning %08x\n", hr); return hr; } @@ -275,13 +327,24 @@ static HRESULT WINAPI MMDevice_OpenPropertyStore(IMMDevice *iface, DWORD access, static HRESULT WINAPI MMDevice_GetId(IMMDevice *iface, WCHAR **itemid) { MMDevice *This = (MMDevice *)iface; + WCHAR *str; + GUID *id = &This->devguid; + static const WCHAR formatW[] = { '{','0','.','0','.','0','.','0','0','0','0','0','0','0','0','}','.', + '{','%','0','8','X','-','%','0','4','X','-', + '%','0','4','X','-','%','0','2','X','%','0','2','X','-', + '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X', + '%','0','2','X','%','0','2','X','}',0 }; TRACE("(%p)->(%p)\n", This, itemid); if (!itemid) return E_POINTER; - *itemid = NULL; - FIXME("stub\n"); - return E_NOTIMPL; + *itemid = str = CoTaskMemAlloc(56 * sizeof(WCHAR)); + if (!str) + return E_OUTOFMEMORY; + wsprintfW( str, formatW, id->Data1, id->Data2, id->Data3, + id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], + id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); + return S_OK; } static HRESULT WINAPI MMDevice_GetState(IMMDevice *iface, DWORD *state)

1 0