March 2022 - Wine-commits - list.winehq.org

Eric Pouech : schannel/tests: Enable compilation with long types.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: f953caf314614b3ee6f8547a879edeaa43a0ab39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f953caf314614b3ee6f8547a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:25:34 2022 +0100 schannel/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schannel/tests/Makefile.in | 1 - dlls/schannel/tests/main.c | 48 ++++++++++++++++++++--------------------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/dlls/schannel/tests/Makefile.in b/dlls/schannel/tests/Makefile.in index ee755457e98..ca82dccfd9b 100644 --- a/dlls/schannel/tests/Makefile.in +++ b/dlls/schannel/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = schannel.dll C_SRCS = \ diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index 4b4b7b4f388..f876d934f3d 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -77,27 +77,27 @@ static void testInitialize(void) /* SpLsaModeInitialize does not care about the LSA version. */ status = pSpLsaModeInitialize(0, &Version, &pTables2, &cTables); - ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); + ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); ok(cTables == 2 || broken(cTables == 1), /* Win2k */ - "cTables: %d\n", cTables); + "cTables: %ld\n", cTables); ok(pTables2 != NULL,"pTables: %p\n", pTables2); /* We can call it as many times we want. */ status = pSpLsaModeInitialize(0x10000, &Version, &pTables, &cTables); - ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); + ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); ok(cTables == 2 || broken(cTables == 1), /* Win2k */ - "cTables: %d\n", cTables); + "cTables: %ld\n", cTables); ok(pTables != NULL, "pTables: %p\n", pTables); /* It will always return the same pointer. */ ok(pTables == pTables2, "pTables: %p, pTables2: %p\n", pTables, pTables2); status = pSpLsaModeInitialize(0x23456, &Version, &pTables, &cTables); - ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); + ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); ok(cTables == 2 || broken(cTables == 1), /* Win2k */ - "cTables: %d\n", cTables); + "cTables: %ld\n", cTables); ok(pTables != NULL, "pTables: %p\n", pTables); ok(pTables == pTables2, "pTables: %p, pTables2: %p\n", pTables, pTables2); @@ -106,32 +106,32 @@ static void testInitialize(void) cUserTables = 0xdead; pUserTables = NULL; status = pSpUserModeInitialize(0, &Version, &pUserTables, &cUserTables); - ok(status == STATUS_INVALID_PARAMETER, "status: 0x%x\n", status); - ok(Version == 0xdead, "Version: 0x%x\n", Version); - ok(cUserTables == 0xdead, "cTables: %d\n", cUserTables); + ok(status == STATUS_INVALID_PARAMETER, "status: 0x%lx\n", status); + ok(Version == 0xdead, "Version: 0x%lx\n", Version); + ok(cUserTables == 0xdead, "cTables: %ld\n", cUserTables); ok(pUserTables == NULL, "pUserTables: %p\n", pUserTables); status = pSpUserModeInitialize(0x20000, &Version, &pUserTables, &cUserTables); - ok(status == STATUS_INVALID_PARAMETER, "status: 0x%x\n", status); - ok(Version == 0xdead, "Version: 0x%x\n", Version); - ok(cUserTables == 0xdead, "cTables: %d\n", cUserTables); + ok(status == STATUS_INVALID_PARAMETER, "status: 0x%lx\n", status); + ok(Version == 0xdead, "Version: 0x%lx\n", Version); + ok(cUserTables == 0xdead, "cTables: %ld\n", cUserTables); ok(pUserTables == NULL, "pUserTables: %p\n", pUserTables); /* Good version to SpUserModeInitialize */ status = pSpUserModeInitialize(SECPKG_INTERFACE_VERSION, &Version, &pUserTables, &cUserTables); - ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); - ok(Version == SECPKG_INTERFACE_VERSION, "Version: 0x%x\n", Version); + ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); + ok(Version == SECPKG_INTERFACE_VERSION, "Version: 0x%lx\n", Version); ok(cUserTables == 2 || broken(cUserTables == 4), /* Win2k */ - "cUserTables: %d\n", cUserTables); + "cUserTables: %ld\n", cUserTables); ok(pUserTables != NULL, "pUserTables: %p\n", pUserTables); /* Initializing user again */ status = pSpUserModeInitialize(SECPKG_INTERFACE_VERSION, &Version, &pUserTables2, &cTables); - ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); + ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); ok(pUserTables == pUserTables2, "pUserTables: %p, pUserTables2: %p\n", pUserTables, pUserTables2); } @@ -161,7 +161,7 @@ static PSECPKG_FUNCTION_TABLE getNextSecPkgTable(PSECPKG_FUNCTION_TABLE pTable, else if (Version == SECPKG_INTERFACE_VERSION_8) size = SECPKG_FUNCTION_TABLE_SIZE_8; else { - ok(FALSE, "Unknown package version 0x%x\n", Version); + ok(FALSE, "Unknown package version 0x%lx\n", Version); return NULL; } @@ -217,21 +217,21 @@ static void testGetInfo(void) /* Get the dispatch table */ status = pSpLsaModeInitialize(0, &Version, &pTables, &cTables); - ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); + ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); /* Passing NULL into ->GetInfo causes a crash. */ /* First package: Unified */ status = pTables->GetInfo(&PackageInfo); - ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); + ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); ok(PackageInfo.fCapabilities == LSA_BASE_CAPS || PackageInfo.fCapabilities == (LSA_BASE_CAPS|SECPKG_FLAG_APPCONTAINER_PASSTHROUGH), - "fCapabilities: 0x%x\n", PackageInfo.fCapabilities); + "fCapabilities: 0x%lx\n", PackageInfo.fCapabilities); ok(PackageInfo.wVersion == 1, "wVersion: %d\n", PackageInfo.wVersion); ok(PackageInfo.wRPCID == 14, "wRPCID: %d\n", PackageInfo.wRPCID); ok(PackageInfo.cbMaxToken == 0x4000 || PackageInfo.cbMaxToken == 0x6000, /* Vista */ - "cbMaxToken: 0x%x\n", + "cbMaxToken: 0x%lx\n", PackageInfo.cbMaxToken); /* Second package */ @@ -251,18 +251,18 @@ static void testGetInfo(void) status = pTables->GetInfo(&PackageInfo); ok(SUCCEEDED(status) || status == SEC_E_UNSUPPORTED_FUNCTION, /* win2k3 */ - "status: 0x%x\n", status); + "status: 0x%lx\n", status); if (SUCCEEDED(status)) { ok(PackageInfo.fCapabilities == LSA_BASE_CAPS || PackageInfo.fCapabilities == (LSA_BASE_CAPS|SECPKG_FLAG_APPCONTAINER_PASSTHROUGH), - "fCapabilities: 0x%x\n", PackageInfo.fCapabilities); + "fCapabilities: 0x%lx\n", PackageInfo.fCapabilities); ok(PackageInfo.wVersion == 1, "wVersion: %d\n", PackageInfo.wVersion); ok(PackageInfo.wRPCID == 14, "wRPCID: %d\n", PackageInfo.wRPCID); ok(PackageInfo.cbMaxToken == 0x4000 || PackageInfo.cbMaxToken == 0x6000, /* Win7 */ - "cbMaxToken: 0x%x\n", + "cbMaxToken: 0x%lx\n", PackageInfo.cbMaxToken); } }

1 0

Eric Pouech : schedsvc/tests: Enable compilation with long types.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: bb14e7b79fcfb59385051cfb1c34a8d22d15fd9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb14e7b79fcfb59385051cfb… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:25:40 2022 +0100 schedsvc/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/tests/Makefile.in | 1 - dlls/schedsvc/tests/atsvcapi.c | 44 ++++----- dlls/schedsvc/tests/rpcapi.c | 210 ++++++++++++++++++++-------------------- 3 files changed, 127 insertions(+), 128 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bb14e7b79fcfb5938505…

1 0

Eric Pouech : scrobj/tests: Enable compilation with long types.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: ff63f8165add4d9e72eede6de98fd3d9def410b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff63f8165add4d9e72eede6d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:25:47 2022 +0100 scrobj/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/tests/Makefile.in | 1 - dlls/scrobj/tests/scrobj.c | 106 +++++++++++++++++++++--------------------- 2 files changed, 53 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ff63f8165add4d9e72ee…

1 0

Eric Pouech : secur32/tests: Enable compilation with long types.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: a92db992c98776ddeb4b3e25327ef2481d3180f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a92db992c98776ddeb4b3e25… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:25:53 2022 +0100 secur32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/Makefile.in | 1 - dlls/secur32/tests/main.c | 12 +- dlls/secur32/tests/negotiate.c | 46 +++---- dlls/secur32/tests/ntlm.c | 46 +++---- dlls/secur32/tests/schannel.c | 286 ++++++++++++++++++++--------------------- dlls/secur32/tests/secur32.c | 86 ++++++------- 6 files changed, 238 insertions(+), 239 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a92db992c98776ddeb4b…

1 0

Alistair Leslie-Hughes : include: Correct BYTE typedef.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: d3b90f6ad19d3194df857b9682ab82c1599531b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3b90f6ad19d3194df857b96… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 3 22:32:10 2022 +1100 include: Correct BYTE typedef. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wtypes.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wtypes.idl b/include/wtypes.idl index 754258839d7..5a09ed717cb 100644 --- a/include/wtypes.idl +++ b/include/wtypes.idl @@ -33,7 +33,7 @@ interface IWinTypes /******************** BASIC WIN32 TYPES ********************/ cpp_quote("#if 0 /* winnt.h */") /* don't redefine these */ -typedef unsigned char BYTE; +typedef byte BYTE; typedef unsigned short WORD; typedef unsigned long DWORD; typedef long BOOL;

1 0

Alistair Leslie-Hughes : widl: Support basic BYTE type.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: 3f942a32c3958a1bf74c3543193e85fbad102610 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f942a32c3958a1bf74c3543… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 3 22:32:11 2022 +1100 widl: Support basic BYTE type. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typetree.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index dc4db35e835..800ddf77219 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -226,12 +226,14 @@ static size_t append_type_signature(char **buf, size_t *len, size_t pos, type_t case TYPE_BASIC_DOUBLE: n += strappend(buf, len, pos + n, "f8"); return n; + case TYPE_BASIC_BYTE: + n += strappend(buf, len, pos + n, "u1"); + return n; case TYPE_BASIC_INT16: case TYPE_BASIC_INT3264: case TYPE_BASIC_LONG: case TYPE_BASIC_CHAR: case TYPE_BASIC_HYPER: - case TYPE_BASIC_BYTE: case TYPE_BASIC_WCHAR: case TYPE_BASIC_ERROR_STATUS_T: case TYPE_BASIC_HANDLE:

1 0

Zebediah Figura : makedep: Do not forbid importing system headers in msvcrt modules.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: 9951f2f4336a42157569531da887e20555990ffe URL: https://source.winehq.org/git/wine.git/?a=commit;h=9951f2f4336a42157569531d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 3 19:50:07 2022 -0600 makedep: Do not forbid importing system headers in msvcrt modules. The apparent intention of catching mistakes early is laudable. However, the number of exceptions both in the code and not in the code (in particular, valgrind.h) shows that this is clearly getting in the way more often than not. In practice an attempt to compile with a system API we don't support will be met with a clear error at link time, e.g.: /usr/bin/x86_64-w64-mingw32-ld: dlls/xmllite/reader.cross.o: in function `debugstr_nodetype': /home/whatsit/git/wine64/../wine/dlls/xmllite/reader.c:116: undefined reference to `pthread_once' And when there is no external function involved (as with stdarg.h, x86intrin.h, valgrind.h), there's no reason to prevent use of the headers. The motivation for this patch is the ability to import system vkd3d.h in e.g. d3d12 and dxgi, which do not link to libvkd3d directly (but rather indirectly through wined3d) and so do not fall under the has_external_import() exception. I could see no simple way to adapt has_external_import() to account for this case. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 25277efd7bb..cc988e2aee7 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1359,22 +1359,6 @@ static struct makefile *find_importlib_module( const char *name ) } -/******************************************************************* - * has_external_import - */ -static int has_external_import( const struct makefile *make ) -{ - unsigned int i; - - for (i = 0; i < make->imports.count; i++) - { - if (!strncmp( make->imports.str[i], "-l", 2 )) - return 1; - } - return 0; -} - - /******************************************************************* * open_include_file */ @@ -1452,17 +1436,6 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ return file; } - if (pFile->type == INCL_SYSTEM && pFile->use_msvcrt && - !make->extlib && !pFile->included_by->is_external) - { - if (!strcmp( pFile->name, "stdarg.h" )) return NULL; - if (!strcmp( pFile->name, "x86intrin.h" )) return NULL; - if (has_external_import( make )) return NULL; - fprintf( stderr, "%s:%d: error: system header %s cannot be used with msvcrt\n", - pFile->included_by->file->name, pFile->included_line, pFile->name ); - exit(1); - } - if (pFile->type == INCL_SYSTEM) return NULL; /* ignore system files we cannot find */ /* try in src file directory */

1 0

Francois Gouget : [tools] testbot/web: Simplify the stats page initialization.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: tools Branch: master Commit: 13acc1eef093ef6688964794d5b73d9fc4e459ab URL: https://source.winehq.org/git/tools.git/?a=commit;h=13acc1eef093ef668896479… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 4 18:36:46 2022 +0100 [tools] testbot/web: Simplify the stats page initialization. Pass the property descriptors directly to FormPage::_initialize(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Stats.pl | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index ab08697..c96e6fd 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -41,7 +41,10 @@ sub _initialize($$$) $self->Validate(); $self->{start} = Time(); - $self->SUPER::_initialize($Request, $RequiredRole); + my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("Days", "Days to analyze", !1, 1, "N", 2), + ); + $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); } sub Validate($) @@ -374,17 +377,6 @@ sub GenerateBody($) print "</tbody></table></div>\n"; } -sub GetPropertyDescriptors($) -{ - my ($self) = @_; - - $self->{PropertyDescriptors} ||= [ - CreateBasicPropertyDescriptor("Days", "Days to analyze", !1, !1, "N", 2), - ]; - - return $self->SUPER::GetPropertyDescriptors(); -} - sub GetDisplayValue($$) { my ($self, $PropertyDescriptor) = @_;

1 0

Francois Gouget : testbot: Simplify the basic property validation.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: tools Branch: master Commit: 700e0863ea58d4f2c32c4fe15a4cd084cfe20c6b URL: https://source.winehq.org/git/tools.git/?a=commit;h=700e0863ea58d4f2c32c4fe… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 4 18:36:54 2022 +0100 testbot: Simplify the basic property validation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/BasicPropertyDescriptor.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm b/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm index 766a342..b283859 100644 --- a/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm @@ -92,7 +92,7 @@ sub ValidateValue($$$) return $self->GetDisplayName() . ": Too long"; } - if ($self->GetType() eq "N" && ! ($Value =~ /^\s*\d+\s*$/)) + if ($self->GetType() eq "N" && $Value !~ /^\s*\d+\s*$/) { return $self->GetDisplayName() . ": Invalid number"; }

1 0

Francois Gouget : testbot: Fix the indentation of FormPage::SaveProperties().
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: tools Branch: master Commit: fc136919abd00e0627cdb12536fc6219fb8b56c2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=fc136919abd00e0627cdb12… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 4 20:00:50 2022 +0100 testbot: Fix the indentation of FormPage::SaveProperties(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 03ddea6..43b9b59 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -361,8 +361,7 @@ sub SaveProperties($) my $PropertyDescriptor = $self->GetPropertyDescriptorByName($ParameterName); if (defined($PropertyDescriptor)) { - if (! $self->SaveProperty($PropertyDescriptor, - $self->GetParam($ParameterName))) + if (! $self->SaveProperty($PropertyDescriptor, $self->GetParam($ParameterName))) { return !1; }

1 0