- wine-devel - winehq.org

Re: [PATCH 2/2] winegstreamer: Always run gstreamer callbacks on a Wine thread
by Michael Stefaniuc 12 Jan '16

12 Jan '16

Hello Andrew, On 01/11/2016 09:13 PM, Andrew Eikum wrote: > This gets winegstreamer with gstreamer-0.10 working for me again, > fixing Bug 30557. However, gstreamer-0.10 is no longer developed and > some distros don't ship it anymore. which distros are those? gstreamer-0.10 is still available in Fedora 23. I intend to pull this patch (or a version of it) into Stable. But I'd rather stick with the old gstreamer-0.10 then go to the new API; it is the smaller change. > I have more patches on top of this one to move winegstreamer to the > gstreamer-1.0 API. See Bug 31836. In order to avoid dependency churn > for packagers, I think it makes sense to apply them both during the > same release, so I intend to send those patches after this one is > accepted. If you prefer to review them all, I can send them all at > once. bye michael

3 4

Re: dwrite: Remove "crashes on native" tests that were already if(0)-ed. if(0)-ed.
by Nikolay Sivov 12 Jan '16

12 Jan '16

On 12.01.2016 14:44, Gerald Pfeifer wrote: > I noticed those via the new -Wmisleading-indentation warnings. All > of these are tests that are disabled (if (0)) since they crash native. > > Am I missing something, or can we just remove them as dead code? There are disabled from the very beginning, and serve documentation purpose. > > (If not, okay to add braces for those cases not having them yet?) We try to avoid workarounds for static analyzers, and this warning is very similar in nature. I personally don't see a need of extra braces just to please it, but if it's decided that it's important to handle this warning for all wine code and if this warning will be actually on by default in gcc release, then sure, braces it is, instead of removing such blocks. > > Gerald >

1 0

Re: [PATCH 1/2] dnsapi: migrating to res_nquery (split resend)
by Hans Leidekker 12 Jan '16

12 Jan '16

On Mon, 2016-01-11 at 22:07 +0300, Donat Enikeev wrote: > -static void initialise_resolver( void ) > +static res_state initialise_resolver( void ) > { > - if ((_res.options & RES_INIT) == 0) > - res_init(); > + res_state dns_res_state = NULL; No need to initialize this variable. Why the dns_ prefix on local variables? > + if ( !(dns_res_state = heap_alloc_zero(sizeof(struct __res_state))) ) > + return NULL; > + > + res_ninit(dns_res_state); > + > + return dns_res_state; > } > @@ -706,6 +719,7 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser > { > DNS_STATUS ret = DNS_ERROR_RCODE_NOT_IMPLEMENTED; > #ifdef HAVE_RESOLV > + res_state dns_res_state; > > TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), dns_type_to_str( type ), > options, servers, result, reserved ); > @@ -713,13 +727,15 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser > if (!name || !result) > return ERROR_INVALID_PARAMETER; > > - initialise_resolver(); > - _res.options |= dns_map_options( options ); > + dns_res_state = initialise_resolver(); > + if ( !dns_res_state ) return ERROR_NOT_ENOUGH_MEMORY; > > - if (servers && (ret = dns_set_serverlist( servers ))) > + dns_res_state->options |= dns_map_options( options ); > + > + if (servers && (ret = dns_set_serverlist( dns_res_state, servers ))) > return ret; You are leaking dns_res_state here. > @@ -824,8 +842,9 @@ DNS_STATUS WINAPI DnsQueryConfig( DNS_CONFIG_TYPE config, DWORD flag, PCWSTR ada > case DnsConfigDnsServerList: > { > #ifdef HAVE_RESOLV > - initialise_resolver(); > - ret = dns_get_serverlist( buffer, len ); > + res_state dns_res_state = initialise_resolver(); > + ret = dns_get_serverlist( dns_res_state, buffer, len ); > + heap_free(dns_res_state); You should check the return value of initialise_resolver() here too.

1 0

Re: regsvr32/tests: Add initial tests
by Marvin 12 Jan '16

12 Jan '16

Hi, While running your changed tests on Windows, 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=19620 Your paranoid android. === wxppro (32 bit dll) === No test summary line found === w2003std (32 bit dll) === No test summary line found === wvistau64 (32 bit dll) === No test summary line found === w2008s64 (32 bit dll) === No test summary line found === w7u (32 bit dll) === No test summary line found === w7pro64 (32 bit dll) === No test summary line found === w8 (32 bit dll) === No test summary line found === w864 (32 bit dll) === No test summary line found === w1064 (32 bit dll) === No test summary line found === wvistau64 (64 bit dll) === No test summary line found === w2008s64 (64 bit dll) === No test summary line found === w7pro64 (64 bit dll) === No test summary line found === w864 (64 bit dll) === No test summary line found === w1064 (64 bit dll) === No test summary line found

2 1

Re: [PATCH 2/2] winegstreamer: Always run gstreamer callbacks on a Wine thread
by Matteo Bruni 11 Jan '16

11 Jan '16

2016-01-11 21:13 GMT+01:00 Andrew Eikum <aeikum(a)codeweavers.com>: Just happened to notice this while skimming the patch: > +GstBusSyncReply watch_bus_wrapper(GstBus *bus, GstMessage *msg, gpointer user) > +{ > + struct cb_data cbdata = { WATCH_BUS, > + { .watch_bus_data = { bus, msg, user} } > + }; I think designators are a C99 feature :/

1 0

ole32: OleInitialize/OleUnitialize behaves differently in Wine and Windows
by Paul Gofman 11 Jan '16

11 Jan '16

OleInitialize/OleUnitialize behave differently in Wine and Windows (at least WinXP) in the following special case. The application thread has a multithreaded apartment initialized. Then OleInitialize is called from the same thread, followed by OleUnitialize call later. According to MSDN spec OleInitialize should return RPC_E_CHANGED_MODE (which is the case both in Windows and Wine) and OleUnitilize call should not be performed after that. If OleUnitilize is actually called (which is the case in the application), it presumably should uninitialize the COM apartment completely just as in case CoUnitialize (this is what Wine does). But this seems to be not the case under Windows. I am attaching a patch which adds such a test to ole32/tests/compobj. The test does CoInitializeEx(NULL, COINIT_MULTITHREADED), then OleInitialize, OleUninitialize and then tries to create COM object. The test fails under Wine (apartment not initialized) but passes OK under my WinXP virtual machine. If to change OleInitialize/OleUninitialize to CoInitializeEx(NULL, COINIT_APARTMENTTHREADED)/CoUnitialize the test will fail both under Wine and Windows. The application works under Windows but crashes under Wine. I can tweak the application to work under Wine by, for instance, incrementing init counter in CoInitializeEx in ole32/compobj.c despite of returning RPC_E_CHANGED_MODE. So, the questions are: 1. Should I submit this test to wine-patches? 2. Is there some obvious way how can this be correctly fixed? E. g. it could potentially be fixed by adding some extra field to COM current info which would be checked in OleUninitialize not to allow the decrement of init counter by OleUnitialize below the value that was before first OleInit call, but I am not sure for now what Windows actually does. Maybe there are some known good ways how to explore this refcounting behaviour under Windows? If no, I could try to guess native behaviour by doing multiple CoInit/CoUninit/OleInit/OleUninit in different combinations followed by CoCreateInstance. Regards, Paul.

1 0

Re: shell32/tests: create_test_association() should either succeed or fail due to insufficient permissions.
by Marvin 11 Jan '16

11 Jan '16

Hi, While running your changed tests on Windows, 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=19589 Your paranoid android. === wvistau64 (32 bit shlexec) === shlexec.c:141: Test failed: ShellExecute(verb="QuotedUpperL", file="C:\Users\winetest\AppData\Local\Temp\wtD538.tmp\test file.shlexec") WaitForSingleObject returned 258 shlexec.c:1567: Test failed: argvA3 expected 'QuotedUpperL', but key not found or empty shlexec.c:1575: Test failed: argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wtD538.tmp\test file.shlexec', but key not found or empty === w1064 (32 bit shlexec) === shlexec.c:2289: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt1306.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2289: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt1306.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2289: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt1306.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2289: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt1306.tmp\test file.sde") failed: rc=29 err=2 === w1064 (64 bit shlexec) === shlexec.c:2289: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt72F2.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2289: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt72F2.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2289: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt72F2.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2301: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wt72F2.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wt72F2.tmp\test file.sde")]' shlexec.c:2289: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt72F2.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2289: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt72F2.tmp\test file.sde") failed: rc=29 err=2

2 1

Re: mshtml: Skip unused named args in Invoke calls.
by Marvin 11 Jan '16

11 Jan '16

Hi, While running your changed tests on Windows, 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=19615 Your paranoid android. === w8 (32 bit script) === script.c:632: Test failed: L"extern_res_script_rs = loaded0,eval,complete1, expected eval,complete1," === w864 (32 bit script) === script.c:632: Test failed: L"extern_res_script_rs = loaded0,eval,complete1, expected eval,complete1,"

1 0

Backup of wiki.winehq.org?
by Michael Stefaniuc 11 Jan '16

11 Jan '16

Hello Dimi, do you have a recent backup of wiki.winehq.org? The bloody spammers went nuts and even renamed the FrontPage to one of their spammer pages... I tried to move it back but MoinMoin didn't let me as it generated a new standard FrontPage. And it seems I have removed by mistake our real FrontPage before I could copy and paste its content over :( So could you please restore the FrontPage from the backup? While you are at it please block those 3 accounts used by the spammer(s). thanks bye michael

3 4

Re: [PATCH] d3dx9/test: magic isn't part of the dds structure
by Józef Kucia 11 Jan '16

11 Jan '16

On Mon, Jan 11, 2016 at 10:46 AM, Alistair Leslie-Hughes < leslie_alistair(a)hotmail.com> wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/d3dx9_36/tests/surface.c | 19 ++++++++++++------- > 1 file changed, 12 insertions(+), 7 deletions(-) > > diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c > index 183086f..5a20658 100644 > --- a/dlls/d3dx9_36/tests/surface.c > +++ b/dlls/d3dx9_36/tests/surface.c > @@ -200,7 +200,6 @@ struct dds_pixel_format > > struct dds_header > { > - DWORD magic; > DWORD size; > DWORD flags; > DWORD height; > @@ -222,7 +221,6 @@ static void fill_dds_header(struct dds_header *header) > { > memset(header, 0, sizeof(*header)); > > - header->magic = MAKEFOURCC('D','D','S',' '); > header->size = sizeof(*header); > header->flags = DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT; > header->height = 4; > @@ -250,10 +248,12 @@ static void check_dds_pixel_format_(unsigned int > line, > D3DXIMAGE_INFO info; > struct > { > + DWORD magic; > struct dds_header header; > BYTE data[256]; > } dds; > > + dds.magic = MAKEFOURCC('D','D','S',' '); > fill_dds_header(&dds.header); > dds.header.pixel_format.flags = flags; > dds.header.pixel_format.fourcc = fourcc; > @@ -281,6 +281,7 @@ static void test_dds_header_handling(void) > D3DXIMAGE_INFO info; > struct > { > + DWORD magic; > struct dds_header header; > BYTE data[4096 * 1024]; > } *dds; > @@ -399,9 +400,10 @@ static void test_dds_header_handling(void) > > for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) > { > - DWORD file_size = sizeof(dds->header) + tests[i].pixel_data_size; > + DWORD file_size = sizeof(dds->magic) + sizeof(dds->header) + > tests[i].pixel_data_size; > assert(file_size <= sizeof(*dds)); > > + dds->magic = MAKEFOURCC('D','D','S',' '); > fill_dds_header(&dds->header); > dds->header.flags |= tests[i].flags; > dds->header.width = tests[i].width; > @@ -1235,6 +1237,7 @@ static void > test_D3DXSaveSurfaceToFileInMemory(IDirect3DDevice9 *device) > ID3DXBuffer *buffer; > IDirect3DSurface9 *surface; > struct dds_header *header; > + BYTE *data; > > hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, > D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &surface, NULL); > if (FAILED(hr)) { > @@ -1257,9 +1260,10 @@ static void > test_D3DXSaveSurfaceToFileInMemory(IDirect3DDevice9 *device) > todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); > if (SUCCEEDED(hr)) > { > - header = ID3DXBuffer_GetBufferPointer(buffer); > + data = ID3DXBuffer_GetBufferPointer(buffer); > + header = (struct dds_header *)(data + sizeof(DWORD)); > > - ok(header->magic == MAKEFOURCC('D','D','S',' '), "Invalid DDS > signature.\n"); > + ok( *(DWORD*)data == MAKEFOURCC('D','D','S',' '), "Invalid DDS > signature.\n"); > ok(header->size == 124, "Invalid DDS size %u.\n", header->size); > ok(!header->height, "Got unexpected height %u.\n", > header->height); > ok(!header->width, "Got unexpected width %u.\n", header->width); > @@ -1274,9 +1278,10 @@ static void > test_D3DXSaveSurfaceToFileInMemory(IDirect3DDevice9 *device) > > hr = D3DXSaveSurfaceToFileInMemory(&buffer, D3DXIFF_DDS, surface, > NULL, NULL); > ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); > - header = ID3DXBuffer_GetBufferPointer(buffer); > > - ok(header->magic == MAKEFOURCC('D','D','S',' '), "Invalid DDS > signature.\n"); > + data = ID3DXBuffer_GetBufferPointer(buffer); > + header = (struct dds_header *)(data + sizeof(DWORD)); > + ok( *(DWORD*)data == MAKEFOURCC('D','D','S',' '), "Invalid DDS > signature.\n"); > ok(header->size == 124, "Invalid DDS size %u.\n", header->size); > ok(header->height == 4, "Got unexpected height %u.\n", > header->height); > ok(header->width == 4, "Got unexpected width %u.\n", header->width); > -- > 2.6.4 > > > > What's the point of this change? It doesn't fix anything and doesn't make code more readable. If the file signature isn't included in the DDS header size it doesn't necessarily mean we have to move it out of struct dds_header.

2 1

Re: [PATCH 2/3] xaudio2_7: Move source to shared xaudio2 directory
by Alistair Leslie-Hughes 11 Jan '16

11 Jan '16

Hi Andrew, On 09/01/16 04:03, Andrew Eikum wrote: > Currently, all of Wine's xaudio2 modules forward their implementations > to xaudio2_7. This fails when the user installs native xaudio2_7 and > tries to use a built-in xaudio DLL like xaudio2_8. Instead, we should > use the shared source mechanism to build each xaudio DLL independent > of the others. > > Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> > --- > > This is the first patch in a long series to move all 22 xaudio DLLs to > use shared source. These first two show the idea; the following > patches move all xaudio2_* DLLs, then xapofx1_*, then x3daudio1_*. > Next, there are a few cleanup patches to remove the run-time version > logic, since we can now do it at compile-time. > > dlls/{xaudio2_7 => xaudio2}/compat.c | 0 > dlls/{xaudio2_7 => xaudio2}/xapofx.c | 0 > dlls/{xaudio2_7 => xaudio2}/xaudio_classes.idl | 0 > dlls/{xaudio2_7 => xaudio2}/xaudio_dll.c | 0 > dlls/{xaudio2_7 => xaudio2}/xaudio_private.h | 0 > dlls/xaudio2_7/Makefile.in | 2 ++ > 6 files changed, 2 insertions(+) Whats the reason behind moving the source into a separate directory? It's not needed, have a look d3dcompiler_46 which uses the source in d3dcompiler_43. If you have main.c in each directory the build script is smart enough to compile the correct one, if that is your concern. Best Regards Alistair Leslie-Hughes

3 2

Re: shell32/tests: Check the hProcess field when ShellExecuteEx() fails.
by Marvin 11 Jan '16

11 Jan '16

Hi, While running your changed tests on Windows, 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=19588 Your paranoid android. === w1064 (32 bit shlexec) === shlexec.c:2290: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt2A18.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2290: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt2A18.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2290: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt2A18.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2290: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt2A18.tmp\test file.sde") failed: rc=29 err=2 === w1064 (64 bit shlexec) === shlexec.c:2290: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wtFF28.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2290: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wtFF28.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2290: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wtFF28.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2302: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wtFF28.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wtFF28.tmp\test file.sde")]' shlexec.c:2290: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wtFF28.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2290: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wtFF28.tmp\test file.sde") failed: rc=29 err=2

2 1

Re: [1/2] bcrypt: Add support for SHA hashes on Linux using Nettle.
by Damjan Jovanovic 11 Jan '16

11 Jan '16

Hi I don't believe it's possible to use Nettle in Wine right now, due to its copyright license: "Nettle is dual licenced under the GNU General Public License version 2 or later, and the GNU Lesser General Public License version 3 or later. When using Nettle, you must comply fully with all conditions of at least one of these licenses." ( http://www.lysator.liu.se/~nisse/nettle/nettle.html#Copyright) Wine is only LGPLv2+, which isn't compatible with either. Besides, why not GnuTLS or Mozilla's NSS? Regards Damjan On Mon, Jan 11, 2016 at 12:25 PM, Hans Leidekker <hans(a)codeweavers.com> wrote: > v2: Load Nettle dynamically. > > Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> > --- > configure.ac | 13 +++ > dlls/bcrypt/Makefile.in | 1 + > dlls/bcrypt/bcrypt_main.c | 199 > ++++++++++++++++++++++++++++++++++++++++++++-- > 3 files changed, 208 insertions(+), 5 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 2b1dd81..32b09ad 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -60,6 +60,7 @@ AC_ARG_WITH(ldap, > AS_HELP_STRING([--without-ldap],[do not use LDAP]), > [if test "x$withval" = "xno"; then ac_cv_header_ldap_h=no; > ac_cv_header_lber_h=no; fi]) > AC_ARG_WITH(mpg123, AS_HELP_STRING([--without-mpg123],[do not use the > mpg123 library])) > AC_ARG_WITH(netapi, AS_HELP_STRING([--without-netapi],[do not use the > Samba NetAPI library])) > +AC_ARG_WITH(nettle, AS_HELP_STRING([--without-nettle],[do not use > Nettle])) > AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use > OpenAL]), > [if test "x$withval" = "xno"; then ac_cv_header_AL_al_h=no; > ac_cv_header_OpenAL_al_h=no; fi]) > AC_ARG_WITH(opencl, AS_HELP_STRING([--without-opencl],[do not use > OpenCL]), > @@ -1274,6 +1275,18 @@ fi > WINE_WARNING_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"], > [libgnutls ${notice_platform}development files not > found, no schannel support.]) > > +dnl **** Check for libnettle *** > +if test "x$with_nettle" != "xno" > +then > + WINE_PACKAGE_FLAGS(NETTLE,[nettle],,,, > + [AC_CHECK_HEADER([nettle/sha2.h], > + > [WINE_CHECK_SONAME(nettle,nettle_sha512_init,,[NETTLE_CFLAGS=""],[$NETTLE_LIBS])], > + [NETTLE_CFLAGS=""])]) > +fi > +WINE_WARNING_WITH(nettle,[test "x$ac_cv_lib_soname_nettle" = "x" -a \ > + > "x$ac_cv_header_CommonCrypto_CommonDigest_h" != "xyes"], > + [libnettle ${notice_platform}development files not > found, no crypto support (bcrypt).]) > + > dnl **** Check which curses lib to use *** > CURSES_LIBS="" > if test "$ac_cv_header_ncurses_h" = "yes" > diff --git a/dlls/bcrypt/Makefile.in b/dlls/bcrypt/Makefile.in > index 87e1429..e83cbab 100644 > --- a/dlls/bcrypt/Makefile.in > +++ b/dlls/bcrypt/Makefile.in > @@ -1,5 +1,6 @@ > MODULE = bcrypt.dll > IMPORTS = advapi32 > +EXTRAINCL = $(NETTLE_CFLAGS) > > C_SRCS = \ > bcrypt_main.c > diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c > index 9cc5227..e66a70f 100644 > --- a/dlls/bcrypt/bcrypt_main.c > +++ b/dlls/bcrypt/bcrypt_main.c > @@ -18,10 +18,14 @@ > */ > > #include "config.h" > +#include "wine/port.h" > > #include <stdarg.h> > #ifdef HAVE_COMMONCRYPTO_COMMONDIGEST_H > #include <CommonCrypto/CommonDigest.h> > +#elif defined(SONAME_LIBNETTLE) > +#include <nettle/sha1.h> > +#include <nettle/sha2.h> > #endif > > #include "ntstatus.h" > @@ -32,10 +36,73 @@ > #include "bcrypt.h" > > #include "wine/debug.h" > +#include "wine/library.h" > #include "wine/unicode.h" > > WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); > > +static HINSTANCE instance; > + > +#if defined(SONAME_LIBNETTLE) && > !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) > +WINE_DECLARE_DEBUG_CHANNEL(winediag); > + > +static void *libnettle_handle; > +#define MAKE_FUNCPTR(f) static typeof(f) * p##f > +MAKE_FUNCPTR(nettle_sha1_init); > +MAKE_FUNCPTR(nettle_sha256_init); > +MAKE_FUNCPTR(nettle_sha384_init); > +MAKE_FUNCPTR(nettle_sha512_init); > +MAKE_FUNCPTR(nettle_sha1_update); > +MAKE_FUNCPTR(nettle_sha256_update); > +MAKE_FUNCPTR(nettle_sha512_update); > +MAKE_FUNCPTR(nettle_sha1_digest); > +MAKE_FUNCPTR(nettle_sha256_digest); > +MAKE_FUNCPTR(nettle_sha384_digest); > +MAKE_FUNCPTR(nettle_sha512_digest); > +#undef MAKE_FUNCPTR > + > +static BOOL nettle_init(void) > +{ > + if (!(libnettle_handle = wine_dlopen( SONAME_LIBNETTLE, RTLD_NOW, > NULL, 0 ))) > + { > + ERR_(winediag)( "failed to load libnettle, no crypto support\n" ); > + return FALSE; > + } > + > +#define LOAD_FUNCPTR(f) \ > + if (!(p##f = wine_dlsym( libnettle_handle, #f, NULL, 0 ))) \ > + { \ > + ERR( "failed to load %s\n", #f ); \ > + goto fail; \ > + } > + > + LOAD_FUNCPTR(nettle_sha1_init) > + LOAD_FUNCPTR(nettle_sha256_init) > + LOAD_FUNCPTR(nettle_sha384_init) > + LOAD_FUNCPTR(nettle_sha512_init) > + LOAD_FUNCPTR(nettle_sha1_update) > + LOAD_FUNCPTR(nettle_sha256_update) > + LOAD_FUNCPTR(nettle_sha512_update) > + LOAD_FUNCPTR(nettle_sha1_digest) > + LOAD_FUNCPTR(nettle_sha256_digest) > + LOAD_FUNCPTR(nettle_sha384_digest) > + LOAD_FUNCPTR(nettle_sha512_digest) > +#undef LOAD_FUNCPTR > + return TRUE; > + > +fail: > + wine_dlclose( libnettle_handle, NULL, 0 ); > + libnettle_handle = NULL; > + return FALSE; > +} > + > +static void nettle_deinit(void) > +{ > + wine_dlclose( libnettle_handle, NULL, 0 ); > + libnettle_handle = NULL; > +} > +#endif /* SONAME_LIBNETTLE && !HAVE_COMMONCRYPTO_COMMONDIGEST_H */ > + > NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG dwAlgOperations, ULONG > *pAlgCount, > BCRYPT_ALGORITHM_IDENTIFIER > **ppAlgList, ULONG dwFlags) > { > @@ -203,7 +270,7 @@ static NTSTATUS hash_init( struct hash *hash ) > return STATUS_SUCCESS; > } > > -static void hash_update( struct hash *hash, UCHAR *input, ULONG size ) > +static NTSTATUS hash_update( struct hash *hash, UCHAR *input, ULONG size ) > { > switch (hash->alg_id) > { > @@ -225,8 +292,9 @@ static void hash_update( struct hash *hash, UCHAR > *input, ULONG size ) > > default: > ERR( "unhandled id %u\n", hash->alg_id ); > - break; > + return STATUS_NOT_IMPLEMENTED; > } > + return STATUS_SUCCESS; > } > > static NTSTATUS hash_finish( struct hash *hash, UCHAR *output, ULONG size > ) > @@ -255,6 +323,105 @@ static NTSTATUS hash_finish( struct hash *hash, > UCHAR *output, ULONG size ) > } > return STATUS_SUCCESS; > } > +#elif defined(SONAME_LIBNETTLE) > +struct hash > +{ > + struct object hdr; > + enum alg_id alg_id; > + union > + { > + struct sha1_ctx sha1_ctx; > + struct sha256_ctx sha256_ctx; > + struct sha512_ctx sha512_ctx; > + } u; > +}; > + > +static NTSTATUS hash_init( struct hash *hash ) > +{ > + if (!libnettle_handle) return STATUS_NOT_IMPLEMENTED; > + > + switch (hash->alg_id) > + { > + case ALG_ID_SHA1: > + pnettle_sha1_init( &hash->u.sha1_ctx ); > + break; > + > + case ALG_ID_SHA256: > + pnettle_sha256_init( &hash->u.sha256_ctx ); > + break; > + > + case ALG_ID_SHA384: > + pnettle_sha384_init( &hash->u.sha512_ctx ); > + break; > + > + case ALG_ID_SHA512: > + pnettle_sha512_init( &hash->u.sha512_ctx ); > + break; > + > + default: > + ERR( "unhandled id %u\n", hash->alg_id ); > + return STATUS_NOT_IMPLEMENTED; > + } > + return STATUS_SUCCESS; > +} > + > +static NTSTATUS hash_update( struct hash *hash, UCHAR *input, ULONG size ) > +{ > + if (!libnettle_handle) return STATUS_NOT_IMPLEMENTED; > + > + switch (hash->alg_id) > + { > + case ALG_ID_SHA1: > + pnettle_sha1_update( &hash->u.sha1_ctx, size, input ); > + break; > + > + case ALG_ID_SHA256: > + pnettle_sha256_update( &hash->u.sha256_ctx, size, input ); > + break; > + > + case ALG_ID_SHA384: > + pnettle_sha512_update( &hash->u.sha512_ctx, size, input ); > + break; > + > + case ALG_ID_SHA512: > + pnettle_sha512_update( &hash->u.sha512_ctx, size, input ); > + break; > + > + default: > + ERR( "unhandled id %u\n", hash->alg_id ); > + return STATUS_NOT_IMPLEMENTED; > + } > + return STATUS_SUCCESS; > +} > + > +static NTSTATUS hash_finish( struct hash *hash, UCHAR *output, ULONG size > ) > +{ > + if (!libnettle_handle) return STATUS_NOT_IMPLEMENTED; > + > + switch (hash->alg_id) > + { > + case ALG_ID_SHA1: > + pnettle_sha1_digest( &hash->u.sha1_ctx, size, output ); > + break; > + > + case ALG_ID_SHA256: > + pnettle_sha256_digest( &hash->u.sha256_ctx, size, output ); > + break; > + > + case ALG_ID_SHA384: > + pnettle_sha384_digest( &hash->u.sha512_ctx, size, output ); > + break; > + > + case ALG_ID_SHA512: > + pnettle_sha512_digest( &hash->u.sha512_ctx, size, output ); > + break; > + > + default: > + ERR( "unhandled id %u\n", hash->alg_id ); > + return STATUS_NOT_IMPLEMENTED; > + } > + return STATUS_SUCCESS; > +} > #else > struct hash > { > @@ -268,9 +435,10 @@ static NTSTATUS hash_init( struct hash *hash ) > return STATUS_NOT_IMPLEMENTED; > } > > -static void hash_update( struct hash *hash, UCHAR *input, ULONG size ) > +static NTSTATUS hash_update( struct hash *hash, UCHAR *input, ULONG size ) > { > ERR( "support for hashes not available at build time\n" ); > + return STATUS_NOT_IMPLEMENTED; > } > > static NTSTATUS hash_finish( struct hash *hash, UCHAR *output, ULONG size > ) > @@ -484,8 +652,7 @@ NTSTATUS WINAPI BCryptHashData( BCRYPT_HASH_HANDLE > handle, UCHAR *input, ULONG s > if (!hash || hash->hdr.magic != MAGIC_HASH) return > STATUS_INVALID_HANDLE; > if (!input) return STATUS_INVALID_PARAMETER; > > - hash_update( hash, input, size ); > - return STATUS_SUCCESS; > + return hash_update( hash, input, size ); > } > > NTSTATUS WINAPI BCryptFinishHash( BCRYPT_HASH_HANDLE handle, UCHAR > *output, ULONG size, ULONG flags ) > @@ -499,3 +666,25 @@ NTSTATUS WINAPI BCryptFinishHash( BCRYPT_HASH_HANDLE > handle, UCHAR *output, ULON > > return hash_finish( hash, output, size ); > } > + > +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) > +{ > + switch (reason) > + { > + case DLL_PROCESS_ATTACH: > + instance = hinst; > + DisableThreadLibraryCalls( hinst ); > +#if defined(SONAME_LIBNETTLE) && > !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) > + nettle_init(); > +#endif > + break; > + > + case DLL_PROCESS_DETACH: > + if (reserved) break; > +#if defined(SONAME_LIBNETTLE) && > !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) > + nettle_deinit(); > +#endif > + break; > + } > + return TRUE; > +} > -- > 2.6.4 > > > >

3 2

Re: [PATCH 1/2] dnsapi: migrating to res_nquery and partial DnsQueryEx implementation
by Hans Leidekker 11 Jan '16

11 Jan '16

On Sun, 2016-01-10 at 16:55 +0300, Donat Enikeev wrote: > There was a note about res_query bug in MacOSX 10.4: > /* call res_init() just once because of a bug in Mac OS X 10.4, call once per thread on systems that have per-thread _res */ > > I've removed it while migratign to res_nquery, let me please clarify reasons: > > 1. I found no proof that bug is fair for res_nquery for MacOSX 10.4 > 2. I believe that generally res_init was not designed to be reliable under several calls > Quote from manual: "res_init() and res_query() use some static (global) state stored in the _res structure, rendering these functions non-thread-safe" That information is outdated, _res is a per-thread variable on modern systems. In any case, you should put the implementation of DnsQueryEx in a separate patch.

1 0

Re: hidclass.sys: Properly quit hid_device_thread when both completion event and halt event are signaled (try 2)
by Qian Hong 11 Jan '16

11 Jan '16

The patch looks good to me, Aric, would you mind sign off the patch? I'm glad to sign off, but I'm not qualified enough :) On Tue, Dec 29, 2015 at 11:19 AM, Changhui LIU <liuchanghui(a)linuxdeepin.com> wrote: > Superseded patch 117285. > > Try 2: Fixed IRP completion event will not be signaled if a driver is > misbehaving and is blocked or crashes while processing an IRP. > -- Regards, Qian Hong - http://www.winehq.org

5 7

Re: shell32/tests: Fix the shortcut vs. class interaction test.
by Marvin 11 Jan '16

11 Jan '16

Hi, While running your changed tests on Windows, 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=19590 Your paranoid android. === w1064 (32 bit shlexec) === shlexec.c:2288: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt11FC.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2288: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt11FC.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2288: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt11FC.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2288: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt11FC.tmp\test file.sde") failed: rc=29 err=2 === w1064 (64 bit shlexec) === shlexec.c:2288: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt7F55.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2288: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt7F55.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2288: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt7F55.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2300: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wt7F55.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wt7F55.tmp\test file.sde")]' shlexec.c:2288: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt7F55.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2288: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt7F55.tmp\test file.sde") failed: rc=29 err=2

1 0

Re: shell32/tests: The expectedArgs parameter of the DDE tests is an argument count, not a boolean.
by Marvin 11 Jan '16

11 Jan '16

Hi, While running your changed tests on Windows, 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=19587 Your paranoid android. === w1064 (32 bit shlexec) === shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wtE3FF.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wtE3FF.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wtE3FF.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2299: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wtE3FF.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wtE3FF.tmp\test file.sde")]' shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wtE3FF.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wtE3FF.tmp\test file.sde") failed: rc=29 err=2 === w1064 (64 bit shlexec) === shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt1846.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt1846.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt1846.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt1846.tmp\test file.sde") failed: rc=29 err=2

1 0

Re: [01/12] shell32/tests: The expectedArgs parameter of the DDE tests is an argument count, not a boolean.
by Marvin 11 Jan '16

11 Jan '16

Hi, While running your changed tests on Windows, 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=19403 Your paranoid android. === wxppro (32 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w2003std (32 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === wvistau64 (32 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w2008s64 (32 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w7u (32 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w7pro64 (32 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w8 (32 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w864 (32 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w1064 (32 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wtE4CD.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wtE4CD.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wtE4CD.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2299: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wtE4CD.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wtE4CD.tmp\test file.sde")]' shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wtE4CD.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wtE4CD.tmp\test file.sde") failed: rc=29 err=2 === wvistau64 (64 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w2008s64 (64 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w7pro64 (64 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w864 (64 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w1064 (64 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt91AC.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt91AC.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt91AC.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt91AC.tmp\test file.sde") failed: rc=29 err=2

3 3

Re: [PATCH] avifil32: Use typed pointers in sizeof() (Coverity)
by Bruno Jesus 10 Jan '16

10 Jan '16

On Sun, Jan 10, 2016 at 10:35 PM, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > --- > dlls/avifil32/api.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c > index c71efb4..a88e3bf 100644 > --- a/dlls/avifil32/api.c > +++ b/dlls/avifil32/api.c > @@ -2332,8 +2332,8 @@ HRESULT WINAPIV AVISaveW(LPCWSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK > > if (nStreams <= 0) return AVIERR_BADPARAM; > > - streams = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(void *)); > - options = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(void *)); > + streams = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(*streams)); > + options = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(*options)); Hi, Nikolay. What about AviSaveA? The structure of code is identical. Also in the loop I used void * to get the next arg from the list, could that be a problem? Best wishes, Bruno

2 1

Re: winhttp: Avoid -Wmisleading-indentation warning in test_IWinHttpRequest_Invoke.
by Nikolay Sivov 10 Jan '16

10 Jan '16

On 10.01.2016 14:26, Gerald Pfeifer wrote: > This is a bit unusual formatting, though I understand where it's coming > from. Adding braces silences GCC 6's new -Wmisleading-indentation. > > Gerald > > Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> > --- > dlls/winhttp/tests/winhttp.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c > index d676dd8..1408f35 100644 > --- a/dlls/winhttp/tests/winhttp.c > +++ b/dlls/winhttp/tests/winhttp.c > @@ -3820,8 +3820,9 @@ static void test_IWinHttpRequest_Invoke(void) > ok(hr == DISP_E_UNKNOWNINTERFACE, "error %#x\n", hr); > > VariantInit(&ret); > -if (0) /* crashes */ > +if (0) /* crashes */ { > hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, NULL, &ret, NULL, &err); > +} > > params.cArgs = 1; > hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &params, &ret, NULL, &err); > I think we have tons of those, I myself almost always use todo_wine this way, to reduce diff that remove todo_wine when implementation is fixed. Actually not sure if todo_wine will trigger this check, does it?

1 0

Re: [PATCH] d3drm/tests: Add tests for IDirect3DRM*::LoadTexture (try 10).
by Stefan Dösinger 09 Jan '16

09 Jan '16

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-01-04 um 18:51 schrieb Aaryaman Vasishta: > + file_header.bfSize = ((((w * bpp + 31) & ~31) >> 3) * h) + > file_header.bfOffBits; This suggests (if I understand it right) that the on-disk bmp is written with 4 byte aligned rows (i.e., similar to bytes_per_line being 4 byte aligned in some cases). The actual image you generate doesn't match that though, so you have some unused data at the end. It's possible that this size alignment is necessary though. Why are you using it instead of just using w * h * (bpp / 8)? -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWkEqmAAoJEN0/YqbEcdMwKhEP/2OjRx6dtXxfqOoLPFb6687p cOBr5nCzJYMHKvNL1yD1Wb1T3jNjQWduOpAuUZV9QfcEsOzwYpMAO0wprFslNEVo r/aPwMnAAjjW/xXQD30s4McXKIdRQdo7myXbVbtyv4n7+PG4ROaHrqxdAcIyEAHe 1APXsX3hXXVSBxxeSwFDxQlos+50T0AmGZOjJL3gK0dZt8yu/Wokk6iuVrSERuu2 x/D2mtOEbhpu2i4YXbgHMAEXayxYr/t+88PC8StAb6CicM4LmbNGNG8JAFrSW+q5 AoXreMs5aM4jjvOrCL/lDYADDzgN/M41eT5vYNAv6KWGA57upAhENg5ar+ukhi9l QiDsjPDL64LfZtTaRrxV76PCBMoP/BVMhumtY0TCu8QvvxuKCFcIQ+5LHExt+Q2l XmF5woFzCtgVI8P4KTCU3eWi+QT5+TSgGQqHd7VrK6qRI7Jc/fh6JpQxrOo0x+j7 wJPS3uk99IcCwh2w0Z8jA3oiCEOKpxfjb8EP4udyVN6BsPX2qKcyQ/lRJJRHOuQi rEkTV8Vy0MC1WC6rfNaOeWphyNvsbzP0lm8sNjgxDjSb8egr507aTkjJxE8AsrCP F+nUMg336lM5Ww/VCAYaw8jVaCRnKcsuoPDulaHPG3Te6pa0BFzM4+6eWFAK0xz+ sLFNfCkHNgGDKHoubKnL =SEdW -----END PGP SIGNATURE-----

2 1

Re: [PATCH] quartz: Handle NULL target format in FilterGraph::ConvertTimeFormat. (try 2)
by Nikolay Sivov 09 Jan '16

09 Jan '16

Looks good, thanks.

1 0

Re: winedbg: Add disassembly_flavor option to use the intel disassembly style like gdb's disassembly-flavor option.
by Michael Müller 08 Jan '16

08 Jan '16

Am 08.01.2016 um 04:28 schrieb Changhui LIU: > The disassembler source is cloned from https://github.com/vmt/udis86. > It is Simplified BSD License. I think your code has a much higher probability in getting accepted if you do not fork the source code but instead link dynamically or statically against this library, i.e. search for the library in configure.ac. I have to admit though that not many distros seem to ship the library as package. You should also put your implementation into #if defined(__i386__) || defined(__amd64__) blocks since Wine also supports other architectures like ARM which are not supported by udis86. The option should be unavailable on these platforms and it also does not make much sense to link against the library in this case. Regards, Michael

1 0

Re: [PATCH 1/3] d3dx9: Implement D3DXCreateAnimationController with a stubbed ID3DXAnimationController interface. (try 2)
by Matteo Bruni 08 Jan '16

08 Jan '16

2016-01-06 3:52 GMT+01:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > From: Christian Costa <titan.costa(a)gmail.com> > > Correct QI to be like the IDevice11 one. > Changed DOUBLE to double in the interface. > Adjusted parameter names in D3DXCreateAnimationController > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > +static inline struct d3dx9_animation_controller *impl_from_ID3DXAnimationController(ID3DXAnimationController *iface) Not a big deal but I think it's better to avoid the "inline" here, it's unnecessary in this case since the function isn't in a .h file. > +static HRESULT WINAPI d3dx9_animation_controller_AdvanceTime(ID3DXAnimationController *iface, double time_delta, > + ID3DXAnimationCallbackHandler **callback_handler) I think callback_handler only wants one '*' here. > +static HRESULT WINAPI d3dx9_animation_controller_GetTrackPriority(ID3DXAnimationController *iface, > + UINT track, D3DXPRIORITY_TYPE *priority) This one should be called SetTrackPriority, at least according to the header from the June 2010 DirectX SDK. The header currently in Wine has the same GetTrackPriority prototype you used here (it's there since the header was first introduced by Dylan Smith in 5cccad1311745117628b9a5f10652b5211151b51). I guess this is simply a typo in our header and it "propagated" here but if anyone knows better please speak up ;) Quite reasonably, in a sense, the "priority" parameter for the SetTrackPriority method is not supposed to be a pointer. > +static HRESULT WINAPI d3dx9_animation_controller_SetTrackPosition(ID3DXAnimationController *iface, > + UINT track, double position) > +{ > + FIXME("iface %p, track %u, position %g stub.\n", iface, track, position); It doesn't seem a good choice to me to use %g instead of %f for double parameters. > +static HRESULT WINAPI d3dx9_animation_controller_SetTrackEnable(ID3DXAnimationController *iface, > + UINT track, BOOL enable) > +{ > + FIXME("iface %p, track %u, enable %u stub.\n", iface, track, enable); BOOL is defined as long i.e. signed. > +static D3DXEVENTHANDLE WINAPI d3dx9_animation_controller_GetUpcomingPriorityBlend(ID3DXAnimationController *iface, > + D3DXEVENTHANDLE handle) > +{ > + FIXME("iface %p, handle %u stub.\n", iface, handle); Not too important but you called all the other occurrences "event" instead of "handle". > +static HRESULT WINAPI d3dx9_animation_controller_CloneAnimationController(ID3DXAnimationController *iface, UINT max_num_anim_outputs, > + UINT max_num_anim_sets, UINT max_num_tracks, UINT max_num_events, ID3DXAnimationController **anim_controller) You can probably drop the "num_" part of those parameter names for brevity.

2 2

Re: [PATCH 1/4] include: Add declarations for D3DUSAGEs added with d3d9ex.
by Henri Verbeet 08 Jan '16

08 Jan '16

On 7 January 2016 at 16:22, Józef Kucia <jkucia(a)codeweavers.com> wrote: > +/* Parts added with d3d9ex */ > +#if !defined(D3D_DISABLE_9EX) > +#define D3DUSAGE_RESTRICTED_CONTENT __MSABI_LONG(0x00000800) > +#define D3DUSAGE_RESTRICT_SHARED_RESOURCE_DRIVER __MSABI_LONG(0x00001000) > +#define D3DUSAGE_RESTRICT_SHARED_RESOURCE __MSABI_LONG(0x00002000) > +#define D3DUSAGE_TEXTAPI __MSABI_LONG(0x10000000) That's a bit of a problem, D3DUSAGE_TEXTAPI conflicts with WINED3DUSAGE_TEXTURE. These would also get masked out by WINED3DUSAGE_MASK.

2 1

Re: [PATCH] comctl32: Update Thumb Rect when position changes
by Nikolay Sivov 08 Jan '16

08 Jan '16

On 08.01.2016 10:33, Alistair Leslie-Hughes wrote: > --- > dlls/comctl32/trackbar.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c > index 6d092a3..3a92794 100644 > --- a/dlls/comctl32/trackbar.c > +++ b/dlls/comctl32/trackbar.c > @@ -1225,13 +1225,17 @@ TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr, BOOL fPosition, LONG lPosition) > infoPtr->lPos = lPosition; > > if (infoPtr->lPos < infoPtr->lRangeMin) > - infoPtr->lPos = infoPtr->lRangeMin; > + infoPtr->lPos = infoPtr->lRangeMin; > > if (infoPtr->lPos > infoPtr->lRangeMax) > - infoPtr->lPos = infoPtr->lRangeMax; > + infoPtr->lPos = infoPtr->lRangeMax; > infoPtr->flags |= TB_THUMBPOSCHANGED; > > - if (fPosition && oldPos != lPosition) TRACKBAR_InvalidateThumbMove(infoPtr, oldPos, lPosition); > + if (fPosition && oldPos != lPosition) > + { > + TRACKBAR_UpdateThumb(infoPtr); > + TRACKBAR_InvalidateThumbMove(infoPtr, oldPos, infoPtr->lPos); > + } > > return 0; > } > It's updated indirectly later I think. What does this fix? Visually SETPOS works as it is for me.

2 1

Re: ntdll: add RtlCreateUserProcess stub (try 2)
by Sebastian Lackner 08 Jan '16

08 Jan '16

On 28.12.2015 00:58, Austin English wrote: > Using info from http://www.rohitab.com/discuss/topic/40191-ntcreateuserprocess/ > > Fixes https://bugs.winehq.org/show_bug.cgi?id=38722 > > Try 2: fix prototypes > > -- -Austin > > > 0001-ntdll-add-RtlCreateUserProcess-stub-try-2.patch > > > From 27f4ac611c2d7c9b0d778519fc6eb9675dbd6b09 Mon Sep 17 00:00:00 2001 > From: Austin English <austinenglish(a)gmail.com> > Date: Tue, 15 Dec 2015 01:51:05 -0600 > Subject: [PATCH] ntdll: add RtlCreateUserProcess stub (try 2) > > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > dlls/ntdll/ntdll.spec | 2 +- > dlls/ntdll/rtl.c | 13 +++++++++++++ > include/winternl.h | 10 ++++++++++ > 3 files changed, 24 insertions(+), 1 deletion(-) > > diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec > index c3b6bf0..b8abc9c 100644 > --- a/dlls/ntdll/ntdll.spec > +++ b/dlls/ntdll/ntdll.spec > @@ -505,7 +505,7 @@ > @ stdcall RtlCreateTimerQueue(ptr) > @ stdcall RtlCreateUnicodeString(ptr wstr) > @ stdcall RtlCreateUnicodeStringFromAsciiz(ptr str) > -@ stub RtlCreateUserProcess > +@ stdcall RtlCreateUserProcess(ptr long ptr ptr ptr long long long long ptr) > @ stub RtlCreateUserSecurityObject > @ stdcall RtlCreateUserThread(long ptr long ptr long long ptr ptr ptr ptr) > @ stub RtlCustomCPToUnicodeN > diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c > index 8eb3e9f..1c9b50d 100644 > --- a/dlls/ntdll/rtl.c > +++ b/dlls/ntdll/rtl.c > @@ -1595,3 +1595,16 @@ void WINAPI RtlGetCurrentProcessorNumberEx(PROCESSOR_NUMBER *processor) > processor->Number = NtGetCurrentProcessorNumber(); > processor->Reserved = 0; > } This needs rebasing, your RtlInsertElementGenericTableAvl() implementation conflicts here. > + > +/********************************************************************** > + * RtlCreateUserProcess [NTDLL.@] > + */ > +NTSTATUS WINAPI RtlCreateUserProcess(UNICODE_STRING *path, ULONG attributes, RTL_USER_PROCESS_PARAMETERS *parameters, > + SECURITY_DESCRIPTOR *process_descriptor, SECURITY_DESCRIPTOR *thread_descriptor, > + HANDLE parent, BOOLEAN inherit, HANDLE debug, HANDLE exception, > + RTL_USER_PROCESS_INFORMATION *info) > +{ > + FIXME("(%p %u %p %p %p %p %d %p %p %p): stub\n", path, attributes, parameters, process_descriptor, thread_descriptor, > + parent, inherit, debug, exception, info); > + return STATUS_NOT_IMPLEMENTED; > +} > diff --git a/include/winternl.h b/include/winternl.h > index ecd5791..69b7b2d 100644 > --- a/include/winternl.h > +++ b/include/winternl.h > @@ -1892,6 +1892,15 @@ typedef struct _LPC_MESSAGE { > UCHAR Data[ANYSIZE_ARRAY]; > } LPC_MESSAGE, *PLPC_MESSAGE; > > +typedef struct _RTL_USER_PROCESS_INFORMATION > +{ > + ULONG Length; Most definitions I have found call this field "Size", not "Length". Based on which header files is your patch? > + HANDLE Process; > + HANDLE Thread; > + CLIENT_ID ClientId; > + SECTION_IMAGE_INFORMATION ImageInformation; > +} RTL_USER_PROCESS_INFORMATION, *PRTL_USER_PROCESS_INFORMATION; > + > typedef enum _SHUTDOWN_ACTION { > ShutdownNoReboot, > ShutdownReboot, > @@ -2391,6 +2400,7 @@ NTSYSAPI NTSTATUS WINAPI RtlCreateTimerQueue(PHANDLE); > NTSYSAPI NTSTATUS WINAPI RtlCreateTimer(PHANDLE, HANDLE, RTL_WAITORTIMERCALLBACKFUNC, PVOID, DWORD, DWORD, ULONG); > NTSYSAPI BOOLEAN WINAPI RtlCreateUnicodeString(PUNICODE_STRING,LPCWSTR); > NTSYSAPI BOOLEAN WINAPI RtlCreateUnicodeStringFromAsciiz(PUNICODE_STRING,LPCSTR); > +NTSYSAPI NTSTATUS WINAPI RtlCreateUserProcess(UNICODE_STRING *, ULONG, RTL_USER_PROCESS_PARAMETERS *, SECURITY_DESCRIPTOR *, SECURITY_DESCRIPTOR *, HANDLE, BOOLEAN, HANDLE, HANDLE, RTL_USER_PROCESS_INFORMATION *); > NTSYSAPI NTSTATUS WINAPI RtlCreateUserThread(HANDLE,const SECURITY_DESCRIPTOR*,BOOLEAN,PVOID,SIZE_T,SIZE_T,PRTL_THREAD_START_ROUTINE,void*,HANDLE*,CLIENT_ID*); > NTSYSAPI void WINAPI RtlDeactivateActivationContext(DWORD,ULONG_PTR); > NTSYSAPI PVOID WINAPI RtlDecodePointer(PVOID); > -- 2.6.4 >

2 2

[RFC] Removing 200XXXXX versions from Bugzilla
by Austin English 08 Jan '16

08 Jan '16

Howdy all, I'd like to remove the old 200XXXXX from Bugzilla, and replace them with a pre-0.9 version instead. My reasoning is that it's obnoxious to have to find the latest release in the middle of the list (or type it in to find it), but if we removed all the 200XXXXX versions, it would be the second to last (next to -unknown). For that matter, I'd be okay with merging everything pre-1.0, but I'm mostly concerned about the 200XXXXX versions. Comments would be appreciated. -- -Austin

3 3

Re: [PATCH 2/2] d3dx9: Improve generated DDS file header. (try 5)
by Matteo Bruni 08 Jan '16

08 Jan '16

2015-12-22 8:26 GMT+01:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > From: Christian Costa <titan.costa(a)gmail.com> > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> It would be nice if you could write a few followup patches to fix struct dds_header properly, as Henri suggested in his review, and the remaining todo_wines.

1 0

Re: Mac OS X beta packages!
by James LeFevre 07 Jan '16

07 Jan '16

Can’t get wine to work. Here is what shows in the terminal window when I click on the Wine sysbol on the launch pad. Last login: Wed Jan 6 10:22:23 on ttys000 [parsont:~] jameslefevre% export PATH="/Applications/Wine Devel.app/Contents/Resources/wine/bin":$PATH; source "/Applications/Wine Devel.app/Contents/Resources/start-script.sh" export: Command not found. Illegal variable name. [parsont:~] jameslefevre% Running Mac OS X 10.11.2 Any ideas Jim

3 2

Re: [PATCH 4/4] d3d9/tests: Add missing space to trace() message.
by Marvin 07 Jan '16

07 Jan '16

Hi, While running your changed tests on Windows, 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=19514 Your paranoid android. === w1064 (32 bit d3d9ex) === d3d9ex.c:2347: Test failed: Got unexpected hr 0, i=0. d3d9ex.c:2349: Test failed: Got unexpected hr 0, i=0. d3d9ex.c:2347: Test failed: Got unexpected hr 0, i=1. d3d9ex.c:2349: Test failed: Got unexpected hr 0, i=1.

1 0

Re: [PATCH 3/4] d3d9/tests: Add test for CreateDepthStencilSurfaceEx().
by Marvin 07 Jan '16

07 Jan '16

Hi, While running your changed tests on Windows, 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=19513 Your paranoid android. === w1064 (32 bit d3d9ex) === d3d9ex.c:2347: Test failed: Got unexpected hr 0, i=0. d3d9ex.c:2349: Test failed: Got unexpected hr 0, i=0. d3d9ex.c:2347: Test failed: Got unexpected hr 0, i=1. d3d9ex.c:2349: Test failed: Got unexpected hr 0, i=1.

1 0

Re: [PATCH] xaudio2: Added missing break in a switch (Coverity)
by Andrew Eikum 07 Jan '16

07 Jan '16

On Wed, Jan 06, 2016 at 05:56:05PM +0300, Nikolay Sivov wrote: > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > --- > dlls/xaudio2_7/xaudio_dll.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c > index e7176b2..1f5a91f 100644 > --- a/dlls/xaudio2_7/xaudio_dll.c > +++ b/dlls/xaudio2_7/xaudio_dll.c > @@ -449,6 +449,7 @@ static ALenum get_al_format(const WAVEFORMATEX *fmt) > case 8: > return AL_FORMAT_71CHN8; > } > + break; > case 16: Could you also add a break to the 16 case? Thanks, Andrew

2 2

Re: [PATCH 1/2] d3d10core/tests: Multisampled render targets are zeroed on creation (v2).
by Henri Verbeet 07 Jan '16

07 Jan '16

On 6 January 2016 at 23:56, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &single); > + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); > + ID3D10Device_ResolveSubresource(device, (ID3D10Resource *)single, 0, > + (ID3D10Resource *)multi, 0, DXGI_FORMAT_R8G8B8A8_UNORM); > + > + get_texture_readback(single, &rb); > + for (y = 0; y < 480; ++y) > + { > + for (x = 0; x < 640; ++x) > + { > + color = get_readback_color(&rb, x, y); > + if (!compare_color(color, 0x00000000, 0)) > + { > + all_zero = FALSE; > + break; > + } > + } > + if (!all_zero) > + break; > + } > + release_texture_readback(&rb); > + ok(all_zero, "Got unexpected color 0x%08x, position %ux%u.\n", color, x, y); > + This probably works, but depends very much on ResolveSubresource() working as intended. I think it would be a little more robust to first clear "single" with a different color. Also, it's not strictly required, but if you use a swapchain surface to resolve to, it's easier to later debug the test visually by inserting a Present() call in the appropriate place.

1 0

Re: user32: Set correct caret state in the server in SetCaretPos. (try 5)
by Sebastian Lackner 07 Jan '16

07 Jan '16

On 31.12.2015 17:39, Sebastian Lackner wrote: > From: Anton Baskanov <baskanov(a)gmail.com> > > Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > > Changes since v4: > > * Replace !!req->state with (req->state != CARET_STATE_OFF). > The first version still depends on CARET_STATE_OFF == 0, which > might change in the future. > > * Avoid nested ifs by reordering checks. > > dlls/user32/caret.c | 8 ++++---- > server/protocol.def | 6 +++++- > server/queue.c | 8 ++++++-- > 3 files changed, 15 insertions(+), 7 deletions(-) > Any remarks on this patch?

1 0

Re: [PATCH 1/2] ntdll: RtlIpv4|6 implementations
by Sebastian Lackner 07 Jan '16

07 Jan '16

Thanks for your contribution. I didn't do a full review yet, but there are a couple of things I would like to point out. Before you resend, please also wait if other people have additional comments. Sorry in advance, the Wine project can sometimes be a bit picky with patch acceptance. ;) Please note that especially for people new to the Wine project, it is highly recommended to send your patches splitted in small pieces. In this case for example, you could send one patch per function, with corresponding test patch inbetween, to make reviewing as easy as possible. On 07.01.2016 00:25, Donat Enikeev wrote: > Using inet_?to? if available, otherwise - behave like a stub. > > Tested on Windows8@VM and Ubutnu 15.04. > > Signed-off-by: Donat Enikeev <donat(a)enikeev.net> > > --- > dlls/ntdll/ntdll.spec | 6 +-- > dlls/ntdll/rtl.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++++++ > include/in6addr.h | 4 ++ > 3 files changed, 136 insertions(+), 3 deletions(-) > > diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec > index 8cabf95..d7c23fc 100644 > --- a/dlls/ntdll/ntdll.spec > +++ b/dlls/ntdll/ntdll.spec > @@ -711,14 +711,14 @@ > @ stdcall RtlIpv4AddressToStringExA(ptr long ptr ptr) > @ stdcall RtlIpv4AddressToStringExW(ptr long ptr ptr) > @ stdcall RtlIpv4AddressToStringW(ptr ptr) > -# @ stub RtlIpv4StringToAddressA > +@ stdcall RtlIpv4StringToAddressA(ptr long ptr ptr) For strings (like the first argument), str should be used. > # @ stub RtlIpv4StringToAddressExA > @ stdcall RtlIpv4StringToAddressExW(ptr ptr wstr ptr) > # @ stub RtlIpv4StringToAddressW > -# @ stub RtlIpv6AddressToStringA > +@ stdcall RtlIpv6AddressToStringA(ptr ptr) > # @ stub RtlIpv6AddressToStringExA > # @ stub RtlIpv6AddressToStringExW > -# @ stub RtlIpv6AddressToStringW > +@ stdcall RtlIpv6AddressToStringW(ptr ptr) Usually *A functions are implemented on top of the corresponding *W function. This means you have to implement RtlIpv4StringToAddressW first, and then RtlIpv4StringToAddressA on top of it. > # @ stub RtlIpv6StringToAddressA > # @ stub RtlIpv6StringToAddressExA > # @ stub RtlIpv6StringToAddressExW > diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c > index 74ad35a..5c82d43 100644 > --- a/dlls/ntdll/rtl.c > +++ b/dlls/ntdll/rtl.c > @@ -33,6 +33,9 @@ > #ifdef HAVE_NETINET_IN_H > #include <netinet/in.h> > #endif > +#ifdef HAVE_ARPA_INET_H > +#include <arpa/inet.h> > +#endif > #include "ntstatus.h" > #define NONAMELESSUNION > #define NONAMELESSSTRUCT > @@ -45,6 +48,7 @@ > #include "wine/unicode.h" > #include "ntdll_misc.h" > #include "inaddr.h" > +#include "in6addr.h" > #include "ddk/ntddk.h" > > WINE_DEFAULT_DEBUG_CHANNEL(ntdll); > @@ -891,6 +895,50 @@ NTSTATUS WINAPI RtlIpv4StringToAddressExW(PULONG IP, PULONG Port, > } > > /*********************************************************************** > + * RtlIpv4StringToAddressA [NTDLL.@] > + * > + * Convert the given ipv4 address to binary representation (network byte order) > + * > + * PARAMS > + * s [I] NULL terminated string with address to convert > + * strict [I] TRUE: restricts to usual 4-part ip-address with decimal parts; FALSE: other forms allowed > + * terminator [O] Pointer to the terminated charatcer of s > + * in_addr [IO] PTR to store converted ip address > + * > + * RETURNS > + * Success: STATUS_SUCCESS > + * Failure: STATUS_INVALID_PARAMETER > + * > + */ > +NTSTATUS WINAPI RtlIpv4StringToAddressA(LPCSTR s, BOOLEAN strict, LPCSTR *terminator, IN_ADDR *in_addr) As mentioned above, usually *A functions forward to the corresponding *W function. It might be preferred to avoid using inet_pton(), and use direct string operations instead. > +{ > + if (!s || !in_addr) > + return STATUS_INVALID_PARAMETER; > + > + if (strict == FALSE) > + FIXME("Support of non-decimal IP addresses is not implemented. semi-stub (%s)\n", s); > + /* ^ support of the option above could be easily implemented with `inet_atop`, not available by the moment in wine */ > + > + #ifdef HAVE_INET_PTON > + > + TRACE("('%s' @ %s, %d, %p, %p, %llu) \n", s, s, strict, terminator, in_addr, (long long unsigned)in_addr->S_un.S_addr); Use debugstr_a / debugstr_w() for tracing untrusted values. Why do you print s twice? > + > + if (!inet_pton(AF_INET, s, &in_addr->S_un.S_addr)) > + { > + TRACE("Conversion of ip address '%s' failed\n", s); > + return STATUS_INVALID_PARAMETER; > + } > + > + *terminator = s+(int)strlen(s); > + > + return STATUS_SUCCESS; > + #endif > + > + FIXME( "No inet_pton() available on the platform - stub\n" ); > + return STATUS_INVALID_PARAMETER; > +} > + > +/*********************************************************************** > * RtlIpv4AddressToStringExW [NTDLL.@] > * > * Convert the given ipv4 address and optional the port to a string > @@ -1004,6 +1052,87 @@ CHAR * WINAPI RtlIpv4AddressToStringA(const IN_ADDR *pin, LPSTR buffer) > } > > /*********************************************************************** > + * RtlIpv6AddressToStringA [NTDLL.@] > + * > + * Converts the given ipv6 address to a string > + * > + * PARAMS > + * pin [I] PTR to the ip address to convert (network byte order) > + * buffer [O] destination buffer for the result (at least 46 characters) > + * > + * RETURNS > + * PTR to the 0 character at the end of the converted string > + * > + */ > +CHAR * WINAPI RtlIpv6AddressToStringA(const IN6_ADDR *pin, LPSTR buffer) > +{ Please add TRACES or FIXMEs (for partial implementations) at the top of each function. > + if (!pin || !buffer) > + { > + WARN("Incorrect parameters passed: (%p, %p)", pin, buffer); Always add a linebreak at the end of messages. > + return NULL; > + } > + > + #ifdef HAVE_INET_NTOP > + > + if (!inet_ntop(AF_INET6, &(pin->u), buffer, INET6_ADDRSTRLEN)) > + ERR("Conversion of Ipv6Address failed\n"); > + > + TRACE("(%p, %p) Ipv6 Address %s\n", pin, buffer, buffer); > + > + return buffer+strlen(buffer); > + > + #else > + > + FIXME( "No inet_ntop() available - stub\n" ); > + return buffer; > + > + #endif > +} > + > +/*********************************************************************** > + * RtlIpv6AddressToStringW [NTDLL.@] > + * > + * Converts the given ipv6 address to a string > + * > + * PARAMS > + * pin [I] PTR to the ip address to convert (network byte order) > + * buffer [O] destination buffer for the result (at least 46 characters) > + * > + * RETURNS > + * PTR to the 0 character at the end of the converted string > + * > + */ > +WCHAR * WINAPI RtlIpv6AddressToStringW(const IN6_ADDR *pin, LPWSTR buffer) > +{ > + CHAR tmp_buffer[INET6_ADDRSTRLEN]; Here a TRACE/FIXME is also missing. > + > + if (!pin || !buffer) > + { > + WARN("Incorrect parameters passed: (%p, %p)", pin, buffer); > + return NULL; > + } > + > + if (RtlIpv6AddressToStringA(pin, (LPSTR)&tmp_buffer)) There are many places in your patch with unncessary casts. Those should be avoided. > + { > + int len = strlen(tmp_buffer); > + > + RtlZeroMemory(buffer, len*sizeof(WCHAR)); This doesn't work when your string contains multibyte characters. > + > + if (len > INET6_ADDRSTRLEN) > + WARN("Potential buffer overflow with %d length of %d maximum supposed", len, INET6_ADDRSTRLEN); Unless the same limitation exists on Windows, such code should be avoided. Also please note that INET6_ADDRSTRLEN is defined different on Linux/Windows. > + > + TRACE("Got Ipv6Address '%s' of length %d from RtlIpv6AddressToStringA\n", (char *)&tmp_buffer, len); > + > + ntdll_umbstowcs(0, (const char *)&tmp_buffer, len, buffer, len); > + > + return buffer+len; > + } > + > + FIXME("(%p, %p): semi-stub\n", pin, buffer); > + return buffer; > +} > + > +/*********************************************************************** > * get_pointer_obfuscator (internal) > */ > static DWORD_PTR get_pointer_obfuscator( void ) > diff --git a/include/in6addr.h b/include/in6addr.h > index a745bd2..7600407 100644 > --- a/include/in6addr.h > +++ b/include/in6addr.h > @@ -32,6 +32,10 @@ typedef struct WS(in6_addr) { > } u; > } IN6_ADDR, *PIN6_ADDR, *LPIN6_ADDR; > > +#ifndef INET6_ADDRSTRLEN > +#define INET6_ADDRSTRLEN 65 > +#endif > + > #define in_addr6 WS(in6_addr) > > #ifdef USE_WS_PREFIX >

2 1

Re: [PATCH 2/2] ntdll: RtlIpv4|6 tests
by Sebastian Lackner 07 Jan '16

07 Jan '16

For tests, the subject should start with "ntdll/tests:". Please note that Mark Jansen also has been working on the tests. Instead of starting again from scratch, you might want to take a look at: https://github.com/wine-compholio/wine-staging/tree/master/patches/ntdll-Rt… It probably should be possible to get those patches upstream with no or just minor changes, I'll also take a look at them again. On 07.01.2016 00:26, Donat Enikeev wrote: > Tests for newly added implementations plus `test_RtlIpv4StringToAddress` rewritten as there was no such function before and therefore tests were never applied > > Signed-off-by: Donat Enikeev <donat(a)enikeev.net> > --- > dlls/ntdll/tests/rtl.c | 444 +++++++++++++++++++++++++++++++------------------ > 1 file changed, 281 insertions(+), 163 deletions(-) > > diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c > index 94a22ac..8a77bcc 100644 > --- a/dlls/ntdll/tests/rtl.c > +++ b/dlls/ntdll/tests/rtl.c > @@ -25,6 +25,8 @@ > > #include "ntdll_test.h" > #include "inaddr.h" > +#include "in6addr.h" > +#include "winnls.h" > > #ifndef __WINE_WINTERNL_H > > @@ -89,6 +91,8 @@ static IMAGE_BASE_RELOCATION *(WINAPI *pLdrProcessRelocationBlock)(void*,UINT,US > static CHAR * (WINAPI *pRtlIpv4AddressToStringA)(const IN_ADDR *, LPSTR); > static NTSTATUS (WINAPI *pRtlIpv4AddressToStringExA)(const IN_ADDR *, USHORT, LPSTR, PULONG); > static NTSTATUS (WINAPI *pRtlIpv4StringToAddressA)(PCSTR, BOOLEAN, PCSTR *, IN_ADDR *); > +static CHAR * (WINAPI *pRtlIpv6AddressToStringA)(const IN6_ADDR *, LPSTR); > +static WCHAR * (WINAPI *pRtlIpv6AddressToStringW)(const IN6_ADDR *, LPWSTR); > static NTSTATUS (WINAPI *pLdrAddRefDll)(ULONG, HMODULE); > static NTSTATUS (WINAPI *pLdrLockLoaderLock)(ULONG, ULONG*, ULONG_PTR*); > static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG_PTR); > @@ -115,24 +119,24 @@ static void InitFunctionPtrs(void) > hntdll = LoadLibraryA("ntdll.dll"); > ok(hntdll != 0, "LoadLibrary failed\n"); > if (hntdll) { > - pRtlCompareMemory = (void *)GetProcAddress(hntdll, "RtlCompareMemory"); > - pRtlCompareMemoryUlong = (void *)GetProcAddress(hntdll, "RtlCompareMemoryUlong"); > + pRtlCompareMemory = (void *)GetProcAddress(hntdll, "RtlCompareMemory"); > + pRtlCompareMemoryUlong = (void *)GetProcAddress(hntdll, "RtlCompareMemoryUlong"); > pRtlDeleteTimer = (void *)GetProcAddress(hntdll, "RtlDeleteTimer"); > - pRtlMoveMemory = (void *)GetProcAddress(hntdll, "RtlMoveMemory"); > - pRtlFillMemory = (void *)GetProcAddress(hntdll, "RtlFillMemory"); > - pRtlFillMemoryUlong = (void *)GetProcAddress(hntdll, "RtlFillMemoryUlong"); > - pRtlZeroMemory = (void *)GetProcAddress(hntdll, "RtlZeroMemory"); > - pRtlUlonglongByteSwap = (void *)GetProcAddress(hntdll, "RtlUlonglongByteSwap"); > - pRtlUniform = (void *)GetProcAddress(hntdll, "RtlUniform"); > - pRtlRandom = (void *)GetProcAddress(hntdll, "RtlRandom"); > - pRtlAreAllAccessesGranted = (void *)GetProcAddress(hntdll, "RtlAreAllAccessesGranted"); > - pRtlAreAnyAccessesGranted = (void *)GetProcAddress(hntdll, "RtlAreAnyAccessesGranted"); > - pRtlComputeCrc32 = (void *)GetProcAddress(hntdll, "RtlComputeCrc32"); > - pRtlInitializeHandleTable = (void *)GetProcAddress(hntdll, "RtlInitializeHandleTable"); > - pRtlIsValidIndexHandle = (void *)GetProcAddress(hntdll, "RtlIsValidIndexHandle"); > - pRtlDestroyHandleTable = (void *)GetProcAddress(hntdll, "RtlDestroyHandleTable"); > - pRtlAllocateHandle = (void *)GetProcAddress(hntdll, "RtlAllocateHandle"); > - pRtlFreeHandle = (void *)GetProcAddress(hntdll, "RtlFreeHandle"); > + pRtlMoveMemory = (void *)GetProcAddress(hntdll, "RtlMoveMemory"); > + pRtlFillMemory = (void *)GetProcAddress(hntdll, "RtlFillMemory"); > + pRtlFillMemoryUlong = (void *)GetProcAddress(hntdll, "RtlFillMemoryUlong"); > + pRtlZeroMemory = (void *)GetProcAddress(hntdll, "RtlZeroMemory"); > + pRtlUlonglongByteSwap = (void *)GetProcAddress(hntdll, "RtlUlonglongByteSwap"); > + pRtlUniform = (void *)GetProcAddress(hntdll, "RtlUniform"); > + pRtlRandom = (void *)GetProcAddress(hntdll, "RtlRandom"); > + pRtlAreAllAccessesGranted = (void *)GetProcAddress(hntdll, "RtlAreAllAccessesGranted"); > + pRtlAreAnyAccessesGranted = (void *)GetProcAddress(hntdll, "RtlAreAnyAccessesGranted"); > + pRtlComputeCrc32 = (void *)GetProcAddress(hntdll, "RtlComputeCrc32"); > + pRtlInitializeHandleTable = (void *)GetProcAddress(hntdll, "RtlInitializeHandleTable"); > + pRtlIsValidIndexHandle = (void *)GetProcAddress(hntdll, "RtlIsValidIndexHandle"); > + pRtlDestroyHandleTable = (void *)GetProcAddress(hntdll, "RtlDestroyHandleTable"); > + pRtlAllocateHandle = (void *)GetProcAddress(hntdll, "RtlAllocateHandle"); > + pRtlFreeHandle = (void *)GetProcAddress(hntdll, "RtlFreeHandle"); To keep your patches as simple as possible, it might be easier to skip the formatting changes. Touching code which is unrelated to your patch is usually not a good idea. ;) > pRtlAllocateAndInitializeSid = (void *)GetProcAddress(hntdll, "RtlAllocateAndInitializeSid"); > pRtlFreeSid = (void *)GetProcAddress(hntdll, "RtlFreeSid"); > pNtCurrentTeb = (void *)GetProcAddress(hntdll, "NtCurrentTeb"); > @@ -141,6 +145,8 @@ static void InitFunctionPtrs(void) > pLdrProcessRelocationBlock = (void *)GetProcAddress(hntdll, "LdrProcessRelocationBlock"); > pRtlIpv4AddressToStringA = (void *)GetProcAddress(hntdll, "RtlIpv4AddressToStringA"); > pRtlIpv4AddressToStringExA = (void *)GetProcAddress(hntdll, "RtlIpv4AddressToStringExA"); > + pRtlIpv6AddressToStringA = (void *)GetProcAddress(hntdll, "RtlIpv6AddressToStringA"); > + pRtlIpv6AddressToStringW = (void *)GetProcAddress(hntdll, "RtlIpv6AddressToStringW"); > pRtlIpv4StringToAddressA = (void *)GetProcAddress(hntdll, "RtlIpv4StringToAddressA"); > pLdrAddRefDll = (void *)GetProcAddress(hntdll, "LdrAddRefDll"); > pLdrLockLoaderLock = (void *)GetProcAddress(hntdll, "LdrLockLoaderLock"); > @@ -1129,172 +1135,282 @@ static void test_RtlIpv4AddressToStringEx(void) > static void test_RtlIpv4StringToAddress(void) > { > NTSTATUS res; > - IN_ADDR ip, expected_ip; > - PCSTR terminator; > - CHAR dummy; > + IN_ADDR ip; > + LPCSTR terminator; If you want to improve existing tests, this should probably also go into a separate patch. Also, it wouldn't hurt to explain more detailed what exactly you improved. > struct > { > PCSTR address; > NTSTATUS res; > int terminator_offset; > - int ip[4]; > - BOOL strict_is_different; > - NTSTATUS res_strict; > - int terminator_offset_strict; > - int ip_strict[4]; > - } tests[] = > + ULONG ip_ulong; > + } tests[] = /** tests data for non-strict (strict below) */ > + { > + { "255.255.255.255:123", STATUS_SUCCESS, 15, 4294967295UL }, > + { "255.255.255.256", STATUS_INVALID_PARAMETER, 15, 1 }, > + { "255.255.255.42949672", STATUS_INVALID_PARAMETER, 22, 1 }, > + { "a", STATUS_INVALID_PARAMETER, 0, 1 }, > + { "1.1.1.0xaA", STATUS_SUCCESS, 10, 2852192513UL }, > + { "1.1.1.0XaA", STATUS_SUCCESS, 10, 2852192513UL }, > + { "1.1.1.0x", STATUS_INVALID_PARAMETER, 8, 1 }, > + { "1.1.1.0xff", STATUS_SUCCESS, 10, 4278255873UL }, > + { "1.1.1.0x100", STATUS_INVALID_PARAMETER, 11, 1 }, > + { "1.1.1.0xffffffff", STATUS_INVALID_PARAMETER, 16, 1 }, > + { "1.1.1.0x100000000", STATUS_INVALID_PARAMETER, 16, 1 }, > + { "1.1.1.010", STATUS_SUCCESS, 9, 134283521UL }, > + { "1.1.1.00", STATUS_SUCCESS, 8, 65793 }, > + { "1.1.1.007", STATUS_SUCCESS, 9, 117506305UL }, > + { "1.1.1.08", STATUS_INVALID_PARAMETER, 7, 1 }, > + { "1.1.1.008", STATUS_SUCCESS, 8, 65793 }, > + { "1.1.1.0a", STATUS_SUCCESS, 7, 65793 }, > + { "1.1.1.0o10", STATUS_SUCCESS, 7, 65793 }, > + { "1.1.1.0b10", STATUS_SUCCESS, 7, 65793 }, > + { "1.1.1.-2", STATUS_INVALID_PARAMETER, 6, 1 }, > + { "1", STATUS_SUCCESS, 1, 16777216 }, > + { "-1", STATUS_INVALID_PARAMETER, 0, 0 }, > + { "203569230", STATUS_SUCCESS, 9, 1312301580UL }, > + { "1.223756", STATUS_SUCCESS, 8, 208274177 }, > + { "3.4.756", STATUS_SUCCESS, 7, 4093772803UL }, > + { "3.4.756.1", STATUS_INVALID_PARAMETER, 9, 1 }, > + { "3.4.65536", STATUS_INVALID_PARAMETER, 9, 1 }, > + { "3.4.5.6.7", STATUS_INVALID_PARAMETER, 7, 1 }, > + { "3.4.5.+6", STATUS_INVALID_PARAMETER, 6, 1 }, > + { " 3.4.5.6", STATUS_INVALID_PARAMETER, 0, 1 }, > + { "\t3.4.5.6", STATUS_INVALID_PARAMETER, 0, 1 }, > + { "3.4.5.6 ", STATUS_SUCCESS, 7, 100992003UL }, > + { "3. 4.5.6", STATUS_INVALID_PARAMETER, 2, 1 }, > + { ".", STATUS_INVALID_PARAMETER, 1, 1 }, > + { "..", STATUS_INVALID_PARAMETER, 1, 1 }, > + { "1.", STATUS_INVALID_PARAMETER, 2, 1 }, > + { "1..", STATUS_INVALID_PARAMETER, 3, 1 }, > + { ".1", STATUS_INVALID_PARAMETER, 1, 1 }, > + { ".1.", STATUS_INVALID_PARAMETER, 1, 1 }, > + { ".1.2.3", STATUS_INVALID_PARAMETER, 1, 1 }, > + { "::1", STATUS_INVALID_PARAMETER, 0, 1 }, > + { ":1", STATUS_INVALID_PARAMETER, 0, 1 }, > + }, tests_strict[] = > { > - { "", STATUS_INVALID_PARAMETER, 0, { -1 } }, > - { " ", STATUS_INVALID_PARAMETER, 0, { -1 } }, > - { "1.1.1.1", STATUS_SUCCESS, 7, { 1, 1, 1, 1 } }, > - { "0.0.0.0", STATUS_SUCCESS, 7, { 0, 0, 0, 0 } }, > - { "255.255.255.255", STATUS_SUCCESS, 15, { 255, 255, 255, 255 } }, > - { "255.255.255.255:123", > - STATUS_SUCCESS, 15, { 255, 255, 255, 255 } }, > - { "255.255.255.256", STATUS_INVALID_PARAMETER, 15, { -1 } }, > - { "255.255.255.4294967295", > - STATUS_INVALID_PARAMETER, 22, { -1 } }, > - { "255.255.255.4294967296", > - STATUS_INVALID_PARAMETER, 21, { -1 } }, > - { "255.255.255.4294967297", > - STATUS_INVALID_PARAMETER, 21, { -1 } }, > - { "a", STATUS_INVALID_PARAMETER, 0, { -1 } }, > - { "1.1.1.0xaA", STATUS_SUCCESS, 10, { 1, 1, 1, 170 }, > - TRUE, STATUS_INVALID_PARAMETER, 8, { -1 } }, > - { "1.1.1.0XaA", STATUS_SUCCESS, 10, { 1, 1, 1, 170 }, > - TRUE, STATUS_INVALID_PARAMETER, 8, { -1 } }, > - { "1.1.1.0x", STATUS_INVALID_PARAMETER, 8, { -1 } }, > - { "1.1.1.0xff", STATUS_SUCCESS, 10, { 1, 1, 1, 255 }, > - TRUE, STATUS_INVALID_PARAMETER, 8, { -1 } }, > - { "1.1.1.0x100", STATUS_INVALID_PARAMETER, 11, { -1 }, > - TRUE, STATUS_INVALID_PARAMETER, 8, { -1 } }, > - { "1.1.1.0xffffffff",STATUS_INVALID_PARAMETER, 16, { -1 }, > - TRUE, STATUS_INVALID_PARAMETER, 8, { -1 } }, > - { "1.1.1.0x100000000", > - STATUS_INVALID_PARAMETER, 16, { -1, 0, 0, 0 }, > - TRUE, STATUS_INVALID_PARAMETER, 8, { -1 } }, > - { "1.1.1.010", STATUS_SUCCESS, 9, { 1, 1, 1, 8 }, > - TRUE, STATUS_INVALID_PARAMETER, 7, { -1 } }, > - { "1.1.1.00", STATUS_SUCCESS, 8, { 1, 1, 1, 0 }, > - TRUE, STATUS_INVALID_PARAMETER, 7, { -1 } }, > - { "1.1.1.007", STATUS_SUCCESS, 9, { 1, 1, 1, 7 }, > - TRUE, STATUS_INVALID_PARAMETER, 7, { -1 } }, > - { "1.1.1.08", STATUS_INVALID_PARAMETER, 7, { -1 } }, > - { "1.1.1.008", STATUS_SUCCESS, 8, { 1, 1, 1, 0 }, > - TRUE, STATUS_INVALID_PARAMETER, 7, { -1 } }, > - { "1.1.1.0a", STATUS_SUCCESS, 7, { 1, 1, 1, 0 } }, > - { "1.1.1.0o10", STATUS_SUCCESS, 7, { 1, 1, 1, 0 } }, > - { "1.1.1.0b10", STATUS_SUCCESS, 7, { 1, 1, 1, 0 } }, > - { "1.1.1.-2", STATUS_INVALID_PARAMETER, 6, { -1 } }, > - { "1", STATUS_SUCCESS, 1, { 0, 0, 0, 1 }, > - TRUE, STATUS_INVALID_PARAMETER, 1, { -1 } }, > - { "-1", STATUS_INVALID_PARAMETER, 0, { -1 } }, > - { "203569230", STATUS_SUCCESS, 9, { 12, 34, 56, 78 }, > - TRUE, STATUS_INVALID_PARAMETER, 9, { -1 } }, > - { "1.223756", STATUS_SUCCESS, 8, { 1, 3, 106, 12 }, > - TRUE, STATUS_INVALID_PARAMETER, 8, { -1 } }, > - { "3.4.756", STATUS_SUCCESS, 7, { 3, 4, 2, 244 }, > - TRUE, STATUS_INVALID_PARAMETER, 7, { -1 } }, > - { "3.4.756.1", STATUS_INVALID_PARAMETER, 9, { -1 } }, > - { "3.4.65536", STATUS_INVALID_PARAMETER, 9, { -1 } }, > - { "3.4.5.6.7", STATUS_INVALID_PARAMETER, 7, { -1 } }, > - { "3.4.5.+6", STATUS_INVALID_PARAMETER, 6, { -1 } }, > - { " 3.4.5.6", STATUS_INVALID_PARAMETER, 0, { -1 } }, > - { "\t3.4.5.6", STATUS_INVALID_PARAMETER, 0, { -1 } }, > - { "3.4.5.6 ", STATUS_SUCCESS, 7, { 3, 4, 5, 6 } }, > - { "3. 4.5.6", STATUS_INVALID_PARAMETER, 2, { -1 } }, > - { ".", STATUS_INVALID_PARAMETER, 1, { -1 } }, > - { "..", STATUS_INVALID_PARAMETER, 1, { -1 } }, > - { "1.", STATUS_INVALID_PARAMETER, 2, { -1 } }, > - { "1..", STATUS_INVALID_PARAMETER, 3, { -1 } }, > - { ".1", STATUS_INVALID_PARAMETER, 1, { -1 } }, > - { ".1.", STATUS_INVALID_PARAMETER, 1, { -1 } }, > - { ".1.2.3", STATUS_INVALID_PARAMETER, 1, { -1 } }, > - { "0.1.2.3", STATUS_SUCCESS, 7, { 0, 1, 2, 3 } }, > - { "0.1.2.3.", STATUS_INVALID_PARAMETER, 7, { -1 } }, > - { "[0.1.2.3]", STATUS_INVALID_PARAMETER, 0, { -1 } }, > - { "::1", STATUS_INVALID_PARAMETER, 0, { -1 } }, > - { ":1", STATUS_INVALID_PARAMETER, 0, { -1 } }, > + { "", STATUS_INVALID_PARAMETER, 0, 0}, > + { " ", STATUS_INVALID_PARAMETER, 0, 0 }, > + { "1.1.1.1", STATUS_SUCCESS, 7, 16843009 }, > + { "0.0.0.0", STATUS_SUCCESS, 7, 0 }, > + { "255.255.255.255", STATUS_SUCCESS, 15, 4294967295UL }, > + { "255.255.255.256", STATUS_INVALID_PARAMETER, 15, 1 }, > + { "255.255.255.42949672", STATUS_INVALID_PARAMETER, 22, 1 }, > + { "1.1.1.010", STATUS_INVALID_PARAMETER, 9, 1 }, > + { "1.1.1.00", STATUS_INVALID_PARAMETER, 8, 1 }, > + { "1.1.1.007", STATUS_INVALID_PARAMETER, 9, 1 }, > + { "1.1.1.08", STATUS_INVALID_PARAMETER, 7, 1 }, > + { "1.1.1.008", STATUS_INVALID_PARAMETER, 8, 1 }, > + { "1.1.1.-2", STATUS_INVALID_PARAMETER, 6, 1 }, > + { "1", STATUS_INVALID_PARAMETER, 1, 1 }, > + { "-1", STATUS_INVALID_PARAMETER, 0, 1 }, > + { "203569230", STATUS_INVALID_PARAMETER, 9, 1 }, > + { "1.223756", STATUS_INVALID_PARAMETER, 8, 1 }, > + { "3.4.756", STATUS_INVALID_PARAMETER, 7, 1 }, > + { "3.4.756.1", STATUS_INVALID_PARAMETER, 9, 1 }, > + { "3.4.65536", STATUS_INVALID_PARAMETER, 9, 1 }, > + { "3.4.5.6.7", STATUS_INVALID_PARAMETER, 7, 1 }, > + { "3.4.5.+6", STATUS_INVALID_PARAMETER, 6, 1 }, > + { " 3.4.5.6", STATUS_INVALID_PARAMETER, 0, 1 }, > + { "\t3.4.5.6", STATUS_INVALID_PARAMETER, 0, 1 }, > + { "3.4.5.6", STATUS_SUCCESS, 7, 100992003 }, > + { "3. 4.5.6", STATUS_INVALID_PARAMETER, 2, 1 }, > + { ".", STATUS_INVALID_PARAMETER, 1, 1 }, > + { "..", STATUS_INVALID_PARAMETER, 1, 1 }, > + { "1.", STATUS_INVALID_PARAMETER, 2, 1 }, > + { "1..", STATUS_INVALID_PARAMETER, 3, 1 }, > + { ".1", STATUS_INVALID_PARAMETER, 1, 1 }, > + { ".1.", STATUS_INVALID_PARAMETER, 1, 1 }, > + { ".1.2.3", STATUS_INVALID_PARAMETER, 1, 1 }, > + { "0.1.2.3", STATUS_SUCCESS, 7, 50462976 }, > + { "0.1.2.3.", STATUS_INVALID_PARAMETER, 7, 1 }, > + { "[0.1.2.3]", STATUS_INVALID_PARAMETER, 0, 1 }, > + { "::1", STATUS_INVALID_PARAMETER, 0, 1 }, > + { ":1", STATUS_INVALID_PARAMETER, 0, 1 }, > }; > const int testcount = sizeof(tests) / sizeof(tests[0]); > + const int testcount_strict = sizeof(tests_strict) / sizeof(tests_strict[0]); > int i; > > if (!pRtlIpv4StringToAddressA) > { > - skip("RtlIpv4StringToAddress not available\n"); > + skip("RtlIpv4StringToAddressA not available\n"); > return; > } > > - if (0) > - { > - /* leaving either parameter NULL crashes on Windows */ > - res = pRtlIpv4StringToAddressA(NULL, FALSE, &terminator, &ip); > - res = pRtlIpv4StringToAddressA("1.1.1.1", FALSE, NULL, &ip); > - res = pRtlIpv4StringToAddressA("1.1.1.1", FALSE, &terminator, NULL); > - /* same for the wide char version */ > - /* > - res = pRtlIpv4StringToAddressW(NULL, FALSE, &terminatorW, &ip); > - res = pRtlIpv4StringToAddressW(L"1.1.1.1", FALSE, NULL, &ip); > - res = pRtlIpv4StringToAddressW(L"1.1.1.1", FALSE, &terminatorW, NULL); > - */ > - } > - > + /* non-strict */ > for (i = 0; i < testcount; i++) > { > - /* non-strict */ > - terminator = &dummy; > - ip.S_un.S_addr = 0xabababab; > + memset(&ip, 0, sizeof(ip)); > + > res = pRtlIpv4StringToAddressA(tests[i].address, FALSE, &terminator, &ip); > - ok(res == tests[i].res, > - "[%s] res = 0x%08x, expected 0x%08x\n", > - tests[i].address, res, tests[i].res); > - ok(terminator == tests[i].address + tests[i].terminator_offset, > - "[%s] terminator = %p, expected %p\n", > - tests[i].address, terminator, tests[i].address + tests[i].terminator_offset); > - if (tests[i].ip[0] == -1) > - expected_ip.S_un.S_addr = 0xabababab; > - else > - { > - expected_ip.S_un.S_un_b.s_b1 = tests[i].ip[0]; > - expected_ip.S_un.S_un_b.s_b2 = tests[i].ip[1]; > - expected_ip.S_un.S_un_b.s_b3 = tests[i].ip[2]; > - expected_ip.S_un.S_un_b.s_b4 = tests[i].ip[3]; > - } > - ok(ip.S_un.S_addr == expected_ip.S_un.S_addr, > - "[%s] ip = %08x, expected %08x\n", > - tests[i].address, ip.S_un.S_addr, expected_ip.S_un.S_addr); > + todo_wine ok(res == tests[i].res, > + "#%d '%s' (Strict:FALSE) res = 0x%08x, expected 0x%08x\n", i, > + tests[i].address, res, tests[i].res); > + > + if (res == STATUS_SUCCESS) { > + todo_wine ok( terminator == tests[i].address + (size_t)tests[i].terminator_offset, > + "#%d '%s' (Strict:FALSE) terminator = %p, expected %p for ptr %p\n", i, > + tests[i].address, terminator, tests[i].address + (size_t)tests[i].terminator_offset, tests[i].address); > + > + todo_wine ok(ip.S_un.S_addr == tests[i].ip_ulong, > + "#%d '%s' (Strict:FALSE) ip = %llu, expected %llu\n", i, > + tests[i].address, (long long unsigned)ip.S_un.S_addr, (long long unsigned)tests[i].ip_ulong); > > - if (!tests[i].strict_is_different) > - { > - tests[i].res_strict = tests[i].res; > - tests[i].terminator_offset_strict = tests[i].terminator_offset; > - tests[i].ip_strict[0] = tests[i].ip[0]; > - tests[i].ip_strict[1] = tests[i].ip[1]; > - tests[i].ip_strict[2] = tests[i].ip[2]; > - tests[i].ip_strict[3] = tests[i].ip[3]; > } > - /* strict */ > - terminator = &dummy; > - ip.S_un.S_addr = 0xabababab; > - res = pRtlIpv4StringToAddressA(tests[i].address, TRUE, &terminator, &ip); > - ok(res == tests[i].res_strict, > - "[%s] res = 0x%08x, expected 0x%08x\n", > - tests[i].address, res, tests[i].res_strict); > - ok(terminator == tests[i].address + tests[i].terminator_offset_strict, > - "[%s] terminator = %p, expected %p\n", > - tests[i].address, terminator, tests[i].address + tests[i].terminator_offset_strict); > - if (tests[i].ip_strict[0] == -1) > - expected_ip.S_un.S_addr = 0xabababab; > - else > + } > + > + /* strict */ > + for (i=0; i<testcount_strict; i++) > + { > + memset(&ip, 0, sizeof(ip)); > + > + res = pRtlIpv4StringToAddressA(tests_strict[i].address, TRUE, &terminator, &ip); > + > + ok(res == tests_strict[i].res, > + "#%d '%s' (Strict:TRUE) res = 0x%08x, expected 0x%08x\n", i, > + tests_strict[i].address, res, tests_strict[i].res); > + > + if (res == STATUS_SUCCESS) > { > - expected_ip.S_un.S_un_b.s_b1 = tests[i].ip_strict[0]; > - expected_ip.S_un.S_un_b.s_b2 = tests[i].ip_strict[1]; > - expected_ip.S_un.S_un_b.s_b3 = tests[i].ip_strict[2]; > - expected_ip.S_un.S_un_b.s_b4 = tests[i].ip_strict[3]; > + ok(terminator == tests_strict[i].address + (size_t)tests_strict[i].terminator_offset, > + "#%d '%s' (Strict:TRUE) terminator = %p, expected %p for ptr %p\n", i, > + tests_strict[i].address, terminator, tests_strict[i].address + tests_strict[i].terminator_offset, tests_strict[i].address); > + > + ok(ip.S_un.S_addr == tests_strict[i].ip_ulong, > + "#%d '%s' (Strict:TRUE) ip = %llu, expected %llu\n", i, > + tests_strict[i].address, (long long unsigned)ip.S_un.S_addr, (long long unsigned)tests_strict[i].ip_ulong); > } > - ok(ip.S_un.S_addr == expected_ip.S_un.S_addr, > - "[%s] ip = %08x, expected %08x\n", > - tests[i].address, ip.S_un.S_addr, expected_ip.S_un.S_addr); > + > + } > +} > + > +struct ipv6_testing_data > +{ > + LPCSTR readable_addr; > + UCHAR expected_representation[16]; > + LPCSTR readable_compact_addr; /** could differ from readable **/ > +}; > + > +static struct ipv6_testing_data ipv6_samples[] = > +{ > + { "0::", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, "::" }, > + { "::01", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 }, "::1" }, > + { "1::2", { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2 }, "1::2" }, > + { "2002:4559:1FE2::4559:1FE2", { 32, 2, 69, 89, 31, 226, 0, 0, 0, 0, 0, 0, 69, 89, 31, 226 }, "2002:4559:1fe2::4559:1fe2" }, > + { "2a02:6b8::3", { 42, 2, 6, 184, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3 }, "2a02:6b8::3" }, > + { "::192.168.001.1", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 192, 168, 1, 1 }, "::192.168.1.1" }, > + { "fff::190.160.10.10", { 15, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 190, 160, 10, 10 }, "FFf::bea0:a0a" }, > + { "2001:0db8:11a3:09d7:1f34:8a2e:07a0:765d", { 32, 1, 13, 184, 17, 163, 9, 215,31, 52, 138, 46, 7, 160, 118, 93 }, "2001:db8:11a3:9d7:1f34:8a2e:7a0:765d" }, > + { "2001:0db8::", { 32, 1, 13, 184, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, "2001:db8::" }, > + { "ff00::", { 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, "ff00::" } The number of tests is most likely not sufficient. The special cases (empty string, invalid format, ...) might be more interesting. > +}; > + > + > +static void test_RtlIpv6AddressToStringA(void) > +{ > + const int testcount = sizeof(ipv6_samples) / sizeof(ipv6_samples[0]); > + int i; > + CHAR buffer[65]; > + CHAR * res; > + > + if ( !pRtlIpv6AddressToStringA ) > + { > + win_skip("Method not supported\n"); > + return; > + } > + > + res = pRtlIpv6AddressToStringA((IN6_ADDR*) &ipv6_samples[0].expected_representation, (LPSTR)&buffer); > + if ((void *)&buffer==(void *)res) { Please avoid unnecessary casts. buffer and res should both have the same type. The same also applies to a couple of other places. > + win_skip("No conversion expected with stub without inet_ntop\n"); > + return; > + } > + > + for (i=0; i<testcount; i++) > + { > + CHAR buffer[65]; Did you forget to replace with the constant maybe? > + CHAR * res; > + IN6_ADDR * in6; > + int expected_len, result_len; > + > + memset(buffer, 0, sizeof(buffer) - 1); > + > + in6 = (IN6_ADDR*) &ipv6_samples[i].expected_representation; > + > + res = pRtlIpv6AddressToStringA(in6, (LPSTR)&buffer); > + > + ok( 0 == (CHAR)(*res), > + "Pointer to 0 expected, got %c at %p\n", > + (CHAR)(*res), res); > + > + expected_len = strlen(ipv6_samples[i].readable_compact_addr); > + result_len = strlen(buffer); > + > + ok( expected_len == result_len, > + "Unexpected resulting strlen, waited for %d, got %d\n", > + expected_len, result_len); > + > + ok ( strcasecmp((const char *)ipv6_samples[i].readable_compact_addr, (const char *)&buffer) == 0, > + "Unexpected IPv6 address, waited '%s', got '%s'", > + ipv6_samples[i].readable_compact_addr, (const char *)&buffer); > + } > + > +} > + > +static void test_RtlIpv6AddressToStringW(void) > +{ > + const int testcount = sizeof(ipv6_samples) / sizeof(ipv6_samples[0]); > + int i; > + WCHAR buffer[INET6_ADDRSTRLEN]; > + WCHAR * res; > + > + if ( !pRtlIpv6AddressToStringW ) > + { > + win_skip("Method not supported\n"); > + return; > + } > + > + res = pRtlIpv6AddressToStringW((IN6_ADDR*) &ipv6_samples[0].expected_representation, (LPWSTR)&buffer); > + > + if ((void *)&buffer==(void *)res) > + { > + win_skip("No conversion expected with stub without inet_ntop\n"); > + return; > + } > + > + for (i=0; i<testcount; i++) > + { > + WCHAR buffer[INET6_ADDRSTRLEN]; > + WCHAR * res; > + WCHAR W_readable_addr[INET6_ADDRSTRLEN]; > + > + IN6_ADDR * in6; > + int expected_len, result_len; > + > + in6 = (IN6_ADDR*) &ipv6_samples[i].expected_representation; > + > + expected_len = strlen(ipv6_samples[i].readable_compact_addr); > + > + memset(&W_readable_addr,0, sizeof(W_readable_addr)); > + memset(&buffer,0, sizeof(W_readable_addr)); > + > + MultiByteToWideChar(CP_ACP,0,ipv6_samples[i].readable_compact_addr,expected_len,(LPWSTR)&W_readable_addr,expected_len); > + > + res = pRtlIpv6AddressToStringW(in6, (LPWSTR)&buffer); > + > + ok( '\0' == (WCHAR)(*res), > + "Pointer to 0 expected, got %s at %p+%p, full string '%s'\n", > + wine_dbgstr_wn(res, 1), buffer, res, wine_dbgstr_w((const WCHAR *)&buffer)); > + > + expected_len = lstrlenW((LPCWSTR)&W_readable_addr); > + result_len = lstrlenW((LPCWSTR)&buffer); > + > + ok( expected_len == result_len, > + "Unexpected resulting strlen, waited for %d, got %d\n", expected_len, result_len); > + > + ok( lstrcmpiW((LPCWSTR)&W_readable_addr, (LPCWSTR)&buffer) == 0, > + "IPv6 address strings are not equal, '%s' expected, got '%s'", > + wine_dbgstr_w((const WCHAR *)&W_readable_addr), wine_dbgstr_w((const WCHAR *)&buffer)); > } > } > > @@ -1779,8 +1895,8 @@ static void test_RtlDecompressBuffer(void) > /* regular tests for RtlDecompressBuffer */ > for (i = 0; i < sizeof(test_lznt) / sizeof(test_lznt[0]); i++) > { > - trace("Running test %d (compressed_size=%u, uncompressed_size=%u, status=0x%08x)\n", > - i, test_lznt[i].compressed_size, test_lznt[i].uncompressed_size, test_lznt[i].status); > + /* trace("Running test %d (compressed_size=%u, uncompressed_size=%u, status=0x%08x)\n", > + i, test_lznt[i].compressed_size, test_lznt[i].uncompressed_size, test_lznt[i].status); */ Any reason why you comment out traces in a completely unrelated test? ;) > > /* test with very big buffer */ > final_size = 0xdeadbeef; > @@ -2080,6 +2196,8 @@ START_TEST(rtl) > test_RtlIpv4AddressToString(); > test_RtlIpv4AddressToStringEx(); > test_RtlIpv4StringToAddress(); > + test_RtlIpv6AddressToStringA(); > + test_RtlIpv6AddressToStringW(); > test_LdrAddRefDll(); > test_LdrLockLoaderLock(); > test_RtlCompressBuffer(); >

1 0

Re: Hans Leidekker : bcrypt: Implement BCryptHashData.
by Bruno Jesus 06 Jan '16

06 Jan '16

On Thu, Jan 7, 2016 at 3:50 AM, Alexandre Julliard <julliard(a)wine.codeweavers.com> wrote: > + case ALG_ID_SHA384: > + CC_SHA384_Update( &hash->u.sha512_ctx, input, size ); > + break; > + > + case ALG_ID_SHA512: > + CC_SHA512_Update( &hash->u.sha512_ctx, input, size ); > + break; I missed this when I first saw the patches but in a second look and judging by the surrounding code I guess there is a copy&paste issue here. SHA384 should probably use &hash->u.sha384_ctx, no?

2 2

Re: msdrm: add stub dll
by Alex Henrie 06 Jan '16

06 Jan '16

diff --git a/configure.ac b/configure.ac index d47f7e9..69ab604 100644 --- a/configure.ac +++ b/configure.ac @@ -3009,6 +3009,7 @@ WINE_CONFIG_TEST(dlls/msctf/tests) WINE_CONFIG_DLL(msctfp,,[clean]) WINE_CONFIG_DLL(msdaps,,[clean]) WINE_CONFIG_DLL(msdelta) +WINE_CONFIG_DLL(msdrm) WINE_CONFIG_DLL(msdmo,,[implib]) WINE_CONFIG_TEST(dlls/msdmo/tests) WINE_CONFIG_DLL(msftedit) If you're going for alphabetical order, msdmo would come before msdrm. -Alex

1 0

Re: [PATCH] quartz: Handle NULL target format in FilterGraph::ConvertTimeFormat.
by Nikolay Sivov 06 Jan '16

06 Jan '16

On 05.01.2016 14:13, Anton Baskanov wrote: > Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> > --- > dlls/quartz/filtergraph.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c > index 5b4b080..5cb670e 100644 > --- a/dlls/quartz/filtergraph.c > +++ b/dlls/quartz/filtergraph.c > @@ -2530,6 +2530,9 @@ static HRESULT WINAPI MediaSeeking_ConvertTimeFormat(IMediaSeeking *iface, LONGL > if (!pSourceFormat) > pSourceFormat = &This->timeformatseek; > > + if (!pTargetFormat) > + pTargetFormat = &This->timeformatseek; > + > if (IsEqualGUID(pTargetFormat, pSourceFormat)) > *pTarget = Source; > else > Hi, Anton. According to msdn this looks correct to me. Could you add a simple test for that? Let's say one test with both formats as NULL; and a couple more with one format being NULL and another set to current format. Looks like it could be added easily to test_mediacontrol() as it has everything you'd need.

2 1

Wine Gecko 2.44-beta1
by Jacek Caban 06 Jan '16

06 Jan '16

Hi all, I prepared beta builds of the next Wine Gecko release. They are available via our new download site [1]. If you want to help testing, all that's needed is the attached patch (Wine will dowload the package for you). This build is based on Firefox 44 sources. It includes a few Wine-specific bug fixes. Also the way we hook IO in Gecko is redesigned. The new interface should be more stable and the code is cleaner. I think wine-staging may be a good way to have more testing before we do the final release. Please commit the patch to the tree. Thanks, Jacek [1] http://dl.winehq.org/wine/wine-gecko/2.44-beta1/

2 2

Re: [PATCH] mscoree: Set config path for default app domain
by Vincent Povirk 06 Jan '16

06 Jan '16

+ GetModuleFileNameA(NULL, base_dir, sizeof(base_dir)); + + slash = strrchr(base_dir, '\\'); + if (slash) + *slash = 0; + + TRACE("setting base_dir: %s, config_path: %s\n", base_dir, config_pathA); + mono_domain_set_config(This->default_domain, base_dir, config_pathA); Mono embedding api functions expect utf8-encoded paths. We need to use the W function and utf8-encode using WtoA.

1 0

Re: jscript: Added support for Function constructor called as a function.
by Marvin 06 Jan '16

06 Jan '16

Hi, While running your changed tests on Windows, 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=19463 Your paranoid android. === wxppro (32 bit) === No test summary line found === w2003std (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w7pro64 (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === w864 (32 bit) === No test summary line found === w1064 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found === w7pro64 (64 bit) === No test summary line found === w864 (64 bit) === No test summary line found === w1064 (64 bit) === No test summary line found

1 0

Re: [PATCH 3/3] ddraw: Only allow DDSCAPS_MIPMAP on textures.
by Marvin 06 Jan '16

06 Jan '16

Hi, While running your changed tests on Windows, 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=19462 Your paranoid android. === w1064 (32 bit ddraw2) === ddraw2.c:2338: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw1) === ddraw1.c:2187: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw7) === ddraw7.c:2254: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw4) === ddraw4.c:2523: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: [PATCH 2/3] ddraw/tests: Merge MipMapCreationTest() with test_mipmap_lock().
by Marvin 06 Jan '16

06 Jan '16

Hi, While running your changed tests on Windows, 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=19461 Your paranoid android. === w1064 (32 bit ddraw4) === ddraw4.c:2523: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw2) === ddraw2.c:2338: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit dsurface) === dsurface.c:144: Test failed: Destination data after blitting is not correct dsurface.c:178: Test failed: Destination data after blitting is not correct dsurface.c:357: Test failed: Surface data after srckey blit does not match dsurface.c:382: Test failed: Surface data after src override key blit does not match dsurface.c:436: Test failed: Surface data after dest key blit does not match dsurface.c:462: Test failed: Surface data after dest key override blit does not match dsurface.c:524: Test failed: Surface data with src key and dest key blit does not match === w1064 (32 bit ddraw1) === ddraw1.c:2187: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw7) === ddraw7.c:2254: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: [7/8] bcrypt: Add support for SHA hashes on Linux using Nettle.
by Bruno Jesus 06 Jan '16

06 Jan '16

On Wed, Jan 6, 2016 at 8:19 PM, Hans Leidekker <hans(a)codeweavers.com> wrote: > Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> > --- > configure.ac | 18 +++++++++ > dlls/bcrypt/Makefile.in | 1 + > dlls/bcrypt/bcrypt_main.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 114 insertions(+) Hi, Hans. Great job in the patch series, but Is this change really necessary? Can't we reuse the internal libraries from rsaenh? I think it was a copy of tomcrypt lib, I'm not able to check right now. By using rsaenh or moving the tomcrypt to a more generic place it could be reused without need for external dependencies, right? Unless I'm missing something obvious. Best wishes, Bruno

3 3

Re: [8/8] bcrypt/tests: Add tests for SHA hashes.
by Marvin 06 Jan '16

06 Jan '16

Hi, While running your changed tests on Windows, 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=19459 Your paranoid android. === w864 (64 bit bcrypt) === bcrypt.c:259: Test failed: got c0000023 bcrypt.c:260: Test failed: hash not set bcrypt.c:263: Test failed: got c0000008 bcrypt.c:267: Test failed: got c0000008 bcrypt.c:268: Test failed: got 3735928559 bcrypt.c:269: Test failed: got 3735928559 bcrypt.c:273: Test failed: got c0000008 bcrypt.c:275: Test failed: got 0000000000000000000000000000000000000000000000000000000000000000 bcrypt.c:278: Test failed: got c000000d bcrypt.c:338: Test failed: got c0000023 bcrypt.c:339: Test failed: hash not set bcrypt.c:342: Test failed: got c0000008 bcrypt.c:346: Test failed: got c0000008 bcrypt.c:347: Test failed: got 3735928559 bcrypt.c:348: Test failed: got 3735928559 bcrypt.c:352: Test failed: got c0000008 bcrypt.c:354: Test failed: got 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 bcrypt.c:357: Test failed: got c000000d bcrypt.c:418: Test failed: got c0000023 bcrypt.c:419: Test failed: hash not set bcrypt.c:422: Test failed: got c0000008 bcrypt.c:426: Test failed: got c0000008 bcrypt.c:427: Test failed: got 3735928559 bcrypt.c:428: Test failed: got 3735928559 bcrypt.c:432: Test failed: got c0000008 bcrypt.c:434: Test failed: got 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 bcrypt.c:437: Test failed: got c000000d === w1064 (64 bit bcrypt) === bcrypt.c:180: Test failed: got c0000023 bcrypt.c:181: Test failed: hash not set bcrypt.c:184: Test failed: got c0000008 bcrypt.c:188: Test failed: got c0000008 bcrypt.c:189: Test failed: got 3735928559 bcrypt.c:190: Test failed: got 3735928559 bcrypt.c:194: Test failed: got c0000008 bcrypt.c:196: Test failed: got 0000000000000000000000000000000000000000 bcrypt.c:199: Test failed: got c000000d bcrypt.c:338: Test failed: got c0000023 bcrypt.c:339: Test failed: hash not set bcrypt.c:342: Test failed: got c0000008 bcrypt.c:346: Test failed: got c0000008 bcrypt.c:347: Test failed: got 3735928559 bcrypt.c:348: Test failed: got 3735928559 bcrypt.c:352: Test failed: got c0000008 bcrypt.c:354: Test failed: got 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 bcrypt.c:357: Test failed: got c000000d bcrypt.c:418: Test failed: got c0000023 bcrypt.c:419: Test failed: hash not set bcrypt.c:422: Test failed: got c0000008 bcrypt.c:426: Test failed: got c0000008 bcrypt.c:427: Test failed: got 3735928559 bcrypt.c:428: Test failed: got 3735928559 bcrypt.c:432: Test failed: got c0000008 bcrypt.c:434: Test failed: got 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 bcrypt.c:437: Test failed: got c000000d

1 0

Re: mshtml: Added IHTMLDocument4::hasFocus implementation.
by Marvin 06 Jan '16

06 Jan '16

Hi, While running your changed tests on Windows, 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=19458 Your paranoid android. === wxppro (32 bit dom) === dom.c:6263: Test failed: hasFocus returned 0, expected ffffffff === w2003std (32 bit dom) === dom.c:6263: Test failed: hasFocus returned 0, expected ffffffff === wvistau64 (32 bit dom) === dom.c:6263: Test failed: hasFocus returned 0, expected ffffffff === w2008s64 (32 bit dom) === dom.c:6263: Test failed: hasFocus returned 0, expected ffffffff === w7u (32 bit dom) === dom.c:6263: Test failed: hasFocus returned 0, expected ffffffff === w7pro64 (32 bit dom) === dom.c:6263: Test failed: hasFocus returned 0, expected ffffffff === w8 (32 bit dom) === dom.c:6263: Test failed: hasFocus returned 0, expected ffffffff === w864 (32 bit dom) === dom.c:6263: Test failed: hasFocus returned 0, expected ffffffff === w1064 (32 bit dom) === dom.c:6263: Test failed: hasFocus returned 0, expected ffffffff === wvistau64 (64 bit dom) === dom.c:6263: Test failed: hasFocus returned 0, expected ffffffff === w7pro64 (64 bit dom) === dom.c:6263: Test failed: hasFocus returned 0, expected ffffffff === w864 (64 bit dom) === dom.c:6263: Test failed: hasFocus returned 0, expected ffffffff

1 0

Re: [RFC] msvcp120: Change exported vbtable sizes.
by Piotr Caban 06 Jan '16

06 Jan '16

Hi, On 01/04/16 12:08, Bernhard Übelacker wrote: > The test contains 2 tests: > - Simply check the exports of the vbtable sizes for their values. This test needs some improvements before it can be accepted to wine. The structure sizes are different in 32-bit and 64-bit cases. > - Call constructor and destructor like it is done in Supertux. This test will need to be rewritten in order to get into wine. You should use vbtable while computing this pointer (you can tests values inside vbtable). The test should also be named differently (e.g. test_virtual_base_func_call). > I tried to add these 8 bytes as an unknown field to basic_istream_* > and basic_ostream_* structs. But then I cannot find a way to get the > sizes for basic_iostream_* right. I've tried to find what happens there. It looks like there's a bug in Visual Studio that is described here (sorry I couldn't find it on Microsoft pages): http://stackoverflow.com/questions/14487241/avoiding-an-inheritance-by-domi… I've tried looking on basic_istream_char class layout (32-bit): void* vbtable 4-byte padding int64 count 4-byte padding int vtordisp = 0 (as described https://msdn.microsoft.com/en-us/library/7sf3txa8%28v=vs.100%29.aspx) basic_ios_char I've also tried creating following classes and ended with a different layout: class vbase { public: int a; virtual ~vbase() {}; }; class c : virtual public vbase { public: int b; virtual ~c() {}; virtual _Add_vtordisp1() {}; }; c class has following layout (as expected): void *vtable; void *vbtable; int b; void *vtable; int a; if b is defined as offsetof the layout changes strangely (looks like there's another problem in compiler related to padding): void *vtable; 4-byte padding; void *vbtable; 4-byte padding int64 b void *vtable int a The difference shows that _Add_vtordisp1 and _Add_vtordisp2 are defined in basic_ios_char class. I don't understand yet why vtordisp is needed. It's kind of described here (https://msdn.microsoft.com/en-us/library/453x4xdd%28v=vs.100%29.aspx) but I don't understand it yet. Thanks, Piotr

2 3

Re: [PATCH 01/12] shell32/tests: The expectedArgs parameter of the DDE tests is an argument count, not a boolean.
by Marvin 06 Jan '16

06 Jan '16

Hi, While running your changed tests on Windows, 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=19429 Your paranoid android. === wxppro (32 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w2003std (32 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === wvistau64 (32 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w2008s64 (32 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w7u (32 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w7pro64 (32 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w8 (32 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w864 (32 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w1064 (32 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wtF7A6.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wtF7A6.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wtF7A6.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2299: Test failed: ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wtF7A6.tmp\test file.sde")]', got '[open("C:\Users\winetest\AppData\Local\Temp\wtF7A6.tmp\test file.sde")]' shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wtF7A6.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wtF7A6.tmp\test file.sde") failed: rc=29 err=2 === wvistau64 (64 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w2008s64 (64 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w7pro64 (64 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w864 (64 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 === w1064 (64 bit shlexec) === shlexec.c:2294: Test failed: argcA expected 3, but got 4 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt4B23.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt4B23.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt4B23.tmp\test file.sde") failed: rc=29 err=2 shlexec.c:2287: Test failed: ShellExecuteEx(mask="0x500", file="C:\Users\winetest\AppData\Local\Temp\wt4B23.tmp\test file.sde") failed: rc=29 err=2

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel