September 2017 - Wine-Commits

Huw Davies : sapi: Register the classes from sapiddk.idl that would otherwise not get registered.
by Alexandre Julliard Sept. 27, 2017

Sept. 27, 2017

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

Michael Stefaniuc : fonts: Fix the character count in some fonts.
by Alexandre Julliard Sept. 27, 2017

Sept. 27, 2017

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 Sept. 27, 2017

Sept. 27, 2017

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 Sept. 27, 2017

Sept. 27, 2017

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

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

Sept. 27, 2017

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

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

Sept. 27, 2017

Module: wine Branch: master Commit: 85c4419859d41455ffd5c421219d40cae8f3e37f URL: http://source.winehq.org/git/wine.git/?a=commit;h=85c4419859d41455ffd5c4212… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 27 09:47:53 2017 +0200 d2d1: Implement d2d_radial_gradient_brush_SetCenter(). 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 01ebc0d..9df2301 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -678,7 +678,11 @@ static void STDMETHODCALLTYPE d2d_radial_gradient_brush_GetTransform(ID2D1Radial static void STDMETHODCALLTYPE d2d_radial_gradient_brush_SetCenter(ID2D1RadialGradientBrush *iface, D2D1_POINT_2F centre) { - FIXME("iface %p, centre {%.8e, %.8e} stub!\n", iface, centre.x, centre.y); + struct d2d_brush *brush = impl_from_ID2D1RadialGradientBrush(iface); + + TRACE("iface %p, centre {%.8e, %.8e}.\n", iface, centre.x, centre.y); + + brush->u.radial.centre = centre; } static void STDMETHODCALLTYPE d2d_radial_gradient_brush_SetGradientOriginOffset(ID2D1RadialGradientBrush *iface,

1 0

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

Sept. 27, 2017

Module: wine Branch: master Commit: 4482324455485c7bed9a3d977dcdf576845f37e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4482324455485c7bed9a3d977… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 27 09:47:52 2017 +0200 d2d1: Implement d2d_radial_gradient_brush_GetCenter(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 10 +++++++--- dlls/d2d1/d2d1_private.h | 7 ++++++- dlls/d2d1/render_target.c | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 7f4c7bb..01ebc0d 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -700,9 +700,11 @@ static void STDMETHODCALLTYPE d2d_radial_gradient_brush_SetRadiusY(ID2D1RadialGr static D2D1_POINT_2F * STDMETHODCALLTYPE d2d_radial_gradient_brush_GetCenter(ID2D1RadialGradientBrush *iface, D2D1_POINT_2F *centre) { - FIXME("iface %p, centre %p stub!\n", iface, centre); + struct d2d_brush *brush = impl_from_ID2D1RadialGradientBrush(iface); + + TRACE("iface %p, centre %p.\n", iface, centre); - d2d_point_set(centre, 0.0f, 0.0f); + *centre = brush->u.radial.centre; return centre; } @@ -758,7 +760,8 @@ static const struct ID2D1RadialGradientBrushVtbl d2d_radial_gradient_brush_vtbl d2d_radial_gradient_brush_GetGradientStopCollection, }; -HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory, const D2D1_BRUSH_PROPERTIES *brush_desc, +HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory, + const D2D1_RADIAL_GRADIENT_BRUSH_PROPERTIES *gradient_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1GradientStopCollection *gradient, struct d2d_brush **brush) { struct d2d_brush *b; @@ -767,6 +770,7 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory, const D2D1_BRUSH return E_OUTOFMEMORY; d2d_brush_init(b, factory, D2D_BRUSH_TYPE_RADIAL, brush_desc, (ID2D1BrushVtbl *)&d2d_radial_gradient_brush_vtbl); + b->u.radial.centre = gradient_desc->center; TRACE("Created brush %p.\n", b); *brush = b; diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 0a4bb89..6054a1d 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -241,6 +241,10 @@ struct d2d_brush } linear; struct { + D2D1_POINT_2F centre; + } radial; + struct + { struct d2d_bitmap *bitmap; D2D1_EXTEND_MODE extend_mode_x; D2D1_EXTEND_MODE extend_mode_y; @@ -255,7 +259,8 @@ HRESULT d2d_solid_color_brush_create(ID2D1Factory *factory, const D2D1_COLOR_F * HRESULT d2d_linear_gradient_brush_create(ID2D1Factory *factory, const D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES *gradient_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1GradientStopCollection *gradient, struct d2d_brush **brush) DECLSPEC_HIDDEN; -HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory, const D2D1_BRUSH_PROPERTIES *brush_desc, +HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory, + const D2D1_RADIAL_GRADIENT_BRUSH_PROPERTIES *gradient_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1GradientStopCollection *gradient, struct d2d_brush **brush) DECLSPEC_HIDDEN; HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index a5fee20..2f41f44 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -417,7 +417,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateRadialGradientBrush iface, gradient_brush_desc, brush_desc, gradient, brush); if (SUCCEEDED(hr = d2d_radial_gradient_brush_create(render_target->factory, - brush_desc, gradient, &object))) + gradient_brush_desc, brush_desc, gradient, &object))) *brush = (ID2D1RadialGradientBrush *)&object->ID2D1Brush_iface; return hr;

1 0

Alexandre Julliard : ntdll: Support loading binaries that start inside the DOS area.
by Alexandre Julliard Sept. 27, 2017

Sept. 27, 2017

Module: wine Branch: master Commit: a27f187503f55de4b0c703bdb2d24dd07cd63cc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a27f187503f55de4b0c703bdb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 27 09:30:05 2017 +0200 ntdll: Support loading binaries that start inside the DOS area. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index c64a31d..d0d25c7 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1593,6 +1593,8 @@ void virtual_init(void) { preload_reserve_start = (void *)start; preload_reserve_end = (void *)end; + /* some apps start inside the DOS area */ + address_space_start = min( address_space_start, preload_reserve_start ); } }

1 0

Alex Henrie : shell32: Implement ShellExec_RunDLL.
by Alexandre Julliard Sept. 27, 2017

Sept. 27, 2017

Module: wine Branch: master Commit: 67826491a69f9cddfea6feef0ba27ddd0efe384a URL: http://source.winehq.org/git/wine.git/?a=commit;h=67826491a69f9cddfea6feef0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Sep 25 22:52:52 2017 -0600 shell32: Implement ShellExec_RunDLL. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.spec | 6 +++--- dlls/shell32/shlexec.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 6974332..6d2c61b 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -440,9 +440,9 @@ @ stub SheShortenPathW @ stdcall ShellAboutA(long str str long) @ stdcall ShellAboutW(long wstr wstr long) -@ stub ShellExec_RunDLL -@ stub ShellExec_RunDLLA -@ stub ShellExec_RunDLLW +@ stdcall ShellExec_RunDLL(long long str long) ShellExec_RunDLLA +@ stdcall ShellExec_RunDLLA(long long str long) +@ stdcall ShellExec_RunDLLW(long long wstr long) @ stdcall ShellExecuteA(long str str str str long) @ stdcall ShellExecuteEx (long) ShellExecuteExA @ stdcall ShellExecuteExA (long) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index c0ef53a..7a432c6 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -2016,6 +2016,58 @@ HINSTANCE WINAPI WOWShellExecute(HWND hWnd, LPCSTR lpVerb,LPCSTR lpFile, } /************************************************************************* + * ShellExec_RunDLLW [SHELL32.@] + */ +void WINAPI ShellExec_RunDLLW(HWND hwnd, HINSTANCE instance, WCHAR *cmdline, int cmdshow) +{ + BOOL in_single_quotes = FALSE, in_double_quotes = FALSE; + WCHAR *args; + + TRACE("%p, %p, %s, %d\n", hwnd, instance, debugstr_w(cmdline), cmdshow); + + /* Replace the first whitespace character in the command line string with a + null terminator to separate the program name from the program arguments */ + for (args = cmdline; *args; args++) + { + switch (*args) + { + case '\\': + args++; /* skip the next character */ + break; + case '\'': + if (!in_double_quotes) + in_single_quotes = !in_single_quotes; + break; + case '"': + if (!in_single_quotes) + in_double_quotes = !in_double_quotes; + break; + case ' ': + case '\t': + if (!in_single_quotes && !in_double_quotes) + { + *args = 0; + args++; + goto execute; + } + } + } + +execute: + ShellExecuteW(hwnd, NULL, cmdline, args, NULL, cmdshow); +} + +/************************************************************************* + * ShellExec_RunDLLA [SHELL32.@] + */ +void WINAPI ShellExec_RunDLLA(HWND hwnd, HINSTANCE instance, CHAR *cmdline, int cmdshow) +{ + WCHAR *cmdlineW; + ShellExec_RunDLLW(hwnd, instance, __SHCloneStrAtoW(&cmdlineW, cmdline), cmdshow); + SHFree(cmdlineW); +} + +/************************************************************************* * OpenAs_RunDLLA [SHELL32.@] */ void WINAPI OpenAs_RunDLLA(HWND hwnd, HINSTANCE hinst, LPCSTR cmdline, int cmdshow)

1 0

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

Sept. 27, 2017

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