wine-commits September 2017

wine-commits@winehq.org

2 participants
446 discussions

Huw Davies : sapi: Register the classes from sapiddk.idl that would otherwise not get registered.
by Alexandre Julliard 27 Sep '17

27 Sep '17

Module: wine Branch: master Commit: d5308e809d6f7d68771a6a93a5cd2ac63c548587 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5308e809d6f7d68771a6a93a… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 27 10:17:17 2017 +0100 sapi: Register the classes from sapiddk.idl that would otherwise not get registered. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/Makefile.in | 1 + dlls/sapi/sapi_classes.idl | 52 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/dlls/sapi/Makefile.in b/dlls/sapi/Makefile.in index e4a0746..99a0143 100644 --- a/dlls/sapi/Makefile.in +++ b/dlls/sapi/Makefile.in @@ -5,4 +5,5 @@ C_SRCS = \ main.c IDL_SRCS = \ + sapi_classes.idl \ sapi_typelib.idl diff --git a/dlls/sapi/sapi_classes.idl b/dlls/sapi/sapi_classes.idl new file mode 100644 index 0000000..40886f5 --- /dev/null +++ b/dlls/sapi/sapi_classes.idl @@ -0,0 +1,52 @@ +/* + * Speech API (SAPI) classes. + * + * 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 + */ + +/* + * These are the classes from the typelib in sapiddk.idl. They don't get + * registered because the typelib is not registered. + */ + +#pragma makedep register + +[ + 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

Huw Davies : sapi: Register the typelib.
by Alexandre Julliard 27 Sep '17

27 Sep '17

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 27 Sep '17

27 Sep '17

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

Huw Davies : include: Add sperror.h.
by Alexandre Julliard 27 Sep '17

27 Sep '17

Module: wine Branch: master Commit: 5f3e6b0433b2a3dd4334bf1e7d7f14eb2b67b693 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f3e6b0433b2a3dd4334bf1e7… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 27 10:17:14 2017 +0100 include: Add sperror.h. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/sperror.h | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index a36cf89..2e17067 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -618,6 +618,7 @@ HEADER_SRCS = \ slpublic.h \ snmp.h \ softpub.h \ + sperror.h \ sql.h \ sqlext.h \ sqltypes.h \ diff --git a/include/sperror.h b/include/sperror.h new file mode 100644 index 0000000..4b24799 --- /dev/null +++ b/include/sperror.h @@ -0,0 +1,31 @@ +/* + * Speech API (SAPI) Errors. + * + * 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 + */ + +#ifndef SPError_h +#define SPError_h + +#include <winerror.h> + +#define SPERR_UNINITIALIZED 0x80045001 +#define SPERR_ALREADY_INITIALIZED 0x80045002 +#define SPERR_NOT_FOUND 0x8004503a +#define SPERR_INVALID_REGISTRY_KEY 0x80045040 + +#endif /* SPError_h */

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

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

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

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

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: 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

← Newer
1
2
3
4
5
6
7
8
...
45
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2017