September 2017 - Wine-commits

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

Martin Payne : user.exe16: Support Windows 2 menus.
by Alexandre Julliard 27 Sep '17

27 Sep '17

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

Alex Henrie : shell32: Implement ShellExec_RunDLL.
by Alexandre Julliard 27 Sep '17

27 Sep '17

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

Alexandre Julliard : ntdll: Support loading binaries that start inside the DOS area.
by Alexandre Julliard 27 Sep '17

27 Sep '17

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

Alistair Leslie-Hughes : hnetcfg: Implement INetFwPolicy2 get_Rules.
by Alexandre Julliard 27 Sep '17

27 Sep '17

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

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

27 Sep '17

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

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

27 Sep '17

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_GetGradientOriginOffset().
by Alexandre Julliard 27 Sep '17

27 Sep '17

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