February 2017 - Wine-commits

Austin English : wine.inf: Set default Windows version to win7.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 6737ac70d6233f6b10f397ee8f94cb23c3ea04fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6737ac70d6233f6b10f397ee8… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 31 12:59:44 2017 -0600 wine.inf: Set default Windows version to win7. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/version.c | 6 +----- loader/wine.inf.in | 20 ++++++++++---------- programs/winecfg/appdefaults.c | 2 +- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 06f9827..1fa40e0 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -489,16 +489,12 @@ void version_init( const WCHAR *appname ) { static const WCHAR configW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e',0}; static const WCHAR appdefaultsW[] = {'A','p','p','D','e','f','a','u','l','t','s','\\',0}; - static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; HANDLE root, hkey, config_key; BOOL got_win_ver = FALSE; - if (is_win64 || is_wow64) - current_version = &VersionData[WINXP64]; /* default if nothing else is specified */ - else - current_version = &VersionData[WINXP]; + current_version = &VersionData[WIN7]; RtlOpenCurrentUser( KEY_ALL_ACCESS, &root ); attr.Length = sizeof(attr); diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 9a55b38..5dfbd7f 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3366,23 +3366,23 @@ HKLM,"System\CurrentControlSet\Services\Winsock\Parameters",,16 HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Catalog_Entries",,16 [VersionInfo] -HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.1" -HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 3" -HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"2600" +HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.1" +HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1" +HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" -HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows XP" +HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 7" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" -HKLM,%Control%\Windows,"CSDVersion",0x10003,0x300 +HKLM,%Control%\Windows,"CSDVersion",0x10003,0x100 HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT" [VersionInfo.ntamd64] -HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.2" -HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 2" -HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"3790" +HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.1" +HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1" +HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" -HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows XP" +HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 7" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" -HKLM,%Control%\Windows,"CSDVersion",0x10003,0x200 +HKLM,%Control%\Windows,"CSDVersion",0x10003,0x100 HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT" [Wow64] diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index f674824..d272d1c 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -146,7 +146,7 @@ static void update_comboboxes(HWND dialog) return; } if (ver != -1) winver = strdupA( win_versions[ver].szVersion ); - else winver = strdupA("winxp"); + else winver = strdupA("win7"); } WINE_TRACE("winver is %s\n", winver);

1 0

Piotr Caban : ntdll: Add stub implementation of NtQueryInformationThread( ThreadIsIoPending).
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 05ab8b98be81929a742d98ba3f1baf95aeabfe78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05ab8b98be81929a742d98ba3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 2 19:27:26 2017 +0100 ntdll: Add stub implementation of NtQueryInformationThread(ThreadIsIoPending). Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 1 + dlls/kernel32/thread.c | 13 +++++++++++-- dlls/ntdll/thread.c | 9 ++++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 001128b..334bdf4 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1969,6 +1969,7 @@ todo_wine case ThreadAffinityMask: case ThreadQuerySetWin32StartAddress: + case ThreadIsIoPending: todo_wine ok(status == STATUS_ACCESS_DENIED, "for info %u expected STATUS_ACCESS_DENIED, got %08x (ret_len %u)\n", i, status, ret_len); break; diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 82ccebe..de46618 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -918,8 +918,17 @@ LANGID WINAPI GetThreadUILanguage( void ) */ BOOL WINAPI GetThreadIOPendingFlag( HANDLE thread, PBOOL io_pending ) { - FIXME("%p, %p\n", thread, io_pending); - *io_pending = FALSE; + NTSTATUS status; + + TRACE("%p, %p\n", thread, io_pending); + + status = NtQueryInformationThread( thread, ThreadIsIoPending, + io_pending, sizeof(*io_pending), NULL ); + if (status) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } return TRUE; } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index e3cc11a..c9a5da6 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1157,6 +1157,14 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, } } return status; + case ThreadIsIoPending: + FIXME( "ThreadIsIoPending info class not supported yet\n" ); + if (length != sizeof(BOOL)) return STATUS_INFO_LENGTH_MISMATCH; + if (!data) return STATUS_ACCESS_DENIED; + + *(BOOL*)data = FALSE; + if (ret_len) *ret_len = sizeof(BOOL); + return STATUS_SUCCESS; case ThreadPriority: case ThreadBasePriority: case ThreadImpersonationToken: @@ -1167,7 +1175,6 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, case ThreadIdealProcessor: case ThreadPriorityBoost: case ThreadSetTlsArrayAddress: - case ThreadIsIoPending: default: FIXME( "info class %d not supported yet\n", class ); return STATUS_NOT_IMPLEMENTED;

1 0

Alistair Leslie-Hughes : uuid: Add comsvcs.h.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 533a18f143e78e27c355e49ea6e9cb4d2f1723e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=533a18f143e78e27c355e49ea… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 8 03:49:51 2017 +0000 uuid: Add comsvcs.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uuid/uuid.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 4834dee..92ec9d0 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -88,6 +88,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "msdasc.h" #include "netcfgx.h" #include "shimgdata.h" +#include "comsvcs.h" /* FIXME: cguids declares GUIDs but does not define their values */

1 0

Alistair Leslie-Hughes : comsvcs: Register typelib.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 0bff5fb971865baae9130bcb3bb1261202713a23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bff5fb971865baae9130bcb3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 8 03:50:01 2017 +0000 comsvcs: Register typelib. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/comsvcs/Makefile.in | 3 +++ dlls/comsvcs/comsvcs_tlb.idl | 22 ++++++++++++++++++++++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 24c375d..b2ec13a 100755 --- a/configure +++ b/configure @@ -17798,7 +17798,7 @@ wine_fn_config_dll comm.drv16 enable_win16 wine_fn_config_dll commdlg.dll16 enable_win16 wine_fn_config_dll compobj.dll16 enable_win16 wine_fn_config_dll compstui enable_compstui implib -wine_fn_config_dll comsvcs enable_comsvcs implib +wine_fn_config_dll comsvcs enable_comsvcs clean,implib wine_fn_config_dll concrt140 enable_concrt140 wine_fn_config_dll connect enable_connect wine_fn_config_dll credui enable_credui clean,implib diff --git a/configure.ac b/configure.ac index c6d63b2..43f19de 100644 --- a/configure.ac +++ b/configure.ac @@ -2856,7 +2856,7 @@ WINE_CONFIG_DLL(comm.drv16,enable_win16) WINE_CONFIG_DLL(commdlg.dll16,enable_win16) WINE_CONFIG_DLL(compobj.dll16,enable_win16) WINE_CONFIG_DLL(compstui,,[implib]) -WINE_CONFIG_DLL(comsvcs,,[implib]) +WINE_CONFIG_DLL(comsvcs,,[clean,implib]) WINE_CONFIG_DLL(concrt140) WINE_CONFIG_DLL(connect) WINE_CONFIG_DLL(credui,,[clean,implib]) diff --git a/dlls/comsvcs/Makefile.in b/dlls/comsvcs/Makefile.in index 1bf9f4f..bd71e7d 100644 --- a/dlls/comsvcs/Makefile.in +++ b/dlls/comsvcs/Makefile.in @@ -4,3 +4,6 @@ IMPORTS = ole32 C_SRCS = \ main.c + +IDL_SRCS = \ + comsvcs_tlb.idl diff --git a/dlls/comsvcs/comsvcs_tlb.idl b/dlls/comsvcs/comsvcs_tlb.idl new file mode 100644 index 0000000..04041a0 --- /dev/null +++ b/dlls/comsvcs/comsvcs_tlb.idl @@ -0,0 +1,22 @@ +/* + * COM+ Services + * + * Copyright 2017 Alistair Leslie-Hughes + * + * 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 "comsvcs.idl"

1 0

Nikolay Sivov : winex11: Pass correct buffer length to RegQueryValueExW().
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 703e82094bbc76532d666ffc51862a4e990d974f URL: http://source.winehq.org/git/wine.git/?a=commit;h=703e82094bbc76532d666ffc5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 8 14:46:30 2017 +0300 winex11: Pass correct buffer length to RegQueryValueExW(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 186899f..1c1df93 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -967,7 +967,7 @@ static Cursor create_xcursor_system_cursor( const ICONINFOEXW *info ) HKEY key; WCHAR *p, name[MAX_PATH * 2], valueW[64]; char valueA[64]; - DWORD size, ret; + DWORD ret; if (!info->szModName[0]) return 0; @@ -982,7 +982,7 @@ static Cursor create_xcursor_system_cursor( const ICONINFOEXW *info ) /* @@ Wine registry key: HKCU\Software\Wine\X11 Driver\Cursors */ if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\X11 Driver\\Cursors", &key )) { - size = sizeof(valueW) / sizeof(WCHAR); + DWORD size = sizeof(valueW); ret = RegQueryValueExW( key, name, NULL, NULL, (BYTE *)valueW, &size ); RegCloseKey( key ); if (!ret)

1 0

Nikolay Sivov : shell32: Pass correct buffer length to RegQueryValueExW().
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 0bfb97dcba29552b51d8609fcc6e7bbc04bb8320 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bfb97dcba29552b51d8609fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 8 14:55:57 2017 +0300 shell32: Pass correct buffer length to RegQueryValueExW(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 9230623..8569b53 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3209,8 +3209,8 @@ static HRESULT _SHGetUserShellFolderPath(HKEY rootKey, LPCWSTR userPrefix, HRESULT hr; WCHAR shellFolderPath[MAX_PATH], userShellFolderPath[MAX_PATH]; LPCWSTR pShellFolderPath, pUserShellFolderPath; - DWORD dwType, dwPathLen = MAX_PATH; HKEY userShellFolderKey, shellFolderKey; + DWORD dwType, dwPathLen; TRACE("%p,%s,%s,%p\n",rootKey, debugstr_w(userPrefix), debugstr_w(value), path); @@ -3245,6 +3245,7 @@ static HRESULT _SHGetUserShellFolderPath(HKEY rootKey, LPCWSTR userPrefix, return E_FAIL; } + dwPathLen = MAX_PATH * sizeof(WCHAR); if (!RegQueryValueExW(userShellFolderKey, value, NULL, &dwType, (LPBYTE)path, &dwPathLen) && (dwType == REG_EXPAND_SZ || dwType == REG_SZ)) {

1 0

Nikolay Sivov : setupapi: Use sizeof() instead of numerical constants for buffer sizes.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 01080e6750abcad22ac30df0e4efe669b458f8ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=01080e6750abcad22ac30df0e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 8 15:11:42 2017 +0300 setupapi: Use sizeof() instead of numerical constants for buffer sizes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 63e578c..ffb5fad 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -903,7 +903,7 @@ BOOL WINAPI SetupDiClassGuidsFromNameExW( for (dwIndex = 0; ; dwIndex++) { - dwLength = 40; + dwLength = sizeof(szKeyName) / sizeof(WCHAR); lError = RegEnumKeyExW(hClassesKey, dwIndex, szKeyName, @@ -927,7 +927,7 @@ BOOL WINAPI SetupDiClassGuidsFromNameExW( return FALSE; } - dwLength = 256 * sizeof(WCHAR); + dwLength = sizeof(szClassName); if (!RegQueryValueExW(hClassKey, Class, NULL,

1 0

Nikolay Sivov : secur32: Pass correct buffer length to RegQueryValueExW().
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 3769d5750c9849ae007a9a3a5f31f7d383605ba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3769d5750c9849ae007a9a3a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 8 15:15:20 2017 +0300 secur32: Pass correct buffer length to RegQueryValueExW(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/secur32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index c7e353f..d3cbb9b 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -575,7 +575,7 @@ static void SECUR32_initializeProviders(void) if (apiRet == ERROR_SUCCESS) { WCHAR securityPkgNames[MAX_PATH]; /* arbitrary len */ - DWORD size = sizeof(securityPkgNames) / sizeof(WCHAR), type; + DWORD size = sizeof(securityPkgNames), type; apiRet = RegQueryValueExW(key, securityProvidersW, NULL, &type, (PBYTE)securityPkgNames, &size);

1 0

Nikolay Sivov : oleaut32: Return proper interface pointers.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 9e54ae767e761dce16abb3696cbe8b8f8dff5c5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e54ae767e761dce16abb3696… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 8 16:02:31 2017 +0300 oleaut32: Return proper interface pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/olepicture.c | 2 +- dlls/oleaut32/typelib.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index bfca22f..ac8b207 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -461,7 +461,7 @@ static HRESULT WINAPI OLEPictureImpl_QueryInterface( *ppvObject = 0; if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IPicture, riid)) - *ppvObject = This; + *ppvObject = &This->IPicture_iface; else if (IsEqualIID(&IID_IDispatch, riid)) *ppvObject = &This->IDispatch_iface; else if (IsEqualIID(&IID_IPictureDisp, riid)) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4fdfbeb..3df9631 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5579,7 +5579,7 @@ static HRESULT WINAPI ITypeInfo_fnQueryInterface( if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid,&IID_ITypeInfo)|| IsEqualIID(riid,&IID_ITypeInfo2)) - *ppvObject = This; + *ppvObject = &This->ITypeInfo2_iface; else if(IsEqualIID(riid, &IID_ICreateTypeInfo) || IsEqualIID(riid, &IID_ICreateTypeInfo2)) *ppvObject = &This->ICreateTypeInfo2_iface;

1 0

Alistair Leslie-Hughes : dpnet/test: Share code between tests.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: afe438a8d013c87997b8374f3ef91447bc59c7d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afe438a8d013c87997b8374f3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 7 21:27:20 2017 +0000 dpnet/test: Share code between tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/address.c | 28 +------- dlls/dpnet/tests/client.c | 150 +----------------------------------------- dlls/dpnet/tests/dpnet_test.h | 32 +++++++++ dlls/dpnet/tests/server.c | 16 ++--- 4 files changed, 42 insertions(+), 184 deletions(-) diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index 16ba6a7..4aed626 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -22,6 +22,8 @@ #include <dplay8.h> #include "wine/test.h" +#include "dpnet_test.h" + /* {6733C6E8-A0D6-450E-8C18-CEACF331DC27} */ static const GUID IID_Random = {0x6733c6e8, 0xa0d6, 0x450e, { 0x8c, 0x18, 0xce, 0xac, 0xf3, 0x31, 0xdc, 0x27 } }; static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; @@ -353,32 +355,6 @@ static void address_duplicate(void) } } -/* taken from programs/winetest/main.c */ -static BOOL is_stub_dll(const char *filename) -{ - DWORD size, ver; - BOOL isstub = FALSE; - char *p, *data; - - size = GetFileVersionInfoSizeA(filename, &ver); - if (!size) return FALSE; - - data = HeapAlloc(GetProcessHeap(), 0, size); - if (!data) return FALSE; - - if (GetFileVersionInfoA(filename, ver, size, data)) - { - char buf[256]; - - sprintf(buf, "\\StringFileInfo\\%04x%04x\\OriginalFilename", MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), 1200); - if (VerQueryValueA(data, buf, (void**)&p, &size)) - isstub = !lstrcmpiA("wcodstub.dll", p); - } - HeapFree(GetProcessHeap(), 0, data); - - return isstub; -} - START_TEST(address) { HRESULT hr; diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index a1817a4..d2edcbe 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -24,9 +24,10 @@ #include <dplobby8.h> #include <winver.h> #define COBJMACROS -#include <netfw.h> #include "wine/test.h" +#include "dpnet_test.h" + static IDirectPlay8Peer* peer = NULL; static IDirectPlay8Client* client = NULL; static IDirectPlay8LobbiedApplication* lobbied = NULL; @@ -609,153 +610,6 @@ static void test_cleanup_dp_peer(void) CoUninitialize(); } -static BOOL is_process_elevated(void) -{ - HANDLE token; - if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) - { - TOKEN_ELEVATION_TYPE type; - DWORD size; - BOOL ret; - - ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); - CloseHandle( token ); - return (ret && type == TokenElevationTypeFull); - } - return FALSE; -} - -static BOOL is_firewall_enabled(void) -{ - HRESULT hr, init; - INetFwMgr *mgr = NULL; - INetFwPolicy *policy = NULL; - INetFwProfile *profile = NULL; - VARIANT_BOOL enabled = VARIANT_FALSE; - - init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); - - hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, - (void **)&mgr ); - ok( hr == S_OK, "got %08x\n", hr ); - if (hr != S_OK) goto done; - - hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); - ok( hr == S_OK, "got %08x\n", hr ); - if (hr != S_OK) goto done; - - hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); - if (hr != S_OK) goto done; - - hr = INetFwProfile_get_FirewallEnabled( profile, &enabled ); - ok( hr == S_OK, "got %08x\n", hr ); - -done: - if (policy) INetFwPolicy_Release( policy ); - if (profile) INetFwProfile_Release( profile ); - if (mgr) INetFwMgr_Release( mgr ); - if (SUCCEEDED( init )) CoUninitialize(); - return (enabled == VARIANT_TRUE); -} - -enum firewall_op -{ - APP_ADD, - APP_REMOVE -}; - -static HRESULT set_firewall( enum firewall_op op ) -{ - static const WCHAR testW[] = {'d','p','n','e','t','_','t','e','s','t',0}; - HRESULT hr, init; - INetFwMgr *mgr = NULL; - INetFwPolicy *policy = NULL; - INetFwProfile *profile = NULL; - INetFwAuthorizedApplication *app = NULL; - INetFwAuthorizedApplications *apps = NULL; - BSTR name, image = SysAllocStringLen( NULL, MAX_PATH ); - - if (!GetModuleFileNameW( NULL, image, MAX_PATH )) - { - SysFreeString( image ); - return E_FAIL; - } - init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); - - hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, - (void **)&mgr ); - ok( hr == S_OK, "got %08x\n", hr ); - if (hr != S_OK) goto done; - - hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); - ok( hr == S_OK, "got %08x\n", hr ); - if (hr != S_OK) goto done; - - hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); - if (hr != S_OK) goto done; - - INetFwProfile_get_AuthorizedApplications( profile, &apps ); - ok( hr == S_OK, "got %08x\n", hr ); - if (hr != S_OK) goto done; - - hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER, - &IID_INetFwAuthorizedApplication, (void **)&app ); - ok( hr == S_OK, "got %08x\n", hr ); - if (hr != S_OK) goto done; - - hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); - if (hr != S_OK) goto done; - - name = SysAllocString( testW ); - hr = INetFwAuthorizedApplication_put_Name( app, name ); - SysFreeString( name ); - ok( hr == S_OK, "got %08x\n", hr ); - if (hr != S_OK) goto done; - - if (op == APP_ADD) - hr = INetFwAuthorizedApplications_Add( apps, app ); - else if (op == APP_REMOVE) - hr = INetFwAuthorizedApplications_Remove( apps, image ); - else - hr = E_INVALIDARG; - -done: - if (app) INetFwAuthorizedApplication_Release( app ); - if (apps) INetFwAuthorizedApplications_Release( apps ); - if (policy) INetFwPolicy_Release( policy ); - if (profile) INetFwProfile_Release( profile ); - if (mgr) INetFwMgr_Release( mgr ); - if (SUCCEEDED( init )) CoUninitialize(); - SysFreeString( image ); - return hr; -} - -/* taken from programs/winetest/main.c */ -static BOOL is_stub_dll(const char *filename) -{ - DWORD size, ver; - BOOL isstub = FALSE; - char *p, *data; - - size = GetFileVersionInfoSizeA(filename, &ver); - if (!size) return FALSE; - - data = HeapAlloc(GetProcessHeap(), 0, size); - if (!data) return FALSE; - - if (GetFileVersionInfoA(filename, ver, size, data)) - { - char buf[256]; - - sprintf(buf, "\\StringFileInfo\\%04x%04x\\OriginalFilename", MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), 1200); - if (VerQueryValueA(data, buf, (void**)&p, &size)) - isstub = !lstrcmpiA("wcodstub.dll", p); - } - HeapFree(GetProcessHeap(), 0, data); - - return isstub; -} - START_TEST(client) { BOOL firewall_enabled; diff --git a/dlls/dpnet/tests/dpnet_test.h b/dlls/dpnet/tests/dpnet_test.h new file mode 100644 index 0000000..1de2559 --- /dev/null +++ b/dlls/dpnet/tests/dpnet_test.h @@ -0,0 +1,32 @@ +/* + * Copyright 2016 Alistair Leslie-Hughes + * + * 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 __DPNET_PRIVATE_H__ +#define __DPNET_PRIVATE_H__ + +enum firewall_op +{ + APP_ADD, + APP_REMOVE +}; + +extern BOOL is_firewall_enabled(void) DECLSPEC_HIDDEN; +extern BOOL is_process_elevated(void) DECLSPEC_HIDDEN; +extern HRESULT set_firewall( enum firewall_op op ) DECLSPEC_HIDDEN; +extern BOOL is_stub_dll(const char *filename) DECLSPEC_HIDDEN; + +#endif diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c index bfc21b0..2f52c58 100644 --- a/dlls/dpnet/tests/server.c +++ b/dlls/dpnet/tests/server.c @@ -24,6 +24,8 @@ #include <netfw.h> #include "wine/test.h" +#include "dpnet_test.h" + /* {CD0C3D4B-E15E-4CF2-9EA8-6E1D6548C5A5} */ static const GUID appguid = { 0xcd0c3d4b, 0xe15e, 0x4cf2, { 0x9e, 0xa8, 0x6e, 0x1d, 0x65, 0x48, 0xc5, 0xa5 } }; static WCHAR sessionname[] = {'w','i','n','e','g','a','m','e','s','s','e','r','v','e','r',0}; @@ -182,7 +184,7 @@ static void test_server_info(void) } } -static BOOL is_process_elevated(void) +BOOL is_process_elevated(void) { HANDLE token; if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) @@ -198,7 +200,7 @@ static BOOL is_process_elevated(void) return FALSE; } -static BOOL is_firewall_enabled(void) +BOOL is_firewall_enabled(void) { HRESULT hr, init; INetFwMgr *mgr = NULL; @@ -231,13 +233,7 @@ done: return (enabled == VARIANT_TRUE); } -enum firewall_op -{ - APP_ADD, - APP_REMOVE -}; - -static HRESULT set_firewall( enum firewall_op op ) +HRESULT set_firewall( enum firewall_op op ) { static const WCHAR dpnsvrW[] = {'c',':','\\','w','i','n','d','o','w','s','\\','s','y','s','t','e','m','3','2','\\', @@ -341,7 +337,7 @@ done: } /* taken from programs/winetest/main.c */ -static BOOL is_stub_dll(const char *filename) +BOOL is_stub_dll(const char *filename) { DWORD size, ver; BOOL isstub = FALSE;

1 0