July 2019 - Wine-Devel - list.winehq.org

Re: [PATCH 1/3] kernel32/tests: Add more debugger tests.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=54349 Your paranoid android. === w2008s64 (64 bit report) === kernel32: debugger.c:1013: Test failed: dwDebugEventCode = -1 debugger.c:1015: Test failed: ContinueDebugEvent failed, last error 87. debugger.c:143: Test failed: unable078c:debugger: to open7 tests executed (0 marked as todo, 0 failur 'C:\Users\ADMINI~1\AppData\Loes), 0 skippedcal\. === w1064v1507 (64 bit report) === kernel32: debugger: Timeout === debian9 (build log) === Task: WineTest did not produce the wow32 report

July 2, 2019

[PATCH 3/3] ntdll: Use the machine ID for the system UUID on Linux.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ntdll/nt.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 7cfe57c9bd..1211234293 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -101,6 +101,7 @@ struct smbios_system { BYTE product; BYTE version; BYTE serial; + BYTE uuid[16]; }; struct smbios_board { @@ -2064,6 +2065,45 @@ static size_t get_smbios_string(const char *path, char *str, size_t size) return len; } +static void get_system_uuid( GUID *uuid ) +{ + static const unsigned char hex[] = + { + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x00 */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x10 */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x20 */ + 0,1,2,3,4,5,6,7,8,9,0,0,0,0,0,0, /* 0x30 */ + 0,10,11,12,13,14,15,0,0,0,0,0,0,0,0,0, /* 0x40 */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x50 */ + 0,10,11,12,13,14,15 /* 0x60 */ + }; + int fd; + + memset( uuid, 0xff, sizeof(*uuid) ); + if ((fd = open( "/var/lib/dbus/machine-id", O_RDONLY )) != -1) + { + unsigned char buf[32], *p = buf; + if (read( fd, buf, sizeof(buf) ) == sizeof(buf)) + { + uuid->Data1 = hex[p[6]] << 28 | hex[p[7]] << 24 | hex[p[4]] << 20 | hex[p[5]] << 16 | + hex[p[2]] << 12 | hex[p[3]] << 8 | hex[p[0]] << 4 | hex[p[1]]; + + uuid->Data2 = hex[p[10]] << 12 | hex[p[11]] << 8 | hex[p[8]] << 4 | hex[p[9]]; + uuid->Data3 = hex[p[14]] << 12 | hex[p[15]] << 8 | hex[p[12]] << 4 | hex[p[13]]; + + uuid->Data4[0] = hex[p[16]] << 4 | hex[p[17]]; + uuid->Data4[1] = hex[p[18]] << 4 | hex[p[19]]; + uuid->Data4[2] = hex[p[20]] << 4 | hex[p[21]]; + uuid->Data4[3] = hex[p[22]] << 4 | hex[p[23]]; + uuid->Data4[4] = hex[p[24]] << 4 | hex[p[25]]; + uuid->Data4[5] = hex[p[26]] << 4 | hex[p[27]]; + uuid->Data4[6] = hex[p[28]] << 4 | hex[p[29]]; + uuid->Data4[7] = hex[p[30]] << 4 | hex[p[31]]; + } + close( fd ); + } +} + static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG available_len, ULONG *required_len) { switch (sfti->ProviderSignature) @@ -2163,6 +2203,7 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG system->product = system_product_len ? ++string_count : 0; system->version = system_version_len ? ++string_count : 0; system->serial = system_serial_len ? ++string_count : 0; + get_system_uuid( (GUID *)system->uuid ); buffer += sizeof(struct smbios_system); copy_smbios_string(&buffer, system_vendor, system_vendor_len); -- 2.11.0

July 2, 2019

[PATCH 2/3] ntdll: Use a common structure for the SMBIOS table entry header.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ntdll/nt.c | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 2a2bd4fd60..7cfe57c9bd 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -79,10 +79,14 @@ struct smbios_prologue { DWORD length; }; -struct smbios_bios { +struct smbios_header { BYTE type; BYTE length; WORD handle; +}; + +struct smbios_bios { + struct smbios_header hdr; BYTE vendor; BYTE version; WORD start; @@ -92,9 +96,7 @@ struct smbios_bios { }; struct smbios_system { - BYTE type; - BYTE length; - WORD handle; + struct smbios_header hdr; BYTE vendor; BYTE product; BYTE version; @@ -102,9 +104,7 @@ struct smbios_system { }; struct smbios_board { - BYTE type; - BYTE length; - WORD handle; + struct smbios_header hdr; BYTE vendor; BYTE product; BYTE version; @@ -112,9 +112,7 @@ struct smbios_board { }; struct smbios_chassis { - BYTE type; - BYTE length; - WORD handle; + struct smbios_header hdr; BYTE vendor; BYTE shape; BYTE version; @@ -2139,9 +2137,9 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG string_count = 0; bios = (struct smbios_bios*)buffer; - bios->type = 0; - bios->length = sizeof(struct smbios_bios); - bios->handle = 0; + bios->hdr.type = 0; + bios->hdr.length = sizeof(struct smbios_bios); + bios->hdr.handle = 0; bios->vendor = bios_vendor_len ? ++string_count : 0; bios->version = bios_version_len ? ++string_count : 0; bios->start = 0; @@ -2158,9 +2156,9 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG string_count = 0; system = (struct smbios_system*)buffer; - system->type = 1; - system->length = sizeof(struct smbios_system); - system->handle = 0; + system->hdr.type = 1; + system->hdr.length = sizeof(struct smbios_system); + system->hdr.handle = 0; system->vendor = system_vendor_len ? ++string_count : 0; system->product = system_product_len ? ++string_count : 0; system->version = system_version_len ? ++string_count : 0; @@ -2176,9 +2174,9 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG string_count = 0; board = (struct smbios_board*)buffer; - board->type = 2; - board->length = sizeof(struct smbios_board); - board->handle = 0; + board->hdr.type = 2; + board->hdr.length = sizeof(struct smbios_board); + board->hdr.handle = 0; board->vendor = board_vendor_len ? ++string_count : 0; board->product = board_product_len ? ++string_count : 0; board->version = board_version_len ? ++string_count : 0; @@ -2194,9 +2192,9 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG string_count = 0; chassis = (struct smbios_chassis*)buffer; - chassis->type = 3; - chassis->length = sizeof(struct smbios_chassis); - chassis->handle = 0; + chassis->hdr.type = 3; + chassis->hdr.length = sizeof(struct smbios_chassis); + chassis->hdr.handle = 0; chassis->vendor = chassis_vendor_len ? ++string_count : 0; chassis->shape = 0x2; /* unknown */ chassis->version = chassis_version_len ? ++string_count : 0; -- 2.11.0

July 2, 2019

[PATCH 1/3] ntdll: Fix sysfs path for the product name.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ntdll/nt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 0dc06f971b..2a2bd4fd60 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -2093,7 +2093,7 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG bios_version_len = get_smbios_string("/sys/class/dmi/id/bios_version", S(bios_version)); bios_date_len = get_smbios_string("/sys/class/dmi/id/bios_date", S(bios_date)); system_vendor_len = get_smbios_string("/sys/class/dmi/id/sys_vendor", S(system_vendor)); - system_product_len = get_smbios_string("/sys/class/dmi/id/product", S(system_product)); + system_product_len = get_smbios_string("/sys/class/dmi/id/product_name", S(system_product)); system_version_len = get_smbios_string("/sys/class/dmi/id/product_version", S(system_version)); system_serial_len = get_smbios_string("/sys/class/dmi/id/product_serial", S(system_serial)); board_vendor_len = get_smbios_string("/sys/class/dmi/id/board_vendor", S(board_vendor)); -- 2.11.0

July 2, 2019

[PATCH 3/3] kernel32: Terminate process in unhandled exception handler.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/process.c | 2 +- dlls/kernel32/tests/debugger.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)

July 2, 2019

[PATCH 2/3] server: Fix debug event order in generate_startup_debug_events.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/debugger.c | 2 -- server/debugger.c | 20 +++++++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-)

July 2, 2019

[PATCH 1/3] kernel32/tests: Add more debugger tests.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/debugger.c | 270 ++++++++++++++++++++++++++++++--- 1 file changed, 248 insertions(+), 22 deletions(-)

July 2, 2019

Re: [PATCH] kerberos: Fix compilation on systems where SONAME_LIBKRB5 is not defined.

by Dmitry Timoshkov

Hans Leidekker <hans(a)codeweavers.com> wrote: > On Tue, 2019-07-02 at 18:14 +0800, Dmitry Timoshkov wrote: > > Sounds like a broken install. To fix this I think it would be better to improve > > > our configure check than to add more (nested) ifdefs. > > > > I believe that the added ifdefs are actually necessary, and they logically > > separate libkrb5 functionality from libgssapi one. Without libkrb5 the only > > things that won't be supported are custom credentials and the ticket cache, > > everything else works just fine. > > > > > AcquireCredentialsHandle won't be very useful without these krb5 functions. > > > > It works just fine with cached system credentials. > > gssapi itself depends on krb5, so there's no reason to build with partial support. Apparently there are configurations where that's not the case, and supporting them isn't that hard as the patch shows. > The user will have it installed but can't make use of it, and the developer will > not be warned that support is missing. I won't argue that whether it's a useful configuration, but the patch solves both a compilation bug and and makes kerberos.dll at least partially working. -- Dmitry.

July 2, 2019

Re: [PATCH] kerberos: Fix compilation on systems where SONAME_LIBKRB5 is not defined.

by Hans Leidekker

On Tue, 2019-07-02 at 18:14 +0800, Dmitry Timoshkov wrote: > Sounds like a broken install. To fix this I think it would be better to improve > > our configure check than to add more (nested) ifdefs. > > I believe that the added ifdefs are actually necessary, and they logically > separate libkrb5 functionality from libgssapi one. Without libkrb5 the only > things that won't be supported are custom credentials and the ticket cache, > everything else works just fine. > > > AcquireCredentialsHandle won't be very useful without these krb5 functions. > > It works just fine with cached system credentials. gssapi itself depends on krb5, so there's no reason to build with partial support. The user will have it installed but can't make use of it, and the developer will not be warned that support is missing.

July 2, 2019

Re: [PATCH] kerberos: Fix compilation on systems where SONAME_LIBKRB5 is not defined.

by Dmitry Timoshkov

Hans Leidekker <hans(a)codeweavers.com> wrote: > On Tue, 2019-07-02 at 17:02 +0800, Dmitry Timoshkov wrote: > > Where do you see this? Note that this code is inside an #ifdef SONAME_LIBGSSAPI_KRB5 > > > block and configure should disable gssapi when it can't detect krb5. This means that > > > SONAME_LIBGSSAPI_KRB5 should not be set when SONAME_LIBKRB5 isn't. > > > > I can confirm that on my system configure undefs SONAME_LIBGSSAPI_KRB5. > > > > Unfortunately that's not on one of my machines. According to the reporter, > > configure fails to find libkrb55.so but successfully locates libgssapi.so, > > and configure log confirms that. > > Sounds like a broken install. To fix this I think it would be better to improve > our configure check than to add more (nested) ifdefs. I believe that the added ifdefs are actually necessary, and they logically separate libkrb5 functionality from libgssapi one. Without libkrb5 the only things that won't be supported are custom credentials and the ticket cache, everything else works just fine. > AcquireCredentialsHandle won't be very useful without these krb5 functions. It works just fine with cached system credentials. -- Dmitry.

July 2, 2019