September 2017 - Wine-commits

Henri Verbeet : d2d1: Implement d2d_radial_gradient_brush_SetGradientOriginOffset().
by Alexandre Julliard 27 Sep '17

27 Sep '17

Module: wine Branch: master Commit: 5aef3d6352f352a49e2f20d9b11197b0b8b70d54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aef3d6352f352a49e2f20d9b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 27 09:47:55 2017 +0200 d2d1: Implement d2d_radial_gradient_brush_SetGradientOriginOffset(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 8a080e1..20e5b0e 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -688,7 +688,11 @@ static void STDMETHODCALLTYPE d2d_radial_gradient_brush_SetCenter(ID2D1RadialGra static void STDMETHODCALLTYPE d2d_radial_gradient_brush_SetGradientOriginOffset(ID2D1RadialGradientBrush *iface, D2D1_POINT_2F offset) { - FIXME("iface %p, offset {%.8e, %.8e} stub!\n", iface, offset.x, offset.y); + struct d2d_brush *brush = impl_from_ID2D1RadialGradientBrush(iface); + + TRACE("iface %p, offset {%.8e, %.8e}.\n", iface, offset.x, offset.y); + + brush->u.radial.offset = offset; } static void STDMETHODCALLTYPE d2d_radial_gradient_brush_SetRadiusX(ID2D1RadialGradientBrush *iface, float radius)

1 0

Henri Verbeet : d2d1: Implement d2d_radial_gradient_brush_GetGradientStopCollection().
by Alexandre Julliard 27 Sep '17

27 Sep '17

Module: wine Branch: master Commit: 48dfe437f9053001ce2c24cd5958258f3e7f74d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48dfe437f9053001ce2c24cd5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 27 09:47:56 2017 +0200 d2d1: Implement d2d_radial_gradient_brush_GetGradientStopCollection(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 11 +++++++++-- dlls/d2d1/d2d1_private.h | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 20e5b0e..f141c72 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -622,7 +622,10 @@ static ULONG STDMETHODCALLTYPE d2d_radial_gradient_brush_Release(ID2D1RadialGrad TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + ID2D1GradientStopCollection_Release(&brush->u.radial.gradient->ID2D1GradientStopCollection_iface); d2d_brush_destroy(brush); + } return refcount; } @@ -744,9 +747,11 @@ static float STDMETHODCALLTYPE d2d_radial_gradient_brush_GetRadiusY(ID2D1RadialG static void STDMETHODCALLTYPE d2d_radial_gradient_brush_GetGradientStopCollection(ID2D1RadialGradientBrush *iface, ID2D1GradientStopCollection **gradient) { - FIXME("iface %p, gradient %p stub!\n", iface, gradient); + struct d2d_brush *brush = impl_from_ID2D1RadialGradientBrush(iface); + + TRACE("iface %p, gradient %p.\n", iface, gradient); - *gradient = NULL; + ID2D1GradientStopCollection_AddRef(*gradient = &brush->u.radial.gradient->ID2D1GradientStopCollection_iface); } static const struct ID2D1RadialGradientBrushVtbl d2d_radial_gradient_brush_vtbl = @@ -780,6 +785,8 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory, return E_OUTOFMEMORY; d2d_brush_init(b, factory, D2D_BRUSH_TYPE_RADIAL, brush_desc, (ID2D1BrushVtbl *)&d2d_radial_gradient_brush_vtbl); + b->u.radial.gradient = unsafe_impl_from_ID2D1GradientStopCollection(gradient); + ID2D1GradientStopCollection_AddRef(&b->u.radial.gradient->ID2D1GradientStopCollection_iface); b->u.radial.centre = gradient_desc->center; b->u.radial.offset = gradient_desc->gradientOriginOffset; diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index b0c7fed..ccff6df 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -241,6 +241,7 @@ struct d2d_brush } linear; struct { + struct d2d_gradient *gradient; D2D1_POINT_2F centre; D2D1_POINT_2F offset; } radial;

1 0

Nikolay Sivov : shell32: System shellfolders don' t implement GetDefaultColumn().
by Alexandre Julliard 27 Sep '17

27 Sep '17

Module: wine Branch: master Commit: babd22b4431b76a2c9fde3771fc691a08c3e9e82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=babd22b4431b76a2c9fde3771… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 27 11:13:42 2017 +0300 shell32: System shellfolders don't implement GetDefaultColumn(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/cpanelfolder.c | 12 +++++----- dlls/shell32/recyclebin.c | 10 ++++---- dlls/shell32/shfldr_desktop.c | 13 ++++------- dlls/shell32/shfldr_fs.c | 12 +++------- dlls/shell32/shfldr_mycomp.c | 14 +++++------ dlls/shell32/shfldr_netplaces.c | 13 ++++------- dlls/shell32/shfldr_printers.c | 8 ++++--- dlls/shell32/shfldr_unixfs.c | 12 +++------- dlls/shell32/tests/shlfolder.c | 52 +++++++++++++++++++++++++++++++++++++++++ 9 files changed, 88 insertions(+), 58 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 527ddfd..f12faf7 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -724,17 +724,17 @@ static HRESULT WINAPI ISF_ControlPanel_fnEnumSearches(IShellFolder2 *iface, FIXME("(%p)\n", This); return E_NOTIMPL; } -static HRESULT WINAPI ISF_ControlPanel_fnGetDefaultColumn(IShellFolder2 *iface, DWORD dwRes, - ULONG *pSort, ULONG *pDisplay) + +static HRESULT WINAPI ISF_ControlPanel_fnGetDefaultColumn(IShellFolder2 *iface, DWORD reserved, + ULONG *sort, ULONG *display) { ICPanelImpl *This = impl_from_IShellFolder2(iface); - TRACE("(%p)\n", This); + TRACE("(%p)->(%#x %p %p)\n", This, reserved, sort, display); - if (pSort) *pSort = 0; - if (pDisplay) *pDisplay = 0; - return S_OK; + return E_NOTIMPL; } + static HRESULT WINAPI ISF_ControlPanel_fnGetDefaultColumnState(IShellFolder2 *iface, UINT iColumn, DWORD *pcsFlags) { diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 80e5aad..7d34af2 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -580,13 +580,13 @@ static HRESULT WINAPI RecycleBin_EnumSearches(IShellFolder2 *iface, IEnumExtraSe return E_NOTIMPL; } -static HRESULT WINAPI RecycleBin_GetDefaultColumn(IShellFolder2 *iface, DWORD dwReserved, ULONG *pSort, ULONG *pDisplay) +static HRESULT WINAPI RecycleBin_GetDefaultColumn(IShellFolder2 *iface, DWORD reserved, ULONG *sort, ULONG *display) { RecycleBin *This = impl_from_IShellFolder2(iface); - TRACE("(%p, %x, %p, %p)\n", This, dwReserved, pSort, pDisplay); - *pSort = 0; - *pDisplay = 0; - return S_OK; + + TRACE("(%p)->(%#x, %p, %p)\n", This, reserved, sort, display); + + return E_NOTIMPL; } static HRESULT WINAPI RecycleBin_GetDefaultColumnState(IShellFolder2 *iface, UINT iColumn, SHCOLSTATEF *pcsFlags) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 8d85dfd..bc5935f 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -769,20 +769,15 @@ static HRESULT WINAPI ISF_Desktop_fnEnumSearches (IShellFolder2 *iface, return E_NOTIMPL; } -static HRESULT WINAPI ISF_Desktop_fnGetDefaultColumn (IShellFolder2 * iface, - DWORD reserved, ULONG * pSort, ULONG * pDisplay) +static HRESULT WINAPI ISF_Desktop_fnGetDefaultColumn(IShellFolder2 *iface, DWORD reserved, ULONG *sort, ULONG *display) { IDesktopFolderImpl *This = impl_from_IShellFolder2(iface); - TRACE ("(%p)->(%d %p %p)\n", This, reserved, pSort, pDisplay); + TRACE ("(%p)->(%#x, %p, %p)\n", This, reserved, sort, display); - if (pSort) - *pSort = 0; - if (pDisplay) - *pDisplay = 0; - - return S_OK; + return E_NOTIMPL; } + static HRESULT WINAPI ISF_Desktop_fnGetDefaultColumnState ( IShellFolder2 * iface, UINT iColumn, DWORD * pcsFlags) { diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 31c0043..0c1d95e 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -926,19 +926,13 @@ static HRESULT WINAPI IShellFolder_fnEnumSearches (IShellFolder2 * iface, } static HRESULT WINAPI -IShellFolder_fnGetDefaultColumn (IShellFolder2 * iface, DWORD dwRes, - ULONG * pSort, ULONG * pDisplay) +IShellFolder_fnGetDefaultColumn(IShellFolder2 *iface, DWORD reserved, ULONG *sort, ULONG *display) { IGenericSFImpl *This = impl_from_IShellFolder2(iface); - TRACE ("(%p)\n", This); - - if (pSort) - *pSort = 0; - if (pDisplay) - *pDisplay = 0; + TRACE("(%p)->(%#x, %p, %p)\n", This, reserved, sort, display); - return S_OK; + return E_NOTIMPL; } static HRESULT WINAPI diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index f5df7e1..c514cd8 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -782,19 +782,17 @@ static HRESULT WINAPI ISF_MyComputer_fnEnumSearches ( FIXME ("(%p)\n", This); return E_NOTIMPL; } -static HRESULT WINAPI ISF_MyComputer_fnGetDefaultColumn ( - IShellFolder2 *iface, DWORD dwRes, ULONG *pSort, ULONG *pDisplay) + +static HRESULT WINAPI ISF_MyComputer_fnGetDefaultColumn(IShellFolder2 *iface, DWORD reserved, + ULONG *sort, ULONG *display) { IMyComputerFolderImpl *This = impl_from_IShellFolder2(iface); - TRACE ("(%p)\n", This); + TRACE("(%p)->(%#x, %p, %p)\n", This, reserved, sort, display); - if (pSort) - *pSort = 0; - if (pDisplay) - *pDisplay = 0; - return S_OK; + return E_NOTIMPL; } + static HRESULT WINAPI ISF_MyComputer_fnGetDefaultColumnState ( IShellFolder2 * iface, UINT iColumn, DWORD * pcsFlags) { diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index f7834a2..e41359b 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -519,19 +519,14 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnEnumSearches (IShellFolder2 * iface, return E_NOTIMPL; } -static HRESULT WINAPI ISF_NetworkPlaces_fnGetDefaultColumn (IShellFolder2 * iface, - DWORD dwRes, ULONG * pSort, ULONG * pDisplay) +static HRESULT WINAPI ISF_NetworkPlaces_fnGetDefaultColumn(IShellFolder2 *iface, DWORD reserved, + ULONG *sort, ULONG *display) { IGenericSFImpl *This = impl_from_IShellFolder2(iface); - TRACE ("(%p)\n", This); - - if (pSort) - *pSort = 0; - if (pDisplay) - *pDisplay = 0; + TRACE("(%p)->(%#x, %p, %p)\n", This, reserved, sort, display); - return S_OK; + return E_NOTIMPL; } static HRESULT WINAPI ISF_NetworkPlaces_fnGetDefaultColumnState ( diff --git a/dlls/shell32/shfldr_printers.c b/dlls/shell32/shfldr_printers.c index 16d1adb..08841fb 100644 --- a/dlls/shell32/shfldr_printers.c +++ b/dlls/shell32/shfldr_printers.c @@ -267,11 +267,13 @@ static HRESULT WINAPI IShellFolder_Printers_fnEnumSearches ( return E_NOTIMPL; } -static HRESULT WINAPI IShellFolder_Printers_fnGetDefaultColumn ( - IShellFolder2 *iface, DWORD dwRes, ULONG *pSort, ULONG *pDisplay) +static HRESULT WINAPI IShellFolder_Printers_fnGetDefaultColumn(IShellFolder2 *iface, DWORD reserved, + ULONG *sort, ULONG *display) { IPrintersFolderImpl *This = impl_from_IShellFolder2(iface); - FIXME("(%p) stub\n", This); + + TRACE("(%p)->(%#x, %p, %p)\n", This, reserved, sort, display); + return E_NOTIMPL; } diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index e74e4db..d9ac506 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1437,19 +1437,13 @@ static HRESULT WINAPI ShellFolder2_EnumSearches(IShellFolder2* iface, IEnumExtra return E_NOTIMPL; } -static HRESULT WINAPI ShellFolder2_GetDefaultColumn(IShellFolder2* iface, - DWORD dwReserved, ULONG *pSort, ULONG *pDisplay) +static HRESULT WINAPI ShellFolder2_GetDefaultColumn(IShellFolder2* iface, DWORD reserved, ULONG *sort, ULONG *display) { UnixFolder *This = impl_from_IShellFolder2(iface); - TRACE("(%p)->(0x%x %p %p)\n", This, dwReserved, pSort, pDisplay); + TRACE("(%p)->(%#x, %p, %p)\n", This, reserved, sort, display); - if (pSort) - *pSort = 0; - if (pDisplay) - *pDisplay = 0; - - return S_OK; + return E_NOTIMPL; } static HRESULT WINAPI ShellFolder2_GetDefaultColumnState(IShellFolder2* iface, diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 739e685..8ce7d74 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -5395,6 +5395,57 @@ static void test_DataObject(void) IDataObject_Release(data_obj); } +static void test_GetDefaultColumn(void) +{ + static const CLSID *folders[] = + { + &CLSID_MyComputer, + &CLSID_MyDocuments, + &CLSID_ControlPanel, + &CLSID_NetworkPlaces, + &CLSID_Printers, + &CLSID_RecycleBin, + &CLSID_ShellDesktop, + }; + HRESULT hr; + int i; + + CoInitialize(NULL); + + for (i = 0; i < sizeof(folders)/sizeof(folders[0]); i++) + { + IShellFolder2 *folder; + ULONG sort, display; + + hr = CoCreateInstance(folders[i], NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder2, (void **)&folder); + if (hr != S_OK) + { + win_skip("Failed to create folder %s, hr %#x.\n", wine_dbgstr_guid(folders[i]), hr); + continue; + } + + hr = IShellFolder2_GetDefaultColumn(folder, 0, NULL, NULL); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + sort = display = 123; + hr = IShellFolder2_GetDefaultColumn(folder, 0, &sort, &display); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(sort == 123 && display == 123, "Unexpected default column.\n"); + + display = 123; + hr = IShellFolder2_GetDefaultColumn(folder, 0, NULL, &display); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(display == 123, "Unexpected default column.\n"); + + sort = 123; + hr = IShellFolder2_GetDefaultColumn(folder, 0, &sort, NULL); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(sort == 123, "Unexpected default column.\n"); + } + + CoUninitialize(); +} + START_TEST(shlfolder) { init_function_pointers(); @@ -5434,6 +5485,7 @@ START_TEST(shlfolder) test_ShellItemArrayGetAttributes(); test_SHCreateDefaultContextMenu(); test_DataObject(); + test_GetDefaultColumn(); OleUninitialize(); }

1 0

Nikolay Sivov : shell32: System shellfolders don' t support GetDefaultSearchGUID() in recent versions.
by Alexandre Julliard 27 Sep '17

27 Sep '17

Module: wine Branch: master Commit: 2406d6cd84bd93b6f3f321d2f86291ab8b2ebce7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2406d6cd84bd93b6f3f321d2f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 27 11:13:43 2017 +0300 shell32: System shellfolders don't support GetDefaultSearchGUID() in recent versions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/cpanelfolder.c | 5 +++-- dlls/shell32/recyclebin.c | 5 +++-- dlls/shell32/shfldr_desktop.c | 5 ++--- dlls/shell32/shfldr_fs.c | 6 ++--- dlls/shell32/shfldr_mycomp.c | 5 ++--- dlls/shell32/shfldr_netplaces.c | 6 ++--- dlls/shell32/shfldr_printers.c | 5 ++--- dlls/shell32/shfldr_unixfs.c | 5 ++--- dlls/shell32/tests/shlfolder.c | 49 +++++++++++++++++++++++++++++++++++++++++ 9 files changed, 68 insertions(+), 23 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index f12faf7..ea5e9e2 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -711,12 +711,13 @@ static HRESULT WINAPI ISF_ControlPanel_fnSetNameOf(IShellFolder2 *iface, HWND hw return E_FAIL; } -static HRESULT WINAPI ISF_ControlPanel_fnGetDefaultSearchGUID(IShellFolder2 *iface, GUID *pguid) +static HRESULT WINAPI ISF_ControlPanel_fnGetDefaultSearchGUID(IShellFolder2 *iface, GUID *guid) { ICPanelImpl *This = impl_from_IShellFolder2(iface); - FIXME("(%p)\n", This); + TRACE("(%p)->(%p)\n", This, guid); return E_NOTIMPL; } + static HRESULT WINAPI ISF_ControlPanel_fnEnumSearches(IShellFolder2 *iface, IEnumExtraSearch **ppenum) { diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 7d34af2..5d4725e 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -567,9 +567,10 @@ static HRESULT WINAPI RecycleBin_GetCurFolder(IPersistFolder2 *iface, LPITEMIDLI return S_OK; } -static HRESULT WINAPI RecycleBin_GetDefaultSearchGUID(IShellFolder2 *iface, GUID *pguid) +static HRESULT WINAPI RecycleBin_GetDefaultSearchGUID(IShellFolder2 *iface, GUID *guid) { - FIXME("stub\n"); + RecycleBin *This = impl_from_IShellFolder2(iface); + TRACE("(%p)->(%p)\n", This, guid); return E_NOTIMPL; } diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index bc5935f..880291c 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -753,11 +753,10 @@ static HRESULT WINAPI ISF_Desktop_fnSetNameOf (IShellFolder2 * iface, return E_FAIL; } -static HRESULT WINAPI ISF_Desktop_fnGetDefaultSearchGUID(IShellFolder2 *iface, - GUID * pguid) +static HRESULT WINAPI ISF_Desktop_fnGetDefaultSearchGUID(IShellFolder2 *iface, GUID *guid) { IDesktopFolderImpl *This = impl_from_IShellFolder2(iface); - FIXME ("(%p)->(%p) stub\n", This, pguid); + TRACE("(%p)->(%p)\n", This, guid); return E_NOTIMPL; } diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 0c1d95e..1fb4f1b 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -910,13 +910,13 @@ static HRESULT WINAPI IShellFolder_fnSetNameOf (IShellFolder2 * iface, return E_FAIL; } -static HRESULT WINAPI IShellFolder_fnGetDefaultSearchGUID (IShellFolder2 *iface, - GUID * pguid) +static HRESULT WINAPI IShellFolder_fnGetDefaultSearchGUID(IShellFolder2 *iface, GUID *guid) { IGenericSFImpl *This = impl_from_IShellFolder2(iface); - FIXME ("(%p)\n", This); + TRACE("(%p)->(%p)\n", This, guid); return E_NOTIMPL; } + static HRESULT WINAPI IShellFolder_fnEnumSearches (IShellFolder2 * iface, IEnumExtraSearch ** ppenum) { diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index c514cd8..3ed887c 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -768,11 +768,10 @@ static HRESULT WINAPI ISF_MyComputer_fnSetNameOf ( return E_FAIL; } -static HRESULT WINAPI ISF_MyComputer_fnGetDefaultSearchGUID ( - IShellFolder2 * iface, GUID * pguid) +static HRESULT WINAPI ISF_MyComputer_fnGetDefaultSearchGUID(IShellFolder2 *iface, GUID *guid) { IMyComputerFolderImpl *This = impl_from_IShellFolder2(iface); - FIXME ("(%p)\n", This); + TRACE("(%p)->(%p)\n", This, guid); return E_NOTIMPL; } static HRESULT WINAPI ISF_MyComputer_fnEnumSearches ( diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index e41359b..d973e40 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -501,12 +501,10 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnSetNameOf (IShellFolder2 * iface, return E_FAIL; } -static HRESULT WINAPI ISF_NetworkPlaces_fnGetDefaultSearchGUID ( - IShellFolder2 * iface, GUID * pguid) +static HRESULT WINAPI ISF_NetworkPlaces_fnGetDefaultSearchGUID(IShellFolder2 *iface, GUID *guid) { IGenericSFImpl *This = impl_from_IShellFolder2(iface); - - FIXME ("(%p)\n", This); + TRACE("(%p)->(%p)\n", This, guid); return E_NOTIMPL; } diff --git a/dlls/shell32/shfldr_printers.c b/dlls/shell32/shfldr_printers.c index 08841fb..66260ac 100644 --- a/dlls/shell32/shfldr_printers.c +++ b/dlls/shell32/shfldr_printers.c @@ -251,11 +251,10 @@ static HRESULT WINAPI IShellFolder_Printers_fnSetNameOf ( return E_FAIL; } -static HRESULT WINAPI IShellFolder_Printers_fnGetDefaultSearchGUID ( - IShellFolder2 * iface, GUID * pguid) +static HRESULT WINAPI IShellFolder_Printers_fnGetDefaultSearchGUID(IShellFolder2 *iface, GUID *guid) { IPrintersFolderImpl *This = impl_from_IShellFolder2(iface); - FIXME ("(%p) stub\n", This); + TRACE("(%p)->(%p)\n", This, guid); return E_NOTIMPL; } diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index d9ac506..345e965 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1454,11 +1454,10 @@ static HRESULT WINAPI ShellFolder2_GetDefaultColumnState(IShellFolder2* iface, return E_NOTIMPL; } -static HRESULT WINAPI ShellFolder2_GetDefaultSearchGUID(IShellFolder2* iface, - GUID *guid) +static HRESULT WINAPI ShellFolder2_GetDefaultSearchGUID(IShellFolder2* iface, GUID *guid) { UnixFolder *This = impl_from_IShellFolder2(iface); - FIXME("(%p)->(%p): stub\n", This, guid); + TRACE("(%p)->(%p)\n", This, guid); return E_NOTIMPL; } diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 8ce7d74..1ee0274 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -5446,6 +5446,54 @@ static void test_GetDefaultColumn(void) CoUninitialize(); } +static void test_GetDefaultSearchGUID(void) +{ + static const CLSID *folders[] = + { + &CLSID_MyComputer, + &CLSID_MyDocuments, + &CLSID_ControlPanel, + &CLSID_NetworkPlaces, + &CLSID_Printers, + &CLSID_RecycleBin, + &CLSID_ShellDesktop, + }; + HRESULT hr; + int i; + + CoInitialize(NULL); + + for (i = 0; i < sizeof(folders)/sizeof(folders[0]); i++) + { + IShellFolder2 *folder; + GUID guid; + + hr = CoCreateInstance(folders[i], NULL, CLSCTX_INPROC_SERVER, &IID_IShellFolder2, (void **)&folder); + if (hr != S_OK) + { + win_skip("Failed to create folder %s, hr %#x.\n", wine_dbgstr_guid(folders[i]), hr); + continue; + } + + if (0) + { + /* crashes on XP */ + hr = IShellFolder2_GetDefaultSearchGUID(folder, NULL); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + } + + memcpy(&guid, &CLSID_MyComputer, sizeof(guid)); + hr = IShellFolder2_GetDefaultSearchGUID(folder, &guid); + ok(hr == E_NOTIMPL || broken(hr == S_OK) /* Method was last supported on XP */, "Unexpected hr %#x.\n", hr); + if (hr == E_NOTIMPL) + ok(IsEqualGUID(&guid, &CLSID_MyComputer), "Unexpected guid %s.\n", wine_dbgstr_guid(&guid)); + + IShellFolder2_Release(folder); + } + + CoUninitialize(); +} + START_TEST(shlfolder) { init_function_pointers(); @@ -5486,6 +5534,7 @@ START_TEST(shlfolder) test_SHCreateDefaultContextMenu(); test_DataObject(); test_GetDefaultColumn(); + test_GetDefaultSearchGUID(); OleUninitialize(); }

1 0

Nikolay Sivov : shell32: Implement ParseName() using shellfolder API.
by Alexandre Julliard 27 Sep '17

27 Sep '17

Module: wine Branch: master Commit: d484650b6d95b22000744f9316564a97bfb0a379 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d484650b6d95b22000744f931… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 27 11:13:44 2017 +0300 shell32: Implement ParseName() using shellfolder API. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 644f67be..3763ff8 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -1502,31 +1502,25 @@ static HRESULT WINAPI FolderImpl_Items(Folder3 *iface, FolderItems **ppid) static HRESULT WINAPI FolderImpl_ParseName(Folder3 *iface, BSTR name, FolderItem **item) { FolderImpl *This = impl_from_Folder(iface); - FolderItem *self; - BSTR str; WCHAR pathW[MAX_PATH]; + LPITEMIDLIST pidl; + STRRET strret; HRESULT hr; TRACE("(%p,%s,%p)\n", iface, debugstr_w(name), item); *item = NULL; - if (!name || !name[0]) + if (FAILED(IShellFolder2_ParseDisplayName(This->folder, NULL, NULL, name, NULL, &pidl, NULL))) return S_FALSE; - hr = Folder3_get_Self(iface, &self); + hr = IShellFolder2_GetDisplayNameOf(This->folder, pidl, SHGDN_FORPARSING, &strret); + ILFree(pidl); if (FAILED(hr)) - return hr; - - hr = FolderItem_get_Path(self, &str); - FolderItem_Release(self); - - PathCombineW(pathW, str, name); - SysFreeString(str); - - if (!PathFileExistsW(pathW)) return S_FALSE; + StrRetToBufW(&strret, NULL, pathW, sizeof(pathW)/sizeof(*pathW)); + return FolderItem_Constructor(This, pathW, item); }

1 0

Nikolay Sivov : shell32: Fix IEnumIDList::Next() called for multiple items.
by Alexandre Julliard 27 Sep '17

27 Sep '17

Module: wine Branch: master Commit: c14c2ebfb70ae9e6d0d807cdb93ec2a025217278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c14c2ebfb70ae9e6d0d807cdb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 27 11:13:45 2017 +0300 shell32: Fix IEnumIDList::Next() called for multiple items. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 3763ff8..148c45f 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -1284,7 +1284,10 @@ static HRESULT FolderItems_Constructor(FolderImpl *folder, FolderItems **ret) if (This->item_count) { - LPITEMIDLIST *pidls = HeapAlloc(GetProcessHeap(), 0, This->item_count * sizeof(*pidls)); + LPITEMIDLIST *pidls; + ULONG fetched; + + pidls = HeapAlloc(GetProcessHeap(), 0, This->item_count * sizeof(*pidls)); This->item_names = HeapAlloc(GetProcessHeap(), 0, This->item_count * sizeof(*This->item_names)); if (!pidls || !This->item_names) @@ -1296,7 +1299,7 @@ static HRESULT FolderItems_Constructor(FolderImpl *folder, FolderItems **ret) } IEnumIDList_Reset(enumidlist); - if (IEnumIDList_Next(enumidlist, This->item_count, pidls, NULL) == S_OK) + if (IEnumIDList_Next(enumidlist, This->item_count, pidls, &fetched) == S_OK) idlist_sort(pidls, 0, This->item_count - 1, folder->folder); for (i = 0; i < This->item_count; i++)

1 0

Nikolay Sivov : shell32: Simplify Verbs() method.
by Alexandre Julliard 27 Sep '17

27 Sep '17

Module: wine Branch: master Commit: 876dc3d8fd0880fa895c78121f90c0aa85a4c27c URL: http://source.winehq.org/git/wine.git/?a=commit;h=876dc3d8fd0880fa895c78121… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 27 11:13:46 2017 +0300 shell32: Simplify Verbs() method. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 148c45f..3ff9ff0 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -577,6 +577,8 @@ static HRESULT FolderItemVerbs_Constructor(BSTR path, FolderItemVerbs **verbs) LPITEMIDLIST pidl; HRESULT hr; + *verbs = NULL; + This = HeapAlloc(GetProcessHeap(), 0, sizeof(FolderItemVerbsImpl)); if (!This) return E_OUTOFMEMORY; @@ -865,23 +867,14 @@ static HRESULT WINAPI FolderItemImpl_get_Type(FolderItem2 *iface, BSTR *pbs) static HRESULT WINAPI FolderItemImpl_Verbs(FolderItem2 *iface, FolderItemVerbs **verbs) { - HRESULT hr; - BSTR path; + FolderItemImpl *This = impl_from_FolderItem(iface); TRACE("(%p, %p)\n", iface, verbs); if (!verbs) return E_INVALIDARG; - *verbs = NULL; - - hr = FolderItem2_get_Path(iface, &path); - if (FAILED(hr)) - return hr; - - hr = FolderItemVerbs_Constructor(path, verbs); - SysFreeString(path); - return hr; + return FolderItemVerbs_Constructor(This->path ? This->path : This->folder->path, verbs); } static HRESULT WINAPI FolderItemImpl_InvokeVerb(FolderItem2 *iface,

1 0

Michael Stefaniuc : fonts: Fix the character count in some fonts.
by Alexandre Julliard 27 Sep '17

27 Sep '17

Module: wine Branch: master Commit: 7ea82a02079d1600191743cc2c148955efe725fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ea82a02079d1600191743cc2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 27 15:34:52 2017 +0200 fonts: Fix the character count in some fonts. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- fonts/courier.sfd | 2 +- fonts/ms_sans_serif.sfd | 2 +- fonts/small_fonts.sfd | 2 +- fonts/system.sfd | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fonts/courier.sfd b/fonts/courier.sfd index c40af9b..dc79a21 100644 --- a/fonts/courier.sfd +++ b/fonts/courier.sfd @@ -52,7 +52,7 @@ FitToEm: 1 WinInfo: 0 21 19 OnlyBitmaps: 1 TeXData: 1 0 0 346030 173015 115343 0 1048576 115343 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 65536 477 +BeginChars: 65536 498 StartChar: space Encoding: 32 32 0 diff --git a/fonts/ms_sans_serif.sfd b/fonts/ms_sans_serif.sfd index 36c90c7..fa847b5 100644 --- a/fonts/ms_sans_serif.sfd +++ b/fonts/ms_sans_serif.sfd @@ -55,7 +55,7 @@ AntiAlias: 0 FitToEm: 1 WinInfo: 43 43 21 OnlyBitmaps: 1 -BeginChars: 65536 504 +BeginChars: 65536 518 StartChar: space Encoding: 32 32 0 diff --git a/fonts/small_fonts.sfd b/fonts/small_fonts.sfd index 2556168..53864ec 100644 --- a/fonts/small_fonts.sfd +++ b/fonts/small_fonts.sfd @@ -61,7 +61,7 @@ FitToEm: 1 WinInfo: 0 61 20 OnlyBitmaps: 1 TeXData: 1 0 0 189792 94896 63264 0 1048576 63264 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 65536 497 +BeginChars: 65536 513 StartChar: A Encoding: 65 65 0 diff --git a/fonts/system.sfd b/fonts/system.sfd index 8da0f87..a622b10 100644 --- a/fonts/system.sfd +++ b/fonts/system.sfd @@ -51,7 +51,7 @@ AntiAlias: 0 FitToEm: 1 WinInfo: 0 21 19 OnlyBitmaps: 1 -BeginChars: 65536 538 +BeginChars: 65536 549 StartChar: space Encoding: 32 32 0

1 0

Huw Davies : include: Add sapi.idl.
by Alexandre Julliard 27 Sep '17

27 Sep '17

Module: wine Branch: master Commit: 7017c4a0cfd2ae59feb96e858b98f03f3947a5f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7017c4a0cfd2ae59feb96e858… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 27 10:17:12 2017 +0100 include: Add sapi.idl. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/sapi.idl | 213 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 214 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 1982386..9bce848 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -154,6 +154,7 @@ IDL_SRCS = \ rstinf.idl \ rstloc.idl \ rstnot.idl \ + sapi.idl \ sensevts.idl \ servprov.idl \ sesprp.idl \ diff --git a/include/sapi.idl b/include/sapi.idl new file mode 100644 index 0000000..e138432 --- /dev/null +++ b/include/sapi.idl @@ -0,0 +1,213 @@ +/* + * Speech API (SAPI) IDL file. + * + * Copyright (C) 2017 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; + +#ifndef __WIDL__ +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + +typedef [hidden] enum SPDATAKEYLOCATION +{ + SPDKL_DefaultLocation = 0, + SPDKL_CurrentUser = 1, + SPDKL_LocalMachine = 2, + SPDKL_CurrentConfig = 5 +} SPDATAKEYLOCATION; + +cpp_quote("#if defined(__GNUC__)") + +cpp_quote("#define SPCAT_AUDIOOUT (const WCHAR []){ 'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E','\\\\','S','O','F','T','W','A','R','E','\\\\','M','i','c','r','o','s','o','f','t','\\\\','S','p','e','e','c','h','\\\\','A','u','d','i','o','O','u','t','p','u','t',0 }") +cpp_quote("#define SPCAT_AUDIOIN (const WCHAR []){ 'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E','\\\\','S','O','F','T','W','A','R','E','\\\\','M','i','c','r','o','s','o','f','t','\\\\','S','p','e','e','c','h','\\\\','A','u','d','i','o','I','n','p','u','t',0 }") +cpp_quote("#define SPCAT_VOICES (const WCHAR []){ 'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E','\\\\','S','O','F','T','W','A','R','E','\\\\','M','i','c','r','o','s','o','f','t','\\\\','S','p','e','e','c','h','\\\\','V','o','i','c','e','s',0 }") + +cpp_quote("#elif defined(_MSC_VER)") + +cpp_quote("#define SPCAT_AUDIOOUT L\"HKEY_LOCAL_MACHINE\\\\SOFTWARE\\\\Microsoft\\\\Speech\\\\AudioOutput\"") +cpp_quote("#define SPCAT_AUDIOIN L\"HKEY_LOCAL_MACHINE\\\\SOFTWARE\\\\Microsoft\\\\Speech\\\\AudioInput\"") +cpp_quote("#define SPCAT_VOICES L\"HKEY_LOCAL_MACHINE\\\\SOFTWARE\\\\Microsoft\\\\Speech\\\\Voices\"") + +cpp_quote("#else") + +cpp_quote("static const WCHAR SPCAT_AUDIOOUT[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E','\\\\','S','O','F','T','W','A','R','E','\\\\','M','i','c','r','o','s','o','f','t','\\\\','S','p','e','e','c','h','\\\\','A','u','d','i','o','O','u','t','p','u','t',0};") +cpp_quote("static const WCHAR SPCAT_AUDIOIN[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E','\\\\','S','O','F','T','W','A','R','E','\\\\','M','i','c','r','o','s','o','f','t','\\\\','S','p','e','e','c','h','\\\\','A','u','d','i','o','I','n','p','u','t',0};") +cpp_quote("static const WCHAR SPCAT_VOICES[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E','\\\\','S','O','F','T','W','A','R','E','\\\\','M','i','c','r','o','s','o','f','t','\\\\','S','p','e','e','c','h','\\\\','V','o','i','c','e','s',0};") + +cpp_quote("#endif") + +interface IEnumSpObjectTokens; + +[ + object, + uuid(14056581-e16c-11d2-bb90-00c04f8ee6c0), + helpstring("ISpDataKey"), + pointer_default(unique), + local, + restricted +] +interface ISpDataKey : IUnknown +{ + HRESULT SetData([in] LPCWSTR pszValueName, + [in] ULONG cbData, + [in] const BYTE *pData); + HRESULT GetData([in] LPCWSTR pszValueName, + [in] ULONG *pcbData, + [out] BYTE *pData); + HRESULT SetStringValue([in] LPCWSTR pszValueName, + [in] LPCWSTR pszValue); + HRESULT GetStringValue([in] LPCWSTR pszValueName, + [out] LPWSTR *ppszValue); + HRESULT SetDWORD([in] LPCWSTR pszValueName, + [in] DWORD dwValue); + HRESULT GetDWORD([in] LPCWSTR pszValueName, + [out] DWORD *pdwValue); + HRESULT OpenKey([in] LPCWSTR pszSubKeyName, + [out] ISpDataKey **ppSubKey); + HRESULT CreateKey([in] LPCWSTR pszSubKey, + [out] ISpDataKey **ppSubKey); + HRESULT DeleteKey([in] LPCWSTR pszSubKey); + HRESULT DeleteValue([in] LPCWSTR pszValueName); + HRESULT EnumKeys([in] ULONG Index, + [out] LPWSTR *ppszSubKeyName); + HRESULT EnumValues([in] ULONG Index, + [out] LPWSTR *ppszValueName); +} +[ + object, + uuid(92a66e2b-c830-4149-83df-6fc2ba1e7a5b), + helpstring("ISpRegDataKey"), + pointer_default(unique), + restricted +] +interface ISpRegDataKey : ISpDataKey +{ + [local] HRESULT SetKey([in] HKEY hkey, [in] BOOL fReadOnly); +} + +[ + object, + uuid(2d3d3845-39af-4850-bbf9-40b49780011d), + helpstring("ISpObjectTokenCategory"), + pointer_default(unique), + local, + restricted +] +interface ISpObjectTokenCategory : ISpDataKey +{ + HRESULT SetId([in] LPCWSTR pszCategoryId, + [in] BOOL fCreateIfNotExist); + HRESULT GetId([out] LPWSTR *ppszCoMemCategoryId); + HRESULT GetDataKey([in] SPDATAKEYLOCATION spdkl, + [out] ISpDataKey **ppDataKey); + HRESULT EnumTokens([in, string] LPCWSTR pszReqAttribs, + [in, string] LPCWSTR pszOptAttribs, + [out] IEnumSpObjectTokens **ppEnum); + HRESULT SetDefaultTokenId([in] LPCWSTR pszTokenId); + HRESULT GetDefaultTokenId([out] LPWSTR *ppszCoMemTokenId); +} + +[ + object, + uuid(14056589-e16c-11d2-bb90-00c04f8ee6c0), + helpstring("ISpObjectToken"), + pointer_default(unique), + local, + restricted +] +interface ISpObjectToken : ISpDataKey +{ + HRESULT SetId(/*[in]*/ LPCWSTR pszCategoryId, + [in] LPCWSTR pszTokenId, + [in] BOOL fCreateIfNotExist); + HRESULT GetId([out] LPWSTR *ppszCoMemTokenId); + HRESULT GetCategory([out] ISpObjectTokenCategory **ppTokenCategory); + HRESULT CreateInstance([in] IUnknown *pUnkOuter, + [in] DWORD dwClsContext, + [in] REFIID riid, + [out, iid_is(riid)] void **ppvObject); + HRESULT GetStorageFileName([in] REFCLSID clsidCaller, + [in] LPCWSTR pszValueName, + [in, string] LPCWSTR pszFileNameSpecifier, + [in] ULONG nFolder, + [out] LPWSTR *ppszFilePath); + HRESULT RemoveStorageFileName([in] REFCLSID clsidCaller, + [in] LPCWSTR pszKeyName, + [in] BOOL fDeleteFile); + HRESULT Remove(/*[in]*/ const CLSID *pclsidCaller); + [local] HRESULT IsUISupported([in] LPCWSTR pszTypeOfUI, + [in] void *pvExtraData, + [in] ULONG cbExtraData, + [in] IUnknown *punkObject, + [out] BOOL *pfSupported); + [local] HRESULT DisplayUI([in] HWND hwndParent, + [in] LPCWSTR pszTitle, + [in] LPCWSTR pszTypeOfUI, + [in] void *pvExtraData, + [in] ULONG cbExtraData, + [in] IUnknown *punkObject); + HRESULT MatchesAttributes([in] LPCWSTR pszAttributes, + [out] BOOL *pfMatches); +} + +[ + object, + uuid(06b64f9e-7fda-11d2-b4f2-00c04f797396), + helpstring("IEnumSpObjectTokens"), + pointer_default(unique), + local, + restricted +] +interface IEnumSpObjectTokens : IUnknown +{ + HRESULT Next([in] ULONG celt, + [out, size_is(celt), length_is(*pceltFetched)] ISpObjectToken **pelt, + [out] ULONG *pceltFetched); + HRESULT Skip([in] ULONG celt); + HRESULT Reset(void); + HRESULT Clone([out] IEnumSpObjectTokens **ppEnum); + HRESULT Item([in] ULONG Index, + [out] ISpObjectToken **ppToken); + HRESULT GetCount([out] ULONG *pCount); +} + +[ + helpstring("Speech Object Library"), + uuid(c866ca3a-32f7-11d2-9602-00c04f8ee628), + version(5.4) +] +library SpeechLib +{ + importlib("stdole2.tlb"); + + [ + uuid(a910187f-0c7a-45ac-92cc-59edafb77b53), + helpstring("SpObjectTokenCategory Class"), + progid("SAPI.SpObjectTokenCategory.1"), + vi_progid("SAPI.SpObjectTokenCategory"), + threading(both) + ] + coclass SpObjectTokenCategory + { + interface ISpObjectTokenCategory; + } +}

1 0

Huw Davies : include: Add sapiddk.idl.
by Alexandre Julliard 27 Sep '17

27 Sep '17

Module: wine Branch: master Commit: 5948b0ccd9e4511585bc2241efe84a54c667981f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5948b0ccd9e4511585bc2241e… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 27 10:17:13 2017 +0100 include: Add sapiddk.idl. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/sapiddk.idl | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 9bce848..a36cf89 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -155,6 +155,7 @@ IDL_SRCS = \ rstloc.idl \ rstnot.idl \ sapi.idl \ + sapiddk.idl \ sensevts.idl \ servprov.idl \ sesprp.idl \ diff --git a/include/sapiddk.idl b/include/sapiddk.idl new file mode 100644 index 0000000..670b8c0 --- /dev/null +++ b/include/sapiddk.idl @@ -0,0 +1,86 @@ +/* + * Speech API (SAPI) DDK IDL file. + * + * Copyright (C) 2017 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; +import "sapi.idl"; + +#ifndef __WIDL__ +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + +[ + object, + uuid(06b64f9f-7fda-11d2-b4f2-00c04f797396), + helpstring("ISpObjectTokenEnumBuilder"), + pointer_default(unique), + local, + restricted +] +interface ISpObjectTokenEnumBuilder : IEnumSpObjectTokens +{ + HRESULT SetAttribs([in] LPCWSTR pszReqAttribs, + [in] LPCWSTR pszOptAttribs); + HRESULT AddTokens([in] ULONG cTokens, + [in] ISpObjectToken **pToken); + HRESULT AddTokensFromDataKey([in] ISpDataKey *pDataKey, + [in] LPCWSTR pszSubKey, + [in] LPCWSTR pszCategoryId); + HRESULT AddTokensFromTokenEnum([in] IEnumSpObjectTokens *pTokenEnum); + HRESULT Sort([in] LPCWSTR pszTokenIdToListFirst); +} + +[ + helpstring("Speech Object DDK Library"), + uuid(9903f14c-12ce-4c99-9986-2ee3d7d588a8), + version(5.4) +] +library SpeechDDKLib +{ + importlib("stdole2.tlb"); + + [ + uuid(d9f6ee60-58c9-458b-88e1-2f908fd7f87c), + helpstring("Data Key"), + progid("SAPI.SpDataKey.1"), + vi_progid("SAPI.SpDataKey"), + threading(both) + ] + coclass SpDataKey + { + interface ISpRegDataKey; + [default] interface ISpDataKey; + } + + [ + uuid(3918d75f-0acb-41f2-b733-92aa15bcecf6), + helpstring("Object Token Enumerator"), + progid("SAPI.SpObjectTokenEnum.1"), + vi_progid("SAPI.SpObjectTokenEnum"), + threading(both) + ] + coclass SpObjectTokenEnum + { + interface ISpObjectTokenEnumBuilder; + [default] interface IEnumSpObjectTokens; + } +}

1 0