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

Andrey Gusev : api-ms-win-rtcore-ntuser-wmpointer-l1-1-0: Add dll.
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: eb1de172c5b31ca01f68a20fdf9352411c413650 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb1de172c5b31ca01f68a20f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Mar 7 18:24:25 2018 +0200 api-ms-win-rtcore-ntuser-wmpointer-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec | 25 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 30 insertions(+) diff --git a/configure b/configure index 2dc1d37..2e0cbec 100755 --- a/configure +++ b/configure @@ -1068,6 +1068,7 @@ enable_api_ms_win_power_setting_l1_1_0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 enable_api_ms_win_rtcore_ntuser_window_l1_1_0 enable_api_ms_win_rtcore_ntuser_winevent_l1_1_0 +enable_api_ms_win_rtcore_ntuser_wmpointer_l1_1_0 enable_api_ms_win_security_activedirectoryclient_l1_1_0 enable_api_ms_win_security_audit_l1_1_1 enable_api_ms_win_security_base_l1_1_0 @@ -18353,6 +18354,7 @@ wine_fn_config_makefile dlls/api-ms-win-power-setting-l1-1-0 enable_api_ms_win_p wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-private-l1-1-0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-window-l1-1-0 enable_api_ms_win_rtcore_ntuser_window_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-winevent-l1-1-0 enable_api_ms_win_rtcore_ntuser_winevent_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0 enable_api_ms_win_rtcore_ntuser_wmpointer_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-security-activedirectoryclient-l1-1-0 enable_api_ms_win_security_activedirectoryclient_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-security-audit-l1-1-1 enable_api_ms_win_security_audit_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 diff --git a/configure.ac b/configure.ac index 0477c72..568c01f 100644 --- a/configure.ac +++ b/configure.ac @@ -3000,6 +3000,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-power-setting-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-private-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-window-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-winevent-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-activedirectoryclient-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-audit-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-base-l1-1-0) diff --git a/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/Makefile.in b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/Makefile.in new file mode 100644 index 0000000..9ba3a86 --- /dev/null +++ b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.dll diff --git a/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec new file mode 100644 index 0000000..1e9fa50 --- /dev/null +++ b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec @@ -0,0 +1,25 @@ +@ stub EnableMouseInPointer +@ stub GetCurrentInputMessageSource +@ stub GetPointerCursorId +@ stub GetPointerDevice +@ stub GetPointerDeviceProperties +@ stub GetPointerDeviceRects +@ stub GetPointerDevices +@ stub GetPointerFrameInfo +@ stub GetPointerFrameInfoHistory +@ stub GetPointerFramePenInfo +@ stub GetPointerFrameTouchInfo +@ stub GetPointerFrameTouchInfoHistory +@ stub GetPointerInfo +@ stub GetPointerInfoHistory +@ stub GetPointerInputTransform +@ stub GetPointerPenInfo +@ stub GetPointerPenInfoHistory +@ stub GetPointerTouchInfo +@ stub GetPointerTouchInfoHistory +@ stub GetPointerType +@ stub GetRawPointerDeviceData +@ stub InitializeTouchInjection +@ stub InjectTouchInput +@ stub IsMouseInPointerEnabled +@ stub SkipPointerFrameMessages diff --git a/tools/make_specfiles b/tools/make_specfiles index 60a9381..1f4aec0 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -348,6 +348,7 @@ my @dll_groups = "api-ms-win-rtcore-ntuser-private-l1-1-0", "api-ms-win-rtcore-ntuser-window-l1-1-0", "api-ms-win-rtcore-ntuser-winevent-l1-1-0", + "api-ms-win-rtcore-ntuser-wmpointer-l1-1-0", "ext-ms-win-ntuser-message-l1-1-1", "ext-ms-win-ntuser-private-l1-1-1", "ext-ms-win-ntuser-rectangle-ext-l1-1-0",

1 0

Andrey Gusev : api-ms-win-rtcore-ntuser-wmpointer-l1-1-3: Add dll.
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: 04ea1d4a9478bc9fcb2b9798ed38ffca45845472 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04ea1d4a9478bc9fcb2b9798… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Mar 7 18:24:56 2018 +0200 api-ms-win-rtcore-ntuser-wmpointer-l1-1-3: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-3/Makefile.in | 1 + .../api-ms-win-rtcore-ntuser-wmpointer-l1-1-3.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) diff --git a/configure b/configure index 2e0cbec..e6e1d68 100755 --- a/configure +++ b/configure @@ -1069,6 +1069,7 @@ enable_api_ms_win_rtcore_ntuser_private_l1_1_0 enable_api_ms_win_rtcore_ntuser_window_l1_1_0 enable_api_ms_win_rtcore_ntuser_winevent_l1_1_0 enable_api_ms_win_rtcore_ntuser_wmpointer_l1_1_0 +enable_api_ms_win_rtcore_ntuser_wmpointer_l1_1_3 enable_api_ms_win_security_activedirectoryclient_l1_1_0 enable_api_ms_win_security_audit_l1_1_1 enable_api_ms_win_security_base_l1_1_0 @@ -18355,6 +18356,7 @@ wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-private-l1-1-0 enable_api_ wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-window-l1-1-0 enable_api_ms_win_rtcore_ntuser_window_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-winevent-l1-1-0 enable_api_ms_win_rtcore_ntuser_winevent_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0 enable_api_ms_win_rtcore_ntuser_wmpointer_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-3 enable_api_ms_win_rtcore_ntuser_wmpointer_l1_1_3 wine_fn_config_makefile dlls/api-ms-win-security-activedirectoryclient-l1-1-0 enable_api_ms_win_security_activedirectoryclient_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-security-audit-l1-1-1 enable_api_ms_win_security_audit_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 diff --git a/configure.ac b/configure.ac index 568c01f..e16cc3a 100644 --- a/configure.ac +++ b/configure.ac @@ -3001,6 +3001,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-private-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-window-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-winevent-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-3) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-activedirectoryclient-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-audit-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-base-l1-1-0) diff --git a/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-3/Makefile.in b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-3/Makefile.in new file mode 100644 index 0000000..8dcda0f --- /dev/null +++ b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-3/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-rtcore-ntuser-wmpointer-l1-1-3.dll diff --git a/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-3/api-ms-win-rtcore-ntuser-wmpointer-l1-1-3.spec b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-3/api-ms-win-rtcore-ntuser-wmpointer-l1-1-3.spec new file mode 100644 index 0000000..fd5d1ed --- /dev/null +++ b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-3/api-ms-win-rtcore-ntuser-wmpointer-l1-1-3.spec @@ -0,0 +1 @@ +@ stub GetWindowFeedbackSetting diff --git a/tools/make_specfiles b/tools/make_specfiles index 1f4aec0..31d2f20 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -349,6 +349,7 @@ my @dll_groups = "api-ms-win-rtcore-ntuser-window-l1-1-0", "api-ms-win-rtcore-ntuser-winevent-l1-1-0", "api-ms-win-rtcore-ntuser-wmpointer-l1-1-0", + "api-ms-win-rtcore-ntuser-wmpointer-l1-1-3", "ext-ms-win-ntuser-message-l1-1-1", "ext-ms-win-ntuser-private-l1-1-1", "ext-ms-win-ntuser-rectangle-ext-l1-1-0",

1 0

Zebediah Figura : quartz/tests: Remove a debug trace.
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: 813ab925abd45d48c811898028fddc1047b0c250 URL: https://source.winehq.org/git/wine.git/?a=commit;h=813ab925abd45d48c8118980… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 7 13:43:13 2018 -0600 quartz/tests: Remove a debug trace. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtermapper.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index 602a6d1..829e89b 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -182,7 +182,6 @@ static void test_fm2_enummatchingfilters(void) ok(hr == S_OK, "IFilterMapper_EnumMatchingFilters failed: %#x\n", hr); while (!found && IEnumRegFilters_Next(enum_reg, 1, &regfilter, &count) == S_OK) { - trace("%s %s\n", wine_dbgstr_guid(&regfilter->Clsid), wine_dbgstr_w(regfilter->Name)); if (!lstrcmpW(regfilter->Name, wszFilterName1) && IsEqualGUID(&clsidFilter1, &regfilter->Clsid)) found = TRUE; }

1 0

Zebediah Figura : devenum/tests: Test all registered categories.
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: d34637f597bcd9172ed2d47aaf70a30d4395523b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d34637f597bcd9172ed2d47a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 6 20:57:06 2018 -0600 devenum/tests: Test all registered categories. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/tests/devenum.c | 109 +++++++++++++++++++------------------------ 1 file changed, 48 insertions(+), 61 deletions(-) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 5a41183..575aebd 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -30,57 +30,56 @@ static const WCHAR friendly_name[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; static const WCHAR fcc_handlerW[] = {'F','c','c','H','a','n','d','l','e','r',0}; +static const WCHAR clsidW[] = {'C','L','S','I','D',0}; static const WCHAR mrleW[] = {'m','r','l','e',0}; -struct category -{ - const char * name; - const GUID * clsid; -}; - -static struct category am_categories[] = -{ - { "Legacy AM Filter category", &CLSID_LegacyAmFilterCategory }, - { "Audio renderer category", &CLSID_AudioRendererCategory }, - { "Midi renderer category", &CLSID_MidiRendererCategory }, - { "Audio input device category", &CLSID_AudioInputDeviceCategory }, - { "Video input device category", &CLSID_VideoInputDeviceCategory }, - { "Audio compressor category", &CLSID_AudioCompressorCategory }, - { "Video compressor category", &CLSID_VideoCompressorCategory } -}; - static void test_devenum(IBindCtx *bind_ctx) { - HRESULT res; + IEnumMoniker *enum_cat, *enum_moniker; ICreateDevEnum* create_devenum; - IEnumMoniker* enum_moniker = NULL; + IPropertyBag *prop_bag; + IMoniker *moniker; BOOL have_mrle = FALSE; - int i; + GUID cat_guid, clsid; + VARIANT var; + HRESULT hr; - res = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, + hr = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, &IID_ICreateDevEnum, (LPVOID*)&create_devenum); - if (res != S_OK) { - skip("Cannot create SystemDeviceEnum object (%x)\n", res); - return; - } + ok(hr == S_OK, "Failed to create devenum: %#x\n", hr); - for (i = 0; i < (sizeof(am_categories) / sizeof(struct category)); i++) + hr = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_ActiveMovieCategories, &enum_cat, 0); + ok(hr == S_OK, "Failed to enum categories: %#x\n", hr); + + while (IEnumMoniker_Next(enum_cat, 1, &moniker, NULL) == S_OK) { + hr = IMoniker_BindToStorage(moniker, bind_ctx, NULL, &IID_IPropertyBag, (void **)&prop_bag); + ok(hr == S_OK, "IMoniker_BindToStorage failed: %#x\n", hr); + + VariantInit(&var); + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + ok(hr == S_OK, "Failed to read FriendlyName: %#x\n", hr); + if (winetest_debug > 1) - trace("%s:\n", am_categories[i].name); + trace("%s:\n", wine_dbgstr_w(V_BSTR(&var))); + + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, clsidW, &var, NULL); + ok(hr == S_OK, "Failed to read CLSID: %#x\n", hr); + + hr = CLSIDFromString(V_BSTR(&var), &cat_guid); + ok(hr == S_OK, "got %#x\n", hr); + + IPropertyBag_Release(prop_bag); + IMoniker_Release(moniker); + + hr = ICreateDevEnum_CreateClassEnumerator(create_devenum, &cat_guid, &enum_moniker, 0); + ok(SUCCEEDED(hr), "Failed to enum devices: %#x\n", hr); - res = ICreateDevEnum_CreateClassEnumerator(create_devenum, am_categories[i].clsid, &enum_moniker, 0); - ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); - if (res == S_OK) + if (hr == S_OK) { - IMoniker* moniker; while (IEnumMoniker_Next(enum_moniker, 1, &moniker, NULL) == S_OK) { - IPropertyBag* prop_bag = NULL; - VARIANT var; - HRESULT hr; - CLSID clsid = {0}; - hr = IMoniker_GetClassID(moniker, NULL); ok(hr == E_INVALIDARG, "IMoniker_GetClassID should failed %x\n", hr); @@ -93,36 +92,24 @@ static void test_devenum(IBindCtx *bind_ctx) hr = IMoniker_BindToStorage(moniker, bind_ctx, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag); ok(hr == S_OK, "IMoniker_BindToStorage failed with error %x\n", hr); - if (SUCCEEDED(hr)) - { - hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); - ok((hr == S_OK) || broken(hr == 0x80070002), "IPropertyBag_Read failed with error %x\n", hr); + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + ok(hr == S_OK, "IPropertyBag_Read failed: %#x\n", hr); - if (SUCCEEDED(hr)) - { - if (winetest_debug > 1) - trace(" %s\n", wine_dbgstr_w(V_BSTR(&var))); - VariantClear(&var); - } - else - { - trace(" ???\n"); - } + if (winetest_debug > 1) + trace(" %s\n", wine_dbgstr_w(V_BSTR(&var))); - if (IsEqualGUID(&CLSID_VideoCompressorCategory, am_categories[i].clsid)) { - /* Test well known compressor to ensure that we really enumerate codecs */ - hr = IPropertyBag_Read(prop_bag, fcc_handlerW, &var, NULL); - if (SUCCEEDED(hr)) { - ok(V_VT(&var) == VT_BSTR, "V_VT(var) = %d\n", V_VT(&var)); - if(!lstrcmpW(V_BSTR(&var), mrleW)) - have_mrle = TRUE; - VariantClear(&var); - } + if (IsEqualGUID(&CLSID_VideoCompressorCategory, &cat_guid)) { + /* Test well known compressor to ensure that we really enumerate codecs */ + hr = IPropertyBag_Read(prop_bag, fcc_handlerW, &var, NULL); + if (SUCCEEDED(hr)) { + ok(V_VT(&var) == VT_BSTR, "V_VT(var) = %d\n", V_VT(&var)); + if(!lstrcmpW(V_BSTR(&var), mrleW)) + have_mrle = TRUE; + VariantClear(&var); } } - if (prop_bag) - IPropertyBag_Release(prop_bag); + IPropertyBag_Release(prop_bag); IMoniker_Release(moniker); } IEnumMoniker_Release(enum_moniker);

1 0

Zebediah Figura : devenum/tests: Test registering DirectShow filters.
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: a736400eed739052dab56750411ddf53919948d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a736400eed739052dab56750… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 6 20:57:07 2018 -0600 devenum/tests: Test registering DirectShow filters. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/tests/devenum.c | 74 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 73 insertions(+), 1 deletion(-) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 575aebd..79189f3 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -211,7 +211,78 @@ static void test_moniker_isequal(void) return; } -/* CLSID_CDeviceMoniker */ +static BOOL find_moniker(const GUID *class, IMoniker *needle) +{ + ICreateDevEnum *devenum; + IEnumMoniker *enum_mon; + IMoniker *mon; + BOOL found = FALSE; + + CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, &IID_ICreateDevEnum, (void **)&devenum); + ICreateDevEnum_CreateClassEnumerator(devenum, class, &enum_mon, 0); + while (!found && IEnumMoniker_Next(enum_mon, 1, &mon, NULL) == S_OK) + { + if (IMoniker_IsEqual(mon, needle) == S_OK) + found = TRUE; + + IMoniker_Release(mon); + } + + IEnumMoniker_Release(enum_mon); + ICreateDevEnum_Release(devenum); + return found; +} + +DEFINE_GUID(CLSID_TestFilter, 0xdeadbeef,0xcf51,0x43e6,0xb6,0xc5,0x29,0x9e,0xa8,0xb6,0xb5,0x91); + +static void test_register_filter(void) +{ + static const WCHAR name[] = {'d','e','v','e','n','u','m',' ','t','e','s','t',0}; + IFilterMapper2 *mapper2; + IMoniker *mon = NULL; + REGFILTER2 rgf2 = {0}; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC, &IID_IFilterMapper2, (void **)&mapper2); + ok(hr == S_OK, "Failed to create FilterMapper2: %#x\n", hr); + + rgf2.dwVersion = 2; + rgf2.dwMerit = MERIT_UNLIKELY; + S2(U(rgf2)).cPins2 = 0; + + hr = IFilterMapper2_RegisterFilter(mapper2, &CLSID_TestFilter, name, &mon, NULL, NULL, &rgf2); + if (hr == E_ACCESSDENIED) + { + skip("Not enough permissions to register filters\n"); + IFilterMapper2_Release(mapper2); + return; + } + ok(hr == S_OK, "RegisterFilter failed: %#x\n", hr); + + ok(find_moniker(&CLSID_LegacyAmFilterCategory, mon), "filter should be registered\n"); + + hr = IFilterMapper2_UnregisterFilter(mapper2, NULL, NULL, &CLSID_TestFilter); + ok(hr == S_OK, "UnregisterFilter failed: %#x\n", hr); + + ok(!find_moniker(&CLSID_LegacyAmFilterCategory, mon), "filter should not be registered\n"); + IMoniker_Release(mon); + + mon = NULL; + hr = IFilterMapper2_RegisterFilter(mapper2, &CLSID_TestFilter, name, &mon, &CLSID_AudioRendererCategory, NULL, &rgf2); + ok(hr == S_OK, "RegisterFilter failed: %#x\n", hr); + + ok(find_moniker(&CLSID_AudioRendererCategory, mon), "filter should be registered\n"); + + hr = IFilterMapper2_UnregisterFilter(mapper2, &CLSID_AudioRendererCategory, NULL, &CLSID_TestFilter); +todo_wine + ok(hr == S_OK, "UnregisterFilter failed: %#x\n", hr); + +todo_wine + ok(!find_moniker(&CLSID_AudioRendererCategory, mon), "filter should not be registered\n"); + IMoniker_Release(mon); + + IFilterMapper2_Release(mapper2); +} START_TEST(devenum) { @@ -231,6 +302,7 @@ START_TEST(devenum) } test_moniker_isequal(); + test_register_filter(); CoUninitialize(); }

1 0

Zebediah Figura : devenum: More correctly handle device types.
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: f5c531bdd10ea10c78a74e45beb9009dadf70c09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5c531bdd10ea10c78a74e45… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 6 20:57:08 2018 -0600 devenum: More correctly handle device types. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/createdevenum.c | 134 ++++++------------------------------- dlls/devenum/devenum_private.h | 23 ++++--- dlls/devenum/mediacatenum.c | 100 +++++++++++++++------------ dlls/devenum/parsedisplayname.c | 42 ++++++++---- dlls/devenum/tests/devenum.c | 145 +++++++++++++++++++++++++++++++++++++++- 5 files changed, 267 insertions(+), 177 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f5c531bdd10ea10c78a7…

1 0

Zebediah Figura : devenum: Allow parsing display name without class ID.
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: f49fc4c7ef940409a2c41ab7230a97e423980015 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f49fc4c7ef940409a2c41ab7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 6 20:57:09 2018 -0600 devenum: Allow parsing display name without class ID. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/devenum_private.h | 5 +++ dlls/devenum/mediacatenum.c | 3 ++ dlls/devenum/parsedisplayname.c | 96 +++++++++++++++++++---------------------- dlls/devenum/tests/devenum.c | 37 ++++++++++++++++ 4 files changed, 90 insertions(+), 51 deletions(-) diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index bcc5085..9a0b5ad 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -71,6 +71,10 @@ typedef struct IMoniker IMoniker_iface; LONG ref; HKEY hkey; + CLSID class; + BOOL has_class; + enum device_type type; + WCHAR *name; } MediaCatMoniker; MediaCatMoniker * DEVENUM_IMediaCatMoniker_Construct(void) DECLSPEC_HIDDEN; @@ -84,6 +88,7 @@ extern IParseDisplayName DEVENUM_ParseDisplayName DECLSPEC_HIDDEN; * Global string constant declarations */ +static const WCHAR backslashW[] = {'\\',0}; static const WCHAR clsidW[] = {'C','L','S','I','D','\\',0}; static const WCHAR instanceW[] = {'\\','I','n','s','t','a','n','c','e',0}; static const WCHAR wszActiveMovieKey[] = {'S','o','f','t','w','a','r','e','\\', diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 583ca7d..0f38a0e 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -345,6 +345,7 @@ static ULONG WINAPI DEVENUM_IMediaCatMoniker_Release(IMoniker *iface) if (ref == 0) { RegCloseKey(This->hkey); + CoTaskMemFree(This->name); CoTaskMemFree(This); DEVENUM_UnlockModule(); } @@ -695,6 +696,8 @@ MediaCatMoniker * DEVENUM_IMediaCatMoniker_Construct(void) pMoniker->IMoniker_iface.lpVtbl = &IMoniker_Vtbl; pMoniker->ref = 0; pMoniker->hkey = NULL; + pMoniker->has_class = FALSE; + pMoniker->name = NULL; DEVENUM_IMediaCatMoniker_AddRef(&pMoniker->IMoniker_iface); diff --git a/dlls/devenum/parsedisplayname.c b/dlls/devenum/parsedisplayname.c index b5a3951..2875a8c 100644 --- a/dlls/devenum/parsedisplayname.c +++ b/dlls/devenum/parsedisplayname.c @@ -76,87 +76,81 @@ static ULONG WINAPI DEVENUM_IParseDisplayName_Release(IParseDisplayName *iface) * not in "@device:sw:{CLSID1}\<filter name or CLSID>" format */ static HRESULT WINAPI DEVENUM_IParseDisplayName_ParseDisplayName(IParseDisplayName *iface, - IBindCtx *pbc, LPOLESTR pszDisplayName, ULONG *pchEaten, IMoniker **ppmkOut) + IBindCtx *pbc, LPOLESTR name, ULONG *eaten, IMoniker **ret) { - LPOLESTR pszBetween = NULL; - LPOLESTR pszClass = NULL; - MediaCatMoniker * pMoniker = NULL; - CLSID clsidDevice; - HRESULT hr = S_OK; - WCHAR wszRegKeyName[MAX_PATH]; + WCHAR buffer[MAX_PATH]; enum device_type type; + MediaCatMoniker *mon; HKEY hbasekey; - int classlen; - LONG res; - static const WCHAR wszRegSeparator[] = {'\\', 0 }; + CLSID class; + LRESULT res; - TRACE("(%p, %s, %p, %p)\n", pbc, debugstr_w(pszDisplayName), pchEaten, ppmkOut); + TRACE("(%p, %s, %p, %p)\n", pbc, debugstr_w(name), eaten, ret); - *ppmkOut = NULL; - if (pchEaten) - *pchEaten = strlenW(pszDisplayName); + *ret = NULL; + if (eaten) + *eaten = strlenW(name); - pszDisplayName = strchrW(pszDisplayName, ':') + 1; - if (pszDisplayName[0] == 's' && pszDisplayName[1] == 'w' && pszDisplayName[2] == ':') + name = strchrW(name, ':') + 1; + + if (name[0] == 's' && name[1] == 'w' && name[2] == ':') { type = DEVICE_FILTER; if ((res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsidW, 0, 0, &hbasekey))) return HRESULT_FROM_WIN32(res); + name += 3; } - else if (pszDisplayName[0] == 'c' && pszDisplayName[1] == 'm' && pszDisplayName[2] == ':') + else if (name[0] == 'c' && name[1] == 'm' && name[2] == ':') { type = DEVICE_CODEC; if ((res = RegOpenKeyExW(HKEY_CURRENT_USER, wszActiveMovieKey, 0, 0, &hbasekey))) return HRESULT_FROM_WIN32(res); + name += 3; } else { - FIXME("unhandled device type %s\n", debugstr_w(pszDisplayName+1)); + FIXME("unhandled device type %s\n", debugstr_w(name)); return MK_E_SYNTAX; } - pszDisplayName = strchrW(pszDisplayName, '{'); - pszBetween = strchrW(pszDisplayName, '}') + 2; - - /* size = pszBetween - pszDisplayName - 1 (for '\\' after CLSID) - * + 1 (for NULL character) - */ - classlen = (int)(pszBetween - pszDisplayName - 1); - pszClass = CoTaskMemAlloc((classlen + 1) * sizeof(WCHAR)); - if (!pszClass) + if (!(mon = DEVENUM_IMediaCatMoniker_Construct())) return E_OUTOFMEMORY; - memcpy(pszClass, pszDisplayName, classlen * sizeof(WCHAR)); - pszClass[classlen] = 0; + lstrcpynW(buffer, name, CHARS_IN_GUID); + if (CLSIDFromString(buffer, &class) == S_OK) + { + mon->has_class = TRUE; + mon->class = class; + name += CHARS_IN_GUID; + } - TRACE("Device CLSID: %s\n", debugstr_w(pszClass)); + mon->type = type; - hr = CLSIDFromString(pszClass, &clsidDevice); + if (!(mon->name = CoTaskMemAlloc((strlenW(name) + 1) * sizeof(WCHAR)))) + { + IMoniker_Release(&mon->IMoniker_iface); + return E_OUTOFMEMORY; + } + strcpyW(mon->name, name); - if (SUCCEEDED(hr)) + buffer[0] = 0; + if (mon->has_class) { - pMoniker = DEVENUM_IMediaCatMoniker_Construct(); - if (pMoniker) - { - strcpyW(wszRegKeyName, pszClass); - if (type == DEVICE_FILTER) - strcatW(wszRegKeyName, instanceW); - strcatW(wszRegKeyName, wszRegSeparator); - strcatW(wszRegKeyName, pszBetween); - if (RegCreateKeyW(hbasekey, wszRegKeyName, &pMoniker->hkey) == ERROR_SUCCESS) - *ppmkOut = &pMoniker->IMoniker_iface; - else - { - IMoniker_Release(&pMoniker->IMoniker_iface); - hr = MK_E_NOOBJECT; - } - } + StringFromGUID2(&mon->class, buffer, CHARS_IN_GUID); + if (mon->type == DEVICE_FILTER) + strcatW(buffer, instanceW); + strcatW(buffer, backslashW); } + strcatW(buffer, mon->name); - CoTaskMemFree(pszClass); + if (RegCreateKeyW(hbasekey, buffer, &mon->hkey)) + { + IMoniker_Release(&mon->IMoniker_iface); + return MK_E_NOOBJECT; + } + *ret = &mon->IMoniker_iface; - TRACE("-- returning: %x\n", hr); - return hr; + return S_OK; } /********************************************************************** diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index c53f909..fe8cb2e 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -365,6 +365,43 @@ static void test_directshow_filter(void) VariantClear(&var); IPropertyBag_Release(prop_bag); + + /* name can be anything */ + + lstrcpyW(buffer, deviceW); + lstrcatW(buffer, testW+1); + mon = check_display_name(parser, buffer); + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); + ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#x\n", hr); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(testW); + hr = IPropertyBag_Write(prop_bag, friendly_name, &var); + if (hr != E_ACCESSDENIED) + { + ok(hr == S_OK, "Write failed: %#x\n", hr); + + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(!lstrcmpW(V_BSTR(&var), testW), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + + IMoniker_Release(mon); + + /* vista+ stores it inside the Instance key */ + RegDeleteKeyA(HKEY_CLASSES_ROOT, "CLSID\\test\\Instance"); + + res = RegDeleteKeyA(HKEY_CLASSES_ROOT, "CLSID\\test"); + ok(!res, "RegDeleteKey failed: %lu\n", res); + } + + VariantClear(&var); + IPropertyBag_Release(prop_bag); IParseDisplayName_Release(parser); }

1 0

Zebediah Figura : devenum: Correctly implement IMoniker::GetDisplayName().
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: b0300ce56483fb2f2a03de8aa216d41b0bfd034e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0300ce56483fb2f2a03de8a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 6 20:57:10 2018 -0600 devenum: Correctly implement IMoniker::GetDisplayName(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/devenum_private.h | 1 + dlls/devenum/mediacatenum.c | 51 ++++++++++++++++++++++++++++++++---------- dlls/devenum/tests/devenum.c | 4 ++-- 3 files changed, 42 insertions(+), 14 deletions(-) diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 9a0b5ad..83d0ce3 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -95,6 +95,7 @@ static const WCHAR wszActiveMovieKey[] = {'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'A','c','t','i','v','e','M','o','v','i','e','\\', 'd','e','v','e','n','u','m','\\',0}; +static const WCHAR deviceW[] = {'@','d','e','v','i','c','e',':',0}; extern const WCHAR clsid_keyname[6] DECLSPEC_HIDDEN; diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 0f38a0e..0d4e01e 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(devenum); typedef struct { IEnumMoniker IEnumMoniker_iface; + CLSID class; LONG ref; HKEY sw_key; DWORD sw_index; @@ -621,24 +622,35 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_RelativePathTo(IMoniker *iface, I static HRESULT WINAPI DEVENUM_IMediaCatMoniker_GetDisplayName(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, LPOLESTR *ppszDisplayName) { + static const WCHAR swW[] = {'s','w',':',0}; + static const WCHAR cmW[] = {'c','m',':',0}; MediaCatMoniker *This = impl_from_IMoniker(iface); - WCHAR wszBuffer[MAX_PATH]; - static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; - DWORD received = sizeof(wszBuffer); + WCHAR *buffer; TRACE("(%p)->(%p, %p, %p)\n", iface, pbc, pmkToLeft, ppszDisplayName); *ppszDisplayName = NULL; - /* FIXME: should this be the weird stuff we have to parse in IParseDisplayName? */ - if (RegQueryValueExW(This->hkey, wszFriendlyName, NULL, NULL, (LPBYTE)wszBuffer, &received) == ERROR_SUCCESS) + buffer = CoTaskMemAlloc((strlenW(deviceW) + 4 + (This->has_class ? CHARS_IN_GUID : 0) + + strlenW(This->name) + 1) * sizeof(WCHAR)); + if (!buffer) + return E_OUTOFMEMORY; + + strcpyW(buffer, deviceW); + if (This->type == DEVICE_FILTER) + strcatW(buffer, swW); + else if (This->type == DEVICE_CODEC) + strcatW(buffer, cmW); + + if (This->has_class) { - *ppszDisplayName = CoTaskMemAlloc(received); - strcpyW(*ppszDisplayName, wszBuffer); - return S_OK; + StringFromGUID2(&This->class, buffer + strlenW(buffer), CHARS_IN_GUID); + strcatW(buffer, backslashW); } + strcatW(buffer, This->name); - return E_FAIL; + *ppszDisplayName = buffer; + return S_OK; } static HRESULT WINAPI DEVENUM_IMediaCatMoniker_ParseDisplayName(IMoniker *iface, IBindCtx *pbc, @@ -782,6 +794,11 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt, This->sw_index++; if ((res = RegOpenKeyExW(This->sw_key, buffer, 0, KEY_QUERY_VALUE, &hkey))) break; + + if (!(pMoniker = DEVENUM_IMediaCatMoniker_Construct())) + return E_OUTOFMEMORY; + + pMoniker->type = DEVICE_FILTER; } /* then try codecs */ else if (!(res = RegEnumKeyW(This->cm_key, This->cm_index, buffer, sizeof(buffer)/sizeof(WCHAR)))) @@ -790,14 +807,23 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt, if ((res = RegOpenKeyExW(This->cm_key, buffer, 0, KEY_QUERY_VALUE, &hkey))) break; + + if (!(pMoniker = DEVENUM_IMediaCatMoniker_Construct())) + return E_OUTOFMEMORY; + + pMoniker->type = DEVICE_CODEC; } else break; - pMoniker = DEVENUM_IMediaCatMoniker_Construct(); - if (!pMoniker) + if (!(pMoniker->name = CoTaskMemAlloc((strlenW(buffer) + 1) * sizeof(WCHAR)))) + { + IMoniker_Release(&pMoniker->IMoniker_iface); return E_OUTOFMEMORY; - + } + strcpyW(pMoniker->name, buffer); + pMoniker->has_class = TRUE; + pMoniker->class = This->class; pMoniker->hkey = hkey; rgelt[fetched] = &pMoniker->IMoniker_iface; @@ -887,6 +913,7 @@ HRESULT create_EnumMoniker(REFCLSID class, IEnumMoniker **ppEnumMoniker) pEnumMoniker->ref = 1; pEnumMoniker->sw_index = 0; pEnumMoniker->cm_index = 0; + pEnumMoniker->class = *class; strcpyW(buffer, clsidW); StringFromGUID2(class, buffer + strlenW(buffer), CHARS_IN_GUID); diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index fe8cb2e..0437b6b 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -293,10 +293,8 @@ static IMoniker *check_display_name_(int line, IParseDisplayName *parser, WCHAR ok_(__FILE__, line)(hr == S_OK, "ParseDisplayName failed: %#x\n", hr); hr = IMoniker_GetDisplayName(mon, NULL, NULL, &str); -todo_wine { ok_(__FILE__, line)(hr == S_OK, "GetDisplayName failed: %#x\n", hr); ok_(__FILE__, line)(!lstrcmpW(str, buffer), "got %s\n", wine_dbgstr_w(str)); -} CoTaskMemFree(str); @@ -328,6 +326,7 @@ static void test_directshow_filter(void) mon = check_display_name(parser, buffer); /* Test writing and reading from the property bag */ +todo_wine ok(!find_moniker(&CLSID_AudioRendererCategory, mon), "filter should not be registered\n"); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); @@ -426,6 +425,7 @@ static void test_codec(void) mon = check_display_name(parser, buffer); /* Test writing and reading from the property bag */ +todo_wine ok(!find_moniker(&CLSID_AudioRendererCategory, mon), "codec should not be registered\n"); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag);

1 0

Zebediah Figura : devenum: Create the key in IPropertyBag::Write() instead of ParseDisplayName().
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: 38482b326a7068e064a47d2ec3ccdeb9fe5d86e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38482b326a7068e064a47d2e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 6 20:57:11 2018 -0600 devenum: Create the key in IPropertyBag::Write() instead of ParseDisplayName(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/devenum_private.h | 1 - dlls/devenum/mediacatenum.c | 65 ++++++++++++++++++++++++++++++----------- dlls/devenum/parsedisplayname.c | 21 ------------- dlls/devenum/tests/devenum.c | 2 -- 4 files changed, 48 insertions(+), 41 deletions(-) diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 83d0ce3..a483062 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -70,7 +70,6 @@ typedef struct { IMoniker IMoniker_iface; LONG ref; - HKEY hkey; CLSID class; BOOL has_class; enum device_type type; diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 0d4e01e..b0cdc6c 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -45,7 +45,8 @@ typedef struct { IPropertyBag IPropertyBag_iface; LONG ref; - HKEY hkey; + enum device_type type; + WCHAR path[MAX_PATH]; } RegPropBagImpl; @@ -101,7 +102,6 @@ static ULONG WINAPI DEVENUM_IPropertyBag_Release(LPPROPERTYBAG iface) ref = InterlockedDecrement(&This->ref); if (ref == 0) { - RegCloseKey(This->hkey); CoTaskMemFree(This); DEVENUM_UnlockModule(); } @@ -119,22 +119,32 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Read( DWORD type = 0; RegPropBagImpl *This = impl_from_IPropertyBag(iface); HRESULT res = S_OK; - LONG reswin32; + LONG reswin32 = ERROR_SUCCESS; + HKEY hkey; TRACE("(%p)->(%s, %p, %p)\n", This, debugstr_w(pszPropName), pVar, pErrorLog); if (!pszPropName || !pVar) return E_POINTER; - reswin32 = RegQueryValueExW(This->hkey, pszPropName, NULL, NULL, NULL, &received); + if (This->type == DEVICE_FILTER) + reswin32 = RegOpenKeyW(HKEY_CLASSES_ROOT, This->path, &hkey); + else if (This->type == DEVICE_CODEC) + reswin32 = RegOpenKeyW(HKEY_CURRENT_USER, This->path, &hkey); res = HRESULT_FROM_WIN32(reswin32); if (SUCCEEDED(res)) { + reswin32 = RegQueryValueExW(hkey, pszPropName, NULL, NULL, NULL, &received); + res = HRESULT_FROM_WIN32(reswin32); + } + + if (SUCCEEDED(res)) + { pData = HeapAlloc(GetProcessHeap(), 0, received); /* work around a GCC bug that occurs here unless we use the reswin32 variable as well */ - reswin32 = RegQueryValueExW(This->hkey, pszPropName, NULL, &type, pData, &received); + reswin32 = RegQueryValueExW(hkey, pszPropName, NULL, &type, pData, &received); res = HRESULT_FROM_WIN32(reswin32); } @@ -215,6 +225,8 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Read( HeapFree(GetProcessHeap(), 0, pData); + RegCloseKey(hkey); + TRACE("<- %x\n", res); return res; } @@ -229,6 +241,8 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Write( DWORD cbData = 0; DWORD dwType = 0; HRESULT res = S_OK; + LONG lres = ERROR_SUCCESS; + HKEY hkey; TRACE("(%p)->(%s, %p)\n", This, debugstr_w(pszPropName), pVar); @@ -265,10 +279,18 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Write( return E_FAIL; } - if (RegSetValueExW(This->hkey, - pszPropName, 0, - dwType, lpData, cbData) != ERROR_SUCCESS) - res = E_FAIL; + if (This->type == DEVICE_FILTER) + lres = RegCreateKeyW(HKEY_CLASSES_ROOT, This->path, &hkey); + else if (This->type == DEVICE_CODEC) + lres = RegCreateKeyW(HKEY_CURRENT_USER, This->path, &hkey); + res = HRESULT_FROM_WIN32(lres); + + if (SUCCEEDED(res)) + { + lres = RegSetValueExW(hkey, pszPropName, 0, dwType, lpData, cbData); + res = HRESULT_FROM_WIN32(lres); + RegCloseKey(hkey); + } if (V_VT(pVar) & VT_ARRAY) res = SafeArrayUnaccessData(V_ARRAY(pVar)); @@ -285,14 +307,28 @@ static const IPropertyBagVtbl IPropertyBag_Vtbl = DEVENUM_IPropertyBag_Write }; -static HRESULT DEVENUM_IPropertyBag_Construct(HANDLE hkey, IPropertyBag **ppBag) +static HRESULT create_PropertyBag(MediaCatMoniker *mon, IPropertyBag **ppBag) { RegPropBagImpl * rpb = CoTaskMemAlloc(sizeof(RegPropBagImpl)); if (!rpb) return E_OUTOFMEMORY; rpb->IPropertyBag_iface.lpVtbl = &IPropertyBag_Vtbl; rpb->ref = 1; - rpb->hkey = hkey; + rpb->type = mon->type; + + if (rpb->type == DEVICE_FILTER) + strcpyW(rpb->path, clsidW); + else if (rpb->type == DEVICE_CODEC) + strcpyW(rpb->path, wszActiveMovieKey); + if (mon->has_class) + { + StringFromGUID2(&mon->class, rpb->path + strlenW(rpb->path), CHARS_IN_GUID); + if (rpb->type == DEVICE_FILTER) + strcatW(rpb->path, instanceW); + strcatW(rpb->path, backslashW); + } + strcatW(rpb->path, mon->name); + *ppBag = &rpb->IPropertyBag_iface; DEVENUM_LockModule(); return S_OK; @@ -345,7 +381,6 @@ static ULONG WINAPI DEVENUM_IMediaCatMoniker_Release(IMoniker *iface) TRACE("(%p) ref=%d\n", This, ref); if (ref == 0) { - RegCloseKey(This->hkey); CoTaskMemFree(This->name); CoTaskMemFree(This); DEVENUM_UnlockModule(); @@ -487,9 +522,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_BindToStorage(IMoniker *iface, IB if (IsEqualGUID(riid, &IID_IPropertyBag)) { - HANDLE hkey; - DuplicateHandle(GetCurrentProcess(), This->hkey, GetCurrentProcess(), &hkey, 0, 0, DUPLICATE_SAME_ACCESS); - return DEVENUM_IPropertyBag_Construct(hkey, (IPropertyBag**)ppvObj); + return create_PropertyBag(This, (IPropertyBag**)ppvObj); } return MK_E_NOSTORAGE; @@ -707,7 +740,6 @@ MediaCatMoniker * DEVENUM_IMediaCatMoniker_Construct(void) pMoniker->IMoniker_iface.lpVtbl = &IMoniker_Vtbl; pMoniker->ref = 0; - pMoniker->hkey = NULL; pMoniker->has_class = FALSE; pMoniker->name = NULL; @@ -824,7 +856,6 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt, strcpyW(pMoniker->name, buffer); pMoniker->has_class = TRUE; pMoniker->class = This->class; - pMoniker->hkey = hkey; rgelt[fetched] = &pMoniker->IMoniker_iface; fetched++; diff --git a/dlls/devenum/parsedisplayname.c b/dlls/devenum/parsedisplayname.c index 2875a8c..0f3ef3b 100644 --- a/dlls/devenum/parsedisplayname.c +++ b/dlls/devenum/parsedisplayname.c @@ -81,9 +81,7 @@ static HRESULT WINAPI DEVENUM_IParseDisplayName_ParseDisplayName(IParseDisplayNa WCHAR buffer[MAX_PATH]; enum device_type type; MediaCatMoniker *mon; - HKEY hbasekey; CLSID class; - LRESULT res; TRACE("(%p, %s, %p, %p)\n", pbc, debugstr_w(name), eaten, ret); @@ -96,15 +94,11 @@ static HRESULT WINAPI DEVENUM_IParseDisplayName_ParseDisplayName(IParseDisplayNa if (name[0] == 's' && name[1] == 'w' && name[2] == ':') { type = DEVICE_FILTER; - if ((res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsidW, 0, 0, &hbasekey))) - return HRESULT_FROM_WIN32(res); name += 3; } else if (name[0] == 'c' && name[1] == 'm' && name[2] == ':') { type = DEVICE_CODEC; - if ((res = RegOpenKeyExW(HKEY_CURRENT_USER, wszActiveMovieKey, 0, 0, &hbasekey))) - return HRESULT_FROM_WIN32(res); name += 3; } else @@ -133,21 +127,6 @@ static HRESULT WINAPI DEVENUM_IParseDisplayName_ParseDisplayName(IParseDisplayNa } strcpyW(mon->name, name); - buffer[0] = 0; - if (mon->has_class) - { - StringFromGUID2(&mon->class, buffer, CHARS_IN_GUID); - if (mon->type == DEVICE_FILTER) - strcatW(buffer, instanceW); - strcatW(buffer, backslashW); - } - strcatW(buffer, mon->name); - - if (RegCreateKeyW(hbasekey, buffer, &mon->hkey)) - { - IMoniker_Release(&mon->IMoniker_iface); - return MK_E_NOOBJECT; - } *ret = &mon->IMoniker_iface; return S_OK; diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 0437b6b..7e3270f 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -326,7 +326,6 @@ static void test_directshow_filter(void) mon = check_display_name(parser, buffer); /* Test writing and reading from the property bag */ -todo_wine ok(!find_moniker(&CLSID_AudioRendererCategory, mon), "filter should not be registered\n"); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); @@ -425,7 +424,6 @@ static void test_codec(void) mon = check_display_name(parser, buffer); /* Test writing and reading from the property bag */ -todo_wine ok(!find_moniker(&CLSID_AudioRendererCategory, mon), "codec should not be registered\n"); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag);

1 0

James Woodcock : msvcrt: Gets() should handle EOF on stdin gracefully.
by Alexandre Julliard 07 Mar '18

07 Mar '18

Module: wine Branch: master Commit: 91c72ce7def5ccec3ea7f759111b0d6fb96d722b URL: https://source.winehq.org/git/wine.git/?a=commit;h=91c72ce7def5ccec3ea7f759… Author: James Woodcock <james_woodcock(a)yahoo.co.uk> Date: Tue Mar 6 22:16:28 2018 -0600 msvcrt: Gets() should handle EOF on stdin gracefully. Signed-off-by: James Woodcock <james_woodcock(a)yahoo.co.uk> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 7022e48..6b295cf 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4719,10 +4719,16 @@ char * CDECL MSVCRT_gets(char *buf) if(cc != '\r') *buf++ = (char)cc; } + MSVCRT__unlock_file(MSVCRT_stdin); + + if ((cc == MSVCRT_EOF) && (buf_start == buf)) + { + TRACE(":nothing read\n"); + return NULL; + } *buf = '\0'; TRACE("got '%s'\n", buf_start); - MSVCRT__unlock_file(MSVCRT_stdin); return buf_start; } @@ -4741,10 +4747,16 @@ MSVCRT_wchar_t* CDECL MSVCRT__getws(MSVCRT_wchar_t* buf) if (cc != '\r') *buf++ = (MSVCRT_wchar_t)cc; } + MSVCRT__unlock_file(MSVCRT_stdin); + + if ((cc == MSVCRT_WEOF) && (ws == buf)) + { + TRACE(":nothing read\n"); + return NULL; + } *buf = '\0'; TRACE("got %s\n", debugstr_w(ws)); - MSVCRT__unlock_file(MSVCRT_stdin); return ws; }

1 0