April 2018 - Wine-devel - list.winehq.org

[PATCH] testbot: Remove an unneeded WineTestBot::UserRoles import.
by Francois Gouget 30 Apr '18

30 Apr '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Users.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index f7ebd93da..772a2b7e8 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -33,7 +33,6 @@ use Digest::SHA qw(sha1_hex); use URI::Escape; use WineTestBot::Config; use WineTestBot::Roles; -use WineTestBot::UserRoles; use WineTestBot::Utils; -- 2.17.0

1 0

[PATCH] testbot: Remove an unneeded WineTestBot::CGI::Sessions import.
by Francois Gouget 30 Apr '18

30 Apr '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/ForgotPassword.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/web/ForgotPassword.pl b/testbot/web/ForgotPassword.pl index af79b65c7..4e1c508b2 100644 --- a/testbot/web/ForgotPassword.pl +++ b/testbot/web/ForgotPassword.pl @@ -27,7 +27,6 @@ our @ISA = qw(ObjectModel::CGI::FreeFormPage); use ObjectModel::BasicPropertyDescriptor; use WineTestBot::Users; use WineTestBot::Utils; -use WineTestBot::CGI::Sessions; sub _initialize($$$) -- 2.17.0

1 0

[PATCH] testbot: Remove some unneeded Jobs, Steps and Tasks imports.
by Francois Gouget 30 Apr '18

30 Apr '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/StepsTasks.pm | 2 -- testbot/lib/WineTestBot/Tasks.pm | 3 +-- testbot/web/GetFile.pl | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 232efe520..ff94b1452 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -106,8 +106,6 @@ BEGIN use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; -use WineTestBot::Steps; -use WineTestBot::Tasks; use WineTestBot::VMs; sub _initialize($$) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 0cb2e7b02..5121abb19 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -40,8 +40,7 @@ use POSIX qw(:errno_h); use File::Path; use ObjectModel::BackEnd; use WineTestBot::Config; -use WineTestBot::Jobs; -use WineTestBot::Steps; + sub InitializeNew($$) { diff --git a/testbot/web/GetFile.pl b/testbot/web/GetFile.pl index e4d54871e..7e6c615ea 100644 --- a/testbot/web/GetFile.pl +++ b/testbot/web/GetFile.pl @@ -24,7 +24,7 @@ use CGI; use Fcntl; # For O_XXX use WineTestBot::Config; use WineTestBot::Jobs; -use WineTestBot::Steps; + sub GetFile($$$) { -- 2.17.0

1 0

[PATCH] MAINTAINERS: Remove previous wine-staging maintainers
by Alistair Leslie-Hughes 30 Apr '18

30 Apr '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- MAINTAINERS | 2 -- 1 file changed, 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 7d76e51..e72a9e8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -325,8 +325,6 @@ W: https://wiki.winehq.org/StableRules Staging Branch M: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -M: Sebastian Lackner <sebastian(a)fds-team.de> -M: Michael Müller <michael(a)fds-team.de> P: Zebediah Figura <z.figura12(a)gmail.com> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> W: https://wine-staging.com/ -- 1.9.1

1 0

[PATCH 1/2] wininet: Allow INTERNET_OPTION_SETTINGS_CHANGED on connections.
by Alistair Leslie-Hughes 30 Apr '18

30 Apr '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/internet.c | 3 +++ dlls/wininet/tests/internet.c | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 699962c..c3838e0 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2937,6 +2937,9 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, ret = (res == ERROR_SUCCESS); break; } + case INTERNET_OPTION_SETTINGS_CHANGED: + FIXME("INTERNET_OPTION_SETTINGS_CHANGED; STUB\n"); + break; default: FIXME("Option %d STUB\n",dwOption); SetLastError(ERROR_INTERNET_INVALID_OPTION); diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 3201dd9..d9cb720 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1165,6 +1165,12 @@ static void test_InternetSetOption(void) ok(ret == FALSE, "InternetSetOption should've failed\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() = %x\n", GetLastError()); + ret = InternetSetOptionA(req, INTERNET_OPTION_SETTINGS_CHANGED, NULL, 0); + ok(ret == TRUE, "InternetSetOption should've succeeded\n"); + + ret = InternetSetOptionA(ses, INTERNET_OPTION_SETTINGS_CHANGED, NULL, 0); + ok(ret == TRUE, "InternetSetOption should've succeeded\n"); + ret = InternetCloseHandle(req); ok(ret == TRUE, "InternetCloseHandle failed: 0x%08x\n", GetLastError()); ret = InternetCloseHandle(con); -- 1.9.1

1 0

[PATCH] mfplat: Return S_OK from MFStartup stub.
by Alistair Leslie-Hughes 30 Apr '18

30 Apr '18

Fixes: https://bugs.winehq.org/show_bug.cgi?id=43607 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/main.c | 9 ++++++++- dlls/mfplat/tests/mfplat.c | 6 +++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 7c5be65..b0ac7a0 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -404,8 +404,15 @@ HRESULT WINAPI MFTUnregister(CLSID clsid) */ HRESULT WINAPI MFStartup(ULONG version, DWORD flags) { +#define MF_VERSION_XP (0x0001 << 16 | MF_API_VERSION) +#define MF_VERSION_WIN7 (0x0002 << 16 | MF_API_VERSION) + FIXME("(%u, %u): stub\n", version, flags); - return MF_E_BAD_STARTUP_VERSION; + + if(version != MF_VERSION_XP && version != MF_VERSION_WIN7) + return MF_E_BAD_STARTUP_VERSION; + + return S_OK; } /*********************************************************************** diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f85b00c..a260f6c 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -199,11 +199,15 @@ static void init_functions(void) static void test_MFCreateMediaType(void) { +#define MF_VERSION_INVALID (0xdead << 16 | MF_API_VERSION) HRESULT hr; IMFMediaType *mediatype; + hr = MFStartup(MF_VERSION_INVALID, MFSTARTUP_FULL); + ok(hr == MF_E_BAD_STARTUP_VERSION, "got 0x%08x\n", hr); + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); if(0) { -- 1.9.1

1 0

[PATCH] ntdll: Partly implementRtlDosPathNameToRelativeNtPathName_U_WithStatus (resend)
by Stefan Leichter 29 Apr '18

29 Apr '18

Re-diffed/send with some blanks in the subject Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/ntdll_misc.h | 6 ++++++ dlls/ntdll/path.c | 21 +++++++++++++++++++++ 3 files changed, 28 insertions(+)

2 1

Wine staging 3.7 release
by Alistair Leslie-Hughes 29 Apr '18

29 Apr '18

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 3.7 (920 patches are applied to wine vanilla) * Reviewed and upstreamed patches. Fixes * Allow staging to be compiled for Android. New Patches * Use xdg-email to sent emails when available. * Stubs to help Destiny 2 (Still not runable). Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game: Into the Breach, The Witcher 3. * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.com Best Regards Alistair.

1 0

[PATCH] netapi32: Add DsEnumerateDomainTrustsA/W stubs
by Alistair Leslie-Hughes 29 Apr '18

29 Apr '18

Fixes: https://bugs.winehq.org/show_bug.cgi?id=45081 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/netapi32/netapi32.c | 18 ++++++++++++++++++ dlls/netapi32/netapi32.spec | 3 ++- include/dsgetdc.h | 26 ++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 620df791b6..ff57c223b4 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -3544,6 +3544,24 @@ DWORD WINAPI DavGetUNCFromHTTPPath(const WCHAR *http_path, WCHAR *buf, DWORD *bu return ERROR_SUCCESS; } +/************************************************************ + * DsEnumerateDomainTrustsA (NETAPI32.@) + */ +DWORD WINAPI DsEnumerateDomainTrustsA(LPSTR server, ULONG flags, PDS_DOMAIN_TRUSTSA* domains, PULONG count) +{ + FIXME("(%s, 0x%04x, %p, %p): stub\n", debugstr_a(server), flags, domains, count); + return ERROR_NO_LOGON_SERVERS; +} + +/************************************************************ + * DsEnumerateDomainTrustsW (NETAPI32.@) + */ +DWORD WINAPI DsEnumerateDomainTrustsW(LPWSTR server, ULONG flags, PDS_DOMAIN_TRUSTSW* domains, PULONG count) +{ + FIXME("(%s, 0x%04x, %p, %p): stub\n", debugstr_w(server), flags, domains, count); + return ERROR_NO_LOGON_SERVERS; +} + DECLSPEC_HIDDEN void __RPC_FAR *__RPC_USER MIDL_user_allocate(SIZE_T n) { return HeapAlloc(GetProcessHeap(), 0, n); diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index 7b51939b80..7e83b1afe7 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -3,7 +3,8 @@ @ stub DsAddressToSiteNames @ stub DsAddressToSiteNamesEx @ stub DsDeregisterDnsHostRecords -@ stub DsEnumerateDomainTrusts +@ stdcall DsEnumerateDomainTrustsA(str long ptr ptr) +@ stdcall DsEnumerateDomainTrustsW(wstr long ptr ptr) @ stub DsGetDcClose @ stdcall DsGetDcNameA(str str ptr str long ptr) @ stdcall DsGetDcNameW(wstr wstr ptr wstr long ptr) diff --git a/include/dsgetdc.h b/include/dsgetdc.h index faae31aa8c..107d5881b5 100644 --- a/include/dsgetdc.h +++ b/include/dsgetdc.h @@ -86,6 +86,28 @@ typedef struct _DOMAIN_CONTROLLER_INFOW { LPWSTR ClientSiteName; } DOMAIN_CONTROLLER_INFOW, *PDOMAIN_CONTROLLER_INFOW; +typedef struct _DS_DOMAIN_TRUSTSA { + LPSTR NetbiosDomainName; + LPSTR DnsDomainName; + ULONG Flags; + ULONG ParentIndex; + ULONG TrustType; + ULONG TrustAttributes; + PSID DomainSid; + GUID DomainGuid; +} DS_DOMAIN_TRUSTSA, *PDS_DOMAIN_TRUSTSA; + +typedef struct _DS_DOMAIN_TRUSTSW { + LPWSTR NetbiosDomainName; + LPWSTR DnsDomainName; + ULONG Flags; + ULONG ParentIndex; + ULONG TrustType; + ULONG TrustAttributes; + PSID DomainSid; + GUID DomainGuid; +} DS_DOMAIN_TRUSTSW, *PDS_DOMAIN_TRUSTSW; + DECL_WINELIB_TYPE_AW(DOMAIN_CONTROLLER_INFO) DWORD WINAPI DsGetDcNameA(LPCSTR,LPCSTR,GUID*,LPCSTR,ULONG,PDOMAIN_CONTROLLER_INFOA*); @@ -96,6 +118,10 @@ DWORD WINAPI DsGetSiteNameA(LPCSTR ComputerName, LPSTR *SiteName); DWORD WINAPI DsGetSiteNameW(LPCWSTR ComputerName, LPWSTR *SiteName); #define DsGetSiteName WINELIB_NAME_AW(DsGetSiteName) +DWORD WINAPI DsEnumerateDomainTrustsA(LPSTR, ULONG, PDS_DOMAIN_TRUSTSA*, PULONG); +DWORD WINAPI DsEnumerateDomainTrustsW(LPWSTR, ULONG, PDS_DOMAIN_TRUSTSW*, PULONG); +#define DsEnumerateDomainTrusts WINELIB_NAME_AW(DsEnumerateDomainTrusts) + #ifdef __cplusplus } #endif -- 2.17.0

1 0

[PATCH] devenum: Check for null pointer in IMoniker_BindToObject().
by Zebediah Figura 28 Apr '18

28 Apr '18

Fixes https://bugs.winehq.org/show_bug.cgi?id=45078. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/devenum/mediacatenum.c | 3 +++ dlls/devenum/tests/devenum.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index b0cdc6c..a76c7be 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -444,6 +444,9 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_BindToObject(IMoniker *iface, IBi TRACE("(%p)->(%p, %p, %s, %p)\n", This, pbc, pmkToLeft, debugstr_guid(riidResult), ppvResult); + if (!ppvResult) + return E_POINTER; + VariantInit(&var); *ppvResult = NULL; diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 293ba8d..383619c 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -134,6 +134,9 @@ static void test_devenum(IBindCtx *bind_ctx) } } + hr = IMoniker_BindToObject(moniker, bind_ctx, NULL, &IID_IUnknown, NULL); + ok(hr == E_POINTER, "got %#x\n", hr); + IPropertyBag_Release(prop_bag); IMoniker_Release(moniker); } -- 2.7.4

1 0