November 2016 - Wine-devel - list.winehq.org

Re: [PATCH] ntdll: Make LdrUnloadDLL() a stub for musl libc.
by Austin English 14 Nov '16

14 Nov '16

On Nov 14, 2016 1:24 AM, "He X" <xw897002528(a)gmail.com> wrote: > > https://bugs.winehq.org/show_bug.cgi?id=41703 Hi Wang, As musl's FAQ points out, you should be checking for the broken behavior explicitly, or fix musl itself: http://wiki.musl-libc.org/wiki/FAQ#Q:_why_is_there_no_MUSL_macro_.3F Thanks for looking into this!

1 0

Re: [PATCH] cabinet: Properly initialize our internal fci structure (bug 36115)(valgrind)
by Huw Davies 14 Nov '16

14 Nov '16

Hi Detlef, It was nice to hear you today :-) > On 13 Nov 2016, at 16:58, Detlef Riekenberg <wine.dev(a)web.de> wrote: > diff --git a/dlls/cabinet/fci.c b/dlls/cabinet/fci.c > index 70d4f3f..5f2e4e7 100644 > --- a/dlls/cabinet/fci.c > +++ b/dlls/cabinet/fci.c > @@ -1036,6 +1036,8 @@ HFCI __cdecl FCICreate( > return NULL; > } > > + /* start with a clean structure */ There’s no need for this comment, the code is obvious > + memset(p_fci_internal, 0, sizeof(FCI_Int)); sizeof(*p_fci_internal) > p_fci_internal->magic = FCI_INT_MAGIC; > p_fci_internal->perf = perf; > p_fci_internal->fileplaced = pfnfiledest; > @@ -1050,26 +1052,9 @@ HFCI __cdecl FCICreate( > p_fci_internal->gettemp = pfnfcigtf; > p_fci_internal->ccab = *pccab; > p_fci_internal->pccab = pccab; > - p_fci_internal->fPrevCab = FALSE; > - p_fci_internal->fNextCab = FALSE; > - p_fci_internal->fSplitFolder = FALSE; > - p_fci_internal->fGetNextCabInVain = FALSE; > p_fci_internal->pv = pv; > - p_fci_internal->cdata_in = 0; > - p_fci_internal->cCompressedBytesInFolder = 0; > - p_fci_internal->cFolders = 0; > - p_fci_internal->cFiles = 0; > - p_fci_internal->cDataBlocks = 0; > p_fci_internal->data.handle = -1; > - p_fci_internal->fNewPrevious = FALSE; > - p_fci_internal->estimatedCabinetSize = 0; > - p_fci_internal->statusFolderTotal = 0; > - p_fci_internal->folders_size = 0; > - p_fci_internal->files_size = 0; > - p_fci_internal->placed_files_size = 0; > - p_fci_internal->pending_data_size = 0; > - p_fci_internal->folders_data_size = 0; > - p_fci_internal->compression = tcompTYPE_NONE; > + /* the memset selected tcompTYPE_NONE */ Again, this comment doesn’t add anything. > p_fci_internal->compress = compress_NONE; > > list_init( &p_fci_internal->folders_list );

1 0

Re: [06/23] ntdll: Map empty page if needed inside system mappings.
by Matteo Bruni 13 Nov '16

13 Nov '16

2016-11-13 12:35 GMT-06:00 Andrew Wesie <awesie(a)gmail.com>: > Some anti-debug protections will try to read all of the memory > for a loaded system DLL. This patch will handle the page fault when > it attempts to read the space between sections. > > Signed-off-by: Andrew Wesie <awesie(a)gmail.com> > --- > dlls/ntdll/virtual.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c > index e826fa0..f70e9fc 100644 > --- a/dlls/ntdll/virtual.c > +++ b/dlls/ntdll/virtual.c > @@ -1512,6 +1512,11 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack ) > /* ignore fault if page is writable now */ > if (VIRTUAL_GetUnixProt( *vprot ) & PROT_WRITE) ret = STATUS_SUCCESS; > } > + if (err == 0 && (view->protect & VPROT_SYSTEM)) > + { > + wine_anon_mmap(page, page_size, PROT_READ, MAP_FIXED); > + ret = STATUS_SUCCESS; > + } > if (!on_signal_stack && (*vprot & VPROT_GUARD)) > { > VIRTUAL_SetProt( view, page, page_size, *vprot & ~VPROT_GUARD ); This looks like a much nicer solution than my hack attached to the bug. I don't have time right now to check for all the implications of this patch, when / if I can get around to do a proper review I'll sign it off, for what it might be worth.

1 0

Re: [18/23] wined3d: Add support for flat interpolation in shaders.
by Matteo Bruni 13 Nov '16

13 Nov '16

2016-11-13 12:35 GMT-06:00 Andrew Wesie <awesie(a)gmail.com>: > Signed-off-by: Andrew Wesie <awesie(a)gmail.com> It looks like you're never declaring shader outputs as flat. Is the potential mismatch with the shader input declarations a problem? BTW, I find it a bit surprising that flat varyings are actually used in SM4+ applications, AFAIK there is no way to mark inputs / outputs as flat in HLSL, which would suggest some kind of manual tinkering with the shader bytecode is required to use them.

3 2

Re: [14/23] wined3d: Increase vertex and fragment sampler limit.
by Matteo Bruni 13 Nov '16

13 Nov '16

2016-11-13 12:35 GMT-06:00 Andrew Wesie <awesie(a)gmail.com>: > Signed-off-by: Andrew Wesie <awesie(a)gmail.com> > --- > dlls/wined3d/wined3d_private.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h > index d23b7ef..97f3265 100644 > --- a/dlls/wined3d/wined3d_private.h > +++ b/dlls/wined3d/wined3d_private.h > @@ -176,8 +176,8 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup > #define MAX_STREAM_OUT 4 > #define MAX_STREAMS 16 > #define MAX_TEXTURES 8 > -#define MAX_FRAGMENT_SAMPLERS 16 > -#define MAX_VERTEX_SAMPLERS 4 > +#define MAX_FRAGMENT_SAMPLERS 32 > +#define MAX_VERTEX_SAMPLERS 32 > #define MAX_COMBINED_SAMPLERS (MAX_FRAGMENT_SAMPLERS + MAX_VERTEX_SAMPLERS) > #define MAX_ACTIVE_LIGHTS 8 > #define MAX_CLIP_DISTANCES WINED3DMAXUSERCLIPPLANES I don't think this is how we want to solve this. See bug 41213 comment 6 and 8 for my point of view on the matter.

1 0

Re: [09/23] wined3d: Fix mapping of SV_VertexID to gl_VertexID.
by Matteo Bruni 13 Nov '16

13 Nov '16

2016-11-13 12:35 GMT-06:00 Andrew Wesie <awesie(a)gmail.com>: > SV_VertexID does not have base vertex index applied, but gl_VertexID > does. Fix the vertex ID by subtracting a uniform that is set to the > base vertex index before each draw. > > Signed-off-by: Andrew Wesie <awesie(a)gmail.com> > --- > dlls/wined3d/cs.c | 2 +- > dlls/wined3d/device.c | 6 +++++- > dlls/wined3d/glsl_shader.c | 13 ++++++++++++- > dlls/wined3d/state.c | 7 ++++++- > dlls/wined3d/wined3d_private.h | 1 + > 5 files changed, 25 insertions(+), 4 deletions(-) > > diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c > index 7af0b81..e71c873 100644 > --- a/dlls/wined3d/cs.c > +++ b/dlls/wined3d/cs.c > @@ -481,7 +481,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned i > > op = cs->ops->require_space(cs, sizeof(*op)); > op->opcode = WINED3D_CS_OP_DRAW; > - op->base_vertex_idx = base_vertex_idx; > + op->base_vertex_idx = indexed ? base_vertex_idx : 0; > op->start_idx = start_idx; > op->index_count = index_count; > op->start_instance = start_instance; This should probably be a separate patch. Otherwise it seems good to me.

1 0

Re: [04/23] ntdll: Fix privileged instruction exception code.
by Matteo Bruni 13 Nov '16

13 Nov '16

2016-11-13 12:35 GMT-06:00 Andrew Wesie <awesie(a)gmail.com>: > Signed-off-by: Andrew Wesie <awesie(a)gmail.com> > --- > dlls/ntdll/signal_x86_64.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c > index af16cfd..e2440a6 100644 > --- a/dlls/ntdll/signal_x86_64.c > +++ b/dlls/ntdll/signal_x86_64.c > @@ -2652,7 +2652,6 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) > WORD err = ERROR_sig(ucontext); > if ((err & 7) == 2 && handle_interrupt( err >> 3, rec, win_context )) break; > rec->ExceptionCode = err ? EXCEPTION_ACCESS_VIOLATION : EXCEPTION_PRIV_INSTRUCTION; > - rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; The patch is most likely correct but it would be nice to have a Wine test triggering this codepath.

1 0

Re: [PATCH 5/7] ddraw: Discard the dst vertex buffer if possible.
by Henri Verbeet 13 Nov '16

13 Nov '16

On 30 October 2016 at 15:02, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > Once we have buffer->buffer copies working we can load the source data > into a buffer in SetExecuteData and never have to lock the destination > buffer. In general I think wined3d_device_copy_sub_resource_region() is supposed to work for buffers. Is there something in particular that's broken?

2 1

Re: [PATCH] wininet: Resize buffer when call to InternetCanonicalizeUrlW fails in InternetCrackUrlW
by Marvin 13 Nov '16

13 Nov '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=26605 Your paranoid android. === build (build) === Make failed

2 1

Re: wineconsole: Correctly handle TrueType font widths
by Akihiro Sagawa 13 Nov '16

13 Nov '16

On Tue, 1 Nov 2016 11:59:30 +0000, Hugh McMaster wrote: > - config->cell_width = tm.tmMaxCharWidth; > + if (tm.tmPitchAndFamily & (TMPF_VECTOR | TMPF_TRUETYPE)) > + config->cell_width = tm.tmAveCharWidth; > + else > + config->cell_width = tm.tmMaxCharWidth; > + Hi Hugh, Why don't you use tmAveCharWidth value for raster (bitmap) fonts? Japanese fixed-pitch bitmap font, such as FixedSys (jvgafix.fon) or Terminal (not avaialble in wine), has a half value of tmMaxCharWidth for tmAveCharWidth. In other words, FixedSys shows tmAveCharWidth = 8, tmMaxCharWidth = 16. This works good in DBCS console window because full-width character (e.g. Kanji) occupies two cells. Thanks, Akihiro Sagawa

3 8