- Wine-Commits - list.winehq.org

Zebediah Figura : vkd3d-shader: Set descriptor flags in the caller to vkd3d_shader_scan_add_descriptor().
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: vkd3d Branch: master Commit: ccedb7f711a2a9af49f1057e47bc13a6a929866c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ccedb7f711a2a9af49f1057e47bc1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 15 17:52:24 2023 -0500 vkd3d-shader: Set descriptor flags in the caller to vkd3d_shader_scan_add_descriptor(). Return the vkd3d_shader_descriptor_info1 from that function. --- libs/vkd3d-shader/vkd3d_shader_main.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 3a2432c1..75fb54c2 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -755,10 +755,10 @@ static void vkd3d_shader_scan_record_uav_atomic_op(struct vkd3d_shader_scan_cont vkd3d_shader_scan_add_uav_flag(context, reg, VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_ATOMICS); } -static bool vkd3d_shader_scan_add_descriptor(struct vkd3d_shader_scan_context *context, +static struct vkd3d_shader_descriptor_info1 *vkd3d_shader_scan_add_descriptor(struct vkd3d_shader_scan_context *context, enum vkd3d_shader_descriptor_type type, const struct vkd3d_shader_register *reg, const struct vkd3d_shader_register_range *range, enum vkd3d_shader_resource_type resource_type, - enum vkd3d_shader_resource_data_type resource_data_type, unsigned int flags) + enum vkd3d_shader_resource_data_type resource_data_type) { struct vkd3d_shader_scan_descriptor_info1 *info = context->scan_descriptor_info; struct vkd3d_shader_descriptor_info1 *d; @@ -767,21 +767,21 @@ static bool vkd3d_shader_scan_add_descriptor(struct vkd3d_shader_scan_context *c info->descriptor_count + 1, sizeof(*info->descriptors))) { ERR("Failed to allocate descriptor info.\n"); - return false; + return NULL; } d = &info->descriptors[info->descriptor_count]; + memset(d, 0, sizeof(*d)); d->type = type; d->register_id = reg->idx[0].offset; d->register_space = range->space; d->register_index = range->first; d->resource_type = resource_type; d->resource_data_type = resource_data_type; - d->flags = flags; d->count = (range->last == ~0u) ? ~0u : range->last - range->first + 1; ++info->descriptor_count; - return true; + return d; } static void vkd3d_shader_scan_constant_buffer_declaration(struct vkd3d_shader_scan_context *context, @@ -793,24 +793,24 @@ static void vkd3d_shader_scan_constant_buffer_declaration(struct vkd3d_shader_sc return; vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, &cb->src.reg, &cb->range, - VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0); + VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT); } static void vkd3d_shader_scan_sampler_declaration(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_instruction *instruction) { const struct vkd3d_shader_sampler *sampler = &instruction->declaration.sampler; - unsigned int flags; + struct vkd3d_shader_descriptor_info1 *d; if (!context->scan_descriptor_info) return; + if (!(d = vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, + &sampler->src.reg, &sampler->range, VKD3D_SHADER_RESOURCE_NONE, VKD3D_SHADER_RESOURCE_DATA_UINT))) + return; + if (instruction->flags & VKD3DSI_SAMPLER_COMPARISON_MODE) - flags = VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_SAMPLER_COMPARISON_MODE; - else - flags = 0; - vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, &sampler->src.reg, &sampler->range, - VKD3D_SHADER_RESOURCE_NONE, VKD3D_SHADER_RESOURCE_DATA_UINT, flags); + d->flags |= VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_SAMPLER_COMPARISON_MODE; } static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_context *context, @@ -827,7 +827,7 @@ static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_cont else type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; vkd3d_shader_scan_add_descriptor(context, type, &resource->reg.reg, &resource->range, - resource_type, resource_data_type, 0); + resource_type, resource_data_type); } static void vkd3d_shader_scan_typed_resource_declaration(struct vkd3d_shader_scan_context *context, @@ -1155,7 +1155,7 @@ static int scan_with_parser(const struct vkd3d_shader_compile_info *compile_info if (parser->shader_desc.flat_constant_count[i].external) vkd3d_shader_scan_add_descriptor(&context, VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, &reg, - &range, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0); + &range, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT); } if (!ret && signature_info)

1 0

Giovanni Mascellani : vkd3d: Update a warning so that it aligns with the check that triggers it.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: vkd3d Branch: master Commit: 8f8c89fb876d0c8d4b576ec53ae56e41de916e88 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8f8c89fb876d0c8d4b576ec53ae56… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Aug 17 16:33:40 2023 +0200 vkd3d: Update a warning so that it aligns with the check that triggers it. --- libs/vkd3d/state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 2d813824..7ae46c86 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -375,8 +375,8 @@ static HRESULT d3d12_root_signature_info_count_descriptors(struct d3d12_root_sig if (unbounded && range->OffsetInDescriptorsFromTableStart == D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND) { - WARN("An unbounded range with offset D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND occurs after " - "another unbounded range.\n"); + WARN("A range with offset D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND occurs after " + "an unbounded range.\n"); return E_INVALIDARG; }

1 0

Piotr Caban : msvcr90/tests: Restore thread locale settings in _getptd tests to avoid side effects.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: 6245e2f3a88e856a905ad39648bcee054796ef7b URL: https://gitlab.winehq.org/wine/wine/-/commit/6245e2f3a88e856a905ad39648bcee… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 23 14:29:42 2023 +0200 msvcr90/tests: Restore thread locale settings in _getptd tests to avoid side effects. --- dlls/msvcr90/tests/msvcr90.c | 59 ++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 29 deletions(-)

1 0

Piotr Caban : msvcr90/tests: Reorder locale refcount tests to workaround leak in _create_locale.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: 195ff4bce75915bbed5b217af100c696ed42a604 URL: https://gitlab.winehq.org/wine/wine/-/commit/195ff4bce75915bbed5b217af100c6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 23 14:38:57 2023 +0200 msvcr90/tests: Reorder locale refcount tests to workaround leak in _create_locale. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54718 --- dlls/msvcr90/tests/msvcr90.c | 7 +++++-- dlls/msvcrt/locale.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 506ec5931d2..0b274fd694f 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -2380,7 +2380,7 @@ static void test__get_current_locale(void) ok(l->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l->locinfo->lc_time_curr->unk); ok(l->locinfo->lc_time_curr->refcount == 1, "refcount = %d\n", l->locinfo->lc_time_curr->refcount); ok(l2->locinfo->lc_time_curr->unk == 1, "unk = %d\n", l2->locinfo->lc_time_curr->unk); - ok(l2->locinfo->lc_time_curr->refcount == 3 || broken(l2->locinfo->lc_time_curr->refcount == 2), + ok(l2->locinfo->lc_time_curr->refcount == 2, "refcount = %d\n", l2->locinfo->lc_time_curr->refcount); p__free_locale(l2); @@ -2491,6 +2491,10 @@ START_TEST(msvcr90) if(!init()) return; + /* _get_current_locale tests needs to be run first because there's + * a C-locale refcount leak in native _create_locale implementation. */ + test__get_current_locale(); + test__initterm_e(); test__encode_pointer(); test_error_messages(); @@ -2526,7 +2530,6 @@ START_TEST(msvcr90) test___strncnt(); test_swscanf(); test____mb_cur_max_l_func(); - test__get_current_locale(); test_ioinfo_flags(); test_strcmp(); } diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 82083d66106..f7be2a1e9bc 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -68,7 +68,7 @@ __lc_time_data cloc_time_data = #if _MSVCR_VER < 110 MAKELCID(LANG_ENGLISH, SORT_DEFAULT), #endif - 1, 0, + 1, -1, #if _MSVCR_VER == 0 || _MSVCR_VER >= 100 {{L"Sun", L"Mon", L"Tue", L"Wed", L"Thu", L"Fri", L"Sat", L"Sunday", L"Monday", L"Tuesday", L"Wednesday", L"Thursday", L"Friday", L"Saturday",

1 0

Rémi Bernon : mf/scheme_handler: Implement http(s):// scheme handler using urlmon.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: 8143a57500538b6af9b769f475f63a2ba1c08a15 URL: https://gitlab.winehq.org/wine/wine/-/commit/8143a57500538b6af9b769f475f63a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 22 11:35:09 2023 +0200 mf/scheme_handler: Implement http(s):// scheme handler using urlmon. --- dlls/mf/Makefile.in | 2 +- dlls/mf/main.c | 2 ++ dlls/mf/mf.idl | 6 ++++ dlls/mf/mf.rgs | 8 ++++++ dlls/mf/mf_private.h | 1 + dlls/mf/scheme_handler.c | 74 +++++++++++++++++++++++++++++++++++++++++------- dlls/mf/tests/mf.c | 4 +-- 7 files changed, 83 insertions(+), 14 deletions(-) diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in index f7592df1930..1deffe1cc0e 100644 --- a/dlls/mf/Makefile.in +++ b/dlls/mf/Makefile.in @@ -1,7 +1,7 @@ MODULE = mf.dll IMPORTLIB = mf IMPORTS = advapi32 mfplat ole32 uuid mfuuid strmiids -DELAYIMPORTS = evr user32 +DELAYIMPORTS = evr urlmon user32 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/mf/main.c b/dlls/mf/main.c index b25a47d78c0..92558a86b30 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -549,6 +549,7 @@ static const IClassFactoryVtbl class_factory_vtbl = }; static struct class_factory file_scheme_handler_factory = { { &class_factory_vtbl }, file_scheme_handler_construct }; +static struct class_factory urlmon_scheme_handler_factory = { { &class_factory_vtbl }, urlmon_scheme_handler_construct }; static const struct class_object { @@ -558,6 +559,7 @@ static const struct class_object class_objects[] = { { &CLSID_FileSchemePlugin, &file_scheme_handler_factory.IClassFactory_iface }, + { &CLSID_UrlmonSchemePlugin, &urlmon_scheme_handler_factory.IClassFactory_iface }, }; /******************************************************************************* diff --git a/dlls/mf/mf.idl b/dlls/mf/mf.idl index 289a521b4f2..4f5ef36c965 100644 --- a/dlls/mf/mf.idl +++ b/dlls/mf/mf.idl @@ -24,3 +24,9 @@ uuid(477ec299-1421-4bdd-971f-7ccb933f21ad) ] coclass FileSchemePlugin { } + +[ + threading(both), + uuid(9ec4b4f9-3029-45ad-947b-344de2a249e2) +] +coclass UrlmonSchemePlugin {} diff --git a/dlls/mf/mf.rgs b/dlls/mf/mf.rgs index f127df76321..f06576baccb 100644 --- a/dlls/mf/mf.rgs +++ b/dlls/mf/mf.rgs @@ -12,6 +12,14 @@ HKLM { val '{477ec299-1421-4bdd-971f-7ccb933f21ad}' = s 'File Scheme Handler' } + 'http:' + { + val '{9ec4b4f9-3029-45ad-947b-344de2a249e2}' = s 'Urlmon Scheme Handler' + } + 'https:' + { + val '{9ec4b4f9-3029-45ad-947b-344de2a249e2}' = s 'Urlmon Scheme Handler' + } } } } diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h index 90ad8eaf8b7..bbfadaee5d8 100644 --- a/dlls/mf/mf_private.h +++ b/dlls/mf/mf_private.h @@ -114,6 +114,7 @@ static inline const char *debugstr_propvar(const PROPVARIANT *v) } extern HRESULT file_scheme_handler_construct(REFIID riid, void **obj); +extern HRESULT urlmon_scheme_handler_construct(REFIID riid, void **obj); extern BOOL mf_is_sample_copier_transform(IMFTransform *transform); extern BOOL mf_is_sar_sink(IMFMediaSink *sink); diff --git a/dlls/mf/scheme_handler.c b/dlls/mf/scheme_handler.c index 9f23ffcc76c..7e92748aeb9 100644 --- a/dlls/mf/scheme_handler.c +++ b/dlls/mf/scheme_handler.c @@ -32,6 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +typedef HRESULT (*create_stream_cb)(const WCHAR *url, DWORD flags, IMFByteStream **out); + struct scheme_handler_result { struct list entry; @@ -48,6 +50,7 @@ struct scheme_handler IMFSourceResolver *resolver; struct list results; CRITICAL_SECTION cs; + create_stream_cb create_stream; }; static struct scheme_handler *impl_from_IMFSchemeHandler(IMFSchemeHandler *iface) @@ -374,7 +377,6 @@ static HRESULT scheme_handler_get_resolver(struct scheme_handler *handler, IMFSo static HRESULT WINAPI scheme_handler_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { - static const WCHAR schemeW[] = {'f','i','l','e',':','/','/'}; struct scheme_handler *handler = impl_from_IMFAsyncCallback(iface); struct scheme_handler_result *handler_result; MF_OBJECT_TYPE obj_type = MF_OBJECT_INVALID; @@ -383,7 +385,6 @@ static HRESULT WINAPI scheme_handler_callback_Invoke(IMFAsyncCallback *iface, IM IMFSourceResolver *resolver; IMFAsyncResult *caller; IMFByteStream *stream; - const WCHAR *url; HRESULT hr; caller = (IMFAsyncResult *)IMFAsyncResult_GetStateNoAddRef(result); @@ -396,14 +397,7 @@ static HRESULT WINAPI scheme_handler_callback_Invoke(IMFAsyncCallback *iface, IM context = impl_from_IUnknown(context_object); - /* Strip from scheme, MFCreateFile() won't be expecting it. */ - url = context->url; - if (!wcsnicmp(context->url, schemeW, ARRAY_SIZE(schemeW))) - url += ARRAY_SIZE(schemeW); - - hr = MFCreateFile(context->flags & MF_RESOLUTION_WRITE ? MF_ACCESSMODE_READWRITE : MF_ACCESSMODE_READ, - MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, url, &stream); - if (SUCCEEDED(hr)) + if (SUCCEEDED(hr = handler->create_stream(context->url, context->flags, &stream))) { if (context->flags & MF_RESOLUTION_MEDIASOURCE) { @@ -458,6 +452,14 @@ static const IMFAsyncCallbackVtbl scheme_handler_callback_vtbl = scheme_handler_callback_Invoke, }; +static HRESULT file_stream_create(const WCHAR *url, DWORD flags, IMFByteStream **out) +{ + if (!wcsnicmp(url, L"file://", 7)) + url += 7; + return MFCreateFile(flags & MF_RESOLUTION_WRITE ? MF_ACCESSMODE_READWRITE : MF_ACCESSMODE_READ, + MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, url, out); +} + HRESULT file_scheme_handler_construct(REFIID riid, void **obj) { struct scheme_handler *handler; @@ -473,6 +475,58 @@ HRESULT file_scheme_handler_construct(REFIID riid, void **obj) handler->refcount = 1; list_init(&handler->results); InitializeCriticalSection(&handler->cs); + handler->create_stream = file_stream_create; + + hr = IMFSchemeHandler_QueryInterface(&handler->IMFSchemeHandler_iface, riid, obj); + IMFSchemeHandler_Release(&handler->IMFSchemeHandler_iface); + + return hr; +} + +static HRESULT urlmon_stream_create(const WCHAR *url, DWORD flags, IMFByteStream **out) +{ + IMFAttributes *attributes; + IStream *stream; + HRESULT hr; + + if (flags & MF_RESOLUTION_WRITE) + return E_INVALIDARG; + + if (FAILED(hr = URLOpenBlockingStreamW(NULL, url, &stream, 0, NULL))) + { + WARN("Failed to open url %s, hr %#lx\n", debugstr_w(url), hr); + return hr; + } + + hr = MFCreateMFByteStreamOnStream(stream, out); + IStream_Release(stream); + if (FAILED(hr)) + return hr; + + IMFByteStream_QueryInterface(*out, &IID_IMFAttributes, (void **)&attributes); + IMFAttributes_DeleteItem(attributes, &MF_BYTESTREAM_ORIGIN_NAME); + IMFAttributes_SetString(attributes, &MF_BYTESTREAM_EFFECTIVE_URL, url); + IMFAttributes_SetString(attributes, &MF_BYTESTREAM_CONTENT_TYPE, L"application/octet-stream"); + IMFAttributes_Release(attributes); + return hr; +} + +HRESULT urlmon_scheme_handler_construct(REFIID riid, void **obj) +{ + struct scheme_handler *handler; + HRESULT hr; + + TRACE("%s, %p.\n", debugstr_guid(riid), obj); + + if (!(handler = calloc(1, sizeof(*handler)))) + return E_OUTOFMEMORY; + + handler->IMFSchemeHandler_iface.lpVtbl = &scheme_handler_vtbl; + handler->IMFAsyncCallback_iface.lpVtbl = &scheme_handler_callback_vtbl; + handler->refcount = 1; + list_init(&handler->results); + InitializeCriticalSection(&handler->cs); + handler->create_stream = urlmon_stream_create; hr = IMFSchemeHandler_QueryInterface(&handler->IMFSchemeHandler_iface, riid, obj); IMFSchemeHandler_Release(&handler->IMFSchemeHandler_iface); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index bf7530becf4..7217e744343 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6472,7 +6472,7 @@ static void test_scheme_resolvers(void) for (i = 0; i < ARRAY_SIZE(urls); i++) { hr = IMFSourceResolver_CreateObjectFromURL(resolver, urls[i], MF_RESOLUTION_BYTESTREAM, NULL, &type, &object); - todo_wine + todo_wine_if(i >= 2) ok(hr == S_OK, "got hr %#lx\n", hr); if (hr != S_OK) continue; @@ -6485,7 +6485,6 @@ static void test_scheme_resolvers(void) PropVariantInit(&propvar); hr = IMFAttributes_GetItem(attributes, &MF_BYTESTREAM_EFFECTIVE_URL, &propvar); ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Win7 */, "got hr %#lx\n", hr); - todo_wine ok(!wcsncmp(expect_domain[i], propvar.pwszVal, wcslen(expect_domain[i])) || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Win7 */, "got url %s\n", debugstr_w(propvar.pwszVal)); @@ -6493,7 +6492,6 @@ static void test_scheme_resolvers(void) ok(hr == S_OK, "got hr %#lx\n", hr); hr = IMFAttributes_GetItem(attributes, &MF_BYTESTREAM_CONTENT_TYPE, NULL); - todo_wine ok(hr == S_OK, "got hr %#lx\n", hr); hr = IMFAttributes_GetItem(attributes, &MF_BYTESTREAM_LAST_MODIFIED_TIME, NULL); todo_wine

1 0

Rémi Bernon : include: Add MF_BYTESTREAM_EFFECTIVE_URL GUID declaration.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: e2aee50aa60e9803230b16d6579e7bde8222ba28 URL: https://gitlab.winehq.org/wine/wine/-/commit/e2aee50aa60e9803230b16d6579e7b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 28 08:54:05 2023 +0200 include: Add MF_BYTESTREAM_EFFECTIVE_URL GUID declaration. --- include/mfobjects.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/include/mfobjects.idl b/include/mfobjects.idl index 640cae88af6..33b4bbad008 100644 --- a/include/mfobjects.idl +++ b/include/mfobjects.idl @@ -702,6 +702,7 @@ cpp_quote("EXTERN_GUID(MF_BYTESTREAM_DURATION, 0xfc35828a,0x3cb6,0x460 cpp_quote("EXTERN_GUID(MF_BYTESTREAM_LAST_MODIFIED_TIME, 0xfc35828b,0x3cb6,0x460c,0xa4,0x24,0xb6,0x68,0x12,0x60,0x37,0x5a);") cpp_quote("EXTERN_GUID(MF_BYTESTREAM_IFO_FILE_URI, 0xfc35828c,0x3cb6,0x460c,0xa4,0x24,0xb6,0x68,0x12,0x60,0x37,0x5a);") cpp_quote("EXTERN_GUID(MF_BYTESTREAM_DLNA_PROFILE_ID, 0xfc35828d,0x3cb6,0x460c,0xa4,0x24,0xb6,0x68,0x12,0x60,0x37,0x5a);") +cpp_quote("EXTERN_GUID(MF_BYTESTREAM_EFFECTIVE_URL, 0x9afa0209,0x89d1,0x42af,0x84,0x56,0x1d,0xe6,0xb5,0x62,0xd6,0x91);") typedef enum MF_FILE_ACCESSMODE { MF_ACCESSMODE_READ = 1,

1 0

Rémi Bernon : mf/scheme_handler: Split file scheme handler to scheme_handler.c.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: 70970429a02a6b1573d19476e8ea967ee2ca1b55 URL: https://gitlab.winehq.org/wine/wine/-/commit/70970429a02a6b1573d19476e8ea96… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 19 10:27:53 2023 +0200 mf/scheme_handler: Split file scheme handler to scheme_handler.c. --- dlls/mf/Makefile.in | 1 + dlls/mf/main.c | 448 ------------------------------------------- dlls/mf/mf_private.h | 2 + dlls/mf/scheme_handler.c | 481 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 484 insertions(+), 448 deletions(-)

1 0

Eric Pouech : kernelbase: Correctly handle new process group flag in CreateProcess.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: 3b7baae6e9ebba953c8ee755935f2580dae23237 URL: https://gitlab.winehq.org/wine/wine/-/commit/3b7baae6e9ebba953c8ee755935f25… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Aug 23 12:24:17 2023 +0200 kernelbase: Correctly handle new process group flag in CreateProcess. (when CREATE_NEW_CONSOLE is used). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 4 ++-- dlls/kernelbase/process.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index fb21f143c3b..6facf2ad214 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -5080,8 +5080,8 @@ static void test_CreateProcessCUI(void) /* 15 */ {FALSE, CREATE_NEW_PROCESS_GROUP, STARTUPINFO_STD, FALSE, CP_GROUP_LEADER, .is_todo = TRUE}, {TRUE, CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE, CONSOLE_STD, TRUE, CP_INH_CONSOLE | CP_WITH_WINDOW | CP_GROUP_LEADER | CP_ALONE}, {FALSE, CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE, CONSOLE_STD, TRUE, CP_GROUP_LEADER}, - {TRUE, CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE, CONSOLE_STD, FALSE, CP_INH_CONSOLE | CP_WITH_WINDOW | CP_GROUP_LEADER | CP_ALONE | CP_ENABLED_CTRLC, .is_todo = TRUE}, - {FALSE, CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE, CONSOLE_STD, FALSE, CP_GROUP_LEADER | CP_ENABLED_CTRLC, .is_todo = TRUE}, + {TRUE, CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE, CONSOLE_STD, FALSE, CP_INH_CONSOLE | CP_WITH_WINDOW | CP_GROUP_LEADER | CP_ALONE | CP_ENABLED_CTRLC}, + {FALSE, CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE, CONSOLE_STD, FALSE, CP_GROUP_LEADER | CP_ENABLED_CTRLC}, /* 20 */ {TRUE, CREATE_NEW_PROCESS_GROUP | DETACHED_PROCESS, CONSOLE_STD, TRUE, CP_GROUP_LEADER}, {FALSE, CREATE_NEW_PROCESS_GROUP | DETACHED_PROCESS, CONSOLE_STD, TRUE, CP_GROUP_LEADER}, {TRUE, CREATE_NEW_PROCESS_GROUP | DETACHED_PROCESS, CONSOLE_STD, FALSE, CP_GROUP_LEADER}, diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index b6775052699..4807e84594d 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -187,10 +187,10 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename } RtlFreeUnicodeString( &newdirW ); - if (flags & CREATE_NEW_PROCESS_GROUP) - params->ConsoleFlags = 1; - else + if (!(flags & CREATE_NEW_PROCESS_GROUP)) params->ProcessGroupId = NtCurrentTeb()->Peb->ProcessParameters->ProcessGroupId; + else if (!(flags & CREATE_NEW_CONSOLE)) + params->ConsoleFlags = 1; if (flags & CREATE_NEW_CONSOLE) params->ConsoleHandle = CONSOLE_HANDLE_ALLOC; else if (!(flags & DETACHED_PROCESS))

1 0

Rémi Bernon : mf/tests: Add some network scheme resolver tests.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: fd3d0113f95d3cd4696497cdce5eb5d6d2aa26f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/fd3d0113f95d3cd4696497cdce5eb5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 28 08:54:05 2023 +0200 mf/tests: Add some network scheme resolver tests. --- dlls/mf/tests/mf.c | 130 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 4f4a282a9d8..bf7530becf4 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -33,6 +33,7 @@ #include "mmdeviceapi.h" #include "uuids.h" #include "wmcodecdsp.h" +#include "nserror.h" #include "mf_test.h" @@ -6432,6 +6433,134 @@ static void test_MFGetSupportedSchemes(void) PropVariantClear(&value); } +static void test_scheme_resolvers(void) +{ + static const DWORD expect_caps = MFBYTESTREAM_IS_READABLE | MFBYTESTREAM_IS_SEEKABLE; + static const WCHAR *urls[] = + { + L"http://test.winehq.org/tests/test.mp3", + L"https://test.winehq.org/tests/test.mp3", + L"httpd://test.winehq.org/tests/test.mp3", + L"httpsd://test.winehq.org/tests/test.mp3", + L"mms://test.winehq.org/tests/test.mp3", + }; + static const WCHAR *expect_domain[] = + { + L"http://test.winehq.org", + L"https://test.winehq.org", + L"http://test.winehq.org", + L"https://test.winehq.org", + L"http://test.winehq.org", + }; + + IMFSourceResolver *resolver; + IMFByteStream *byte_stream; + IMFAttributes *attributes; + PROPVARIANT propvar; + MF_OBJECT_TYPE type; + IUnknown *object; + UINT64 length; + DWORD i, caps; + HRESULT hr; + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "got hr %#lx\n", hr); + + hr = MFCreateSourceResolver(&resolver); + ok(hr == S_OK, "got hr %#lx\n", hr); + + for (i = 0; i < ARRAY_SIZE(urls); i++) + { + hr = IMFSourceResolver_CreateObjectFromURL(resolver, urls[i], MF_RESOLUTION_BYTESTREAM, NULL, &type, &object); + todo_wine + ok(hr == S_OK, "got hr %#lx\n", hr); + if (hr != S_OK) + continue; + + hr = IUnknown_QueryInterface(object, &IID_IMFAttributes, (void **)&attributes); + ok(hr == S_OK, "got hr %#lx\n", hr); + hr = IMFAttributes_GetItem(attributes, &MF_BYTESTREAM_ORIGIN_NAME, NULL); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "got hr %#lx\n", hr); + + PropVariantInit(&propvar); + hr = IMFAttributes_GetItem(attributes, &MF_BYTESTREAM_EFFECTIVE_URL, &propvar); + ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Win7 */, "got hr %#lx\n", hr); + todo_wine + ok(!wcsncmp(expect_domain[i], propvar.pwszVal, wcslen(expect_domain[i])) + || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Win7 */, + "got url %s\n", debugstr_w(propvar.pwszVal)); + hr = PropVariantClear(&propvar); + ok(hr == S_OK, "got hr %#lx\n", hr); + + hr = IMFAttributes_GetItem(attributes, &MF_BYTESTREAM_CONTENT_TYPE, NULL); + todo_wine + ok(hr == S_OK, "got hr %#lx\n", hr); + hr = IMFAttributes_GetItem(attributes, &MF_BYTESTREAM_LAST_MODIFIED_TIME, NULL); + todo_wine + ok(hr == S_OK, "got hr %#lx\n", hr); + IMFAttributes_Release(attributes); + + hr = IUnknown_QueryInterface(object, &IID_IMFByteStream, (void **)&byte_stream); + ok(hr == S_OK, "got hr %#lx\n", hr); + hr = IMFByteStream_GetCapabilities(byte_stream, &caps); + ok(hr == S_OK, "got hr %#lx\n", hr); + todo_wine + ok(caps == (expect_caps | MFBYTESTREAM_IS_PARTIALLY_DOWNLOADED) + || caps == (expect_caps | MFBYTESTREAM_DOES_NOT_USE_NETWORK), + "got caps %#lx\n", caps); + hr = IMFByteStream_GetLength(byte_stream, &length); + ok(hr == S_OK, "got hr %#lx\n", hr); + ok(length == 0x110d, "got length %#I64x\n", length); + IMFByteStream_Release(byte_stream); + + IUnknown_Release(object); + } + + hr = IMFSourceResolver_CreateObjectFromURL(resolver, L"httpt://test.winehq.org/tests/test.mp3", MF_RESOLUTION_BYTESTREAM, NULL, &type, &object); + todo_wine + ok(hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got hr %#lx\n", hr); + hr = IMFSourceResolver_CreateObjectFromURL(resolver, L"httpu://test.winehq.org/tests/test.mp3", MF_RESOLUTION_BYTESTREAM, NULL, &type, &object); + todo_wine + ok(hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got hr %#lx\n", hr); + + hr = IMFSourceResolver_CreateObjectFromURL(resolver, L"http://test.winehq.bla/tests/test.mp3", MF_RESOLUTION_BYTESTREAM, NULL, &type, &object); + todo_wine + ok(hr == NS_E_SERVER_NOT_FOUND, "got hr %#lx\n", hr); + hr = IMFSourceResolver_CreateObjectFromURL(resolver, L"https://test.winehq.bla/tests/test.mp3", MF_RESOLUTION_BYTESTREAM, NULL, &type, &object); + todo_wine + ok(hr == WININET_E_NAME_NOT_RESOLVED, "got hr %#lx\n", hr); + hr = IMFSourceResolver_CreateObjectFromURL(resolver, L"httpd://test.winehq.bla/tests/test.mp3", MF_RESOLUTION_BYTESTREAM, NULL, &type, &object); + todo_wine + ok(hr == WININET_E_NAME_NOT_RESOLVED, "got hr %#lx\n", hr); + hr = IMFSourceResolver_CreateObjectFromURL(resolver, L"httpsd://test.winehq.bla/tests/test.mp3", MF_RESOLUTION_BYTESTREAM, NULL, &type, &object); + todo_wine + ok(hr == WININET_E_NAME_NOT_RESOLVED, "got hr %#lx\n", hr); + hr = IMFSourceResolver_CreateObjectFromURL(resolver, L"mms://test.winehq.bla/tests/test.mp3", MF_RESOLUTION_BYTESTREAM, NULL, &type, &object); + todo_wine + ok(hr == WININET_E_NAME_NOT_RESOLVED, "got hr %#lx\n", hr); + + hr = IMFSourceResolver_CreateObjectFromURL(resolver, L"http://test.winehq.org/tests/invalid.mp3", MF_RESOLUTION_BYTESTREAM, NULL, &type, &object); + todo_wine + ok(hr == NS_E_FILE_NOT_FOUND, "got hr %#lx\n", hr); + hr = IMFSourceResolver_CreateObjectFromURL(resolver, L"https://test.winehq.org/tests/invalid.mp3", MF_RESOLUTION_BYTESTREAM, NULL, &type, &object); + todo_wine + ok(hr == NS_E_FILE_NOT_FOUND, "got hr %#lx\n", hr); + hr = IMFSourceResolver_CreateObjectFromURL(resolver, L"httpd://test.winehq.org/tests/invalid.mp3", MF_RESOLUTION_BYTESTREAM, NULL, &type, &object); + todo_wine + ok(hr == NS_E_FILE_NOT_FOUND, "got hr %#lx\n", hr); + hr = IMFSourceResolver_CreateObjectFromURL(resolver, L"httpsd://test.winehq.org/tests/invalid.mp3", MF_RESOLUTION_BYTESTREAM, NULL, &type, &object); + todo_wine + ok(hr == NS_E_FILE_NOT_FOUND, "got hr %#lx\n", hr); + hr = IMFSourceResolver_CreateObjectFromURL(resolver, L"mms://test.winehq.org/tests/invalid.mp3", MF_RESOLUTION_BYTESTREAM, NULL, &type, &object); + todo_wine + ok(hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got hr %#lx\n", hr); + + IMFSourceResolver_Release(resolver); + + hr = MFShutdown(); + ok(hr == S_OK, "got hr %#lx\n", hr); +} + static void test_MFGetTopoNodeCurrentType(void) { static const struct attribute_desc media_type_desc[] = @@ -7098,6 +7227,7 @@ START_TEST(mf) test_MFCreateSimpleTypeHandler(); test_MFGetSupportedMimeTypes(); test_MFGetSupportedSchemes(); + test_scheme_resolvers(); test_MFGetTopoNodeCurrentType(); test_MFRequireProtectedEnvironment(); test_mpeg4_media_sink();

1 0

Eric Pouech : kernel32/tests: Extend to new process group tests for CreateProcess.
by Alexandre Julliard Aug. 23, 2023

Aug. 23, 2023

Module: wine Branch: master Commit: 38906e8f70f3e7679deb4a7c62a83836fa5c1b71 URL: https://gitlab.winehq.org/wine/wine/-/commit/38906e8f70f3e7679deb4a7c62a838… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Aug 23 12:24:17 2023 +0200 kernel32/tests: Extend to new process group tests for CreateProcess. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index e424390feb2..fb21f143c3b 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -5078,6 +5078,14 @@ static void test_CreateProcessCUI(void) {FALSE, CREATE_NEW_PROCESS_GROUP, STARTUPINFO_STD, TRUE, CP_GROUP_LEADER, .is_todo = TRUE}, {FALSE, 0, STARTUPINFO_STD, FALSE, CP_ENABLED_CTRLC, .is_todo = TRUE}, /* 15 */ {FALSE, CREATE_NEW_PROCESS_GROUP, STARTUPINFO_STD, FALSE, CP_GROUP_LEADER, .is_todo = TRUE}, + {TRUE, CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE, CONSOLE_STD, TRUE, CP_INH_CONSOLE | CP_WITH_WINDOW | CP_GROUP_LEADER | CP_ALONE}, + {FALSE, CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE, CONSOLE_STD, TRUE, CP_GROUP_LEADER}, + {TRUE, CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE, CONSOLE_STD, FALSE, CP_INH_CONSOLE | CP_WITH_WINDOW | CP_GROUP_LEADER | CP_ALONE | CP_ENABLED_CTRLC, .is_todo = TRUE}, + {FALSE, CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE, CONSOLE_STD, FALSE, CP_GROUP_LEADER | CP_ENABLED_CTRLC, .is_todo = TRUE}, +/* 20 */ {TRUE, CREATE_NEW_PROCESS_GROUP | DETACHED_PROCESS, CONSOLE_STD, TRUE, CP_GROUP_LEADER}, + {FALSE, CREATE_NEW_PROCESS_GROUP | DETACHED_PROCESS, CONSOLE_STD, TRUE, CP_GROUP_LEADER}, + {TRUE, CREATE_NEW_PROCESS_GROUP | DETACHED_PROCESS, CONSOLE_STD, FALSE, CP_GROUP_LEADER}, + {FALSE, CREATE_NEW_PROCESS_GROUP | DETACHED_PROCESS, CONSOLE_STD, FALSE, CP_GROUP_LEADER}, }; hstd[0] = GetStdHandle(STD_INPUT_HANDLE);

1 0