September 2017 - Wine-Commits

Huw Davies : include: Add sapi.idl.
by Alexandre Julliard Sept. 27, 2017

Sept. 27, 2017

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

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

Sept. 27, 2017

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: System shellfolders don' t implement GetDefaultColumn().
by Alexandre Julliard Sept. 27, 2017

Sept. 27, 2017

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

Henri Verbeet : d2d1: Implement d2d_radial_gradient_brush_GetGradientOriginOffset().
by Alexandre Julliard Sept. 27, 2017

Sept. 27, 2017

Module: wine Branch: master Commit: 2148545e25f0eb6e7322c0ec254cbf71641f117f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2148545e25f0eb6e7322c0ec2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 27 09:47:54 2017 +0200 d2d1: Implement d2d_radial_gradient_brush_GetGradientOriginOffset(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 7 +++++-- dlls/d2d1/d2d1_private.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 9df2301..8a080e1 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -715,9 +715,11 @@ static D2D1_POINT_2F * STDMETHODCALLTYPE d2d_radial_gradient_brush_GetCenter(ID2 static D2D1_POINT_2F * STDMETHODCALLTYPE d2d_radial_gradient_brush_GetGradientOriginOffset( ID2D1RadialGradientBrush *iface, D2D1_POINT_2F *offset) { - FIXME("iface %p, offset %p stub!\n", iface, offset); + struct d2d_brush *brush = impl_from_ID2D1RadialGradientBrush(iface); + + TRACE("iface %p, offset %p.\n", iface, offset); - d2d_point_set(offset, 0.0f, 0.0f); + *offset = brush->u.radial.offset; return offset; } @@ -775,6 +777,7 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory, d2d_brush_init(b, factory, D2D_BRUSH_TYPE_RADIAL, brush_desc, (ID2D1BrushVtbl *)&d2d_radial_gradient_brush_vtbl); b->u.radial.centre = gradient_desc->center; + b->u.radial.offset = gradient_desc->gradientOriginOffset; TRACE("Created brush %p.\n", b); *brush = b; diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 6054a1d..b0c7fed 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -242,6 +242,7 @@ struct d2d_brush struct { D2D1_POINT_2F centre; + D2D1_POINT_2F offset; } radial; struct {

1 0

Alistair Leslie-Hughes : hnetcfg: Implement INetFwPolicy2 get_Rules.
by Alexandre Julliard Sept. 27, 2017

Sept. 27, 2017

Module: wine Branch: master Commit: 19e72fe14921a30fb332321342868d352fc5b56f URL: http://source.winehq.org/git/wine.git/?a=commit;h=19e72fe14921a30fb33232134… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 25 22:43:37 2017 +0000 hnetcfg: Implement INetFwPolicy2 get_Rules. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/hnetcfg_private.h | 1 + dlls/hnetcfg/policy.c | 245 ++++++++++++++++++++++++++++++++++++++++- dlls/hnetcfg/tests/policy.c | 37 +++++++ 3 files changed, 281 insertions(+), 2 deletions(-) diff --git a/dlls/hnetcfg/hnetcfg_private.h b/dlls/hnetcfg/hnetcfg_private.h index 812d970..5245883 100644 --- a/dlls/hnetcfg/hnetcfg_private.h +++ b/dlls/hnetcfg/hnetcfg_private.h @@ -26,6 +26,7 @@ enum type_id INetFwPolicy_tid, INetFwPolicy2_tid, INetFwProfile_tid, + INetFwRules_tid, last_tid }; diff --git a/dlls/hnetcfg/policy.c b/dlls/hnetcfg/policy.c index 285ee0f..c2f3252 100644 --- a/dlls/hnetcfg/policy.c +++ b/dlls/hnetcfg/policy.c @@ -48,6 +48,7 @@ static inline fw_policy *impl_from_INetFwPolicy( INetFwPolicy *iface ) typedef struct fw_policy2 { INetFwPolicy2 INetFwPolicy2_iface; + INetFwRules *fw_policy2_rules; LONG refs; } fw_policy2; @@ -56,6 +57,224 @@ static inline fw_policy2 *impl_from_INetFwPolicy2( INetFwPolicy2 *iface ) return CONTAINING_RECORD(iface, fw_policy2, INetFwPolicy2_iface); } +typedef struct fw_rules +{ + INetFwRules INetFwRules_iface; + LONG refs; +} fw_rules; + +static inline fw_rules *impl_from_INetFwRules( INetFwRules *iface ) +{ + return CONTAINING_RECORD(iface, fw_rules, INetFwRules_iface); +} + +static HRESULT WINAPI netfw_rules_QueryInterface( + INetFwRules *iface, + REFIID riid, + void **object) +{ + fw_rules *This = impl_from_INetFwRules( iface ); + + TRACE("%p %s %p\n", This, debugstr_guid( riid ), object ); + + if ( IsEqualGUID( riid, &IID_INetFwRules ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *object = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + INetFwRules_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI netfw_rules_AddRef( + INetFwRules *iface ) +{ + fw_rules *This = impl_from_INetFwRules( iface ); + return InterlockedIncrement( &This->refs ); +} + +static ULONG WINAPI netfw_rules_Release( + INetFwRules *iface ) +{ + fw_rules *This = impl_from_INetFwRules( iface ); + LONG refs = InterlockedDecrement( &This->refs ); + if (!refs) + { + TRACE("destroying %p\n", This); + HeapFree( GetProcessHeap(), 0, This ); + } + return refs; +} + +static HRESULT WINAPI netfw_rules_GetTypeInfoCount( + INetFwRules *iface, + UINT *pctinfo ) +{ + fw_rules *This = impl_from_INetFwRules( iface ); + + TRACE("%p %p\n", This, pctinfo); + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI netfw_rules_GetTypeInfo( + INetFwRules *iface, + UINT iTInfo, + LCID lcid, + ITypeInfo **ppTInfo) +{ + fw_rules *This = impl_from_INetFwRules( iface ); + + TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo( INetFwRules_tid, ppTInfo ); +} + +static HRESULT WINAPI netfw_rules_GetIDsOfNames( + INetFwRules *iface, + REFIID riid, + LPOLESTR *rgszNames, + UINT cNames, + LCID lcid, + DISPID *rgDispId) +{ + fw_rules *This = impl_from_INetFwRules( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo( INetFwRules_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, rgszNames, cNames, rgDispId ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI netfw_rules_Invoke( + INetFwRules *iface, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pDispParams, + VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, + UINT *puArgErr) +{ + fw_rules *This = impl_from_INetFwRules( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo( INetFwRules_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &This->INetFwRules_iface, dispIdMember, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI netfw_rules_get_Count( + INetFwRules *iface, + LONG *count) +{ + fw_rules *This = impl_from_INetFwRules( iface ); + + FIXME("%p, %p\n", This, count); + + if (count) + *count = 0; + + return S_OK; +} + +static HRESULT WINAPI netfw_rules_Add( + INetFwRules *iface, + INetFwRule *rule) +{ + fw_rules *This = impl_from_INetFwRules( iface ); + + FIXME("%p, %p\n", This, rule); + return E_NOTIMPL; +} + +static HRESULT WINAPI netfw_rules_Remove( + INetFwRules *iface, + BSTR name) +{ + fw_rules *This = impl_from_INetFwRules( iface ); + + FIXME("%p, %s\n", This, debugstr_w(name)); + return E_NOTIMPL; +} + +static HRESULT WINAPI netfw_rules_Item( + INetFwRules *iface, + BSTR name, + INetFwRule **rule) +{ + fw_rules *This = impl_from_INetFwRules( iface ); + + FIXME("%p, %s, %p\n", This, debugstr_w(name), rule); + return E_NOTIMPL; +} + +static HRESULT WINAPI netfw_rules_get__NewEnum( + INetFwRules *iface, + IUnknown **newEnum) +{ + fw_rules *This = impl_from_INetFwRules( iface ); + + FIXME("%p, %p\n", This, newEnum); + return E_NOTIMPL; +} + +static const struct INetFwRulesVtbl fw_rules_vtbl = +{ + netfw_rules_QueryInterface, + netfw_rules_AddRef, + netfw_rules_Release, + netfw_rules_GetTypeInfoCount, + netfw_rules_GetTypeInfo, + netfw_rules_GetIDsOfNames, + netfw_rules_Invoke, + netfw_rules_get_Count, + netfw_rules_Add, + netfw_rules_Remove, + netfw_rules_Item, + netfw_rules_get__NewEnum +}; + +static HRESULT create_INetFwRules(INetFwRules **object) +{ + fw_rules *rules; + + TRACE("(%p)\n", object); + + rules = HeapAlloc( GetProcessHeap(), 0, sizeof(*rules) ); + if (!rules) return E_OUTOFMEMORY; + + rules->INetFwRules_iface.lpVtbl = &fw_rules_vtbl; + rules->refs = 1; + + *object = &rules->INetFwRules_iface; + + TRACE("returning iface %p\n", *object); + return S_OK; +} + static ULONG WINAPI fw_policy_AddRef( INetFwPolicy *iface ) { @@ -238,6 +457,11 @@ static HRESULT WINAPI fwpolicy2_QueryInterface(INetFwPolicy2 *iface, REFIID riid { *out = iface; } + else if( IsEqualGUID( riid, &IID_INetFwRules ) ) + { + TRACE("INetFwRules not supported\n"); + return E_NOINTERFACE; + } else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); @@ -259,6 +483,7 @@ static ULONG WINAPI fwpolicy2_Release(INetFwPolicy2 *iface) LONG refs = InterlockedDecrement( &fw_policy->refs ); if (!refs) { + INetFwRules_Release(fw_policy->fw_policy2_rules); TRACE("destroying %p\n", fw_policy); HeapFree( GetProcessHeap(), 0, fw_policy ); } @@ -411,8 +636,18 @@ static HRESULT WINAPI fwpolicy2_get_Rules(INetFwPolicy2 *iface, INetFwRules **ru { fw_policy2 *This = impl_from_INetFwPolicy2( iface ); - FIXME("%p %p\n", This, rules); - return E_NOTIMPL; + TRACE("%p %p\n", This, rules); + + if(!rules) + return E_POINTER; + + if(rules) + { + *rules = This->fw_policy2_rules; + INetFwRules_AddRef(This->fw_policy2_rules); + } + + return S_OK; } static HRESULT WINAPI fwpolicy2_get_ServiceRestriction(INetFwPolicy2 *iface, INetFwServiceRestriction **ServiceRestriction) @@ -542,6 +777,12 @@ HRESULT NetFwPolicy2_create( IUnknown *outer, void **obj ) *obj = &fp->INetFwPolicy2_iface; + if (FAILED(create_INetFwRules(&fp->fw_policy2_rules))) + { + HeapFree( GetProcessHeap(), 0, fp ); + return E_OUTOFMEMORY; + } + TRACE("returning iface %p\n", *obj); return S_OK; } diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c index a3ed4b2..7b5bef0 100644 --- a/dlls/hnetcfg/tests/policy.c +++ b/dlls/hnetcfg/tests/policy.c @@ -28,6 +28,41 @@ #include "netfw.h" +static void test_policy2_rules(INetFwPolicy2 *policy2) +{ + HRESULT hr; + INetFwRules *rules, *rules2; + INetFwServiceRestriction *restriction; + + hr = INetFwPolicy2_QueryInterface(policy2, &IID_INetFwRules, (void**)&rules); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = INetFwPolicy2_get_Rules(policy2, &rules); + ok(hr == S_OK, "got %08x\n", hr); + + hr = INetFwPolicy2_get_Rules(policy2, &rules2); + ok(hr == S_OK, "got %08x\n", hr); + ok(rules == rules2, "Different pointers\n"); + + hr = INetFwPolicy2_get_ServiceRestriction(policy2, &restriction); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + if(hr == S_OK) + { + INetFwRules *rules3; + + hr = INetFwServiceRestriction_get_Rules(restriction, &rules3); + ok(hr == S_OK, "got %08x\n", hr); + ok(rules != rules3, "same pointers\n"); + + if(rules3) + INetFwRules_Release(rules3); + INetFwServiceRestriction_Release(restriction); + } + + INetFwRules_Release(rules); + INetFwRules_Release(rules2); +} + static void test_interfaces(void) { INetFwMgr *manager; @@ -57,6 +92,8 @@ static void test_interfaces(void) &IID_INetFwPolicy2, (void**)&policy2); if(hr == S_OK) { + test_policy2_rules(policy2); + INetFwPolicy2_Release(policy2); } else

1 0

Martin Payne : user.exe16: Support Windows 2 menus.
by Alexandre Julliard Sept. 27, 2017

Sept. 27, 2017

Module: wine Branch: master Commit: 5ec4d1be97b19d57508d87df34fd7a7d32569d3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ec4d1be97b19d57508d87df3… Author: Martin Payne <development(a)martinpayne.me.uk> Date: Sun Sep 24 09:04:51 2017 +0100 user.exe16: Support Windows 2 menus. Signed-off-by: Martin Payne <development(a)martinpayne.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/krnl386.exe16.spec | 1 + dlls/user.exe16/user.c | 44 +++++++++++++++++++++++++---------- dlls/user.exe16/user_private.h | 1 + 3 files changed, 34 insertions(+), 12 deletions(-) diff --git a/dlls/krnl386.exe16/krnl386.exe16.spec b/dlls/krnl386.exe16/krnl386.exe16.spec index 62d37e5..0fd7e7a 100644 --- a/dlls/krnl386.exe16/krnl386.exe16.spec +++ b/dlls/krnl386.exe16/krnl386.exe16.spec @@ -706,6 +706,7 @@ @ stdcall -arch=win32 GetCurrentTask() @ stdcall -arch=win32 GetDOSEnvironment16() @ stdcall -arch=win32 GetExePtr(long) +@ stdcall -arch=win32 GetExeVersion16() @ stdcall -arch=win32 GetExpWinVer16(long) @ stdcall -arch=win32 GetModuleHandle16(str) @ stdcall -arch=win32 GlobalReAlloc16(long long long) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 35f2585..eac4a19 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -1428,7 +1428,7 @@ HMENU16 WINAPI LookupMenuHandle16( HMENU16 hmenu, INT16 id ) } -static LPCSTR parse_menu_resource( LPCSTR res, HMENU hMenu ) +static LPCSTR parse_menu_resource( LPCSTR res, HMENU hMenu, BOOL oldFormat ) { WORD flags, id = 0; LPCSTR str; @@ -1436,11 +1436,21 @@ static LPCSTR parse_menu_resource( LPCSTR res, HMENU hMenu ) do { - flags = GET_WORD(res); + /* Windows 3.00 and later use a WORD for the flags, whereas 1.x and 2.x use a BYTE. */ + if (oldFormat) + { + flags = GET_BYTE(res); + res += sizeof(BYTE); + } + else + { + flags = GET_WORD(res); + res += sizeof(WORD); + } + end_flag = flags & MF_END; /* Remove MF_END because it has the same value as MF_HILITE */ flags &= ~MF_END; - res += sizeof(WORD); if (!(flags & MF_POPUP)) { id = GET_WORD(res); @@ -1452,7 +1462,7 @@ static LPCSTR parse_menu_resource( LPCSTR res, HMENU hMenu ) { HMENU hSubMenu = CreatePopupMenu(); if (!hSubMenu) return NULL; - if (!(res = parse_menu_resource( res, hSubMenu ))) return NULL; + if (!(res = parse_menu_resource( res, hSubMenu, oldFormat ))) return NULL; AppendMenuA( hMenu, flags, (UINT_PTR)hSubMenu, str ); } else /* Not a popup */ @@ -1468,22 +1478,32 @@ static LPCSTR parse_menu_resource( LPCSTR res, HMENU hMenu ) */ HMENU16 WINAPI LoadMenuIndirect16( LPCVOID template ) { + BOOL oldFormat; HMENU hMenu; WORD version, offset; LPCSTR p = template; TRACE("(%p)\n", template ); - version = GET_WORD(p); - p += sizeof(WORD); - if (version) + + /* Windows 1.x and 2.x menus have a slightly different menu format from 3.x menus */ + oldFormat = (GetExeVersion16() < 0x0300); + + /* Windows 3.00 and later menu items are preceded by a MENUITEMTEMPLATEHEADER structure */ + if (!oldFormat) { - WARN("version must be 0 for Win16\n" ); - return 0; + version = GET_WORD(p); + p += sizeof(WORD); + if (version) + { + WARN("version must be 0 for Win16 >= 3.00 applications\n" ); + return 0; + } + offset = GET_WORD(p); + p += sizeof(WORD) + offset; } - offset = GET_WORD(p); - p += sizeof(WORD) + offset; + if (!(hMenu = CreateMenu())) return 0; - if (!parse_menu_resource( p, hMenu )) + if (!parse_menu_resource( p, hMenu, oldFormat )) { DestroyMenu( hMenu ); return 0; diff --git a/dlls/user.exe16/user_private.h b/dlls/user.exe16/user_private.h index 7c91afb..336b891 100644 --- a/dlls/user.exe16/user_private.h +++ b/dlls/user.exe16/user_private.h @@ -95,6 +95,7 @@ extern LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd extern void call_WH_CALLWNDPROC_hook( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPARAM lp ) DECLSPEC_HIDDEN; +#define GET_BYTE(ptr) (*(const BYTE *)(ptr)) #define GET_WORD(ptr) (*(const WORD *)(ptr)) #define GET_DWORD(ptr) (*(const DWORD *)(ptr))

1 0

Huw Davies : sapi: Register the typelib.
by Alexandre Julliard Sept. 27, 2017

Sept. 27, 2017

Module: wine Branch: master Commit: ad2beedccdc74fe67d6221d3d07f8868c30e6cdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad2beedccdc74fe67d6221d3d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 27 10:17:16 2017 +0100 sapi: Register the typelib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/sapi/Makefile.in | 3 +++ dlls/sapi/main.c | 21 +++++++++++++++++++++ dlls/sapi/sapi.spec | 4 ++-- dlls/sapi/sapi_typelib.idl | 23 +++++++++++++++++++++++ 6 files changed, 51 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 18d9999..339bfc5 100755 --- a/configure +++ b/configure @@ -18666,7 +18666,7 @@ wine_fn_config_dll rstrtmgr enable_rstrtmgr wine_fn_config_dll rtutils enable_rtutils implib wine_fn_config_dll samlib enable_samlib wine_fn_config_dll sane.ds enable_sane_ds clean -wine_fn_config_dll sapi enable_sapi +wine_fn_config_dll sapi enable_sapi clean wine_fn_config_dll scarddlg enable_scarddlg wine_fn_config_dll sccbase enable_sccbase wine_fn_config_dll schannel enable_schannel diff --git a/configure.ac b/configure.ac index 9b6b066..e1dc522 100644 --- a/configure.ac +++ b/configure.ac @@ -3447,7 +3447,7 @@ WINE_CONFIG_DLL(rstrtmgr) WINE_CONFIG_DLL(rtutils,,[implib]) WINE_CONFIG_DLL(samlib) WINE_CONFIG_DLL(sane.ds,,[clean]) -WINE_CONFIG_DLL(sapi) +WINE_CONFIG_DLL(sapi,,[clean]) WINE_CONFIG_DLL(scarddlg) WINE_CONFIG_DLL(sccbase) WINE_CONFIG_DLL(schannel) diff --git a/dlls/sapi/Makefile.in b/dlls/sapi/Makefile.in index c740699..e4a0746 100644 --- a/dlls/sapi/Makefile.in +++ b/dlls/sapi/Makefile.in @@ -3,3 +3,6 @@ IMPORTS = uuid ole32 user32 advapi32 C_SRCS = \ main.c + +IDL_SRCS = \ + sapi_typelib.idl diff --git a/dlls/sapi/main.c b/dlls/sapi/main.c index 5b247a9..53c3bef 100644 --- a/dlls/sapi/main.c +++ b/dlls/sapi/main.c @@ -25,16 +25,21 @@ #include "windef.h" #include "winbase.h" +#include "objbase.h" +#include "rpcproxy.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(sapi); +static HINSTANCE hinstance; + BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved ) { switch (reason) { case DLL_PROCESS_ATTACH: + hinstance = dll; DisableThreadLibraryCalls( dll ); break; } @@ -49,3 +54,19 @@ HRESULT WINAPI DllCanUnloadNow( void ) TRACE( "()\n" ); return S_FALSE; } + +/*********************************************************************** + * DllRegisterServer + */ +HRESULT WINAPI DllRegisterServer( void ) +{ + return __wine_register_resources( hinstance ); +} + +/*********************************************************************** + * DllUnregisterServer + */ +HRESULT WINAPI DllUnregisterServer( void ) +{ + return __wine_unregister_resources( hinstance ); +} diff --git a/dlls/sapi/sapi.spec b/dlls/sapi/sapi.spec index bf4587b..6f279a1 100644 --- a/dlls/sapi/sapi.spec +++ b/dlls/sapi/sapi.spec @@ -1,4 +1,4 @@ @ stdcall -private DllCanUnloadNow() #@ stdcall -private DllGetClassObject(ptr ptr ptr) -#@ stdcall -private DllRegisterServer() -#@ stdcall -private DllUnregisterServer() +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/sapi/sapi_typelib.idl b/dlls/sapi/sapi_typelib.idl new file mode 100644 index 0000000..b30e2e9 --- /dev/null +++ b/dlls/sapi/sapi_typelib.idl @@ -0,0 +1,23 @@ +/* + * Speech API (SAPI) typelib. + * + * 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 + */ + +#pragma makedep regtypelib + +#include "sapi.idl"

1 0

Huw Davies : sapi: Add a stub dll.
by Alexandre Julliard Sept. 27, 2017

Sept. 27, 2017

Module: wine Branch: master Commit: 2a332f4e5ac01f47dedb1dd8ab487dc7c5270db0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a332f4e5ac01f47dedb1dd8a… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 27 10:17:15 2017 +0100 sapi: Add a stub dll. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/sapi/Makefile.in | 5 +++++ dlls/sapi/main.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/sapi/sapi.spec | 4 ++++ loader/wine.inf.in | 2 ++ 6 files changed, 65 insertions(+) diff --git a/configure b/configure index 425f15d..18d9999 100755 --- a/configure +++ b/configure @@ -1425,6 +1425,7 @@ enable_rstrtmgr enable_rtutils enable_samlib enable_sane_ds +enable_sapi enable_scarddlg enable_sccbase enable_schannel @@ -18665,6 +18666,7 @@ wine_fn_config_dll rstrtmgr enable_rstrtmgr wine_fn_config_dll rtutils enable_rtutils implib wine_fn_config_dll samlib enable_samlib wine_fn_config_dll sane.ds enable_sane_ds clean +wine_fn_config_dll sapi enable_sapi wine_fn_config_dll scarddlg enable_scarddlg wine_fn_config_dll sccbase enable_sccbase wine_fn_config_dll schannel enable_schannel diff --git a/configure.ac b/configure.ac index 518e9d3..9b6b066 100644 --- a/configure.ac +++ b/configure.ac @@ -3447,6 +3447,7 @@ WINE_CONFIG_DLL(rstrtmgr) WINE_CONFIG_DLL(rtutils,,[implib]) WINE_CONFIG_DLL(samlib) WINE_CONFIG_DLL(sane.ds,,[clean]) +WINE_CONFIG_DLL(sapi) WINE_CONFIG_DLL(scarddlg) WINE_CONFIG_DLL(sccbase) WINE_CONFIG_DLL(schannel) diff --git a/dlls/sapi/Makefile.in b/dlls/sapi/Makefile.in new file mode 100644 index 0000000..c740699 --- /dev/null +++ b/dlls/sapi/Makefile.in @@ -0,0 +1,5 @@ +MODULE = sapi.dll +IMPORTS = uuid ole32 user32 advapi32 + +C_SRCS = \ + main.c diff --git a/dlls/sapi/main.c b/dlls/sapi/main.c new file mode 100644 index 0000000..5b247a9 --- /dev/null +++ b/dlls/sapi/main.c @@ -0,0 +1,51 @@ +/* + * Speech API (SAPI) main 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 + */ + +#include "config.h" +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(sapi); + +BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved ) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( dll ); + break; + } + return TRUE; +} + +/****************************************************************** + * DllCanUnloadNow + */ +HRESULT WINAPI DllCanUnloadNow( void ) +{ + TRACE( "()\n" ); + return S_FALSE; +} diff --git a/dlls/sapi/sapi.spec b/dlls/sapi/sapi.spec new file mode 100644 index 0000000..bf4587b --- /dev/null +++ b/dlls/sapi/sapi.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +#@ stdcall -private DllGetClassObject(ptr ptr ptr) +#@ stdcall -private DllRegisterServer() +#@ stdcall -private DllUnregisterServer() diff --git a/loader/wine.inf.in b/loader/wine.inf.in index d22137f..322d2cd 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2534,6 +2534,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" ; create some directories first 11,mui, 11,gecko\plugin,npmshtml.dll +11,Speech\Common,sapi.dll 11,wbem,mofcomp.exe 10,syswow64,stdole2.tlb 11,,iexplore.exe @@ -2604,6 +2605,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,msxml6.dll 11,,shdocvw.dll 11,gecko\plugin,npmshtml.dll +11,Speech\Common,sapi.dll 11,wbem,mofcomp.exe 11,wbem,wbemdisp.dll 11,wbem,wbemprox.dll

1 0

Nikolay Sivov : shell32: Implement ParseName() using shellfolder API.
by Alexandre Julliard Sept. 27, 2017

Sept. 27, 2017

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

Henri Verbeet : d2d1: Implement d2d_radial_gradient_brush_SetGradientOriginOffset().
by Alexandre Julliard Sept. 27, 2017

Sept. 27, 2017

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