October 2017 - Wine-Devel - list.winehq.org

Re: [PATCH 3/4] d3d8/tests: Make test_reset more resilient against DPI scaling. (v2)
by Marvin Oct. 19, 2017

Oct. 19, 2017

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=33639 Your paranoid android. === w1064 (32 bit device) === device.c:1532: Test failed: Reset failed, hr 0x80070057. device.c:1534: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1546: Test failed: D3DVIEWPORT->Width = 400. device.c:1547: Test failed: D3DVIEWPORT->Height = 300. 0864:device: unhandled exception c0000005 at 706EA86E

1 0

Re: [PATCH v2] user32: Add the IDI_SHIELD icon resource.
by Alexandre Julliard Oct. 19, 2017

Oct. 19, 2017

"Sergio Gómez Del Real" <sergio.g.delreal(a)gmail.com> writes: > Applications such as Fidibo > (https://bugs.winehq.org/show_bug.cgi?id=43770) ask for the IDI_SHIELD > OEM resource, for example by calling comctl32.LoadIconMetric. Because > the resource doesn't exist in user32, the function returns error and, > in the specific case of Fidibo, the application crashes. This patch > adds to user32.rc the appropriate lines and adds the file > oic_shield.svg, from which oic_shield.ico will be generated. > > NOTE: Tango's public domain network-wireless-encrypted.svg file was > used. Thanks to Alex Henrie for this. To generate a proper icon, we'd need multiple scaled images for the various sizes, and bitmaps for low-color resolutions, with the labels expected by the buildimage script. You can check how this is done in oic_winlogo.svg. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 5/6] wined3d: Pack interpolation modes.
by Henri Verbeet Oct. 18, 2017

Oct. 18, 2017

On 18 October 2017 at 00:25, Józef Kucia <jkucia(a)codeweavers.com> wrote: > +static inline DWORD wined3d_extract_bits(const DWORD *bitstream, > + unsigned int offset, unsigned int count) > +{ > + const unsigned int word_bit_count = sizeof(*bitstream) * CHAR_BIT; > + const unsigned int idx = offset / word_bit_count; > + const unsigned int shift = offset % word_bit_count; > + DWORD mask = (1u << count) - 1; It's not an issue in this patch, but note that the above doesn't work for count > 31. We probably don't care about count > 32, but we may care about count == 32. Specifically, "1u << 32" is undefined, but in practice tends to evaluate as "1u << 0".

2 3

Re: [PATCH 2/4] d3d9/tests: Fix test_reset on Nvidia Windows 10.
by Stefan Dösinger Oct. 18, 2017

Oct. 18, 2017

> Am 18.10.2017 um 21:38 schrieb Stefan Dösinger <stefan(a)codeweavers.com>: > > The client rectangle is 204x150 on my system (real one, Nvidia GPU, not > qemu), even though we requested 200x150. Odd, but not really the concern > of this test. I had an epiphany where the odd behavior comes from: It was caused by my custom UI scaling factor of 172% (=165 DPI). Setting it to 150% (144 DPI), a value suggested by Windows, gives the expected window size. I still think the patch is a good idea because it makes the test more robust against such configurations. I’ll resend it tomorrow with an updated title and description.

1 0

Re: [PATCH] user32: Add the IDI_SHIELD icon resource.
by Alex Henrie Oct. 18, 2017

Oct. 18, 2017

> NOTE: oic_shield.svg is just a copy of oic_winlogo.svg. Could we use an actual shield icon instead? It was pretty easy for me to open Tango's network-wireless-encrypted.svg in Inkscape and edit it down to a plain shield. This icon is in the public domain, so it's fine to use it in Wine. -Alex

1 0

Re: [PATCH] winmm/tests: Give play from 0 to 0 more time to finish.
by Marvin Oct. 18, 2017

Oct. 18, 2017

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=33612 Your paranoid android. === w864 (64 bit mci) === mci.c:995: Test failed: got 0001 instead of MCI_NOTIFY_xyz 0000 from command play (nowait) mci.c:998: Test failed: mci pause wait returned MCIERR_NONAPPLICABLE_FUNCTION mci.c:1002: Test failed: mci status mode: stopped mci.c:1003: Test failed: got 0001 instead of MCI_NOTIFY_xyz 0002 from command play mci.c:1004: Test failed: Expect message 0001 from status

2 1

Re: [1/2] kerberos: Add a stub for Kerberos5 Authentication Package. (v2)
by Alexandre Julliard Oct. 18, 2017

Oct. 18, 2017

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > When compiling without HAVE_KRB5_KRB5_H defined the compiler issues > a warning about libkrb5_handle not being used, libkrb5_handle will be > used later as a detection that libkrb5 is available. I'll move this to avoid the warning, it can be moved back when it's used. Though it may be cleaner to always check it inside the ifdef anyway. -- Alexandre Julliard julliard(a)winehq.org

1 0

wine-2.0.3-rc2 Available
by Michael Stefaniuc Oct. 17, 2017

Oct. 17, 2017

Hello guys, I have pushed wine-2.0.3-rc3 (with tag) to https://github.com/mstefani/wine-stable Changes since rc1: - Removed the commit "gdi32: Return non-zero VREFRESH value for display devices." aka bug #43369 It is a no-op without cherry-picking some risky other patches. bye michael

1 0

Re: [PATCH 3/5] gdiplus: Add internal string format properties used by typographical format
by Vincent Povirk Oct. 17, 2017

Oct. 17, 2017

This removes margins when a NULL format is specified. If that change is correct, it should probably be in a separate patch and have a test case.

2 1

Re: [1/2] kerberos: Add a stub for Kerberos5 Authentication Package.
by Hans Leidekker Oct. 17, 2017

Oct. 17, 2017

Hi Dmitry, Thanks. Alexandre pointed out that we do not need to load libkrb5 dynamically because libgssapi_krb5 depends on libkrb5. So if libkrb5 is missing the SSP wouldn't be usable anyway. > diff --git a/configure.ac b/configure.ac > index 58737162a8..82faa4b943 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -422,6 +422,7 @@ AC_CHECK_HEADERS(\ > ieeefp.h \ > inet/mib2.h \ > io.h \ > + krb5/krb5.h \ > kstat.h \ > libproc.h \ > link.h \ > @@ -1625,6 +1626,14 @@ fi > WINE_NOTICE_WITH(gsm,[test "x$ac_cv_lib_soname_gsm" = "x"], > [libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported.]) > > +dnl **** Check for krb5 **** > +if test "$ac_cv_header_krb5_krb5_h" = "yes" > +then > + WINE_CHECK_SONAME(krb5,krb5_init_context) > +fi > +WINE_NOTICE_WITH(krb5,[test "x$ac_cv_lib_soname_krb5" = "x"], > + [libkrb5 ${notice_platform}development files not found, krb5 won't be supported.]) > + There is pkgconfig support for krb5. I guess we want to use it. You need to guard the code that uses krb5 functions with an ifdef or it will fail to compile if the headers are missing.

4 5

Re: [PATCH] msvcp120: Fix _Xtime_diff_to_millis2 overflow behavior.
by Piotr Caban Oct. 17, 2017

Oct. 17, 2017

On 10/11/17 17:07, Stefan Dösinger wrote: > + {0x7FFFFFFFFFFFFFFF, 0, 0x7FFFFFFFFFFFFFFD, 0, 0}, /* Not an overflow */ Defining LONGLONG constants this way is not portable. > @@ -410,7 +410,13 @@ MSVCRT_long __cdecl _Xtime_diff_to_millis2(const xtime *t1, const xtime *t2) > diff_nsec = t1->nsec - t2->nsec; > ret = diff_sec * MILLISEC_PER_SEC + > (diff_nsec + NANOSEC_PER_MILLISEC - 1) / NANOSEC_PER_MILLISEC; > - return ret > 0 ? ret : 0; > + > + /* This function does not return negative numbers, except when they get created through > + * an integer overflow. */ > + if (diff_sec > ((LONGLONG)INT_MAX + NANOSEC_PER_MILLISEC - 1) / NANOSEC_PER_MILLISEC) > + return ret; > + else > + return ret > 0 ? ret : 0; > } It looks like the function should be treating negative time differences in special way. Except of that it seems to be ignoring overflows. I think that following code is much easier to read. Is something like this working for you? MSVCRT_long __cdecl _Xtime_diff_to_millis2(const xtime *t1, const xtime *t2) { LONGLONG diff_sec, diff_nsec; TRACE("(%p, %p)\n", t1, t2); diff_sec = t1->sec - t2->sec; diff_nsec = t1->nsec - t2->nsec; diff_sec += diff_nsec / NANOSEC_PER_SEC; diff_nsec %= NANOSEC_PER_SEC; if (diff_nsec < 0) { diff_sec -= 1; diff_nsec += NANOSEC_PER_SEC; } if (diff_sec<0 || (diff_sec==0 && diff_nsec<0)) return 0; return diff_sec * MILLISEC_PER_SEC + (diff_nsec + NANOSEC_PER_MILLISEC - 1) / NANOSEC_PER_MILLISEC; } Thanks, Piotr

2 4

Re: [PATCH] ntdll: Always restore TEB to x18 on aarch 64 on return from calls to builtins
by Stefan Dösinger Oct. 17, 2017

Oct. 17, 2017

Am 2017-10-13 um 09:52 schrieb Martin Storsjo: > This requires always enabling relaying of calls though. It also won't work for COM object calls, which aren't intercepted by +relay.

1 0

Re: [PATCH 1/2] mshtml: Use window event target instead of body only for selected event properties.
by Marvin Oct. 17, 2017

Oct. 17, 2017

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=33544 Your paranoid android. === w7u (32 bit htmldoc) === htmldoc.c:2682: Test failed: unexpected call GetOverrideKeyPath

1 0

Re: [PATCH] Revert "user32/combo: Set listbox popup height correctly and add tests."
by Marvin Oct. 16, 2017

Oct. 16, 2017

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=33545 Your paranoid android. === build (build) === The test VM is powered off!

1 0

Re: [PATCH] winex11.drv: Fix misplaced parentheses.
by Alexandre Julliard Oct. 16, 2017

Oct. 16, 2017

Andrey Gusev <andrey.goosev(a)gmail.com> writes: > Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> > --- > dlls/winex11.drv/mouse.c | 2 +- > dlls/winex11.drv/systray.c | 2 +- > dlls/winex11.drv/window.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) Not that it makes much difference, but the existing code is correct. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] regedit: Correctly import hex values with no data
by Marvin Oct. 16, 2017

Oct. 16, 2017

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=33540 Your paranoid android. === build (build) === Patch failed to apply

2 1

Re: [PATCH] reg/tests: Correctly import hex values with no data
by Marvin Oct. 16, 2017

Oct. 16, 2017

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=33541 Your paranoid android. === build (build) === Patch failed to apply

2 1

Re: [01/10] secur32: Implement AcquireCredentialsHandle for Kerberos.
by Alexandre Julliard Oct. 16, 2017

Oct. 16, 2017

Hans Leidekker <hans(a)codeweavers.com> writes: > @@ -2,8 +2,8 @@ MODULE = secur32.dll > IMPORTLIB = secur32 > IMPORTS = netapi32 advapi32 > DELAYIMPORTS = crypt32 > -EXTRAINCL = $(GNUTLS_CFLAGS) > -EXTRALIBS = $(SECURITY_LIBS) > +EXTRAINCL = $(GNUTLS_CFLAGS) $(GSSAPI_CFLAGS) > +EXTRALIBS = $(SECURITY_LIBS) $(GSSAPI_LIBS) Shouldn't the library be loaded dynamically? -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: secur32/tests: Add tests for the Kerberos provider.
by Marvin Oct. 16, 2017

Oct. 16, 2017

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=33537 Your paranoid android. === wxppro (32 bit kerberos) === kerberos.c:361: Test failed: got 00073bbf kerberos.c:149: Test failed: AcquireCredentialsHandleA returned 80090311 === w2003std (32 bit kerberos) === kerberos.c:361: Test failed: got 00073bbf kerberos.c:149: Test failed: AcquireCredentialsHandleA returned 8009030e === wvistau64 (32 bit kerberos) === kerberos.c:149: Test failed: AcquireCredentialsHandleA returned 8009030e === w2008s64 (32 bit kerberos) === kerberos.c:149: Test failed: AcquireCredentialsHandleA returned 8009030e === w7u (32 bit kerberos) === kerberos.c:149: Test failed: AcquireCredentialsHandleA returned 8009030e === w7pro64 (32 bit kerberos) === kerberos.c:149: Test failed: AcquireCredentialsHandleA returned 8009030e === w8 (32 bit kerberos) === kerberos.c:361: Test failed: got 008f3bbf kerberos.c:149: Test failed: AcquireCredentialsHandleA returned 8009030e === w864 (32 bit kerberos) === kerberos.c:361: Test failed: got 008f3bbf kerberos.c:149: Test failed: AcquireCredentialsHandleA returned 8009030e === w1064 (32 bit kerberos) === kerberos.c:361: Test failed: got 008f3bbf kerberos.c:149: Test failed: AcquireCredentialsHandleA returned 8009030e === wvistau64 (64 bit kerberos) === kerberos.c:149: Test failed: AcquireCredentialsHandleA returned 8009030e === w2008s64 (64 bit kerberos) === kerberos.c:149: Test failed: AcquireCredentialsHandleA returned 8009030e === w7pro64 (64 bit kerberos) === kerberos.c:149: Test failed: AcquireCredentialsHandleA returned 8009030e === w864 (64 bit kerberos) === kerberos.c:361: Test failed: got 008f3bbf kerberos.c:149: Test failed: AcquireCredentialsHandleA returned 8009030e === w1064 (64 bit kerberos) === kerberos.c:361: Test failed: got 008f3bbf kerberos.c:149: Test failed: AcquireCredentialsHandleA returned 8009030e

1 0

Re: [PATCH] comctl32/tests: Fix treeview test failures on French Windows XP.
by Nikolay Sivov Oct. 16, 2017

Oct. 16, 2017

On 16.10.2017 6:33, Alex Henrie wrote: > The one testbot machine that's having trouble with these is the one XP > machine with a French locale: > http://test.winehq.org/data/de7220e2553764afd5cf8d463110d4ec5b1a6696/index_… > > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > --- > dlls/comctl32/tests/treeview.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c > index e7ce92cae8..26ba160c60 100644 > --- a/dlls/comctl32/tests/treeview.c > +++ b/dlls/comctl32/tests/treeview.c > @@ -220,6 +220,10 @@ static const struct message test_right_click_seq[] = { > { WM_RBUTTONDOWN, sent|wparam, MK_RBUTTON }, > { WM_CAPTURECHANGED, sent|defwinproc }, > { TVM_GETNEXTITEM, sent|wparam|lparam|defwinproc, TVGN_CARET, 0 }, > + /* the optional messages below are for French WinXP */ > + { WM_NCHITTEST, sent|optional }, > + { WM_SETCURSOR, sent|optional }, > + { WM_MOUSEFIRST, sent|optional }, > { 0 } > }; > > @@ -367,6 +371,9 @@ static const struct message parent_vk_return_seq[] = { > static const struct message parent_right_click_seq[] = { > { WM_NOTIFY, sent|id, 0, 0, NM_RCLICK }, > { WM_CONTEXTMENU, sent }, > + /* the optional messages below are for French WinXP */ > + { WM_NOTIFY, sent|optional }, > + { WM_SETCURSOR, sent|optional }, > { 0 } > }; > If it works, that's great, but comment makes no sense. I find it hard to believe UI language affects messages sent to windows, must be something else. Please resend without it.

1 0

Re: [v3 PATCH 2/3] gdiplus/metafile: Partially implement EmfPlusImage deserialization
by Nikolay Sivov Oct. 14, 2017

Oct. 14, 2017

On 13.10.2017 19:45, Nikolay Sivov wrote: > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > --- > > v3: fail on indexed formats for now > > dlls/gdiplus/gdiplus_private.h | 1 + > dlls/gdiplus/metafile.c | 82 ++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 83 insertions(+) > Ignore that one please. Indexed case is trivial enough, I'll send complete version instead.

1 0

Re: [PATCH 1/2] dx8vb: Add D3DX8 coclass plus ID3DX8 interface and its dependencies
by Nikolay Sivov Oct. 14, 2017

Oct. 14, 2017

How exactly this is supposed to work? When you mentioned such dx8-vb style wrappers exist I thought about usual scripting way to create and access them, yet your idls don't define a type library and interface wrappers are not IDispatch descendants. Normal way is to create factory object using ProgID for example, in this case DXD8, and then all method are requested using IDispatch. Also, is it possible to reuse actual dx8 headers for enums and the like ? P.S. for enum members please use hex notation for fourcc values, and FORCE_DWORD things.

2 1

Regression bug in 2.18: Endless Legend broken
by Walter Woods Oct. 14, 2017

Oct. 14, 2017

Hi all, I'm posting to this list as a result of the instructions on the "AppDB Maintainers" page. Anyway, Endless Legend (https://appdb.winehq.org/objectManager.php?sClass= application&iId=16492) was broken somewhere between 2.17-staging and 2.18-staging. While the initial credits videos load alright, the game's own loading splashscreen (for the Tempest expansion) crashes without fail. If I run Wine 2.18-staging in a terminal, the error messages look like this: fixme:d3d_shader:print_glsl_info_log Info log received from GLSL shader #11: fixme:d3d_shader:print_glsl_info_log Vertex info fixme:d3d_shader:print_glsl_info_log ----------- fixme:d3d_shader:print_glsl_info_log 0(19) : warning C7050: "vs_out[0].zw" might be used before being initialized fixme:d3d_shader:print_glsl_info_log 0(19) : warning C7050: "vs_out[1].zw" might be used before being initialized fixme:d3d_shader:print_glsl_info_log 0(19) : warning C7050: "vs_out[2]" might be used before being initialized fixme:d3d_shader:print_glsl_info_log 0(19) : warning C7050: "vs_out[3]" might be used before being initialized fixme:d3d_shader:print_glsl_info_log 0(19) : warning C7050: "vs_out[4]" might be used before being initialized fixme:d3d_shader:print_glsl_info_log 0(19) : warning C7050: "vs_out[5]" might be used before being initialized fixme:d3d_shader:print_glsl_info_log 0(19) : warning C7050: "vs_out[6]" might be used before being initialized fixme:d3d_shader:print_glsl_info_log 0(19) : warning C7050: "vs_out[7]" might be used before being initialized fixme:d3d_shader:print_glsl_info_log 0(19) : warning C7050: "vs_out[9]" might be used before being initialized fixme:d3d_shader:print_glsl_info_log 0(19) : warning C7050: "vs_out[11]" might be used before being initialized err:dbghelp_msc:pe_load_debug_directory Got a page fault while loading symbols err:dbghelp_msc:pe_load_debug_directory Got a page fault while loading symbols err:dbghelp_msc:pe_load_debug_directory Got a page fault while loading symbols err:dbghelp_msc:pe_load_debug_directory Got a page fault while loading symbols err:dbghelp_msc:pe_load_debug_directory Got a page fault while loading symbols err:dbghelp_msc:pe_load_debug_directory Got a page fault while loading symbols err:dbghelp_msc:pe_load_debug_directory Got a page fault while loading symbols err:dbghelp_msc:pe_load_debug_directory Got a page fault while loading symbols err:dbghelp_msc:pe_load_debug_directory Got a page fault while loading symbols err:dbghelp_msc:pe_load_debug_directory Got a page fault while loading symbols err:seh:setup_exception stack overflow 1600 bytes in thread 0096 eip 000000007bc62c85 esp 00000000053e0fd0 stack 0x53e0000-0x53e1000-0x54e0000 fixme:shell:CustomDestinationList_QueryInterface not implemented for {00000003-0000-0000-c000-000000000046} (unknown) fixme:shell:CustomDestinationList_QueryInterface not implemented for {00000003-0000-0000-c000-000000000046} (unknown) fixme:shell:CustomDestinationList_QueryInterface not implemented for {00000019-0000-0000-c000-000000000046} (unknown) fixme:shell:CustomDestinationList_BeginList 0x5385410 (0x1284e52c {92ca9dcd-5622-4bba-a805-5e9f541bd8c9} 0x1284e538): stub fixme:shell:CustomDestinationList_QueryInterface not implemented for {00000003-0000-0000-c000-000000000046} (unknown) fixme:shell:CustomDestinationList_QueryInterface not implemented for {00000003-0000-0000-c000-000000000046} (unknown) fixme:shell:CustomDestinationList_QueryInterface not implemented for {00000019-0000-0000-c000-000000000046} (unknown) fixme:shell:CustomDestinationList_BeginList 0x5384490 (0x12a4e52c {92ca9dcd-5622-4bba-a805-5e9f541bd8c9} 0x12a4e538): stub If I run Wine 2.17-staging in a terminal, then I get only the following: fixme:d3d_shader:print_glsl_info_log Info log received from GLSL shader #263: fixme:d3d_shader:print_glsl_info_log Vertex info fixme:d3d_shader:print_glsl_info_log ----------- fixme:d3d_shader:print_glsl_info_log 0(19) : warning C7050: "vs_out[2].zw" might be used before being initialized fixme:d3d_shader:print_glsl_info_log 0(19) : warning C7050: "vs_out[3].zw" might be used before being initialized fixme:d3d_shader:print_glsl_info_log 0(19) : warning C7050: "vs_out[5]" might be used before being initialized fixme:d3d_shader:print_glsl_info_log 0(19) : warning C7050: "vs_out[6]" might be used before being initialized fixme:d3d_shader:print_glsl_info_log 0(19) : warning C7050: "vs_out[7]" might be used before being initialized fixme:d3d_shader:print_glsl_info_log 0(19) : warning C7050: "vs_out[8]" might be used before being initialized fixme:d3d_shader:print_glsl_info_log 0(19) : warning C7050: "vs_out[9]" might be used before being initialized fixme:d3d_shader:print_glsl_info_log 0(19) : warning C7050: "vs_out[10]" might be used before being initialized fixme:d3d_shader:print_glsl_info_log 0(19) : warning C7050: "vs_out[11]" might be used before being initialized So, it seems safe to assume that something in 2.18 causes all of those page faults. Cheers, Walt

2 1

Re: [PATCH] msvcrt: Add vf[w]printf_p & vf[w]printf_p_l.
by Piotr Caban Oct. 13, 2017

Oct. 13, 2017

Hi Gijs, I think support for MSVCRT_PRINTF_POSITIONAL_PARAMS flag may be integrated into helper. Thanks to it you will be able to implement vfprintf_p without changing all helper callers. I'm thinking about something like this: static int vfprintf_helper(DWORD options, MSVCRT_FILE* file, const char *format, MSVCRT__locale_t locale, __ms_va_list valist) { printf_arg args_ctx[MSVCRT__ARGMAX+1]; BOOL tmp_buf; int ret; if(!MSVCRT_CHECK_PMT( file != NULL )) return -1; if(!MSVCRT_CHECK_PMT( format != NULL )) return -1; if(options & MSVCRT_PRINTF_POSITIONAL_PARAMS) { memset(args_ctx, 0, sizeof(args_ctx)); ret = create_positional_ctx_a(args_ctx, format, valist); if(ret < 0) { MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); *MSVCRT__errno() = MSVCRT_EINVAL; return ret; } else if(!ret) otions &= ~MSVCRT_PRINTF_POSITIONAL_PARAMS; } MSVCRT__lock_file(file); tmp_buf = add_std_buffer(file); ret = pf_printf_a(puts_clbk_file_a, file, format, locale, options, options & MSVCRT_PRINTF_POSITIONAL_PARAMS ? arg_clbk_positional : arg_clbk_valist, options & MSVCRT_PRINTF_POSITIONAL_PARAMS ? args_ctx : NULL, &valist); if(tmp_buf) remove_std_buffer(file); MSVCRT__unlock_file(file); return ret; } Thanks, Piotr

2 1

Re: [PATCH] msi: Defer the appropriate standard actions to the install script.
by Hans Leidekker Oct. 13, 2017

Oct. 13, 2017

I get test failures: automation.c:2545: Test failed: Expected ERROR_SUCCESS, got 2 automation.c:2550: Test failed: Expected ERROR_SUCCESS, got 6 automation.c:2551: Test failed: Expected imaname, got H�2 automation.c:2556: Test failed: Expected ERROR_FILE_NOT_FOUND, got 6 automation.c:2561: Test failed: Expected ERROR_SUCCESS, got 6 automation.c:2562: Test failed: Expected 314, got 0 automation.c:2567: Test failed: Expected ERROR_SUCCESS, got 6 automation.c:2568: Test failed: Expected imaname, got H�2 automation.c:2573: Test failed: Expected ERROR_SUCCESS, got 2 Makefile:227: recipe for target 'automation.ok' failed make: *** [automation.ok] Error 9 This is the kind of patch that could use lots of tests, though it looks like you are working on it ;-) It would also be a good idea to check a few real installers, such as those for .NET and Office, if you haven't done so already.

2 1