October 2020 - Wine-Commits

Nikolay Sivov : mfplat: Implement GetVideoService() for the device manager.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: 267b365f4ace076f6faed25ebdd3d807b5c8e126 URL: https://source.winehq.org/git/wine.git/?a=commit;h=267b365f4ace076f6faed25e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 23 14:59:39 2020 +0300 mfplat: Implement GetVideoService() for the device manager. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 28 ++++++++++++++++++++++++---- dlls/mfplat/tests/mfplat.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 68aa2cdaa2d..1c51fafff1e 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -8689,12 +8689,32 @@ static HRESULT WINAPI dxgi_device_manager_CloseDeviceHandle(IMFDXGIDeviceManager return hr; } -static HRESULT WINAPI dxgi_device_manager_GetVideoService(IMFDXGIDeviceManager *iface, HANDLE device, - REFIID riid, void **service) +static HRESULT WINAPI dxgi_device_manager_GetVideoService(IMFDXGIDeviceManager *iface, HANDLE hdevice, + REFIID riid, void **service) { - FIXME("(%p, %p, %s, %p): stub.\n", iface, device, debugstr_guid(riid), service); + struct dxgi_device_manager *manager = impl_from_IMFDXGIDeviceManager(iface); + HRESULT hr; + size_t idx; - return E_NOTIMPL; + TRACE("%p, %p, %s, %p.\n", iface, hdevice, debugstr_guid(riid), service); + + EnterCriticalSection(&manager->cs); + + if (!manager->device) + hr = MF_E_DXGI_DEVICE_NOT_INITIALIZED; + else if (SUCCEEDED(hr = dxgi_device_manager_get_handle_index(manager, hdevice, &idx))) + { + if (manager->handles[idx] & DXGI_DEVICE_HANDLE_FLAG_INVALID) + hr = MF_E_DXGI_NEW_VIDEO_DEVICE; + else if (manager->handles[idx] & DXGI_DEVICE_HANDLE_FLAG_OPEN) + hr = IDXGIDevice_QueryInterface(manager->device, riid, service); + else + hr = E_HANDLE; + } + + LeaveCriticalSection(&manager->cs); + + return hr; } static HRESULT WINAPI dxgi_device_manager_LockDevice(IMFDXGIDeviceManager *iface, HANDLE hdevice, diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 17371a0e1c0..971469ec574 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -4530,6 +4530,7 @@ static void test_dxgi_device_manager(void) struct test_thread_param param; HANDLE handle1, handle, thread; UINT token, token2; + IUnknown *unk; HRESULT hr; if (!pMFCreateDXGIDeviceManager) @@ -4560,6 +4561,9 @@ static void test_dxgi_device_manager(void) ok(manager != manager2, "got wrong pointer: %p.\n", manager2); EXPECT_REF(manager, 1); + hr = IMFDXGIDeviceManager_GetVideoService(manager, NULL, &IID_ID3D11Device, (void **)&unk); + ok(hr == MF_E_DXGI_DEVICE_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + hr = IMFDXGIDeviceManager_OpenDeviceHandle(manager, &handle); ok(hr == MF_E_DXGI_DEVICE_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); @@ -4593,6 +4597,12 @@ static void test_dxgi_device_manager(void) EXPECT_REF(manager, 1); EXPECT_REF(d3d11_dev, 2); + /* GetVideoService() on device change. */ + handle = NULL; + hr = IMFDXGIDeviceManager_OpenDeviceHandle(manager, &handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!handle, "Unexpected handle value %p.\n", handle); + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, &d3d11_dev2, NULL, NULL); ok(hr == S_OK, "D3D11CreateDevice failed: %#x.\n", hr); @@ -4603,11 +4613,32 @@ static void test_dxgi_device_manager(void) EXPECT_REF(d3d11_dev2, 2); EXPECT_REF(d3d11_dev, 1); + hr = IMFDXGIDeviceManager_GetVideoService(manager, handle, &IID_ID3D11Device, (void **)&unk); + ok(hr == MF_E_DXGI_NEW_VIDEO_DEVICE, "Unexpected hr %#x.\n", hr); + + hr = IMFDXGIDeviceManager_CloseDeviceHandle(manager, handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + handle = NULL; hr = IMFDXGIDeviceManager_OpenDeviceHandle(manager, &handle); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!!handle, "Unexpected handle value %p.\n", handle); + hr = IMFDXGIDeviceManager_GetVideoService(manager, NULL, &IID_ID3D11Device, (void **)&unk); + ok(hr == E_HANDLE, "Unexpected hr %#x.\n", hr); + + hr = IMFDXGIDeviceManager_GetVideoService(manager, handle, &IID_ID3D11Device, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + hr = IMFDXGIDeviceManager_GetVideoService(manager, handle, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + hr = IMFDXGIDeviceManager_GetVideoService(manager, handle, &IID_IDXGIDevice, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + handle1 = NULL; hr = IMFDXGIDeviceManager_OpenDeviceHandle(manager, &handle1); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Tag wine-5.20 : Alexandre Julliard : Release 5.20
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: refs/tags/wine-5.20 Tag: 9e85717088c324698e0e66b3eac2ec1239fc80b6 URL: https://source.winehq.org/git/wine.git/?a=tag;h=9e85717088c324698e0e66b3eac… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 23 21:24:14 2020 +0200 Release 5.20

1 0

Alexandre Julliard : Release 5.20.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: 6373792eec0f122295723cae77b0115e6c96c3e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6373792eec0f122295723cae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 23 21:24:14 2020 +0200 Release 5.20. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 933 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 454 insertions(+), 501 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6373792eec0f12229572…

1 0

Nikolay Sivov : evr/mixer: Request more sample on successful ProcessOutput().
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: b8507acf53eacc716187ee7046ab0dcec288dc2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8507acf53eacc716187ee70… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 23 14:33:30 2020 +0300 evr/mixer: Request more sample on successful ProcessOutput(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index c0d46ce5331..59d75c0476b 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -1038,6 +1038,7 @@ static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface, { IMFSample_Release(mixer->inputs[i].sample); mixer->inputs[i].sample = NULL; + mixer->inputs[i].sample_requested = 0; } } @@ -1150,6 +1151,7 @@ static HRESULT WINAPI video_mixer_transform_ProcessOutput(IMFTransform *iface, D struct video_mixer *mixer = impl_from_IMFTransform(iface); IDirect3DSurface9 *surface; IDirect3DDevice9 *device; + unsigned int i; HRESULT hr; TRACE("%p, %#x, %u, %p, %p.\n", iface, flags, count, buffers, status); @@ -1168,8 +1170,26 @@ static HRESULT WINAPI video_mixer_transform_ProcessOutput(IMFTransform *iface, D { if (mixer->is_streaming) { - FIXME("Streaming state is not handled.\n"); - hr = E_NOTIMPL; + for (i = 0; i < mixer->input_count; ++i) + { + if (!mixer->inputs[i].sample) + { + hr = MF_E_TRANSFORM_NEED_MORE_INPUT; + break; + } + } + + /* FIXME: for now discard input */ + + if (SUCCEEDED(hr)) + { + for (i = 0; i < mixer->input_count; ++i) + { + IMFSample_Release(mixer->inputs[i].sample); + mixer->inputs[i].sample = NULL; + video_mixer_request_sample(mixer, i); + } + } } else {

1 0

Nikolay Sivov : mfplat: Implement DXGI device manager handle management.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: b0ab5255ad19df4070ae7c69608cf1c57d8a2497 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0ab5255ad19df4070ae7c69… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 23 14:59:38 2020 +0300 mfplat: Implement DXGI device manager handle management. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 248 ++++++++++++++++++++++++++++++++++++++++----- dlls/mfplat/tests/mfplat.c | 156 +++++++++++++++++++++++++++- include/mfapi.h | 4 + 3 files changed, 380 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b0ab5255ad19df4070ae…

1 0

Alexandre Julliard : gdi32: Don't bother caching the font type.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: a13492b3766ed1d71e3a42b43dbc544f297e67d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a13492b3766ed1d71e3a42b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 23 20:14:49 2020 +0200 gdi32: Don't bother caching the font type. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 718c7f3407e..cf8b2c66e22 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3239,7 +3239,7 @@ struct fontdir #include <poppack.h> static void GetEnumStructs(Face *face, const WCHAR *family_name, LPENUMLOGFONTEXW pelf, - NEWTEXTMETRICEXW *pntm, LPDWORD ptype); + NEWTEXTMETRICEXW *pntm); static BOOL get_fontdir( const WCHAR *dos_name, struct fontdir *fd ) { @@ -3249,7 +3249,6 @@ static BOOL get_fontdir( const WCHAR *dos_name, struct fontdir *fd ) WCHAR *family_name; ENUMLOGFONTEXW elf; NEWTEXTMETRICEXW ntm; - DWORD type; if (!(unix_name = wine_get_unix_file_name( dos_name ))) return FALSE; ft_face = new_ft_face( unix_name, NULL, 0, 0, FALSE ); @@ -3259,14 +3258,14 @@ static BOOL get_fontdir( const WCHAR *dos_name, struct fontdir *fd ) if (face) { family_name = ft_face_get_family_name( ft_face, GetSystemDefaultLCID() ); - GetEnumStructs( face, family_name, &elf, &ntm, &type ); + GetEnumStructs( face, family_name, &elf, &ntm ); release_face( face ); HeapFree( GetProcessHeap(), 0, family_name ); } pFT_Done_Face( ft_face ); if (!face) return FALSE; - if ((type & TRUETYPE_FONTTYPE) == 0) return FALSE; + if (!(ntm.ntmTm.tmPitchAndFamily & TMPF_TRUETYPE)) return FALSE; memset( fd, 0, sizeof(*fd) ); @@ -5217,8 +5216,19 @@ static DWORD create_enum_charset_list(DWORD charset, struct enum_charset_list *l return n; } +static UINT get_font_type( const NEWTEXTMETRICEXW *ntm ) +{ + UINT ret = 0; + + if (ntm->ntmTm.tmPitchAndFamily & TMPF_TRUETYPE) ret |= TRUETYPE_FONTTYPE; + if (ntm->ntmTm.tmPitchAndFamily & TMPF_DEVICE) ret |= DEVICE_FONTTYPE; + if (!(ntm->ntmTm.tmPitchAndFamily & TMPF_VECTOR)) ret |= RASTER_FONTTYPE; + return ret; +} + + static void GetEnumStructs(Face *face, const WCHAR *family_name, LPENUMLOGFONTEXW pelf, - NEWTEXTMETRICEXW *pntm, LPDWORD ptype) + NEWTEXTMETRICEXW *pntm) { struct gdi_font *gdi_font; GdiFont *font; @@ -5229,7 +5239,6 @@ static void GetEnumStructs(Face *face, const WCHAR *family_name, LPENUMLOGFONTEX TRACE("Cached\n"); *pelf = face->cached_enum_data->elf; *pntm = face->cached_enum_data->ntm; - *ptype = face->cached_enum_data->type; return; } @@ -5303,20 +5312,11 @@ static void GetEnumStructs(Face *face, const WCHAR *family_name, LPENUMLOGFONTEX pelf->elfLogFont.lfQuality = DRAFT_QUALITY; pelf->elfLogFont.lfPitchAndFamily = (pntm->ntmTm.tmPitchAndFamily & 0xf1) + 1; - *ptype = 0; - if (pntm->ntmTm.tmPitchAndFamily & TMPF_TRUETYPE) - *ptype |= TRUETYPE_FONTTYPE; - if (pntm->ntmTm.tmPitchAndFamily & TMPF_DEVICE) - *ptype |= DEVICE_FONTTYPE; - if(!(pntm->ntmTm.tmPitchAndFamily & TMPF_VECTOR)) - *ptype |= RASTER_FONTTYPE; - face->cached_enum_data = HeapAlloc(GetProcessHeap(), 0, sizeof(*face->cached_enum_data)); if (face->cached_enum_data) { face->cached_enum_data->elf = *pelf; face->cached_enum_data->ntm = *pntm; - face->cached_enum_data->type = *ptype; } free_gdi_font(gdi_font); @@ -5347,10 +5347,10 @@ static BOOL enum_face_charsets(const Family *family, Face *face, struct enum_cha { ENUMLOGFONTEXW elf; NEWTEXTMETRICEXW ntm; - DWORD type = 0; - DWORD i; + DWORD type, i; - GetEnumStructs( face, face->family->family_name, &elf, &ntm, &type ); + GetEnumStructs( face, face->family->family_name, &elf, &ntm ); + type = get_font_type( &ntm ); for(i = 0; i < list->total; i++) { if(!face->scalable && face->fs.fsCsb[0] == 0) { /* OEM bitmap */ elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = OEM_CHARSET;

1 0

Alexandre Julliard : makefiles: Explicitly create destination dirs when installing symlinks.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: ec99ba1b29a78bdace93bd30819d6a90f78e091d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec99ba1b29a78bdace93bd30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 23 12:41:12 2020 +0200 makefiles: Explicitly create destination dirs when installing symlinks. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50039 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 2eed620b429..90a21ef825c 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2434,24 +2434,28 @@ static void output_winegcc_command( struct makefile *make, int is_cross ) * * Output a rule to create a symlink. */ -static void output_symlink_rule( const char *src_name, const char *link_name ) +static void output_symlink_rule( const char *src_name, const char *link_name, int create_dir ) { - const char *name; - - output( "\trm -f %s && ", link_name ); + const char *name = strrchr( link_name, '/' ); + char *dir = NULL; - /* dest path with a directory needs special handling if ln -s isn't supported */ - if (strcmp( ln_s, "ln -s" ) && ((name = strrchr( link_name, '/' )))) + if (name) { - char *dir = xstrdup( link_name ); + dir = xstrdup( link_name ); dir[name - link_name] = 0; - output( "cd %s && %s %s %s\n", *dir ? dir : "/", ln_s, src_name, name + 1 ); - free( dir ); } + + output( "\t" ); + if (create_dir && dir && *dir) output( "%s -d %s && ", root_src_dir_path( "tools/install-sh" ), dir ); + output( "rm -f %s && ", link_name ); + + /* dest path with a directory needs special handling if ln -s isn't supported */ + if (dir && strcmp( ln_s, "ln -s" )) + output( "cd %s && %s %s %s\n", *dir ? dir : "/", ln_s, src_name, name + 1 ); else - { output( "%s %s %s\n", ln_s, src_name, link_name ); - } + + free( dir ); } @@ -2474,7 +2478,7 @@ static void output_srcdir_symlink( struct makefile *make, const char *obj ) if (src_name[0] != '/' && make->obj_dir) src_name = concat_paths( get_relative_path( make->obj_dir, "" ), src_name ); - output_symlink_rule( src_name, dst_file ); + output_symlink_rule( src_name, dst_file, 0 ); strarray_add( &make->all_targets, obj ); } @@ -2524,7 +2528,7 @@ static void output_install_commands( struct makefile *make, struct strarray file install_sh, tools_dir_path( make, files.str[i] ), dest ); break; case 'y': /* symlink */ - output_symlink_rule( files.str[i], dest ); + output_symlink_rule( files.str[i], dest, 1 ); break; default: assert(0); @@ -2648,7 +2652,7 @@ static struct strarray output_importlib_symlinks( const struct makefile *make ) lib = strmake( "lib%s.%s", make->importlib, ext[i] ); dst = strmake( "dlls/%s", lib ); output( "%s: %s\n", dst, obj_dir_path( make, lib )); - output_symlink_rule( concat_paths( make->obj_dir + strlen("dlls/"), lib ), dst ); + output_symlink_rule( concat_paths( make->obj_dir + strlen("dlls/"), lib ), dst, 0 ); strarray_add( &ret, dst ); } return ret; @@ -3496,7 +3500,7 @@ static void output_shared_lib( struct makefile *make ) for (i = 1; i < names.count; i++) { output( "%s: %s\n", obj_dir_path( make, names.str[i] ), obj_dir_path( make, names.str[i-1] )); - output_symlink_rule( names.str[i-1], obj_dir_path( make, names.str[i] )); + output_symlink_rule( names.str[i-1], obj_dir_path( make, names.str[i] ), 0 ); add_install_rule( make, names.str[i], names.str[i-1], strmake( "y$(libdir)/%s", names.str[i] )); } @@ -3608,7 +3612,7 @@ static void output_programs( struct makefile *make ) for (j = 0; j < symlinks.count; j++) { output( "%s: %s\n", obj_dir_path( make, symlinks.str[j] ), obj_dir_path( make, program )); - output_symlink_rule( program, obj_dir_path( make, symlinks.str[j] )); + output_symlink_rule( program, obj_dir_path( make, symlinks.str[j] ), 0 ); } strarray_addall( &make->all_targets, symlinks );

1 0

Hans Leidekker : wbemprox: Also return system properties from IWbemClassObject::GetNames.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: b1ceb7853cf0d7abe99fd917e65a22507795f7de URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1ceb7853cf0d7abe99fd917… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 22 21:25:49 2020 +0200 wbemprox: Also return system properties from IWbemClassObject::GetNames. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50038 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/query.c | 61 ++++++++++++++++++++++++++++++--------------- dlls/wbemprox/tests/query.c | 17 +++++++++++++ 2 files changed, 58 insertions(+), 20 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 525381d88d2..3d60825f24e 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -1375,40 +1375,61 @@ HRESULT put_propval( const struct view *view, UINT index, const WCHAR *name, VAR HRESULT get_properties( const struct view *view, UINT index, LONG flags, SAFEARRAY **props ) { + static const WCHAR * const system_props[] = + { L"__GENUS", L"__CLASS", L"__RELPATH", L"__PROPERTY_COUNT", L"__SERVER", L"__NAMESPACE", L"__PATH" }; SAFEARRAY *sa; BSTR str; - UINT i, table_index, result_index, num_props; + UINT i, table_index, result_index, count = 0; struct table *table; HRESULT hr; - LONG j; + LONG j = 0; if ((hr = map_view_index( view, index, &table_index, &result_index )) != S_OK) return hr; - - num_props = count_result_properties( view, table_index ); - if (!(sa = SafeArrayCreateVector( VT_BSTR, 0, num_props ))) return E_OUTOFMEMORY; - table = view->table[table_index]; - for (i = 0, j = 0; i < table->num_cols; i++) - { - BOOL is_system; - if (is_method( table, i )) continue; - if (!is_result_prop( view, table->columns[i].name )) continue; + if (!(flags & WBEM_FLAG_NONSYSTEM_ONLY)) count += ARRAY_SIZE(system_props); + if (!(flags & WBEM_FLAG_SYSTEM_ONLY)) + { + for (i = 0; i < table->num_cols; i++) + { + if (!is_method( table, i ) && is_result_prop( view, table->columns[i].name )) count++; + } + } - is_system = is_system_prop( table->columns[i].name ); - if ((flags & WBEM_FLAG_NONSYSTEM_ONLY) && is_system) continue; - else if ((flags & WBEM_FLAG_SYSTEM_ONLY) && !is_system) continue; + if (!(sa = SafeArrayCreateVector( VT_BSTR, 0, count ))) return E_OUTOFMEMORY; - str = SysAllocString( table->columns[i].name ); - if (!str || SafeArrayPutElement( sa, &j, str ) != S_OK) + if (!(flags & WBEM_FLAG_NONSYSTEM_ONLY)) + { + for (j = 0; j < ARRAY_SIZE(system_props); j++) + { + str = SysAllocString( system_props[j] ); + if (!str || SafeArrayPutElement( sa, &j, str ) != S_OK) + { + SysFreeString( str ); + SafeArrayDestroy( sa ); + return E_OUTOFMEMORY; + } + SysFreeString( str ); + } + } + if (!(flags & WBEM_FLAG_SYSTEM_ONLY)) + { + for (i = 0; i < table->num_cols; i++) { + if (is_method( table, i ) || !is_result_prop( view, table->columns[i].name )) continue; + + str = SysAllocString( table->columns[i].name ); + if (!str || SafeArrayPutElement( sa, &j, str ) != S_OK) + { + SysFreeString( str ); + SafeArrayDestroy( sa ); + return E_OUTOFMEMORY; + } SysFreeString( str ); - SafeArrayDestroy( sa ); - return E_OUTOFMEMORY; + j++; } - SysFreeString( str ); - j++; } + *props = sa; return S_OK; } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index d1ce42d64cb..7ba55dffdfb 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -460,6 +460,8 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) IWbemClassObject *process, *sig_in, *out; IWbemQualifierSet *qualifiers; VARIANT retval, val; + SAFEARRAY *names; + LONG bound, i; DWORD full_path_len = 0; LONG flavor; CIMTYPE type; @@ -484,6 +486,21 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) win_skip( "Win32_Process not available\n" ); return; } + names = NULL; + hr = IWbemClassObject_GetNames( process, NULL, 0, NULL, &names ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( names != NULL, "names not set\n" ); + hr = SafeArrayGetUBound( names, 1, &bound ); + ok( hr == S_OK, "got %08x\n", hr ); + for (i = 0; i <= bound; i++) + { + BSTR str; + hr = SafeArrayGetElement( names, &i, &str ); + ok( hr == S_OK, "%d: got %08x\n", i, hr ); + SysFreeString( str ); + } + SafeArrayDestroy( names ); + sig_in = (void*)0xdeadbeef; hr = IWbemClassObject_GetMethod( process, L"GetOwner", 0, &sig_in, NULL ); ok( hr == S_OK, "failed to get GetOwner method %08x\n", hr );

1 0

Huw Davies : riched20: Use run and para ptrs in the cursor move lines function.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: c8862864fec884272a46aa477c1e218b3a2b8c78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8862864fec884272a46aa47… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 23 10:25:05 2020 +0100 riched20: Use run and para ptrs in the cursor move lines function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 63 +++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 9676636a64e..bb462b034b7 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1241,13 +1241,17 @@ static void ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs, BOOL extend) { ME_DisplayItem *pRun = pCursor->pRun; - ME_DisplayItem *pOldPara = pCursor->pPara; - ME_DisplayItem *pItem, *pNewPara; + ME_Paragraph *old_para = &pCursor->pPara->member.para, *new_para; + ME_DisplayItem *pItem; int x = ME_GetXForArrow(editor, pCursor); if (editor->bCaretAtEnd && !pCursor->nOffset) - if (!ME_PrevRun(&pOldPara, &pRun, TRUE)) - return; + { + ME_Run *prev = run_prev_all_paras( &pRun->member.run ); + if (!prev) return; + pRun = run_get_di( prev ); + old_para = prev->para; + } if (nRelOfs == -1) { @@ -1262,25 +1266,23 @@ ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs, BOOL ME_SetCursorToStart(editor, pCursor); return; } - pNewPara = ME_GetParagraph(pItem); - if (pOldPara->member.para.nFlags & MEPF_ROWEND || - (pOldPara->member.para.pCell && - pOldPara->member.para.pCell != pNewPara->member.para.pCell)) + new_para = &ME_GetParagraph(pItem)->member.para; + if (old_para->nFlags & MEPF_ROWEND || + (para_cell( old_para ) && para_cell( old_para ) != para_cell( new_para ))) { /* Brought out of a cell */ - pNewPara = table_row_start( &pOldPara->member.para )->prev_para; - if (pNewPara->type == diTextStart) - return; /* At the top, so don't go anywhere. */ - pItem = ME_FindItemFwd(pNewPara, diStartRow); + new_para = para_prev( table_row_start( old_para )); + if (!new_para) return; /* At the top, so don't go anywhere. */ + pItem = ME_FindItemFwd( para_get_di( new_para ), diStartRow); } - if (pNewPara->member.para.nFlags & MEPF_ROWEND) + if (new_para->nFlags & MEPF_ROWEND) { /* Brought into a table row */ - ME_Cell *cell = &ME_FindItemBack(pNewPara, diCell)->member.cell; - while (x < cell->pt.x && cell->prev_cell) - cell = &cell->prev_cell->member.cell; - if (cell->next_cell) /* else - we are still at the end of the row */ - pItem = ME_FindItemBack(cell->next_cell, diStartRow); + ME_Cell *cell = table_row_end_cell( new_para ); + while (x < cell->pt.x && cell_prev( cell )) + cell = cell_prev( cell ); + if (cell_next( cell )) /* else - we are still at the end of the row */ + pItem = ME_FindItemBack( cell_get_di( cell_next( cell ) ), diStartRow ); } } else @@ -1293,25 +1295,22 @@ ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs, BOOL ME_SetCursorToEnd(editor, pCursor, TRUE); return; } - pNewPara = ME_GetParagraph(pItem); - if (pOldPara->member.para.nFlags & MEPF_ROWSTART || - (pOldPara->member.para.pCell && - pOldPara->member.para.pCell != pNewPara->member.para.pCell)) + new_para = &ME_GetParagraph(pItem)->member.para; + if (old_para->nFlags & MEPF_ROWSTART || + (para_cell( old_para ) && para_cell( old_para ) != para_cell( new_para ))) { /* Brought out of a cell */ - pNewPara = table_row_end( &pOldPara->member.para )->next_para; - if (pNewPara->type == diTextEnd) - return; /* At the bottom, so don't go anywhere. */ - pItem = ME_FindItemFwd(pNewPara, diStartRow); + new_para = para_next( table_row_end( old_para ) ); + if (!para_next( new_para )) return; /* At the bottom, so don't go anywhere. */ + pItem = ME_FindItemFwd( para_get_di( new_para ), diStartRow ); } - if (pNewPara->member.para.nFlags & MEPF_ROWSTART) + if (new_para->nFlags & MEPF_ROWSTART) { /* Brought into a table row */ - ME_DisplayItem *cell = ME_FindItemFwd(pNewPara, diCell); - while (cell->member.cell.next_cell && - x >= cell->member.cell.next_cell->member.cell.pt.x) - cell = cell->member.cell.next_cell; - pItem = ME_FindItemFwd(cell, diStartRow); + ME_Cell *cell = table_row_first_cell( new_para ); + while (cell_next( cell ) && x >= cell_next( cell )->pt.x) + cell = cell_next( cell ); + pItem = ME_FindItemFwd( cell_get_di( cell ), diStartRow ); } } if (!pItem)

1 0

Hans Leidekker : wbemprox: Implement IWbemClassObject::GetMethodQualifierSet.
by Alexandre Julliard Oct. 23, 2020

Oct. 23, 2020

Module: wine Branch: master Commit: 09e32f57b713a55bcb7487c1e1dff987d02438d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09e32f57b713a55bcb7487c1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 23 11:15:56 2020 +0200 wbemprox: Implement IWbemClassObject::GetMethodQualifierSet. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/class.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index e048fb3db82..d24d8cbb5ca 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -971,8 +971,11 @@ static HRESULT WINAPI class_object_GetMethodQualifierSet( LPCWSTR wszMethod, IWbemQualifierSet **ppQualSet) { - FIXME("%p, %s, %p\n", iface, debugstr_w(wszMethod), ppQualSet); - return E_NOTIMPL; + struct class_object *co = impl_from_IWbemClassObject( iface ); + + TRACE("%p, %s, %p\n", iface, debugstr_w(wszMethod), ppQualSet); + + return WbemQualifierSet_create( co->name, wszMethod, (void **)ppQualSet ); } static HRESULT WINAPI class_object_GetMethodOrigin(

1 0