March 2016 - Wine-Devel - list.winehq.org

Re: [v8 1/6] d3dx9: Implement preshader parsing.

by Matteo Bruni

2016-03-29 17:22 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > +enum pres_reg_tables > +{ > + PRES_REGTAB_IMMED, /* immediate double constants from CLIT */ I don't quite recall, I might be contradicting my own earlier comments here but at this point this comment doesn't seem to add much. General (and late) note, we usually tend to be more verbose with variable or type names and avoid too cryptic abbreviations. I don't think it's worth changing everything now though. > +struct d3dx_preshader > +{ > + struct d3dx_regstore regs; > + > + unsigned int ins_count; > + struct d3dx_pres_ins *ins; > + > + struct d3dx_const_tab inputs; > +}; > + > + > +struct d3dx_param_eval That double empty line seems unnecessary. > -HRESULT d3dx_create_param_eval(struct d3dx9_base_effect *base_effect, void *byte_code, unsigned int byte_code_size, > +enum pres_ops > +{ > + PRESHADER_OP_NOP, > + PRESHADER_OP_MOV, > + PRESHADER_OP_MAX_ENUM > +}; Maybe rename _MAX_ENUM to _UNKNOWN? At least for this patch series you don't really need that enum value though (see below). > +static HRESULT regstore_alloc_table(struct d3dx_regstore *rs, unsigned int table) > +{ > + unsigned int size; > + > + size = rs->table_sizes[table] * table_info[table].reg_component_count * table_info[table].component_size; > + if (size) > + { > + rs->tables[table] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); > + rs->table_value_set[table] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, > + sizeof(*rs->table_value_set[table]) * > + ((rs->table_sizes[table] + PRES_BITMASK_BLOCK_SIZE - 1) / PRES_BITMASK_BLOCK_SIZE)); Indentation. > +static void regstore_set_values(struct d3dx_regstore *rs, unsigned int table, void *data, > + unsigned int start_offset, unsigned int count) > +{ > + unsigned int block_idx, start, end, start_block, end_block; > + > + if (!count) > + return; > + > + memcpy((BYTE *)rs->tables[table] + start_offset * table_info[table].component_size, > + data, count * table_info[table].component_size); Indentation. > + for (i = 0; i < PRESHADER_OP_MAX_ENUM; ++i) > + if (ins_code == pres_op_info[i].opcode) > + break; > + if (i == PRESHADER_OP_MAX_ENUM) > + { > + FIXME("Unknown opcode %#x, raw %#x.\n", ins_code, ins_raw); > + return NULL; > + } I'd use ARRAY_SIZE(pres_op_info) instead of PRESHADER_OP_MAX_ENUM. > + cdesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*cdesc) * desc.Constants); > + inputs_param = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*inputs_param) * desc.Constants); AFAICS neither really needs HEAP_ZERO_MEMORY. You should also check those allocations and bail out if either one fails. > +static void update_table_sizes_consts(unsigned int *table_sizes, struct d3dx_const_tab *ctab) > +{ > + unsigned int i, table, max_register; > + > + for (i = 0; i < ctab->input_count; ++i) > + { > + max_register = ctab->inputs[i].RegisterIndex + ctab->inputs[i].RegisterCount; > + table = ctab->regset2table[ctab->inputs[i].RegisterSet]; > + if (table < PRES_REGTAB_COUNT) > + table_sizes[table] = max(table_sizes[table], max_register); > + } > +} > + > +static void update_table_size(unsigned int *table_sizes, unsigned int table, unsigned int offset) > +{ > + table_sizes[table] = max(table_sizes[table], get_reg_offset(table, offset) + 1); > +} Why not use it also in update_table_sizes_consts()? The "table < PRES_REGTAB_COUNT" check should then go into the update_table_size() helper. > + if (const_count > UINT_MAX / sizeof(double)) > + { > + WARN("Invalid immediate constants count %u.\n", const_count); > + return NULL; > + } > + if (p - ptr + const_count * (sizeof(double) / sizeof(unsigned int)) >= count) > + { > + WARN("Byte code buffer ends unexpectedly.\n"); > + return NULL; > + } The first check seems unnecessary, if the idea was to avoid integer overflows in the second check you can rewrite that one instead (e.g. by dividing by sizeof(unsigned int) both sides of the inequality). That second check can probably be improved by verifying that the constants fit into the CLIT comment instead (see below). BTW, the function return type is HRESULT, those returns generate warnings for me. > + pres->ins = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pres->ins) * pres->ins_count); You should probably check this allocation too. > + for (i = 0; i < pres->ins_count; ++i) > + { > + unsigned int *ptr_next; > + > + ptr_next = parse_pres_ins(p, count, &pres->ins[i]); > + if (!ptr_next) > + return D3DXERR_INVALIDDATA; > + count -= ptr_next - p; > + p = ptr_next; > + } > + > + if (!count) > + { > + WARN("Byte code buffer ends unexpectedly.\n"); > + return D3DXERR_INVALIDDATA; > + } These kinds of size checks probably work but they are somewhat hard to follow. You could instead check the size of each comment section (making sure that it doesn't overflow the whole bytecode buffer) and then check that you don't go outside of each comment while parsing it. find_bytecode_comment() could do the first check before returning and, for example, also return the comment size so that the caller can use it to validate the relevant accesses. Hopefully what I mean is clear enough, otherwise as usual feel free to ask. > +err_out: > + FIXME("Error creating parameter evaluator.\n"); > + d3dx_free_param_eval(peval); > *peval_out = NULL; > - return E_NOTIMPL; > + return; > +} That return is now unnecessary.

March 31, 2016

Re: [PATCH 2/2] d3dx10: Add D3DX10UnsetAllDeviceObjects stub

by Matteo Bruni

2016-03-29 9:07 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > Reference: https://bugs.winehq.org/show_bug.cgi?id=27035 > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Applying: d3dx10: Add D3DX10UnsetAllDeviceObjects stub .git/rebase-apply/patch:35: new blank line at EOF. + .git/rebase-apply/patch:52: new blank line at EOF. + warning: 2 lines add whitespace errors. Looks okay otherwise.

March 31, 2016

Re: [PATCH 5/5] wined3d: Alpha test emulation for core profile contexts.

by Matteo Bruni

2016-03-31 22:58 GMT+02:00 Henri Verbeet <hverbeet(a)gmail.com>: > On 31 March 2016 at 19:51, Matteo Bruni <mbruni(a)codeweavers.com> wrote: >> + shader_addline(buffer, "if (alpha_test)\n"); >> + if (alpha_func != WINED3D_CMP_NEVER) >> + shader_addline(buffer, " if (!(%s[0].a %s alpha_ref))\n", >> + get_fragment_output(gl_info), comparison_operator[alpha_func - WINED3D_CMP_NEVER]); >> + shader_addline(buffer, " discard;\n"); > Is there really an advantage to having the "alpha_test" uniform > instead of just mapping disabled alpha test to WINED3D_CMP_ALWAYS? The advantage is to avoid creating two shader variants for alpha test enabled vs disabled and flipping between the two when the WINED3D_RS_ALPHATESTENABLE state is toggled. I only have some limited empiric evidence but it seems like changing the alpha test function is very rare in practice while toggling the alpha test enabled / disabled is relatively common. >> @@ -973,6 +981,7 @@ struct ps_compile_args { >> WORD texcoords_initialized; /* MAX_TEXTURES, 8 */ >> BOOL pointsprite; >> BOOL flatshading; >> + enum wined3d_cmp_func alpha_func; >> }; >> >> enum fog_src_type { >> @@ -2022,6 +2031,7 @@ struct ffp_frag_settings >> unsigned char pointsprite : 1; >> unsigned char flatshading : 1; >> unsigned char padding : 5; >> + enum wined3d_cmp_func alpha_func; > "alpha_func" only needs 4 bits (3 if you just mask the 4th bit), so > would still fit in the padding. That applies somewhat to struct > ps_compile_args as well, although we may care less there. Yes, it can be compressed. I'll have a look.

March 31, 2016

Re: [PATCH 5/5] wined3d: Alpha test emulation for core profile contexts.

by Henri Verbeet

On 31 March 2016 at 19:51, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > + shader_addline(buffer, "if (alpha_test)\n"); > + if (alpha_func != WINED3D_CMP_NEVER) > + shader_addline(buffer, " if (!(%s[0].a %s alpha_ref))\n", > + get_fragment_output(gl_info), comparison_operator[alpha_func - WINED3D_CMP_NEVER]); > + shader_addline(buffer, " discard;\n"); Is there really an advantage to having the "alpha_test" uniform instead of just mapping disabled alpha test to WINED3D_CMP_ALWAYS? > @@ -973,6 +981,7 @@ struct ps_compile_args { > WORD texcoords_initialized; /* MAX_TEXTURES, 8 */ > BOOL pointsprite; > BOOL flatshading; > + enum wined3d_cmp_func alpha_func; > }; > > enum fog_src_type { > @@ -2022,6 +2031,7 @@ struct ffp_frag_settings > unsigned char pointsprite : 1; > unsigned char flatshading : 1; > unsigned char padding : 5; > + enum wined3d_cmp_func alpha_func; "alpha_func" only needs 4 bits (3 if you just mask the 4th bit), so would still fit in the padding. That applies somewhat to struct ps_compile_args as well, although we may care less there.

March 31, 2016

Re: [PATCH v2 1/5] ddraw/tests: Add a test for color varyings clamping.

by Marvin

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=21816 Your paranoid android. === w1064 (32 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

March 31, 2016

wine-1.8.2-rc1 Available

by Michael Stefaniuc

Hello guys, sorry for the delay in preparing the next Stable release. Too much stuff going on and I couldn't focus on Wine. I have pushed today an informal wine-1.8.2-rc1 to https://github.com/mstefani/wine-stable https://static-winehq.rhcloud.com/stable/ 1.8.2-rc1 is fairly complete(*) from my point of view. The plan is to give the interested developers about a week time to look at the proposed 1.8.2. On Wednesday next week I plan to hand over the "final" to Alexandre, with a probable release on Friday next week. Depending on the feedback / outcry I might do another release candidate before Wednesday. (*) I wanted to include: Bug 39092 - Regression introduced with xaudio2_8 too. It is a beast to cherry-pick due to the dependencies and dependencies of dependencies... 1.8.2-rc1 is already big enough: - I have included this time interesting commits I have found interesting, mostly based on the additional information in the patch submission. - 32 bugs fixed (of which 6 are regressions). - 86 patches (of which 7 are tests only). - With test file changes filtered out: 95 files changed, 1873 insertions(+), 770 deletions(-) - The biggest "offender" for those changes is Bug 25086 - Multiple games and applications need kernel32.GetLogicalProcessorInformationEx implementation - I have attached the filtered diffstat While I have added a (lightweight) tag to it, I didn't bother with the rest of the release stuff. I have included that info in this email though. ---------------------------------------------------------------- Bugs fixed in 1.8.2-rc1 (total 32) [12652] Tom Clancy's Rainbow Six: Vegas 2 fails to launch (number of quality levels for D3DMULTISAMPLE_NONMASKABLE multiple-sample type must not exceed 8) [13683] Ultima IX: Mouse pointer missing when reading books, under inventory [14617] Multiple Visual Basic 5/6 applications using ActiveX components depend on Standard OLE Types Typelib which is missing from 'olepro32.dll' [15473] Adobe After Effects 4 crashes on startup [25086] Multiple games and applications need kernel32.GetLogicalProcessorInformationEx implementation (CPU-Z 1.72, Splinter Cell: Blacklist, Adobe CC 2015, Kontakt 5) [30687] Powerpoint 2003/2007: embedded video play/pause on click no longer works [32827] Legrand XlPro 3 (MFC app) crashes on startup (failure to load registry-free COM servers via app hook, 'OleCreate' must ignore HRESULT of 'IOleObject::GetMiscStatus') [33787] IE8 crashes on new tab [33988] Star Wars: The Force Unleashed II - Crashes with a page fault [34174] MinGW installer 0.5-beta-20120426-1 fails to process log files (sharing violation on temp file used for piped output) [34318] Multiple games and applications need ntdll.dll.EtwRegisterTraceGuidsW (Process Hacker 2.x, Far Cry 4) [35187] Jade Empire Special Edition configuration tool always resetting video settings [36013] bleem! 1.4 (PlayStation emulator) fails on startup, complaining with 'Not enough memory to load program!' [37115] Calling ReadFile from WINBASEAPI (WinBase.h) with zero read length causes hang [37288] Not implemented feature System.Drawing.Pen.ResetTransform() [37536] Native MSVCP120.dll override requires implementation of msvcr120.dll._W_Gettnames (Desura client) [37556] CompareStringW should abort on the first nonmatching character to avoid invalid memory access. [38314] Mouse Wheel doesn't work for Jagged Alliance 2 version 1.13 (it uses MOUSEHOOKSTRUCTEX) [39591] Crimzon Clover: Page fault on launch [39838] Wreckfest Server: Crashes at startup, unimplemented function KERNEL32.dll.GetConsoleScreenBufferInfoEx & SetConsoleScreenBufferInfoEx [39866] XIIZeal (steam) immediately exits on start [39875] Starcraft can't see Direct Cable Connection games hosted on another computer [39878] Diablo II does not start on 64bit system with more than 2GB VRAM cards [39908] SuperTux 0.3.5a crashes on startup, needs msvcr120.dll.strtof [40021] IDEA v1.7 fails to start [40053] Romance of the Three Kingdoms 13 (三國志13) fails to start [40083] Heroes of the Storm Freezes/Crashes after its recent updates [40129] MSI Reading and Writing Behaves differently than Windows [40147] Assertion 'm->state == STATE_PASSIVE' failed at pulse/mainloop.c:827 on starting Skype 7.18.0.112 [40201] EccoPro only works on Wine 1.6.2 [40204] Steam client fails to start with UmePlus font installed, when running in dwrite mode [40222] IMalloc(Spy)::Free nullptr ---------------------------------------------------------------- Changes since 1.8.1: Alex Henrie (1): ntdll: Finish serial reads of size 0 immediately. Alexandre Julliard (3): make_unicode: Fix typo in Indic syllable table generation. server: Implement serial port read interval timeouts. advapi32: Fix null termination in RegQueryInfoKeyA. Alistair Leslie-Hughes (7): user32: Don't crash in DrawTextEx when tab length is zero. olepro32: Add typelib resource. include: Add GdipGetPenTransform, GdipSetPenTransform declarations. gdiplus/tests: Add Pen Transform tests. gdiplus: Implement GdipGetPenTransform. gdiplus: Implement GdipSetPenTransform. gdiplus: Implement GdipResetPenTransform. Andrew Eikum (5): oleaut32: Don't clear BSTR size. mciqtz: Implement MCI_RESUME. xaudio2: Handle openal source allocation failure. winepulse.drv: Check that the server connection actually succeeded. ntdll: Implement SystemLogicalProcessorInformationEx. André Hentschel (2): winemaker: Markup fixes in German translation. ntdll: Set TPIDRURW also on ARMv8-A. Anton Baskanov (1): quartz: Set the result to 1.0 in FilterGraph::GetRate. Aric Stewart (1): winejoystick.drv: Initialize unhandled dwPOV to JOY_POVCENTERED. Austin English (1): kernel32: Add GetConsoleScreenBufferInfoEx/SetConsoleScreenBufferInfoEx stubs. Bernhard Übelacker (2): include: Implement todo_wine_if for usage in wine tests. msvcr120: Implement strtof and _strtof_l. Charles Davis (3): winex11.drv: Actually query the swap method attribute. dwrite: Fix typos, and fix definition of Mac LangCodes for Welsh and up. configure: Check for __builtin_ms_va_list on all x86_64 platforms. Christopher Thielen (1): user32: A window may be notified with WM_CAPTURECHANGED about itself if SetCapture() is called twice. Dmitry Timoshkov (1): kernel32: CompareStringW should abort on the first nonmatching character to avoid an invalid memory access. Frédéric Delanoy (1): winemaker: Markup fixes in French translation. Hans Leidekker (2): msiexec: Fix manpage markup for repair and logging modifiers. msi: Fix the CHAR column type. Henri Verbeet (1): ntdll: Add special handling for int $0x2d exceptions. Hugh McMaster (1): reg: Remove stub output from the 'add' and 'delete' functions. Huw D. M. Davies (1): ole32: The type of the size of IMalloc'ed blocks is SIZE_T. Jacek Caban (4): ntdll: Pass SYNCHRONIZE flag in NtOpenFile and NtCreateFile calls. ntdll: Don't call NtOpenKeyEx directly from NtOpenKey. kernel32: Don't set unconditionally SECTION_QUERY flag in OpenFileMapping. ntdll: Moved RegisterTraceGuids[AW] implementation to ntdll. Jens Reyer (2): loader: Fix macro-not-defined error from man. winemaker: Fix macro-not-defined errors from man. Józef Kucia (3): wined3d: Validate render state in wined3d_device_set_render_state(). wined3d: Limit amount of video memory for older Windows versions. wined3d: Allow to query if surface format supports gamma correction. Kira Backes (1): user32: Add MOUSEHOOKSTRUCTEX for mouse wheel support. Marcus Meissner (1): manpages: Markup fixes. Matteo Bruni (2): wined3d: Limit the number of WINED3D_MULTISAMPLE_NON_MASKABLE quality levels reported. wined3d: Add WINED3DFMT_FLAG_RENDERTARGET to WINED3DFMT_B5G5R5X1_UNORM. Michael Müller (6): msvideo.dll16: Translate 16 bit address in lparam for MCIWNDM_SETTIMEFORMATA message. include: Add definitions for Win8 pseudo handles. server: Add support for Win8 pseudo handles. advapi32/tests: Add tests for Win8 pseudo handles. kernel32: Allow to pass NULL as old protection in VirtualProtect for Win9x compatibility. user32: Preserve beginning of extra data for MDI windows. Miklós Máté (2): winex11: Add 1280x960 resolution. wined3d: Warn only once about unsupported wrap state. Nikolay Sivov (12): ole2disp: Implement SafeArrayGetDim(). ole2disp: Implement SafeArrayGetElemsize(). ole2disp: Implement SafeArrayLock()/SafeArrayUnlock(). ole2disp: Implement SafeArrayAccessData()/SafeArrayUnaccessData(). include: Fix IsBad* prototypes. ctl3d32: Claim success in Ctl3dRegister(). ole32: Ignore GetMiscStatus() returned value in OleCreate(). dwrite: Handle font data initialization failure when building collections. ntdll/tests: Some tests for NtQuerySystemInformationEx(). ntdll: Add NtQuerySystemInformationEx() stub. kernel32: Forward GetLogicalProcessorInformationEx() to ntdll. ole32: Don't call spy on IMalloc::Free(NULL). Paul Gofman (1): d3dx9: Fix D3DXIntersectTri function. Piotr Caban (5): msxml3: Update xmlNode reference count when nodes are merged in node_insert_before. msxml3: Store information about ignorrable whitespace nodes in xmlNode._private variable. msxml3: Reimplement node_get_text helper so it uses information about ignorred white space nodes. msxml3: Add support for CDATA nodes in node_get_text. msvcr110: Add _W_Gettnames implementation. Sebastian Lackner (13): vcomp/tests: Reenable architecture dependent tests. vcomp: Implement 64-bit atomic instructions. ntdll: Implement RtlInterlockedPushListSListEx and fix calling convention of RtlInterlockedPushListSList. kernel32/tests: Clean up interlocked SList tests. kernel32: Forward InterlockedPushListSList[Ex] to ntdll. cmd: Fix sharing permissions of piped output files. vmm.vxd: Fix protection flags passed to VirtualAlloc. ntdll: Mimic Windows behaviour when calling debug service. ntdll: Implement handling of int $0x2d for x86_64. ntdll/tests: Add more tests for calling int $0x2d on x86 and x86_64. ntdll/tests: Add additional tests for instruction pointer in debug service tests. ntdll/tests: Add separate tests for exception handling of int $0x3. ntdll: Fix up instruction pointer in context for EXCEPTION_BREAKPOINT on x86_64. bye michael

March 31, 2016

Re: [PATCH 1/2] d3dx10: Add D3D10CreateEffectPoolFromMemory stub

by Józef Kucia

On Tue, Mar 29, 2016 at 9:07 AM, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > dlls/d3d10/d3d10.spec | 2 +- > dlls/d3d10/d3d10_main.c | 9 +++++++++ > dlls/d3d10_1/d3d10_1.spec | 2 +- > include/d3d10effect.h | 2 ++ The subject prefix should be "d3d10:". > +HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *data, SIZE_T data_size, UINT fx_flags, > + ID3D10Device *device, ID3D10EffectPool **effectpool) > +{ Please use "effect_pool" instead of "effectpool", mainly for consistency (snake_case). > + FIXME("data %p, data_size %lu, fx_flags %#x, device %p, effectpool %p.\n", > + data, data_size, fx_flags, device, effectpool); The FIXME() message should end with "stub!" or "stub.". > + return E_NOTIMPL; > +} > + I think you can remove this additional empty line. > diff --git a/include/d3d10effect.h b/include/d3d10effect.h > index 1494894..5dafdae 100644 > --- a/include/d3d10effect.h > +++ b/include/d3d10effect.h > @@ -832,6 +832,8 @@ HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const > ID3D10Blob **effect, ID3D10Blob **errors); > HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT flags, > ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3D10Effect **effect); > +HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *data, SIZE_T data_size, UINT fx_flags, > + ID3D10Device *device, ID3D10EffectPool **effectpool); It should be "effect_pool" instead of "effectpool".

March 31, 2016

Re: [PATCH (try2)] setupapi: Fix spec entries for handle parameters

by Alexandre Julliard

Andrew Eikum <aeikum(a)codeweavers.com> writes: > On Thu, Mar 31, 2016 at 04:34:27AM +0200, Sebastian Lackner wrote: >> Is there any specific reason why you want to change that? Using "long" >> for handles is usually perfectly fine and it depends on the exact >> implementation details if its a pointer or just an index into a handle table. > > I thought that ptr and long were different widths on 64-bit, which > could lead to incorrect parameter dumping in relay logs. If that's not > the case, then ignore the patch. ptr and long are identical on both 32-bit and 64-bit. The distinction only matters for 16-bit. -- Alexandre Julliard julliard(a)winehq.org

March 31, 2016

Re: [PATCH (try2)] setupapi: Fix spec entries for handle parameters

by Andrew Eikum

On Thu, Mar 31, 2016 at 04:34:27AM +0200, Sebastian Lackner wrote: > On 30.03.2016 17:00, Andrew Eikum wrote: > > Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> > > --- > > > > try2: Turns out there's a whole bunch more of these. I think I got > > most/all of them. > > > > dlls/setupapi/setupapi.spec | 118 ++++++++++++++++++++++---------------------- > > 1 file changed, 59 insertions(+), 59 deletions(-) > > Is there any specific reason why you want to change that? Using "long" > for handles is usually perfectly fine and it depends on the exact > implementation details if its a pointer or just an index into a handle table. > I thought that ptr and long were different widths on 64-bit, which could lead to incorrect parameter dumping in relay logs. If that's not the case, then ignore the patch. Andrew

March 31, 2016

Re: [PATCH] msvcr120: Add scalbn

by Piotr Caban

On 03/31/16 08:45, Daniel Lehman wrote: @ cdecl scalbn(double long) MSVCRT__scalb It will not compile in case of i386 wine. MSVCRT__scalb is defined inside ifdef. Thanks, Piotr

March 31, 2016

Re: Need some advice on shell32

by Alexandre Julliard

Mathy Vanvoorden <mathy(a)vanvoorden.be> writes: > So by that reasoning it would be better then to in shell32 implement a > 'simpler' version: show dotted files when the option is activated, but > do not hide stuff like /dev, /proc and WINEPREFIX (since they are > native to Unix)? That's probably better, yes. -- Alexandre Julliard julliard(a)winehq.org

March 31, 2016

Re: ntoskrnl.exe: Make IoAllocateIrp not crash on negative values. (try 2)

by Sebastian Lackner

On 29.03.2016 22:13, Bernhard Übelacker wrote: > https://bugs.winehq.org/show_bug.cgi?id=39734 > > This patch should avoid crash in acedrv11.sys. > IoAllocateIrp is called with a stack_size of -128. > Therefore ExAllocatePool gets a negative size value. > > Tested against Windows XP. > (See the test based on wine-staging "driver testing framework" attached to the bug.) > ( https://newtestbot.winehq.org/JobDetails.pl?Key=21722 testrun by Sebastian Lackner.) > > Try 1: https://www.winehq.org/pipermail/wine-patches/2016-March/148587.html > Review 1: https://www.winehq.org/pipermail/wine-devel/2016-March/112476.html > > Changes since try 1: > - Fix usage of wrong variable. > - Use a better name for variable. > - Simplify if statement. > > Signed-off-by: Bernhard Übelacker <bernhardu(a)vr-web.de> > --- > dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) Thanks for the updated version. Could you maybe also add a couple of additional tests with charge_quota = TRUE? Since you are changing both versions, I'm fearing a bit that your changes could break other situations. If there are no unexpected test failures it looks good to me.

March 31, 2016

Re: [PATCH (try2)] setupapi: Fix spec entries for handle parameters

by Sebastian Lackner

On 30.03.2016 17:00, Andrew Eikum wrote: > Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> > --- > > try2: Turns out there's a whole bunch more of these. I think I got > most/all of them. > > dlls/setupapi/setupapi.spec | 118 ++++++++++++++++++++++---------------------- > 1 file changed, 59 insertions(+), 59 deletions(-) Is there any specific reason why you want to change that? Using "long" for handles is usually perfectly fine and it depends on the exact implementation details if its a pointer or just an index into a handle table.

March 31, 2016

Re: [PATCH 4/4] mshtml: Added IHTMLElement::outerText tests.

by Jacek Caban

On 03/30/16 19:25, Marvin wrote: > 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=21790 > > Your paranoid android. It seems that most IE version don't have limitation for usage with table elements, so there is no reason for us to have one. Please ignore the patch series, I will send better version tomorrow. Jacek

March 30, 2016

Re: [PATCH 4/4] mshtml: Added IHTMLElement::outerText tests.

by Marvin

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=21790 Your paranoid android. === wxppro (32 bit dom) === dom.c:6968: Test failed: put_outerText failed: 00000000 dom.c:6971: Test failed: expected len = 2, got 1 === wvistau64 (32 bit dom) === dom.c:6968: Test failed: put_outerText failed: 00000000 dom.c:6971: Test failed: expected len = 2, got 1 === w7u (32 bit dom) === dom.c:6968: Test failed: put_outerText failed: 00000000 dom.c:6971: Test failed: expected len = 2, got 1 === w7pro64 (32 bit dom) === dom.c:6968: Test failed: put_outerText failed: 00000000 dom.c:6971: Test failed: expected len = 2, got 1 === w8 (32 bit dom) === dom.c:6968: Test failed: put_outerText failed: 00000000 dom.c:6971: Test failed: expected len = 2, got 1 === w864 (32 bit dom) === dom.c:6968: Test failed: put_outerText failed: 00000000 dom.c:6971: Test failed: expected len = 2, got 1 === w1064 (32 bit dom) === dom.c:6968: Test failed: put_outerText failed: 00000000 dom.c:6971: Test failed: expected len = 2, got 1 === wvistau64 (64 bit dom) === dom.c:6968: Test failed: put_outerText failed: 00000000 dom.c:6971: Test failed: expected len = 2, got 1 === w7pro64 (64 bit dom) === dom.c:6968: Test failed: put_outerText failed: 00000000 dom.c:6971: Test failed: expected len = 2, got 1 === w864 (64 bit dom) === dom.c:6968: Test failed: put_outerText failed: 00000000 dom.c:6971: Test failed: expected len = 2, got 1 === w1064 (64 bit dom) === dom.c:6968: Test failed: put_outerText failed: 00000000 dom.c:6971: Test failed: expected len = 2, got 1

March 30, 2016

Re: Need some advice on shell32

by Mathy Vanvoorden

2016-03-30 4:50 GMT+02:00 Alexandre Julliard <julliard(a)winehq.org>: > The goal of the shell Unix folder is to show a view of the filesystem as > you would see it in a native Unix app, and it's using direct Unix calls > in order to do that. It allows showing symlinks, device files, etc. even > when we have to hide them in ntdll to avoid breaking apps. So I'm not > sure that replicating ntdll behavior's would be the right thing here. > So by that reasoning it would be better then to in shell32 implement a 'simpler' version: show dotted files when the option is activated, but do not hide stuff like /dev, /proc and WINEPREFIX (since they are native to Unix)?

March 30, 2016

Re: [PATCH] t2embed: Implement TTGetEmbeddingType()

by Nikolay Sivov

On 30.03.2016 13:05, Marvin wrote: > 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=21774 > > Your paranoid android. > > > === build (build) === > Make failed > > Probably didn't pick up configure changes, and new tests dir.

March 30, 2016

Re: [PATCH] t2embed: Implement TTGetEmbeddingType()

by Marvin

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=21774 Your paranoid android. === build (build) === Make failed

March 30, 2016

Re: WineHQ upgrade breaking dinput8:dinput?

by Bernhard Übelacker

Hello Francois, Am 30.03.2016 um 09:46 schrieb Francois Gouget: > On Fri, 25 Mar 2016, Francois Gouget wrote: > > On Fri, 25 Mar 2016, Bernhard Übelacker wrote: > [...] >> one point that could be related is the usage of function local static >> variables. When all of these got the "static" removed, I do not get the >> failures anymore. However I could not prove this with testbot as an empty >> patch did also succeed. > > I have not found static directives that I could remove to fix the > dinput8 failures. Which test did it make a difference for? Could you > send a diff? > > All I could find to fix this is to add 'CFLAGS = -d -O0' in the test's > Makefile.in but that does seem like a nice workaround :-( I attached a diff to this mail or see https://testbot.winehq.org/JobDetails.pl?Key=21671 In my tests it started to fail in a vm when just one of these "statics" was left. Kind regards, Bernhard

March 30, 2016

Re: WineHQ upgrade breaking dinput8:dinput?

by Francois Gouget

On Fri, 25 Mar 2016, Francois Gouget wrote: On Fri, 25 Mar 2016, Bernhard Übelacker wrote: [...] > one point that could be related is the usage of function local static > variables. When all of these got the "static" removed, I do not get the > failures anymore. However I could not prove this with testbot as an empty > patch did also succeed. I have not found static directives that I could remove to fix the dinput8 failures. Which test did it make a difference for? Could you send a diff? All I could find to fix this is to add 'CFLAGS = -d -O0' in the test's Makefile.in but that does seem like a nice workaround :-( -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ You can have my guns when you pry them from my kids cold, dead hands.

March 30, 2016

Re: Need some advice on shell32

by Alexandre Julliard

Mathy Vanvoorden <mathy(a)vanvoorden.be> writes: > 2016-03-29 17:49 GMT+02:00 Vincent Povirk <madewokherd(a)gmail.com>: > > I don't know why shell32 does this at all, rather than going > through > kernel32/ntdll like the rest of Wine. > > > My best guess is that shell32 existed before ntdll? > > So should I rewrite it to use ntdll then? > > Anyone else that can comment on this? The goal of the shell Unix folder is to show a view of the filesystem as you would see it in a native Unix app, and it's using direct Unix calls in order to do that. It allows showing symlinks, device files, etc. even when we have to hide them in ntdll to avoid breaking apps. So I'm not sure that replicating ntdll behavior's would be the right thing here. -- Alexandre Julliard julliard(a)winehq.org

March 30, 2016

Re: ntoskrnl.exe: Make IoAllocateIrp not crash on negative values.

by Bernhard Übelacker

Hello Sebastian, Am 28.03.2016 um 08:02 schrieb Sebastian Lackner: > On 27.03.2016 20:27, Bernhard Übelacker wrote: >> https://bugs.winehq.org/show_bug.cgi?id=39734 >> >> Changes should avoid crash in acedrv11.sys. >> IoAllocateIrp is called with a stack_size of -128. >> >> Tested against Windows XP. >> (See the test based on wine-staging "driver testing framework".) > > For reference, here a testbot run which confirms that the change is correct (for XP/2003): > https://newtestbot.winehq.org/JobDetails.pl?Key=21722 > >> >> Signed-off-by: Bernhard Übelacker <bernhardu(a)vr-web.de> >> --- >> dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++-- >> 1 file changed, 7 insertions(+), 2 deletions(-) >> >> diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c >> index 36488a7..f2ccc61 100644 >> --- a/dlls/ntoskrnl.exe/ntoskrnl.c >> +++ b/dlls/ntoskrnl.exe/ntoskrnl.c >> @@ -592,15 +592,20 @@ PIRP WINAPI IoAllocateIrp( CCHAR stack_size, BOOLEAN charge_quota ) >> { >> SIZE_T size; >> PIRP irp; >> + CCHAR _stack_size = stack_size; >> >> TRACE( "%d, %d\n", stack_size, charge_quota ); >> >> - size = sizeof(IRP) + stack_size * sizeof(IO_STACK_LOCATION); >> + if (_stack_size <= 0 || (_stack_size > 1 && stack_size < 8)) >> + _stack_size = 8; > > I would suggest to use a different variable, its very easy to mix up "stack_size" > and "_stack_size". You even mixed it up yourself in the if() condition above. ;) > If you want, you can also simplify the condition to (stack_size < 8 && stack_size != 1). > >> + >> + size = sizeof(IRP) + _stack_size * sizeof(IO_STACK_LOCATION); >> irp = ExAllocatePool( NonPagedPool, size ); >> if (irp == NULL) >> return NULL; >> IoInitializeIrp( irp, size, stack_size ); >> - irp->AllocationFlags = IRP_ALLOCATED_FIXED_SIZE; >> + if (stack_size >= 1 && stack_size <= 8) >> + irp->AllocationFlags = IRP_ALLOCATED_FIXED_SIZE; >> if (charge_quota) >> irp->AllocationFlags |= IRP_LOOKASIDE_ALLOCATION; >> return irp; >> thanks for your review. I have sent an updated patch. Is the test attached to the bug worth to be included into wine-staging? Kind regards, Bernhard

March 29, 2016

Re: Need some advice on shell32

by Mathy Vanvoorden

2016-03-29 17:49 GMT+02:00 Vincent Povirk <madewokherd(a)gmail.com>: > I don't know why shell32 does this at all, rather than going through > kernel32/ntdll like the rest of Wine. > My best guess is that shell32 existed before ntdll? So should I rewrite it to use ntdll then? Anyone else that can comment on this? Mathy

March 29, 2016

Re: [PATCH] d3drm: Partially Implement IDirect3DRM*::LoadTexture(v3).

by Henri Verbeet

On 29 March 2016 at 18:43, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > AddDestroyCallback would need to be implemened as seperate patches for > IDirect3DRMTexture*. Yeah, but it mostly comes down to adding a struct d3drm_object field to struct d3drm_texture, calling d3drm_object_add_destroy_callback() and d3drm_object_delete_destroy_callback() in the appropriate places, and some initialisation and cleanup code. Shouldn't be hard. > So the overall order of implementations/tests patches will be so: > > CreateObject implementation and test > InitFromImage implementation and test > CreateTexture implementation and test > IDirect3DRMObject function implementations for IDirect3DRMTexture*. > InitFromFile implementation and test > LoadTexture implementations > Yeah, that makes sense. The IDirect3DRMObject only need to be before InitFromFile(), so you could send them e.g. before the CreateObject() implementation as well, if you like.

March 29, 2016

Re: [PATCH] d3drm: Partially Implement IDirect3DRM*::LoadTexture(v3).

by Aaryaman Vasishta

AddDestroyCallback would need to be implemened as seperate patches for IDirect3DRMTexture*. Using the BOOL avoids that, but I have a feeling these callbacks might be useful in games as well, so I'll implement these first before LoadTexture patches. So the overall order of implementations/tests patches will be so: CreateObject implementation and test InitFromImage implementation and test CreateTexture implementation and test IDirect3DRMObject function implementations for IDirect3DRMTexture*. InitFromFile implementation and test LoadTexture implementations If the order is not proper, do let me know. Thanks for the review! Cheers, Aaryaman On Tue, Mar 29, 2016 at 8:52 PM, Henri Verbeet <hverbeet(a)gmail.com> wrote: > On 29 March 2016 at 17:01, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> > wrote: > > Are there any existing examples within wine where a destroy callback was > > used in similar cases? > If you mean AddDestroyCallback() specifically, that's pretty specific > to d3drm and you'd be limited to test_Viewport() in the d3drm tests. > The concept of a callback that gets called on destruction is much more > generic of course, and in that case you should be able to find plenty. > E.g. surface_wined3d_object_destroyed() in d3d9. >

March 29, 2016