- wine-devel - winehq.org

Re: usp10/tests: Reserve for InClass a byte for every character in teststr. (v4)
by Marvin 05 Aug '16

05 Aug '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=24770 Your paranoid android. === w1064 (32 bit usp10) === usp10.c:1467: Test failed: 0: uJustification incorrect (0) usp10.c:1467: Test failed: 1: uJustification incorrect (0) usp10.c:1467: Test failed: 2: uJustification incorrect (0) usp10.c:1467: Test failed: 3: uJustification incorrect (0) usp10.c:1467: Test failed: 4: uJustification incorrect (0) usp10.c:1467: Test failed: 5: uJustification incorrect (0) usp10.c:1467: Test failed: 6: uJustification incorrect (0) usp10.c:1467: Test failed: 7: uJustification incorrect (0) usp10.c:1467: Test failed: 8: uJustification incorrect (0) usp10.c:1467: Test failed: 9: uJustification incorrect (0) usp10.c:1483: Test failed: 3: uJustification incorrect (0) usp10.c:1483: Test failed: 5: fDiacritic incorrect (1) usp10.c:1483: Test failed: 5: fZeroWidth incorrect (1) usp10.c:1483: Test failed: 15: fDiacritic incorrect (1) usp10.c:1483: Test failed: 15: fZeroWidth incorrect (1) === w1064 (64 bit usp10) === usp10.c:1467: Test failed: 0: uJustification incorrect (0) usp10.c:1467: Test failed: 1: uJustification incorrect (0) usp10.c:1467: Test failed: 2: uJustification incorrect (0) usp10.c:1467: Test failed: 3: uJustification incorrect (0) usp10.c:1467: Test failed: 4: uJustification incorrect (0) usp10.c:1467: Test failed: 5: uJustification incorrect (0) usp10.c:1467: Test failed: 6: uJustification incorrect (0) usp10.c:1467: Test failed: 7: uJustification incorrect (0) usp10.c:1467: Test failed: 8: uJustification incorrect (0) usp10.c:1467: Test failed: 9: uJustification incorrect (0) usp10.c:1483: Test failed: 3: uJustification incorrect (0) usp10.c:1483: Test failed: 5: fDiacritic incorrect (1) usp10.c:1483: Test failed: 5: fZeroWidth incorrect (1) usp10.c:1483: Test failed: 15: fDiacritic incorrect (1) usp10.c:1483: Test failed: 15: fZeroWidth incorrect (1)

1 0

Fwd: Simple D3D/WGL demos for wine
by Ruslan Kabatsayev 05 Aug '16

05 Aug '16

Sorry, forgot to include the mailing list to recipients. ---------- Forwarded message ---------- From: Ruslan Kabatsayev <b7.10110111(a)gmail.com> Date: Fri, Aug 5, 2016 at 11:00 PM Subject: Re: Simple D3D/WGL demos for wine To: Matteo Bruni <matteo.mystral(a)gmail.com> On Fri, Aug 5, 2016 at 10:09 PM, Matteo Bruni <matteo.mystral(a)gmail.com> wrote: > 2016-08-04 19:29 GMT+02:00 Ruslan Kabatsayev <b7.10110111(a)gmail.com>: >> Hello all. I'd like to implement a set of simple demos which would be >> something like glxgears for Wine — a simple way to check that WGL, >> D3D8, D3D9 and later D3D10 and D3D11 are operational, without any need >> to look for a real app to test. I suppose it's not very interesting to >> have just flat untextured gears, so I'd instead draw a textured cube >> (similarly to what the tests in dxdiag do). > > Do you plan to include these demos in Wine or maintain them > separately? I'd be in favor of including them in Wine proper (others > might disagree though) but that introduces a few additional > constraints, like no C++ code allowed. I intended them to eventually get into Wine source, after I bring them to more or less final form. It seems Wine does provide some macros to call Direct3D virtual functions from C code — like IDirect3D9_CreateDevice. > BTW, actually we do have a (VERY sketchy) dxdiag implementation in > Wine, under programs/dxdiag/. You could integrate those demos into it > in principle. Good to know it exists, will look into integration of the demos there. Do you think the WGL demo still fits there? I'd like to have a demo for WGL since it's the simplest 3D interface for Wine, it's used by wined3d, and if even it's not working then the users would be better directed to where their problems might be (i.e. graphics configuration, not wined3d code). > >> I have some prototype code for this (standalone and written in C++ for >> now), and it uses D3DXCreateTextureFromFile. This is all OK when I >> compile for D3D9 with wineg++ or when I compile for D3D8 and D3D9 with >> ming32. But when I try to compile for D3D8 with wineg++, there's a >> problem, since there's no d3dx8*.h nor d3dx8.dll in Wine. >> >> Is it undesirable for Wine to have d3dx8 (I remember some commits >> removing the library and headers related to it several years ago)? > > You remember correctly. It turns out d3dx8 in practice was always > statically compiled into the game executables. IIRC the DX8 SDK had no > d3dx8.dll at all, just a d3dx8.lib with the full library. There was > also a d3dx8_d.dll with a debug version of the library but that wasn't > installed by the usual DirectX redistributable so applications can't > depend on its presence either. In any case, we've had 0 applications > using our d3dx8.dll, which means our implementation wasn't actually > used or tested and there was no point in keeping it. > >> Should I just drop usage of D3DXCreateTextureFromFile and use plain >> IDirect3DDeviceX::CreateTexture? > > You could use some other API to load the image files. I imagine that > mixing d3dx9.h with d3d8 won't be a great experience. There are other > options though, depending on the texture file format you want to use; > WIC (windowscodecs) might be a good choice generally speaking. > Another possibility is to create the textures you need procedurally, > without needing to load them from a file or a resource. For WGL version I used GdiPlus (flat) API, so I guess this is the way to go for D3D versions. The texture I thought of using was something like the following: http://6g6.eu/sih0-winehq-logo-glass.png I don't think it'd be easy to generate procedurally, although if there's a good idea on what image to use instead, I'd favor the procedural version due to its better reliability (i.e. no dependency on external file being readable, residing in the expected location etc.). > >> Also I use some matrix functions, which are identical between d3dx8 >> and d3dx9. Would it be OK if a wine demo would link to d3dx9 both for >> d3d9 and d3d8 versions of it? Or should I just reimplement all the >> needed functions? > > As I mentioned above, I suspect you would get issues when trying to > include d3dx9.h together with d3d8.h, although you can probably > workaround that in this case by carefully dividing your code over > multiple .c files. > Depending on what you exactly need, just copying or reimplementing the > relevant functions might be simpler. Yeah there were some issues with including d3dx9.h directly, I worked around them by manually declaring the necessary functions and types and still linking to d3dx9 DLL. > > As an aside, one possible objection to these demos could be "but we > have tests already!" IMO these cover a somewhat separate use case and > having simple d3d* demos that common users could easily run, similarly > to the "Test sound" button in winecfg, could be valuable.

1 0

Wineconf 2016 location and dates are set - book your travel now!
by Jeremy White 05 Aug '16

05 Aug '16

Hi folks, WineConf 2016 will be held on November 12th and 13th in St. Paul, MN. I've put up all of the details here: https://wiki.winehq.org/WineConf2016 Everyone is welcome at WineConf, please feel free to come. If you need help with travel expenses, please write to ask to ask for help; we are generally able to help, particularly for contributors to Wine (directions are in the Wiki). If you're interested in WineConf, you should sign up for the wineconf mailing list: https://www.winehq.org/mailman/listinfo/wineconf I've put the only two agenda items that matter to me on the Wiki: the keynote and fixing the tests. Feel free to suggest other topics or agenda items using the wineconf mailing list. I look forward to seeing you all there! Cheers, Jeremy

1 0

Re: [PATCH] d3dx9: Remove dead assignment (Coverity)
by Nikolay Sivov 05 Aug '16

05 Aug '16

On 05.08.2016 21:57, Matteo Bruni wrote: > 2016-08-04 8:17 GMT+02:00 Nikolay Sivov <nsivov(a)codeweavers.com>: >> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> >> --- >> >> It's overwritten right after if block. >> >> dlls/d3dx9_36/mesh.c | 1 - >> 1 file changed, 1 deletion(-) >> >> diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c >> index 3204ea7..c26aa72 100644 >> --- a/dlls/d3dx9_36/mesh.c >> +++ b/dlls/d3dx9_36/mesh.c >> @@ -5662,7 +5662,6 @@ static HRESULT create_outline(struct glyphinfo *glyph, void *raw_outline, int da >> pt->corner = POINTTYPE_CURVE_END; >> } >> outline->count--; >> - lastpt = &outline->items[outline->count - 1]; >> } else { >> /* outline closed with a line from end to start point */ >> attempt_line_merge(outline, outline->count - 1, &pt->pos, FALSE, cos_table); >> -- >> 2.8.1 > > Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> > > BTW, there is exactly the same issue in the tests in tests/mesh.c line 3737. > > Ok, will try to remember to remove it too.

1 0

Simple D3D/WGL demos for wine
by Ruslan Kabatsayev 05 Aug '16

05 Aug '16

Hello all. I'd like to implement a set of simple demos which would be something like glxgears for Wine — a simple way to check that WGL, D3D8, D3D9 and later D3D10 and D3D11 are operational, without any need to look for a real app to test. I suppose it's not very interesting to have just flat untextured gears, so I'd instead draw a textured cube (similarly to what the tests in dxdiag do). I have some prototype code for this (standalone and written in C++ for now), and it uses D3DXCreateTextureFromFile. This is all OK when I compile for D3D9 with wineg++ or when I compile for D3D8 and D3D9 with ming32. But when I try to compile for D3D8 with wineg++, there's a problem, since there's no d3dx8*.h nor d3dx8.dll in Wine. Is it undesirable for Wine to have d3dx8 (I remember some commits removing the library and headers related to it several years ago)? Should I just drop usage of D3DXCreateTextureFromFile and use plain IDirect3DDeviceX::CreateTexture? Also I use some matrix functions, which are identical between d3dx8 and d3dx9. Would it be OK if a wine demo would link to d3dx9 both for d3d9 and d3d8 versions of it? Or should I just reimplement all the needed functions? Regards, Ruslan

2 1

Re: d3dx10: Add D3DX10CreateEffectPoolFromFileA/W stubs.
by Matteo Bruni 05 Aug '16

05 Aug '16

2016-08-04 11:25 GMT+02:00 Andrey Gusev <andrey.goosev(a)gmail.com>: > For https://bugs.winehq.org/show_bug.cgi?id=39506 You should probably put the stubs in async.c. Looks good to me otherwise.

1 1

Re: [1/6] msvcirt: Add a partial implementation of class ostream_withassign.
by Piotr Caban 05 Aug '16

05 Aug '16

Hi Iván, On 08/05/16 13:12, Iván Matellanes wrote: > typedef struct _ostream { > const int *vbtable; > int unknown; > -} ostream; > +} ostream, ostream_withassign; I don't think you need ostream_withassign type. You can just use ostream since the structures are identical. > /* ??0ostream@@QAE@PAVstreambuf@@@Z */ > /* ??0ostream@@QEAA@PEAVstreambuf@@@Z */ > +/* ??0ostream_withassign@@QAE@PAVstreambuf@@@Z */ > +/* ??0ostream_withassign@@QEAA@PEAVstreambuf@@@Z */ > DEFINE_THISCALL_WRAPPER(ostream_sb_ctor, 12) Calling ostream equivalents is OK in most cases. In case of constructors ostream_withassing_vtable should be used. Thanks, Piotr

2 3

Re: [PATCH 3/3] jscript: Added more tests.
by Marvin 05 Aug '16

05 Aug '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=24755 Your paranoid android. === wxppro (32 bit) === Found no trace of the test summary line or of a crash === w2003std (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (32 bit) === Found no trace of the test summary line or of a crash === w2008s64 (32 bit) === Found no trace of the test summary line or of a crash === w7u (32 bit) === Found no trace of the test summary line or of a crash === w7pro64 (32 bit) === Found no trace of the test summary line or of a crash === w8 (32 bit) === Found no trace of the test summary line or of a crash === w864 (32 bit) === Found no trace of the test summary line or of a crash === w1064 (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (64 bit) === Found no trace of the test summary line or of a crash === w2008s64 (64 bit) === Found no trace of the test summary line or of a crash === w7pro64 (64 bit) === Found no trace of the test summary line or of a crash === w864 (64 bit) === Found no trace of the test summary line or of a crash === w1064 (64 bit) === Found no trace of the test summary line or of a crash

1 0

Re: wininet: Return data available in current chunk in chunked_get_avail_data.
by Sebastian Lackner 05 Aug '16

05 Aug '16

On 02.08.2016 15:33, Jacek Caban wrote: > > Based on patch by Hans Leidekker. > > Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> > --- > dlls/wininet/http.c | 26 ++++++++++++++++++++------ > 1 file changed, 20 insertions(+), 6 deletions(-) > It seems like this patch introduced test failures here: ../../../tools/runtest -q -P wine -T ../../.. -M wininet.dll -p wininet_test.exe.so http && touch http.ok http.c:815: Test failed: length = 12960, expected <= 8192

2 1

Re: [PATCH] dsound: Fix its vs it's typos
by Andrew Eikum 05 Aug '16

05 Aug '16

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> On Thu, Aug 04, 2016 at 10:57:43AM +0300, Nikolay Sivov wrote: > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > --- > dlls/dsound/sound3d.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c > index 840ab93..b416cdc 100644 > --- a/dlls/dsound/sound3d.c > +++ b/dlls/dsound/sound3d.c > @@ -294,12 +294,12 @@ if(0) > dsb->ds3db_ds3db.vVelocity.z == dsb->device->ds3dl.vVelocity.z)) > { > /* calculate length of ds3db_ds3db.vVelocity component which causes Doppler Effect > - NOTE: if buffer moves TOWARDS the listener, it's velocity component is NEGATIVE > - if buffer moves AWAY from listener, it's velocity component is POSITIVE */ > + NOTE: if buffer moves TOWARDS the listener, its velocity component is NEGATIVE > + if buffer moves AWAY from listener, its velocity component is POSITIVE */ > flBufferVel = ProjectVector(&dsb->ds3db_ds3db.vVelocity, &vDistance); > /* calculate length of ds3dl.vVelocity component which causes Doppler Effect > - NOTE: if listener moves TOWARDS the buffer, it's velocity component is POSITIVE > - if listener moves AWAY from buffer, it's velocity component is NEGATIVE */ > + NOTE: if listener moves TOWARDS the buffer, its velocity component is POSITIVE > + if listener moves AWAY from buffer, its velocity component is NEGATIVE */ > flListenerVel = ProjectVector(&dsb->device->ds3dl.vVelocity, &vDistance); > /* formula taken from Gianicoli D.: Physics, 4th edition: */ > /* FIXME: replace dsb->freq with appropriate frequency ! */ > -- > 2.8.1 > > >

1 0

Re: [PATCH 1/2] msvcp140: Take _Mtx_t and _Cnd_t directly
by Piotr Caban 05 Aug '16

05 Aug '16

On 08/05/16 00:33, Daniel Lehman wrote: > +#if _MSVCP_VER >= 140 > +typedef _Mtx_t _Mtx_arg_t; > +#define D(m) (m) > +#define R(m) (m) > +#else > +typedef _Mtx_t *_Mtx_arg_t; > +#define D(m) (*(m)) > +#define R(m) (&(m)) > +#endif How about changing the defines names to something more meaningful, like e.g.: #define MTX_T_FROM_ARG(m) ... #define MTX_T_TO_ARG(m) ... ? Thanks, Piotr

1 0

Re: [PATCH 1/2] concrt140: Add concrt140 stub
by Piotr Caban 05 Aug '16

05 Aug '16

On 08/05/16 00:33, Daniel Lehman wrote: > +MODULE = concrt140.dll > + > + > +C_SRCS = \ > + concrt140_main.c Do you need the concrt140_main.c file? I think the file may be added later (when needed). Thanks, Piotr

1 0

Re: usp10/tests: Reserve for InClass a byte for every character in teststr. (v3)
by Huw Davies 05 Aug '16

05 Aug '16

On Fri, Aug 05, 2016 at 12:50:10AM +0200, Bernhard Übelacker wrote: > diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c > index 6b2152f..971e275 100644 > --- a/dlls/usp10/tests/usp10.c > +++ b/dlls/usp10/tests/usp10.c > @@ -2900,7 +2900,7 @@ static void test_ScriptString(HDC hdc) > DWORD Flags = SSA_GLYPHS; > int ReqWidth = 100; > const int Dx[5] = {10, 10, 10, 10, 10}; > - const BYTE InClass = 0; > + static const BYTE InClass[8]; /* Array size needs to be at least equal to String_len */ And yet len == 10 in this case ;-) How about: static const BYTE InClass[ (sizeof(teststr) / sizeof(WCHAR)) - 1 ]; Of course now I've noticed Dx[5], that's clearly wrong. The sdk has it marked as _In_reads_opt_(cString), so I suggest marking this the same length too. Huw.

1 0

Re: [PATCH] ntdll: Call __finally blocks in __C_specific_handler
by Piotr Caban 05 Aug '16

05 Aug '16

Hi, I was also trying to implement support for finally blocks. My implementation differs a little from yours. On 08/05/16 02:53, Daniel Lehman wrote: > + if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) > + { > + for (i = 0; i < table->Count; i++) > + { > + if (context->Rip >= dispatch->ImageBase + table->ScopeRecord[i].BeginAddress && > + context->Rip < dispatch->ImageBase + table->ScopeRecord[i].EndAddress) > + { > + if (table->ScopeRecord[i].JumpTarget) continue; > + > + if (rec->ExceptionFlags & EH_TARGET_UNWIND && > + dispatch->TargetIp < dispatch->ImageBase + table->ScopeRecord[i].EndAddress) I was also checking if: dispatch->TargetIp >= dispatch->ImageBase + table->ScopeRecord[i].BeginAddress I'm not sure if this is needed. > + { > + break; > + } > + > + handler = (PC_LANGUAGE_EXCEPTION_HANDLER)(dispatch->ImageBase + table->ScopeRecord[i].HandlerAddress); Termination handlers have different signature. I was using following definition: typedef void (WINAPI *TERMINATION_HANDLER)( ULONG flags, ULONG64 frame ); I don't really know what is passed in first argument. I guess that it might be BYTE is_abnormal. On Windows flags were set to 0x1101 or 0x1201 in my test applications (I think that probably only least significant BYTE matters). Thanks, Piotr

1 0

Re: [PATCH 2/4] ucrtbase: Add __std_type_info_name implementation
by Sebastian Lackner 05 Aug '16

05 Aug '16

On 04.08.2016 16:28, Piotr Caban wrote: > +static void CDECL type_info_entry_free(void *ptr) > +{ > + ptr = (char*)ptr - FIELD_OFFSET(type_info_entry, name); > + MSVCRT_free(ptr); > +} [...] > + else > + { > + type_info_entry *entry = (type_info_entry*)(name-FIELD_OFFSET(type_info_entry, name)); > + InterlockedPushEntrySList(header, &entry->entry); > + } Its up to you of course, but why not CONTAINING_RECORD in those two cases?

2 1

Re: usp10/tests: Reserve for InClass a byte for every character in teststr. (v3)
by Marvin 04 Aug '16

04 Aug '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=24733 Your paranoid android. === w1064 (32 bit usp10) === usp10.c:1467: Test failed: 0: uJustification incorrect (0) usp10.c:1467: Test failed: 1: uJustification incorrect (0) usp10.c:1467: Test failed: 2: uJustification incorrect (0) usp10.c:1467: Test failed: 3: uJustification incorrect (0) usp10.c:1467: Test failed: 4: uJustification incorrect (0) usp10.c:1467: Test failed: 5: uJustification incorrect (0) usp10.c:1467: Test failed: 6: uJustification incorrect (0) usp10.c:1467: Test failed: 7: uJustification incorrect (0) usp10.c:1467: Test failed: 8: uJustification incorrect (0) usp10.c:1467: Test failed: 9: uJustification incorrect (0) usp10.c:1483: Test failed: 3: uJustification incorrect (0) usp10.c:1483: Test failed: 5: fDiacritic incorrect (1) usp10.c:1483: Test failed: 5: fZeroWidth incorrect (1) usp10.c:1483: Test failed: 15: fDiacritic incorrect (1) usp10.c:1483: Test failed: 15: fZeroWidth incorrect (1) === w1064 (64 bit usp10) === usp10.c:1467: Test failed: 0: uJustification incorrect (0) usp10.c:1467: Test failed: 1: uJustification incorrect (0) usp10.c:1467: Test failed: 2: uJustification incorrect (0) usp10.c:1467: Test failed: 3: uJustification incorrect (0) usp10.c:1467: Test failed: 4: uJustification incorrect (0) usp10.c:1467: Test failed: 5: uJustification incorrect (0) usp10.c:1467: Test failed: 6: uJustification incorrect (0) usp10.c:1467: Test failed: 7: uJustification incorrect (0) usp10.c:1467: Test failed: 8: uJustification incorrect (0) usp10.c:1467: Test failed: 9: uJustification incorrect (0) usp10.c:1483: Test failed: 3: uJustification incorrect (0) usp10.c:1483: Test failed: 5: fDiacritic incorrect (1) usp10.c:1483: Test failed: 5: fZeroWidth incorrect (1) usp10.c:1483: Test failed: 15: fDiacritic incorrect (1) usp10.c:1483: Test failed: 15: fZeroWidth incorrect (1)

1 0

Re: urlmon/tests: Make use of todo_wine_if().
by Marvin 04 Aug '16

04 Aug '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=24731 Your paranoid android. === w7u (32 bit url) === url.c:3414: Test failed: bctx should be destroyed here

1 0

Re: mmdevapi/tests: Make use of todo_wine_if().
by Marvin 04 Aug '16

04 Aug '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=24728 Your paranoid android. === w7u (32 bit capture) === capture.c:327: Test failed: GCP 11200 vs. BufferSize 21996 === w8 (32 bit capture) === capture.c:181: Test failed: Position 1015 expected 0 capture.c:231: Test failed: Position 2167 expected 1463 capture.c:261: Test failed: Position 2167 expected 1463 capture.c:323: Test failed: Position 3191 gap 1280 capture.c:327: Test failed: GCP 13440 vs. BufferSize 21996 capture.c:347: Test failed: Position 4279 expected 3639 capture.c:372: Test failed: Position 4727 expected 4087 === w864 (32 bit capture) === capture.c:181: Test failed: Position 1079 expected 0 capture.c:231: Test failed: Position 2167 expected 1527 capture.c:261: Test failed: Position 2167 expected 1527 capture.c:323: Test failed: Position 3191 gap 1216 capture.c:327: Test failed: GCP 13888 vs. BufferSize 21996 capture.c:347: Test failed: Position 4279 expected 3639 capture.c:348: Test failed: flags 1 capture.c:372: Test failed: Position 5303 expected 4087 capture.c:373: Test failed: flags 1 === w1064 (32 bit capture) === capture.c:181: Test failed: Position 1079 expected 0 capture.c:231: Test failed: Position 2167 expected 1527 capture.c:261: Test failed: Position 2167 expected 1527 capture.c:323: Test failed: Position 4215 gap 2240 capture.c:327: Test failed: GCP 11648 vs. BufferSize 21996 capture.c:347: Test failed: Position 5303 expected 4663 capture.c:348: Test failed: flags 1 capture.c:372: Test failed: Position 6391 expected 5111 capture.c:373: Test failed: flags 1 === w864 (64 bit capture) === capture.c:181: Test failed: Position 1015 expected 0 capture.c:231: Test failed: Position 2167 expected 1463 capture.c:261: Test failed: Position 2167 expected 1463 capture.c:323: Test failed: Position 3191 gap 1280 capture.c:327: Test failed: GCP 13888 vs. BufferSize 21996 capture.c:347: Test failed: Position 4343 expected 3639 capture.c:348: Test failed: flags 1 capture.c:372: Test failed: Position 4791 expected 4087 === w1064 (64 bit capture) === capture.c:181: Test failed: Position 1143 expected 0 capture.c:231: Test failed: Position 2167 expected 1591 capture.c:261: Test failed: Position 2167 expected 1591 capture.c:323: Test failed: Position 4215 gap 2176 capture.c:327: Test failed: GCP 11648 vs. BufferSize 21996 capture.c:347: Test failed: Position 5303 expected 4663 capture.c:348: Test failed: flags 1 capture.c:372: Test failed: Position 6391 expected 5111 capture.c:373: Test failed: flags 1

2 1

Re: user32/tests: Make use of todo_wine_if().
by Marvin 04 Aug '16

04 Aug '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=24730 Your paranoid android. === w864 (32 bit msg) === msg.c:6482: Test failed: Update region shouldn't be empty msg.c:6715: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6717: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6488: Test failed: Regions are different msg.c:6488: Test failed: Regions are different msg.c:6488: Test failed: Regions are different === w1064 (32 bit msg) === msg.c:6482: Test failed: Update region shouldn't be empty msg.c:6715: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6717: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6488: Test failed: Regions are different msg.c:6488: Test failed: Regions are different msg.c:6488: Test failed: Regions are different === w864 (64 bit msg) === msg.c:6482: Test failed: Update region shouldn't be empty msg.c:6715: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6717: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6488: Test failed: Regions are different msg.c:6488: Test failed: Regions are different msg.c:6488: Test failed: Regions are different msg.c:10053: Test failed: SendMessageTimeout succeeded msg.c:10054: Test failed: WmEmptySeq: 0: the msg sequence is not complete: expected 0000 - actual 0400 === w1064 (64 bit msg) === msg.c:6482: Test failed: Update region shouldn't be empty msg.c:6715: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6717: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6488: Test failed: Regions are different msg.c:6488: Test failed: Regions are different msg.c:6488: Test failed: Regions are different msg.c:7437: Test failed: destroy child on thread exit: 3: the msg sequence is not complete: expected 0000 - actual 001a

1 0

Re: [PATCH v4] ntoskrnl.exe: Implement ObReferenceObjectByName for created drivers
by Sebastian Lackner 04 Aug '16

04 Aug '16

On 04.08.2016 18:24, Aric Stewart wrote: > v2: Suggestions from Sebastian Lackner > v3: eliminate duplicated driver_name > v4: use the rb_tree > > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > dlls/ntoskrnl.exe/ntoskrnl.c | 30 ++++++++++++++++++++++++++++-- > 1 file changed, 28 insertions(+), 2 deletions(-) > > > > 0001-ntoskrnl.exe-Implement-ObReferenceObjectByName-but-onl.txt > > > diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c > index 25187d3..883e845 100644 > --- a/dlls/ntoskrnl.exe/ntoskrnl.c > +++ b/dlls/ntoskrnl.exe/ntoskrnl.c > @@ -2107,8 +2107,34 @@ NTSTATUS WINAPI ObReferenceObjectByName( UNICODE_STRING *ObjectName, > void *ParseContext, > void **Object) > { > - FIXME("stub\n"); > - return STATUS_NOT_IMPLEMENTED; > + struct wine_driver *driver; > + struct wine_rb_entry *entry; > + > + TRACE("mostly-stub:%s %i %p %i %p %i %p %p\n", debugstr_us(ObjectName), > + Attributes, AccessState, DesiredAccess, ObjectType, AccessMode, > + ParseContext, Object); > + > + if (AccessState) FIXME("Unhandled AccessState\n"); > + if (DesiredAccess) FIXME("Unhandled DesiredAccess\n"); > + if (ParseContext) FIXME("Unhandled ParseContext\n"); > + if (ObjectType) FIXME("Unhandled ObjectType\n"); > + > + if (AccessMode != KernelMode) > + { > + FIXME("UserMode access not implemented\n"); > + return STATUS_NOT_IMPLEMENTED; > + } > + > + entry = wine_rb_get(&wine_drivers, ObjectName); You will have to lock the CS before accessing the tree structure. > + if (!entry) > + { > + FIXME("Object not found, may not be tracked.\n"); For debugging purposes it would make sense to dump the name here. > + return STATUS_NOT_IMPLEMENTED; > + } > + > + driver = WINE_RB_ENTRY_VALUE(entry, struct wine_driver, entry); > + *Object = &driver->driver_obj; > + return STATUS_SUCCESS; > } > > > > >

1 0

Re: RFC: dinput8/tests: Add valid wide string termination to actionName member.
by Huw Davies 04 Aug '16

04 Aug '16

On Tue, Aug 02, 2016 at 11:34:10PM +0200, Bernhard Übelacker wrote: > https://bugs.winehq.org/show_bug.cgi?id=40384 > https://www.winehq.org/pipermail/wine-devel/2016-July/114054.html > > DirectX SDK offers the possibility to increase debug > output via "DirectX Control Panel". > This prints this error: > DINPUT8: ERROR IDirectInput8::EnumDevicesBySemantics: arg 2: invalid UNICODE string > > It looks like ansi version of EnumDevicesBySemantics forwards the string to > the wide variant without conversation. > So the assumption is that with the old compiler version we got > enough valid wide string termination between the ansi string actionName > member and the next invalid memory page. > This is the added test trying to prove by putting the string right before > a memory page with PAGE_NOACCESS. This seems pretty convincing, thanks for tracking this down. We don't actually want to test for this Windows bug, so please resend the patch without the PAGE_NOACCESS stuff - just add a comment explaining the double nul-termination. Huw.

1 0

Re: usp10/tests: Reserve for InClass a byte for every character in teststr. (v2)
by Huw Davies 04 Aug '16

04 Aug '16

On Thu, Aug 04, 2016 at 12:44:58AM +0200, Bernhard Übelacker wrote: > https://bugs.winehq.org/show_bug.cgi?id=40385 > > ScriptStringAnalyse crashes if InClass is just one byte in size > followed by memory marked as PAGE_NOACCESS. > By testing the size it seems it should have the same size as characters > in teststr are given to the function. Hi, Thanks for getting to the bottom of this. I don't think we want to test with the PAGE_NOACCESS stuff; it's pretty clear that MSDN is incorrect and class should indeed be an array. Just fix the bug and perhaps add a comment somewhere. Huw.

1 0

Re: usp10/tests: Reserve for InClass a byte for every character in teststr. (v2)
by Marvin 04 Aug '16

04 Aug '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=24709 Your paranoid android. === w1064 (32 bit usp10) === usp10.c:1467: Test failed: 0: uJustification incorrect (0) usp10.c:1467: Test failed: 1: uJustification incorrect (0) usp10.c:1467: Test failed: 2: uJustification incorrect (0) usp10.c:1467: Test failed: 3: uJustification incorrect (0) usp10.c:1467: Test failed: 4: uJustification incorrect (0) usp10.c:1467: Test failed: 5: uJustification incorrect (0) usp10.c:1467: Test failed: 6: uJustification incorrect (0) usp10.c:1467: Test failed: 7: uJustification incorrect (0) usp10.c:1467: Test failed: 8: uJustification incorrect (0) usp10.c:1467: Test failed: 9: uJustification incorrect (0) usp10.c:1483: Test failed: 3: uJustification incorrect (0) usp10.c:1483: Test failed: 5: fDiacritic incorrect (1) usp10.c:1483: Test failed: 5: fZeroWidth incorrect (1) usp10.c:1483: Test failed: 15: fDiacritic incorrect (1) usp10.c:1483: Test failed: 15: fZeroWidth incorrect (1) === w1064 (64 bit usp10) === usp10.c:1467: Test failed: 0: uJustification incorrect (0) usp10.c:1467: Test failed: 1: uJustification incorrect (0) usp10.c:1467: Test failed: 2: uJustification incorrect (0) usp10.c:1467: Test failed: 3: uJustification incorrect (0) usp10.c:1467: Test failed: 4: uJustification incorrect (0) usp10.c:1467: Test failed: 5: uJustification incorrect (0) usp10.c:1467: Test failed: 6: uJustification incorrect (0) usp10.c:1467: Test failed: 7: uJustification incorrect (0) usp10.c:1467: Test failed: 8: uJustification incorrect (0) usp10.c:1467: Test failed: 9: uJustification incorrect (0) usp10.c:1483: Test failed: 3: uJustification incorrect (0) usp10.c:1483: Test failed: 5: fDiacritic incorrect (1) usp10.c:1483: Test failed: 5: fZeroWidth incorrect (1) usp10.c:1483: Test failed: 15: fDiacritic incorrect (1) usp10.c:1483: Test failed: 15: fZeroWidth incorrect (1)

1 0

Re: [PATCH 2/2] winex11: track glx windows per thread
by Miklós Máté 03 Aug '16

03 Aug '16

On 07/22/2016 03:11 AM, Alexandre Julliard wrote: > Miklós Máté<mtmkls(a)gmail.com> writes: > >> Hmm, you are right. Mesa does set an XCloseDisplay callback to clean >> things up for the display connections it encounters. If I use >> data->display instead of gdi_display for pglXCreateWindow in line 1358 >> of opengl.c, the tests pass, and no zombie glx windows remain. I don't >> know if I should dare to take responsibility for this change, though, >> as I know almost nothing about GDI. > If it works then it's the right thing to do. I did some further testing, and it doesn't work. Mesa glx maintains its state per-display, and creating a drawable with one display connection but makecurrent with an other one can lead to bad things. Unfortunately, wine-csmt likes to do those from separate threads, so the thread-specific display connections cannot be used instead of the global gdi_display. MM

2 2

Re: [PATCH v3 ] programs/winedevice.exe: Use IoCreateDriver and IoDeleteDriver
by Sebastian Lackner 03 Aug '16

03 Aug '16

On 29.07.2016 21:02, Aric Stewart wrote: > v2: Pass a proper driver name to IoCreateDriver and use generated keyname > v3: Remove global driver_name > > The two patches are not longer a set as each is independent of the other > > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > programs/winedevice/device.c | 179 +++++++++++++++++++++++-------------------- > 1 file changed, 94 insertions(+), 85 deletions(-) > > > > 0002-programs-winedevice.exe-Use-IoCreateDriver-and-IoDelet.txt > > > diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c > index 94132ed..df0fac3 100644 > --- a/programs/winedevice/device.c > +++ b/programs/winedevice/device.c > @@ -40,11 +40,10 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); > > extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ); > > -static WCHAR *driver_name; > static SERVICE_STATUS_HANDLE service_handle; > static HANDLE stop_event; > -static DRIVER_OBJECT driver_obj; > -static DRIVER_EXTENSION driver_extension; > +static DRIVER_OBJECT *driver_obj; > +static HMODULE driver_module; How do you plan to adjust this when multiple drivers are loaded? Its still not clear to me, unfortunately. The static variables have to go away sooner or later. ;) > > /* find the LDR_MODULE corresponding to the driver module */ > static LDR_MODULE *find_ldr_module( HMODULE module ) > @@ -132,92 +131,25 @@ error: > return NULL; > } > > -/* call the driver init entry point */ > -static NTSTATUS init_driver( HMODULE module, UNICODE_STRING *keyname ) > -{ > - unsigned int i; > - NTSTATUS status; > - const IMAGE_NT_HEADERS *nt = RtlImageNtHeader( module ); > - > - if (!nt->OptionalHeader.AddressOfEntryPoint) return STATUS_SUCCESS; > - > - driver_obj.Size = sizeof(driver_obj); > - driver_obj.DriverSection = find_ldr_module( module ); > - driver_obj.DriverInit = (PDRIVER_INITIALIZE)((char *)module + nt->OptionalHeader.AddressOfEntryPoint); > - driver_obj.DriverExtension = &driver_extension; > - > - driver_extension.DriverObject = &driver_obj; > - driver_extension.ServiceKeyName = *keyname; > - > - if (WINE_TRACE_ON(relay)) > - WINE_DPRINTF( "%04x:Call driver init %p (obj=%p,str=%s)\n", GetCurrentThreadId(), > - driver_obj.DriverInit, &driver_obj, wine_dbgstr_w(keyname->Buffer) ); > - > - status = driver_obj.DriverInit( &driver_obj, keyname ); > - > - if (WINE_TRACE_ON(relay)) > - WINE_DPRINTF( "%04x:Ret driver init %p (obj=%p,str=%s) retval=%08x\n", GetCurrentThreadId(), > - driver_obj.DriverInit, &driver_obj, wine_dbgstr_w(keyname->Buffer), status ); > - > - WINE_TRACE( "init done for %s obj %p\n", wine_dbgstr_w(driver_name), &driver_obj ); > - WINE_TRACE( "- DriverInit = %p\n", driver_obj.DriverInit ); > - WINE_TRACE( "- DriverStartIo = %p\n", driver_obj.DriverStartIo ); > - WINE_TRACE( "- DriverUnload = %p\n", driver_obj.DriverUnload ); > - for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) > - WINE_TRACE( "- MajorFunction[%d] = %p\n", i, driver_obj.MajorFunction[i] ); > - > - return status; > -} > - > -/* call the driver unload function */ > -static void unload_driver( HMODULE module, DRIVER_OBJECT *driver_obj ) > -{ > - if (driver_obj->DriverUnload) > - { > - if (WINE_TRACE_ON(relay)) > - WINE_DPRINTF( "%04x:Call driver unload %p (obj=%p)\n", GetCurrentThreadId(), > - driver_obj->DriverUnload, driver_obj ); > - > - driver_obj->DriverUnload( driver_obj ); > - > - if (WINE_TRACE_ON(relay)) > - WINE_DPRINTF( "%04x:Ret driver unload %p (obj=%p)\n", GetCurrentThreadId(), > - driver_obj->DriverUnload, driver_obj ); > - } > - FreeLibrary( module ); > -} > - > /* load the .sys module for a device driver */ > -static HMODULE load_driver(void) > +static HMODULE load_driver(const WCHAR *driver_name, UNICODE_STRING * keyname) > { > static const WCHAR driversW[] = {'\\','d','r','i','v','e','r','s','\\',0}; > static const WCHAR systemrootW[] = {'\\','S','y','s','t','e','m','R','o','o','t','\\',0}; > static const WCHAR postfixW[] = {'.','s','y','s',0}; > static const WCHAR ntprefixW[] = {'\\','?','?','\\',0}; > static const WCHAR ImagePathW[] = {'I','m','a','g','e','P','a','t','h',0}; > - static const WCHAR servicesW[] = {'\\','R','e','g','i','s','t','r','y', > - '\\','M','a','c','h','i','n','e', > - '\\','S','y','s','t','e','m', > - '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', > - '\\','S','e','r','v','i','c','e','s','\\',0}; > > - UNICODE_STRING keypath; > HKEY driver_hkey; > HMODULE module; > LPWSTR path = NULL, str; > DWORD type, size; > > - str = HeapAlloc( GetProcessHeap(), 0, sizeof(servicesW) + strlenW(driver_name)*sizeof(WCHAR) ); > - lstrcpyW( str, servicesW ); > - lstrcatW( str, driver_name ); > - > - if (RegOpenKeyW( HKEY_LOCAL_MACHINE, str + 18 /* skip \registry\machine */, &driver_hkey )) > + if (RegOpenKeyW( HKEY_LOCAL_MACHINE, keyname->Buffer + 18 /* skip \registry\machine */, &driver_hkey )) Currently its hardcoded in ntoskrnl, but it would be better to check the prefix first. > { > - WINE_ERR( "cannot open key %s, err=%u\n", wine_dbgstr_w(str), GetLastError() ); > - HeapFree( GetProcessHeap(), 0, str); > + WINE_ERR( "cannot open key %s, err=%u\n", wine_dbgstr_w(keyname->Buffer), GetLastError() ); > return NULL; > } > - RtlInitUnicodeString( &keypath, str ); > > /* read the executable path from memory */ > size = 0; > @@ -233,7 +165,6 @@ static HMODULE load_driver(void) > HeapFree( GetProcessHeap(), 0, str ); > if (!path) > { > - RtlFreeUnicodeString( &keypath ); > RegCloseKey( driver_hkey ); > return NULL; > } > @@ -276,19 +207,98 @@ static HMODULE load_driver(void) > > module = load_driver_module( str ); > HeapFree( GetProcessHeap(), 0, path ); > - if (!module) > + return module; > +} > + > +/* call the driver init entry point */ > +static NTSTATUS WINAPI init_driver( DRIVER_OBJECT *driver_object, UNICODE_STRING *keyname ) > +{ > + unsigned int i; > + NTSTATUS status; > + const IMAGE_NT_HEADERS *nt; > + const WCHAR *driver_name; > + > + /* Retrieve driver name from the keyname */ > + driver_name = strrchrW(keyname->Buffer, '\\'); It would be better to test that this actually worked. > + driver_name++; > + > + driver_module = load_driver( driver_name, keyname ); > + if (!driver_module) > { > - RtlFreeUnicodeString( &keypath ); > - return NULL; > + WINE_ERR("Failed to load device\n"); > + return STATUS_DLL_INIT_FAILED; > } > > - init_driver( module, &keypath ); > - return module; > + nt = RtlImageNtHeader( driver_module ); > + > + if (!nt->OptionalHeader.AddressOfEntryPoint) return STATUS_SUCCESS; > + > + driver_obj = driver_object; driver_obj will remain uninitialized when the module has no entry point. You will still need it during the unload step. > + > + driver_object->DriverSection = find_ldr_module( driver_module ); > + driver_object->DriverInit = (PDRIVER_INITIALIZE)((char *)driver_module + nt->OptionalHeader.AddressOfEntryPoint); > + > + if (WINE_TRACE_ON(relay)) > + WINE_DPRINTF( "%04x:Call driver init %p (obj=%p,str=%s)\n", GetCurrentThreadId(), > + driver_object->DriverInit, driver_object, wine_dbgstr_w(keyname->Buffer) ); > + > + status = driver_object->DriverInit( driver_object, keyname ); > + > + if (WINE_TRACE_ON(relay)) > + WINE_DPRINTF( "%04x:Ret driver init %p (obj=%p,str=%s) retval=%08x\n", GetCurrentThreadId(), > + driver_object->DriverInit, driver_object, wine_dbgstr_w(keyname->Buffer), status ); > + > + WINE_TRACE( "init done for %s obj %p\n", wine_dbgstr_w(driver_name), driver_object ); > + WINE_TRACE( "- DriverInit = %p\n", driver_object->DriverInit ); > + WINE_TRACE( "- DriverStartIo = %p\n", driver_object->DriverStartIo ); > + WINE_TRACE( "- DriverUnload = %p\n", driver_object->DriverUnload ); > + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) > + WINE_TRACE( "- MajorFunction[%d] = %p\n", i, driver_object->MajorFunction[i] ); > + > + return status; > +} > + > +/* call the driver unload function */ > +static void unload_driver( HMODULE module, DRIVER_OBJECT *driver_obj ) > +{ > + if (driver_obj->DriverUnload) > + { > + if (WINE_TRACE_ON(relay)) > + WINE_DPRINTF( "%04x:Call driver unload %p (obj=%p)\n", GetCurrentThreadId(), > + driver_obj->DriverUnload, driver_obj ); > + > + driver_obj->DriverUnload( driver_obj ); > + > + if (WINE_TRACE_ON(relay)) > + WINE_DPRINTF( "%04x:Ret driver unload %p (obj=%p)\n", GetCurrentThreadId(), > + driver_obj->DriverUnload, driver_obj ); > + } > + FreeLibrary( module ); > + IoDeleteDriver( driver_obj ); > +} > + > +static HRESULT create_driver(const WCHAR *driver_name) > +{ This should be a NTSTATUS return value. > + static const WCHAR driverW[] = {'\\','D','r','i','v','e','r','\\',0}; > + UNICODE_STRING drv_name; > + HRESULT status; > + WCHAR *str; > + > + str = HeapAlloc( GetProcessHeap(), 0, sizeof(driverW) + strlenW(driver_name)*sizeof(WCHAR) ); > + lstrcpyW( str, driverW); > + lstrcatW( str, driver_name ); > + RtlInitUnicodeString( &drv_name, str ); > + > + status = IoCreateDriver( &drv_name, init_driver ); > + > + RtlFreeUnicodeString( &drv_name); > + return status; > } > > static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context ) > { > SERVICE_STATUS status; > + WCHAR* driver_name = (WCHAR*)context; > > status.dwServiceType = SERVICE_WIN32; > status.dwControlsAccepted = SERVICE_ACCEPT_STOP; > @@ -318,13 +328,13 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ > static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) > { > SERVICE_STATUS status; > - HMODULE driver_module; > + const WCHAR* driver_name = argv[0]; > > WINE_TRACE( "starting service %s\n", wine_dbgstr_w(driver_name) ); > > stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ); > > - service_handle = RegisterServiceCtrlHandlerExW( driver_name, service_handler, NULL ); > + service_handle = RegisterServiceCtrlHandlerExW( driver_name, service_handler, (VOID*)driver_name); Usually "void *" is preferred in Wine source. > if (!service_handle) > return; > > @@ -337,15 +347,14 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) > status.dwWaitHint = 10000; > SetServiceStatus( service_handle, &status ); > > - driver_module = load_driver(); > - if (driver_module) > + if (SUCCEEDED(create_driver(driver_name))) After changing the HRESULT -> NTSTATUS return value, this also needs to be adjusted. > { > status.dwCurrentState = SERVICE_RUNNING; > status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; > SetServiceStatus( service_handle, &status ); > > wine_ntoskrnl_main_loop( stop_event ); > - unload_driver( driver_module, &driver_obj ); > + unload_driver( driver_module, driver_obj ); > } > else WINE_ERR( "driver %s failed to load\n", wine_dbgstr_w(driver_name) ); > > @@ -359,7 +368,7 @@ int wmain( int argc, WCHAR *argv[] ) > { > SERVICE_TABLE_ENTRYW service_table[2]; > > - if (!(driver_name = argv[1])) > + if (!(argv[1])) You can also remove the brackets. ;) > { > WINE_ERR( "missing device name, winedevice isn't supposed to be run manually\n" ); > return 1; > > >

2 2

Re: [PATCH 5/5] jscript: More arguments object tests.
by Marvin 03 Aug '16

03 Aug '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=24706 Your paranoid android. === wxppro (32 bit) === Found no trace of the test summary line or of a crash === w2003std (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (32 bit) === Found no trace of the test summary line or of a crash === w2008s64 (32 bit) === Found no trace of the test summary line or of a crash === w7u (32 bit) === Found no trace of the test summary line or of a crash === w7pro64 (32 bit) === Found no trace of the test summary line or of a crash === w8 (32 bit) === Found no trace of the test summary line or of a crash === w864 (32 bit) === Found no trace of the test summary line or of a crash === w1064 (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (64 bit) === Found no trace of the test summary line or of a crash === w2008s64 (64 bit) === Found no trace of the test summary line or of a crash === w7pro64 (64 bit) === Found no trace of the test summary line or of a crash === w864 (64 bit) === Found no trace of the test summary line or of a crash === w1064 (64 bit) === Found no trace of the test summary line or of a crash

1 0

Re: [PATCH resend 07/10] dxgi/tests: Add tests for IDXGISwapChain_GetFullscreenState() to test_create_swapchain().
by Henri Verbeet 03 Aug '16

03 Aug '16

On 3 August 2016 at 09:41, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + /* When numerator is non-zero and denominator is zero, the windowed mode is used. > + * Additionally, some versions of WARP seem to always fail to change fullscreen state. */ > + if (result_desc.Windowed != creation_desc.Windowed) > + trace("Test %u: Failed to change fullscreen state.\n", i); For what it's worth, I seem to consistently get "device.c:616: Test 1: Failed to change fullscreen state." from this as well on Windows.

1 0

Re: [PATCH] wined3d: Check pointer before use
by Henri Verbeet 03 Aug '16

03 Aug '16

On 3 August 2016 at 04:29, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > - if (tq->context->tid != GetCurrentThreadId()) > + if (!tq->context || tq->context->tid != GetCurrentThreadId()) How can the context be NULL?

2 2

Re: RFC: usp10/tests: Reserve for InClass a byte for every character in teststr.
by Nikolay Sivov 03 Aug '16

03 Aug '16

On 03.08.2016 0:33, Bernhard Übelacker wrote: > https://bugs.winehq.org/show_bug.cgi?id=40385 > > ScriptStringAnalyse crashes if InClass is just one byte in size > followed by memory marked as PAGE_NOACCESS. > By testing the size it seems it should have the same size as characters > in teststr are given to the function. > --- > dlls/usp10/tests/usp10.c | 103 +++++++++++++++++++++++++++++++++++++++++++---- > 1 file changed, 95 insertions(+), 8 deletions(-) > > diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c > index 6b2152f..7eb0592 100644 > --- a/dlls/usp10/tests/usp10.c > +++ b/dlls/usp10/tests/usp10.c > @@ -2900,7 +2900,7 @@ static void test_ScriptString(HDC hdc) > DWORD Flags = SSA_GLYPHS; > int ReqWidth = 100; > const int Dx[5] = {10, 10, 10, 10, 10}; > - const BYTE InClass = 0; > + const BYTE InClass[len]; > SCRIPT_STRING_ANALYSIS ssa = NULL; > > int X = 10; > @@ -2916,29 +2916,30 @@ static void test_ScriptString(HDC hdc) > > > Charset = -1; /* this flag indicates unicode input */ > + memset((void*)InClass, 0, sizeof(InClass)); Instead of using len, it should be either use a constant, or be allocated dynamically, otherwise you'll get compiler warning with default flags we're building with. I think it would be easier to make it 'static const BYTE InClass[32];' (or whatever length is appropriate). Otherwise it looks reasonable, thanks for working on this.

1 0

Enabling/Disabling Joysticks from registry for the Mac
by DavidL 03 Aug '16

03 Aug '16

Hi Ken, I was looking into how the Linux-dinput code and joy.cpl work and comparing that to the macOS-dinput code. I have some questions about how best to proceed: joy.cpl uses joy->instance.tszInstanceName to name the joysticks in the control panel. In Linux-dinput code, they pass the joystick_devices[id].name to both tszInstanceName and tszProductName In the macOS-dinput code, they pass the name "Joystick #" where # is the index in the joystick array to the instance name and the joystick's actual name to the product name. When looking at the Microsoft guidelines for dinput, it does indeed say that the instance name *can* be joystick + position in the array, but doesn't specify that it *has* to be ( https://msdn.microsoft.com/en-us/library/windows/desktop/microsoft.directx_…). Also, I've confirmed that in the Windows 10 joystick control panel the joysticks are listed by their name, not by joystick number (and in my memory of earlier Windows OSes it's the same). So, should I change the macOS-dinput code to set both tszInstanceName and tszProductName to the product name (as in Linux) or should I change joy.cpl to use tszProductName instead of tszInstanceName? This will also make it easier in the registry to know which joystick is being enabled/disabled. Further, while joy.cpl correctly is a dinput control panel, enabling/disabling joystick should be for both dinput and winmm games - e.g. X-wing vs Tie Fighter even has the joystick control panel in the game's loader window*, but, once in the game, joystick control is handled by winmm. I believe the joystick registry entry is under dinput, but the winmm wine joystick driver should read that as well. Is it acceptable for wine joystick driver to read the dinput registry? Or should two registry entries be created? or should a single general joystick registry entry not under dinput or winmm control both? I may have more questions, but we'll start off with these. :) Cheers, David *Interestingly, the game's sequel X-wing: Alliance says I need to install DirectX to access joystick options in the loader window. I'm not sure why the older title brings up the joystick control panel just fine, but the later one does not.

2 2

Re: [PATCH 2/2] kernel32/tests/thread: Add tests for fiber-local storage.
by Marvin 02 Aug '16

02 Aug '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=24688 Your paranoid android. === w1064 (32 bit thread) === thread.c:1086: Test failed: got 0 with 5 (expected FALSE with ERROR_GEN_FAILURE)

1 0

Re: [PATCH 1/2 v2] kernel32/tests/loader: Add tests for fiber-local storage.
by Marvin 02 Aug '16

02 Aug '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=24687 Your paranoid android. === w1064 (32 bit loader) === loader.c:2980: Test failed: Test 0: ResolveDelayLoadedAPI failed loader.c:2981: Test failed: Test 0: expected 74374550, got 00000000 loader.c:2980: Test failed: Test 1: ResolveDelayLoadedAPI failed loader.c:2981: Test failed: Test 1: expected 72BC2CF0, got 00000000 loader.c:2980: Test failed: Test 2: ResolveDelayLoadedAPI failed loader.c:2981: Test failed: Test 2: expected 74372DC0, got 00000000 loader.c:2988: Test failed: Test 3: ResolveDelayLoadedAPI succeeded with 00000000 loader.c:2989: Test failed: Test 3: Wrong callback count: 0 loader.c:2988: Test failed: Test 4: ResolveDelayLoadedAPI succeeded with 00000000 loader.c:2989: Test failed: Test 4: Wrong callback count: 0 === wvistau64 (64 bit loader) === loader.c:720: Test failed: 2: unexpected error 193 loader.c:720: Test failed: 3: unexpected error 193 loader.c:720: Test failed: 4: unexpected error 193 loader.c:720: Test failed: 6: unexpected error 193 loader.c:720: Test failed: 7: unexpected error 193 loader.c:177: Test failed: WriteFile error 1784 === w2008s64 (64 bit loader) === loader.c:720: Test failed: 2: unexpected error 193 loader.c:720: Test failed: 3: unexpected error 193 loader.c:720: Test failed: 4: unexpected error 193 loader.c:720: Test failed: 6: unexpected error 193 loader.c:720: Test failed: 7: unexpected error 193 loader.c:177: Test failed: WriteFile error 1784 === w7pro64 (64 bit loader) === loader.c:720: Test failed: 2: unexpected error 193 loader.c:720: Test failed: 3: unexpected error 193 loader.c:720: Test failed: 4: unexpected error 193 loader.c:720: Test failed: 6: unexpected error 193 loader.c:720: Test failed: 7: unexpected error 193 loader.c:177: Test failed: WriteFile error 1784 === w864 (64 bit loader) === loader.c:720: Test failed: 2: unexpected error 193 loader.c:720: Test failed: 3: unexpected error 193 loader.c:720: Test failed: 4: unexpected error 193 loader.c:720: Test failed: 6: unexpected error 193 loader.c:720: Test failed: 7: unexpected error 193 loader.c:177: Test failed: WriteFile error 1784 === w1064 (64 bit loader) === loader.c:720: Test failed: 2: unexpected error 193 loader.c:720: Test failed: 3: unexpected error 193 loader.c:720: Test failed: 4: unexpected error 193 loader.c:720: Test failed: 6: unexpected error 193 loader.c:720: Test failed: 7: unexpected error 193 loader.c:177: Test failed: WriteFile error 1784

1 0

Re: [PATCH] d3dx10: Implement D3DX10CreateDeviceAndSwapChain
by Matteo Bruni 02 Aug '16

02 Aug '16

2016-08-02 9:48 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > + TRACE("adapter %p, driver_type %d, swrast %p, flags %#x, desc %p, swapchain %p, device %p\n", > + adapter, driver_type, swrast, flags, desc, swapchain, device); Missing period at the end of the trace message. > + if (SUCCEEDED(hr = D3D10CreateDeviceAndSwapChain1(adapter, driver_type, swrast, flags, D3D10_FEATURE_LEVEL_10_1, > + D3D10_1_SDK_VERSION, desc, swapchain, (ID3D10Device1 **)device))) > + return hr; > + > + if (SUCCEEDED(hr = D3D10CreateDeviceAndSwapChain1(adapter, driver_type, swrast, flags, D3D10_FEATURE_LEVEL_10_0, > + D3D10_1_SDK_VERSION, desc, swapchain, (ID3D10Device1 **)device))) > + return hr; > + > + return hr; > +} The second if is redundant, you're going to "return hr;" either way.

1 0

Re: RFC: usp10/tests: Reserve for InClass a byte for every character in teststr.
by Marvin 02 Aug '16

02 Aug '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=24683 Your paranoid android. === w1064 (32 bit usp10) === usp10.c:1467: Test failed: 0: uJustification incorrect (0) usp10.c:1467: Test failed: 1: uJustification incorrect (0) usp10.c:1467: Test failed: 2: uJustification incorrect (0) usp10.c:1467: Test failed: 3: uJustification incorrect (0) usp10.c:1467: Test failed: 4: uJustification incorrect (0) usp10.c:1467: Test failed: 5: uJustification incorrect (0) usp10.c:1467: Test failed: 6: uJustification incorrect (0) usp10.c:1467: Test failed: 7: uJustification incorrect (0) usp10.c:1467: Test failed: 8: uJustification incorrect (0) usp10.c:1467: Test failed: 9: uJustification incorrect (0) usp10.c:1483: Test failed: 3: uJustification incorrect (0) usp10.c:1483: Test failed: 5: fDiacritic incorrect (1) usp10.c:1483: Test failed: 5: fZeroWidth incorrect (1) usp10.c:1483: Test failed: 15: fDiacritic incorrect (1) usp10.c:1483: Test failed: 15: fZeroWidth incorrect (1) === w1064 (64 bit usp10) === usp10.c:1467: Test failed: 0: uJustification incorrect (0) usp10.c:1467: Test failed: 1: uJustification incorrect (0) usp10.c:1467: Test failed: 2: uJustification incorrect (0) usp10.c:1467: Test failed: 3: uJustification incorrect (0) usp10.c:1467: Test failed: 4: uJustification incorrect (0) usp10.c:1467: Test failed: 5: uJustification incorrect (0) usp10.c:1467: Test failed: 6: uJustification incorrect (0) usp10.c:1467: Test failed: 7: uJustification incorrect (0) usp10.c:1467: Test failed: 8: uJustification incorrect (0) usp10.c:1467: Test failed: 9: uJustification incorrect (0) usp10.c:1483: Test failed: 3: uJustification incorrect (0) usp10.c:1483: Test failed: 5: fDiacritic incorrect (1) usp10.c:1483: Test failed: 5: fZeroWidth incorrect (1) usp10.c:1483: Test failed: 15: fDiacritic incorrect (1) usp10.c:1483: Test failed: 15: fZeroWidth incorrect (1)

1 0

Re: [PATCH 1/2] kernel32/tests/loader: Add tests for fiber-local storage.
by Alexandre Julliard 02 Aug '16

02 Aug '16

John Sheu <sheu(a)google.com> writes: > Signed-off-by: John Sheu <sheu(a)google.com> > --- > dlls/kernel32/tests/loader.c | 125 ++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 123 insertions(+), 2 deletions(-) The tests fail here: ../../../tools/runtest -q -P wine -T ../../.. -M kernel32.dll -p kernel32_test.exe.so loader && touch loader.ok loader.c:1880: Test failed: FlsGetValue failed with error 87 loader.c:1880: Test failed: FlsGetValue failed with error 87 loader.c:1880: Test failed: FlsGetValue failed with error 87 loader.c:1880: Test failed: FlsGetValue failed with error 87 loader.c:1880: Test failed: FlsGetValue failed with error 87 loader.c:1880: Test failed: FlsGetValue failed with error 87 loader.c:1880: Test failed: FlsGetValue failed with error 87 loader.c:1880: Test failed: FlsGetValue failed with error 87 loader.c:1880: Test failed: FlsGetValue failed with error 87 loader.c:1880: Test failed: FlsGetValue failed with error 87 loader.c:1880: Test failed: FlsGetValue failed with error 87 loader.c:1880: Test failed: FlsGetValue failed with error 87 loader.c:1880: Test failed: FlsGetValue failed with error 87 loader.c:1880: Test failed: FlsGetValue failed with error 87 make[1]: *** [loader.ok] Error 14 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH v2] msxml3/test: Add XMLParser Tests
by Nikolay Sivov 02 Aug '16

02 Aug '16

On 02.08.2016 11:02, Alistair Leslie-Hughes wrote: > With Signed-off. > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/msxml3/tests/xmlparser.c | 196 ++++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 188 insertions(+), 8 deletions(-) > > diff --git a/dlls/msxml3/tests/xmlparser.c b/dlls/msxml3/tests/xmlparser.c > index 32514e3..bf896e4 100644 > --- a/dlls/msxml3/tests/xmlparser.c > +++ b/dlls/msxml3/tests/xmlparser.c > @@ -26,8 +26,45 @@ > #include "windows.h" > #include "ole2.h" > #include "xmlparser.h" > +#include "rpcproxy.h" > #include "wine/test.h" Why do you need this? > + > +static HRESULT hresult_NotifyEvent = S_OK; Please move this global variable to factory instance. > > static HRESULT WINAPI nodefact_QueryInterface(IXMLNodeFactory *iface, > REFIID riid, void **ppvObject) > @@ -54,34 +91,67 @@ static ULONG WINAPI nodefact_Release(IXMLNodeFactory *iface) > } > > static HRESULT WINAPI nodefact_NotifyEvent(IXMLNodeFactory *iface, > - IXMLNodeSource *pSource, XML_NODEFACTORY_EVENT iEvt) > + IXMLNodeSource *source, XML_NODEFACTORY_EVENT event) > { > - return E_NOTIMPL; > + switch(event) > + { > + case XMLNF_STARTDOCUMENT: > + CHECK_EXPECT(NotifyStartDocument); > + trace("NotifyEvent: XMLNF_STARTDOCUMENT\n"); > + break; > + case XMLNF_ENDPROLOG: > + CHECK_EXPECT(NotifyEndProlog); > + trace("NotifyEvent: XMLNF_ENDPROLOG\n"); > + break; > + case XMLNF_ENDDOCUMENT: > + CHECK_EXPECT(NotifyEndDocument); > + trace("NotifyEvent: XMLNF_ENDDOCUMENT\n"); > + break; > + case XMLNF_DATAAVAILABLE: > + CHECK_EXPECT(NotifyDataAvailable); > + trace("NotifyEvent: XMLNF_DATAAVAILABLE\n"); > + break; > + default: > + ok(0, "Unsupported NotifyEvent %p %d\n", source, event); > + return E_FAIL; > + } > + > + return hresult_NotifyEvent; > } Arguably trace()'s are not really useful in this context, and will appear on every parsing test. > > static HRESULT WINAPI nodefact_BeginChildren(IXMLNodeFactory *iface, > IXMLNodeSource *pSource, XML_NODE_INFO *pNodeInfo) > { > - return E_NOTIMPL; > + trace("nodefact_BeginChildren %p %p %d\n", pSource, pNodeInfo, > + pNodeInfo ? pNodeInfo->dwType : 0); > + return S_OK; > } > > static HRESULT WINAPI nodefact_EndChildren(IXMLNodeFactory *iface, > IXMLNodeSource *pSource, BOOL fEmpty, XML_NODE_INFO *pNodeInfo) > { > - return E_NOTIMPL; > + trace("nodefact_EndChildren %p %d %p %d\n", pSource, fEmpty, pNodeInfo, > + pNodeInfo ? pNodeInfo->dwType : 0); > + return S_OK; > } > > static HRESULT WINAPI nodefact_Error(IXMLNodeFactory *iface, > IXMLNodeSource *pSource, HRESULT hrErrorCode, USHORT cNumRecs, > XML_NODE_INFO **ppNodeInfo) > { > - return E_NOTIMPL; > + CHECK_EXPECT(FactoryError); > + trace("nodefact_Error %p %08x %d %p\n", pSource, hrErrorCode, cNumRecs, ppNodeInfo); > + return S_OK; > } > > -static HRESULT WINAPI nodefact_CreateNode(IXMLNodeFactory *iface, IXMLNodeSource *pSource, > - PVOID pNodeParent, USHORT cNumRecs, XML_NODE_INFO **ppNodeInfo) > +static HRESULT WINAPI nodefact_CreateNode(IXMLNodeFactory *iface, IXMLNodeSource *source, > + void *parent, USHORT recs, XML_NODE_INFO **nodeinfo) > { > - return E_NOTIMPL; > + trace("nodefact_CreateNode %p %p %d %p\n", source, parent, recs, nodeinfo); > + > + *nodeinfo = NULL; > + > + return S_OK; > } > > static const IXMLNodeFactoryVtbl nodefactoryVtbl = > @@ -150,6 +220,114 @@ static void create_test(void) > IXMLParser_Release(parser); > } > > +static void parse_documnet(void) > +{ > + HRESULT hr; > + IXMLParser *parser; > + IStream* stream = NULL; > + HGLOBAL hMem; > + LPBYTE bytes; > + > + hr = CoCreateInstance(&CLSID_XMLParser30, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLParser, (void**)&parser); > + if (FAILED(hr)) > + { > + win_skip("IXMLParser is not available (0x%08x)\n", hr); > + return; > + } > + > + hMem = GlobalAlloc(GMEM_MOVEABLE, strlen(empty_document)); > + bytes = GlobalLock(hMem); > + memcpy(bytes, empty_document, strlen(empty_document)); > + GlobalUnlock(hMem); > + > + CreateStreamOnHGlobal(hMem, TRUE, &stream); > + > + hr = IXMLParser_SetFactory(parser, &thenodefactory); > + ok(hr == S_OK, "Expected S_OK got 0x%08x\n", hr); > + > + hr = IXMLParser_SetInput(parser, (IUnknown *)stream); > + ok(hr == S_OK, "Expected S_OK got 0x%08x\n", hr); > + > + hr = IXMLParser_GetParserState(parser); > + ok(hr == XMLPARSER_IDLE, "got 0x%08x\n", hr); > + > + SET_EXPECT(NotifyStartDocument); > + SET_EXPECT(NotifyEndDocument); > + SET_EXPECT(NotifyEndProlog); > + SET_EXPECT(NotifyDataAvailable); > + hr = IXMLParser_Run(parser, -1); > + todo_wine ok(hr == S_OK, "Expected S_OK got 0x%08x\n", hr); > + todo_wine CHECK_CALLED(NotifyStartDocument); > + todo_wine CHECK_CALLED(NotifyEndDocument); > + todo_wine CHECK_CALLED(NotifyEndProlog); > + todo_wine CHECK_CALLED(NotifyDataAvailable); Main problem is that this does not test actual callback order - actual ordering is - start document; - create node; - end children; - end prolog; - data available; - end document; Please use test sequences facility saxreader.c is using - add_call(), ok_sequence(), etc. > START_TEST(xmlparser) > { > HRESULT hr; > @@ -160,6 +338,8 @@ START_TEST(xmlparser) > return; > > create_test(); > + parse_documnet(); > + parse_documnet_error(); I guess it was meant to be 'document'. > > CoUninitialize(); > } >

1 0

Re: [PATCH 10/11] dxgi: Add multi-monitor test for IDXGISwapChain_GetContainingOutput().
by Matteo Bruni 02 Aug '16

02 Aug '16

2016-08-01 22:28 GMT+02:00 Józef Kucia <jkucia(a)codeweavers.com>: > + refcount = IDXGIOutput_Release(output); > + ok(!refcount, "IDXGIOuput has %u references left.\n", refcount); > refcount = IDXGIOutput_Release(output2); > ok(!refcount, "IDXGIOuput has %u references left.\n", refcount); There are a number of those "Ouput" typos through the patch, probably copypasted from this preexisting ok() message. Certainly not worth a resend by itself, but since you're going to anyway...

1 0

Re: [PATCH 02/11] wined3d: Add WINED3DSWAPCHAIN_ALLOW_MODE_SWITCH flag.
by Matteo Bruni 02 Aug '16

02 Aug '16

2016-08-01 22:28 GMT+02:00 Józef Kucia <jkucia(a)codeweavers.com>: > - FIXME("Ignoring SwapEffect and Flags\n"); > + FIXME("Ignoring SwapEffect %#x.\n", desc->SwapEffect); Yes please. I ended up making a similar change for debugging at least twice in separate occasions (even though in neither case the swap effect had anything to do with the issue at hand) but I didn't feel like sending just the trace change and I never completed a patch actually passing the swap effect to wined3d. I still might at some point, but in the meantime I'd love to see the actual swap effect traced.

1 0

wine-1.8.4-rc1
by Michael Stefaniuc 02 Aug '16

02 Aug '16

Hello guys, I have pushed wine-1.8.4-rc1 (with tag) to https://github.com/mstefani/wine-stable https://static-winehq.rhcloud.com/stable/ Getting nearer to the goal of "around 50" commits for a stable release as this one contains only 66 commits. Nothing fancy though: - Stubs - More GPUs added - One wined3d fix backported (thanks again to Henri) - One original patch aka not cherry-picked, see below. Should somebody look at the release commit he'll notice that 7 of the bugs were already included in wine-1.8.3. That was a mistake as I had deferred those for a later release. So I've modified tools/make_announce to avoid that mistake in the future. For the release I would follow the same process: one week for feedback followed by another rc if needed with the final release 3-4 days later. Lets see how this works out as I'm on vacation travelling and Alexandre will travel too. And last but not least an excerpt from the ANNOUNCE file: What's new in this release (see below for details): - Various bug fixes. - A few more cards added to the GPU description table. ---------------------------------------------------------------- Bugs fixed in 1.8.4 (total 49): 18745 64-bit Mortal Kombat X crashes on unimplemented function KERNEL32.dll.GetLargePageMinimum 20977 Bad hlp table rendering 22819 Some applications like Heroes of Might and Magic 2 display loopback. 25396 Safrosoft RoX freezes at start. 26268 Multiple applications need ntdll.ZwSetLdtEntries stub (kwiksupport.me, Ragnarok Online patcher) 26965 Dragon Age 2 demo - sound in cutscenes is muffled 27680 Multiple 64-bit applications crash on startup (violation of the Windows 64-bit ABI, stack pointer (RSP) must be 16-byte aligned when making a call to Win64 API) 28082 OCCT Perestroïka needs hal.dll.READ_PORT_ULONG 34052 The Witcher: Character models are sometimes invisible 36556 valgrind shows a definite leak in comctl32/tests/syslink.c 36838 TOCA Touring Car Championship: installer copies one file from CD and then shows an error 37063 NTLM EncryptMessage/DecryptMessage failure 37090 Multiple applications crash with built-in amstream (Shogun: Total War, Medieval: Total War) 37271 Applications get IP address of 127.12.34.56 when lo0 is up on OSX 38102 Process Hacker 2.x needs winsta.dll.WinStationEnumerateW 38137 WBaduk: "Could not obtain OLE control window handle" regression 38811 Java JRE 8 installer 'jre-8uXX-windows-i586.exe' crashes on startup (GetThreadPreferredUILanguages is a stub) 38962 expr.c:234 and 235 attempted computation of 1 << 31 should be 1u << 31 39543 Multiple games and applications crash on unimplemented function KERNEL32.dll.FreeUserPhysicalPages (Microsoft Office 2007 diagnosis service, Eden Eternal) 39579 iNode 3.6 client needs ndis.sys.NdisAllocateMemoryWithTag 39842 Skype for windows doesn't work (needs ndis.sys.NdisSystemProcessorCount) 39911 dxd9 PresentationInterval not propagated on device Reset 39933 iNode 3.6 client needs ndis.sys.NdisAllocateSpinLock 40048 Camtasia Studio 8 : crashes on unimplemented function dwmapi.dll.DwmSetPresentParameters 40301 wxDatePickerCtrl (wxWidgets) generates an assert on DTM_GETRANGE message result 40380 Wine should take dosbox's configuration instead of creating a new one 40389 cmd.exe (native): Unimplemented function KERNEL32.dll.GetConsoleAliasExesLengthW 40487 3dmark Vantage Benchmark: unimplemented functions hal.dll.READ and WRITE PORT 40497 "Trainz: A New Era" needs msvcr120.dll.?__ExceptionPtrToBool@@YA_NPEBX@Z 40511 Application that copies files from one place to another stoped working in wine versions greater then 1.6.2 40532 Microsoft Word Viewer 11.8 does not show text on file properties dialog until the text is selected 40557 KSP Trajectory Optimization Tool (MATLAB Runtime (MCR)) crashes at launch 40562 AkelPad: [ToolBar plugin] tooltips for toolbar buttons have some extra text 40581 Regression: dsound input recording from microphone lags with 2 seconds delay 40614 Cisco Jabber 11.6 crashes due to missing dbghelp.dll.EnumerateLoadedModulesExW 40618 Autodesk 123D Design needs msvcr100.dll.mbsrtowcs_s 40659 Window with CS_OWNDC style cause DC leak when GetDC/ReleaseDC is used. 40691 DVDFab 9.2.4.4 pre-check FabCheck.exe executable fails, needs setupapi.dll.CM_Get_DevNode_Status 40745 Python 3.5.1 interpreter crashes, needs _set_thread_local_invalid_parameter_handler 40747 Microsoft Expression Web 4 crashes on startup, needs gdiplus.dll.GdipGetImageAttributesAdjustedPalette 40754 GOG Galaxy crashes with unimplemented function api-ms-win-crt-locale-l1-1-0.dll._lock_locales 40755 GOG Galaxy crashes with unimplemented function ucrtbase.dll._lock_locales 40756 GOG Galaxy crashes with unimplemented function api-ms-win-crt-heap-l1-1-0.dll._calloc_base 40770 Nvidia GeForce GT 730 not recognized properly 40796 Python 3.5.1 interpreter crashes when importing pyqtSlot 40830 Conflict between kVK_RightCommand and macOS 10.12 Sierra in carbon framework 40833 Batman: Arkham Origins Blackgate no sound during gameplay (except cutscenes) 40851 macOS 10.12 Build Failure in winspool.drv with cupsGetPPD 40923 Alone in the Dark (2008) crashes on launch with msvcrt assertion ---------------------------------------------------------------- Changes since 1.8.3: Alex Henrie (6): msvcrt: Stub out _(get|set)_thread_local_invalid_parameter_handler. ucrtbase: Implement _(un)lock_locales. ucrtbase: Implement _calloc_base. ucrtbase: Implement _malloc_base. ucrtbase: Implement _free_base. riched20: Don't call UpdateWindow after setting the background color. Alexandre Julliard (1): user32: Completely free owned DCEs when the corresponding window/class is destroyed. Alistair Leslie-Hughes (2): wininet: Free socket when connection is freed. wined3d: Correct memory size for Geforce 9600 GT. Andrew Eikum (3): dsound: Support downmixing 5.1 to stereo. dsound: Capture all available data on each period callback. xaudio2: Always set current OpenAL context before making AL calls. André Hentschel (1): ndis.sys: Implement NdisSystemProcessorCount. Austin English (12): hal: Add READ_PORT_ULONG stub. hal: Add READ_PORT_UCHAR stub. hal: Add WRITE_PORT_ULONG stub. kernel32: Add FreeUserPhysicalPages stub. winsta: Add a stub for WinStationEnumerateW. dwmapi: Add DwmSetPresentParameters stub. kernel32: Add GetConsoleAliasExesLengthA/W stubs. ntdll: Add NtSetLdtEntries/ZwSetLdtEntries stub. dbghelp: Add forwards for EnumerateLoadedModulesEx/EnumerateLoadedModulesExW. kernel32: Implement GetLargePageMinimum. ndis.sys: Add NdisAllocateMemoryWithTag stub. ndis.sys: Add NdisAllocateSpinLock stub. Benjamin Hodgetts (1): wined3d: Add Intel Iris chips to identification list. Bruno Jesus (1): ws2_32: Ensure default route IP addresses are returned first in gethostbyname. Béla Gyebrószki (2): wined3d: Add Nvidia GeForce GTS 250. wined3d: Add Nvidia GeForce GT 730 (GK208). David Woodhouse (1): secur32: Fix handling of ANSI NTLM credentials. Fabian Maurer (1): msacm32: Added converter for ADPCM to PCM 8 bit mono. Grazvydas Ignotas (3): wined3d: Use Intel data returned by Windows driver. wined3d: Add some more Intel GPUs. wined3d: Add a fallback for Skylake. Hans Leidekker (1): kernel32: Improve the stub for GetThreadPreferredUILanguages. Henri Verbeet (1): wined3d: Also update the swap interval when not recreating the context in wined3d_device_reset(). Jarkko Korpi (1): widl: Fix overflow when left-shifting. Jean-Christophe Cardot (6): winhlp32: Replace magic numbers by symbols. winhlp32: Add some trace calls. winhlp32: Add a warning trace. winhlp32: Prepare winhlp32 for more font types. winhlp32: Rework and rename HLPFILE_HalfPointsToTwips. winhlp32: Fix table formatting. Justas Lavišius (1): include: Force stack alignment on x86_64. Ken Thomases (2): winspool.drv: Include <cups/ppd.h> to fix building against the macOS 10.12 SDK. winemac: Don't define kVK_RightCommand when building against the macOS 10.12 SDK. Luis Sahagun (1): winevdm: Tell dosbox to read the current user's config. Matteo Bruni (1): wined3d: Add a setting to check relative addressing indices when accessing uniforms. Michael Müller (1): amstream: Implement IDirectDrawMediaStream::GetMultiMediaStream. Michael Stefaniuc (1): tools: Get the bug list for ANNOUNCE from the stable-notes git notes. Nikolay Sivov (2): comctl32/datetime: Use MCM_GETRANGE result directly in DTM_GETRANGE. comctl32/tooltips: Cut tooltip text at first tab char unless TTS_NOPREFIX is used. Olivier F. R. Dierick (1): shell32: Set last error explicitly in SHFileOperation(). Piotr Caban (6): msvcrt: Add mbsrtowcs_s implementation. msvcp110: Fix num_put<char> structure layout. msvcrt: Fix mbtowc behavior for buffers containing more than one character. ieframe: Restore closed IOleClientSite in DoVerb. msvcr120: Add __ExceptionPtrToBool implementation. msvcrt: Return error when previously parsed type is accessed while demangling simple data type. Rob Walker (1): setupapi: Add stub for setupapi.dll.CM_Get_DevNode_Status. Sebastian Lackner (3): comctl32/syslink: Fix a blocks leak (Valgrind). amstream/tests: Add tests for GetMultiMediaStream methods. server: Fix assignment of primary_group in token_duplicate. Stefan Leichter (3): kernel32: Add stub for GetSystemPreferredUILanguages. kernel32/tests: Add tests for GetSystemPreferredUILanguages. kernel32: Return a dummy value in GetSystemPreferredUILanguages. Vincent Povirk (1): gdiplus: Implement GdipGetImageAttributesAdjustedPalette. bye michael -- Michael Stefaniuc mstefani(a)winehq.org

3 3

Re: [v2 4/6] msvcirt: Implement istream::operator>> for integers.
by Piotr Caban 02 Aug '16

02 Aug '16

On 08/02/16 13:37, Iván Matellanes wrote: > +static istream* istream_internal_read_unsigned_integer(istream *this, void *p, int size) > +{ > + /* size: 0 => short, 1 => int, 2 => long */ > + ios *base = istream_get_ios(this); > + char buffer[16]; > + int num_base; > + LONG min_value[3] = {SHRT_MIN, INT_MIN, LONG_MIN}; > + ULONG umax_value[3] = {USHRT_MAX, UINT_MAX, ULONG_MAX}, tmp; Shouldn't min_value be equal to 0? How about changing the helper functions to have following prototypes: static LONG istream_internal_read_integer(istream *this, LONG min_value, LONG max_value); and static ULONG istream_internal_read_unsigned_integer(istream *this, ULONG max_value); I think the code will be nicer this way. Thanks, Piotr

2 1

Re: [v2 5/6] msvcirt: Implement istream::operator>> for floats.
by Piotr Caban 02 Aug '16

02 Aug '16

On 08/02/16 13:37, Iván Matellanes wrote: > +static istream* istream_internal_read_float(istream *this, void *p, int size) > +{ > + /* size: 0 => float, 1 => double, 2 => long double */ > + const int max_chars[3] = {20, 28, 32}; /* character count is limited on Windows */ > + char buffer[32]; > + double d; > + > + TRACE("(%p %p %d)\n", this, p, size); > + > + if (istream_ipfx(this, 0)) { > + if (istream_getdouble(this, buffer, max_chars[size]) > 0) { > + d = strtod(buffer, NULL); > + if (size == 0) { > + /* check whether the value fits in the output var */ > + if (d > FLT_MAX) > + d = FLT_MAX; > + else if (d < -FLT_MAX) > + d = -FLT_MAX; > + else if (d > 0 && d < FLT_MIN) > + d = FLT_MIN; > + else if (d < 0 && d > -FLT_MIN) > + d = -FLT_MIN; > + *((float*) p) = d; I think that this helper will be nicer if it has following prototype: static double istream_internal_read_float(istream *this, int max_chars); where max_chars is set to 20, 28 or 32 depending if float, double or LDOUBLE needs to be read. With FLT_MIN/FLT_MAX checks moved to operator>>(float) implementation. Thanks, Piotr

1 0

Re: [v2 3/6] msvcirt: Implement istream::operator>> for strings.
by Piotr Caban 02 Aug '16

02 Aug '16

On 08/02/16 13:37, Iván Matellanes wrote: > @@ -3514,7 +3514,28 @@ istream* __thiscall istream_read_char(istream *this, char *ch) > DEFINE_THISCALL_WRAPPER(istream_read_str, 8) > istream* __thiscall istream_read_str(istream *this, char *str) > { > - FIXME("(%p %p) stub\n", this, str); > + ios *base = istream_get_ios(this); > + int ch, count = 0; > + > + TRACE("(%p %p)\n", this, str); > + > + if (istream_ipfx(this, 0)) { > + for (ch = streambuf_sgetc(base->sb); > + str && count < (unsigned int) base->width - 1 && !isspace(ch); > + ch = streambuf_snextc(base->sb)) { streambuf_sgetc shouldn't be called if str == NULL. Thanks, Piotr

1 0

Re: [PATCH 2/5] mpr: Implement provider selection given remote name.
by Nikolay Sivov 02 Aug '16

02 Aug '16

On 02.08.2016 14:31, Pierre Schweitzer wrote: > + len = WideCharToMultiByte(CP_ACP, 0, provider->lpProvider, -1, NULL, 0, NULL, NULL); > + provider_name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); > + if (provider_name) > + memcpy(provider_name, provider->lpProvider, len * sizeof(WCHAR)); > + > + HeapFree(GetProcessHeap(), 0, provider); > + > + return provider_name; This is confusing. WNetGetResourceInformationW return W string, you convert it to A, and use A length to allocate another W buffer? What's going on?

2 2

Re: [PATCH 4/5] mpr: Implement WNetCancelConnectionA(), WNetCancelConnectionW(), WNetCancelConnection2A().
by Nikolay Sivov 02 Aug '16

02 Aug '16

This looks okay to me.

1 0

Re: [PATCH 1/5] mpr: Implement local name automatic redirection for disks. (try 3)
by Nikolay Sivov 02 Aug '16

02 Aug '16

On 02.08.2016 14:31, Pierre Schweitzer wrote: > + FIXME("Locale device selection is not implemented for printers.\n"); > + return WN_NO_NETWORK; This should be 'local', and not 'locale'.

1 0

Re: [PATCH 1/5] mpr: Implement local name automatic redirection for disks. (try 3)
by Nikolay Sivov 02 Aug '16

02 Aug '16

On 02.08.2016 14:31, Pierre Schweitzer wrote: > This fixes a bug seen during review for ReactOS commit: in case of local > redirection, the name wasn't properly converted back to ANSI for A callers. > > > -static void use_connection_set_accessnameW(struct use_connection_context *ctxt) > +static void use_connection_set_accessnameW(struct use_connection_context *ctxt, WCHAR *local_name) > { > WCHAR *accessname = ctxt->accessname; > - if (ctxt->resource->lpLocalName) > - strcpyW(accessname, ctxt->resource->lpLocalName); > + if (local_name) > + strcpyW(accessname, local_name); > else > strcpyW(accessname, ctxt->resource->lpRemoteName); > } You already have lpLocalName here, why another argument?

2 1

Re: [PATCH 3/5] mpr: Implement WNetCancelConnection2W().
by Nikolay Sivov 02 Aug '16

02 Aug '16

On 02.08.2016 14:31, Pierre Schweitzer wrote: > Resending just for offsets > > + if(providerTable->table[index].getCaps(WNNC_CONNECTION) & > + WNNC_CON_GETCONNECTIONS) > + { > + if (providerTable->table[index].cancelConnection) > + ret = providerTable->table[index].cancelConnection((LPWSTR)lpName, fForce); > + else > + ret = WN_NO_NETWORK; > + if (ret == WN_SUCCESS || ret == WN_OPEN_FILES) > + break; > + } I already asked about this before. Why is this using WNNC_CON_GETCONNECTIONS and not WNNC_CON_CANCELCONNECTION?

1 0

Re: [PATCH 02/11] wined3d: Add WINED3DSWAPCHAIN_ALLOW_MODE_SWITCH flag.
by Henri Verbeet 02 Aug '16

02 Aug '16

On 1 August 2016 at 22:28, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + if (mode) > + ERR("Ignoring mode.\n"); I think it's unclear what this means. "Ignoring mode" seems to suggest we're ignoring the mode, but shouldn't, in which case this should be a FIXME instead of an ERR. It could also mean the user of the API supplied a mode, but it has no effect because WINED3DSWAPCHAIN_ALLOW_MODE_SWITCH is not set on the swapchain, in which case this should be a WARN instead of an ERR. > -#define WINED3DPRESENTFLAG_LOCKABLE_BACKBUFFER 0x00000001 > -#define WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL 0x00000002 > -#define WINED3DPRESENTFLAG_DEVICECLIP 0x00000004 > -#define WINED3DPRESENTFLAG_VIDEO 0x00000010 > -#define WINED3DPRESENTFLAG_NOAUTOROTATE 0x00000020 > -#define WINED3DPRESENTFLAG_UNPRUNEDMODE 0x00000040 > +#define WINED3DSWAPCHAIN_LOCKABLE_BACKBUFFER 0x00000001 > +#define WINED3DSWAPCHAIN_DISCARD_DEPTHSTENCIL 0x00000002 > +#define WINED3DSWAPCHAIN_DEVICECLIP 0x00000004 > +#define WINED3DSWAPCHAIN_VIDEO 0x00000010 > +#define WINED3DSWAPCHAIN_NOAUTOROTATE 0x00000020 > +#define WINED3DSWAPCHAIN_UNPRUNEDMODE 0x00000040 > +#define WINED3DSWAPCHAIN_ALLOW_MODE_SWITCH 0x00001000 Since you're renaming things, I think I'd prefer these as "WINED3D_SWAPCHAIN_". We'll probably want flags/masks to be unsigned, although it usually doesn't make a difference in practice.

2 1

Re: [PATCH 06/11] dxgi: Switch display mode when creating fullscreen swapchains.
by Henri Verbeet 02 Aug '16

02 Aug '16

On 1 August 2016 at 22:28, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + if (swapchain->fullscreen) > + { > + if (FAILED(hr = wined3d_swapchain_set_fullscreen(swapchain->wined3d_swapchain, > + desc, NULL))) > + { > + WARN("Failed to set fullscreen state, hr %#x.\n", hr); > + wined3d_swapchain_decref(swapchain->wined3d_swapchain); > + goto cleanup; > + } > + > + if (FAILED(hr = IDXGISwapChain_GetContainingOutput(&swapchain->IDXGISwapChain_iface, > + &swapchain->target))) > + { > + struct wined3d_swapchain_desc wined3d_desc = *desc; > + WARN("Failed to get target output for fullscreen swapchain, hr %#x.\n", hr); > + wined3d_desc.windowed = FALSE; > + if (FAILED(hr = wined3d_swapchain_set_fullscreen(swapchain->wined3d_swapchain, > + &wined3d_desc, NULL))) Is this needed, or should swapchain destruction take care of this?

2 1

Re: [PATCH 10/11] dxgi: Add multi-monitor test for IDXGISwapChain_GetContainingOutput().
by Henri Verbeet 02 Aug '16

02 Aug '16

On 1 August 2016 at 22:28, Józef Kucia <jkucia(a)codeweavers.com> wrote: > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> > --- > dlls/dxgi/tests/device.c | 159 ++++++++++++++++++++++++++++++++++++++++------- > 1 file changed, 135 insertions(+), 24 deletions(-) > "dxgi/tests: ", right?

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