- wine-devel - winehq.org

Re: [PATCH 6/6] d3d10core/tests: Port test_multiple_render_targets() from d3d11.
by Marvin 29 Feb '16

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

1 0

Re: [PATCH 5/6] d3d10core/tests: Introduce check_texture_color().
by Marvin 29 Feb '16

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

1 0

Re: [PATCH 4/6] d3d11/tests: Introduce check_texture_color().
by Marvin 29 Feb '16

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

1 0

Re: [PATCH 3/6] d3d11/tests: Add test for multiple render targets.
by Marvin 29 Feb '16

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

1 0

Re: [PATCH 1/6] d3d10core/tests: Port test_create_typeless_resource() from d3d11.
by Marvin 29 Feb '16

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

1 0

Re: ole32: Do not open registry keys with no access rights.
by Sebastian Lackner 29 Feb '16

29 Feb '16

On 29.02.2016 16:49, Thomas Faber wrote: > While simply opening a subkey (as done here) does not require any > access rights in particular, NtOpenKey with 0 desired access always > fails with STATUS_ACCESS_DENIED on Windows. > Consequently specifying a nonzero access is a prerequisite for some day > fixing Wine's NtOpenKey behavior in this regard. It would be nice to have tests for that in the wine source tree (marked with todo_wine, until all places which rely on it have been fixed).

2 1

Re: [PATCH v3] winex11.drv: Make the GL context current even if no drawables were given.
by Matteo Bruni 29 Feb '16

29 Feb '16

2016-02-24 5:12 GMT+01:00 Charles Davis <cdavis5x(a)gmail.com>: > Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> > --- > Try 3: Fix an assignment I missed. (Thanks, Ken.) > > dlls/opengl32/tests/opengl.c | 2 +- > dlls/winex11.drv/opengl.c | 69 +++++++++++++++++++++++++------------------- > 2 files changed, 41 insertions(+), 30 deletions(-) > > diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c > index e5e1507..c058c19 100644 > --- a/dlls/opengl32/tests/opengl.c > +++ b/dlls/opengl32/tests/opengl.c > @@ -975,7 +975,7 @@ static void test_opengl3(HDC hdc) > * expect drivers to ever offer it. > */ > res = wglMakeCurrent(0, gl3Ctx); > - ok(res == FALSE, "Wow, OpenGL 3.0 windowless rendering passed while it was expected not to!\n"); > + ok(res || broken(!res), "OpenGL 3.0 windowless rendering failed!\n"); That seems suspicious... AFAICS the comment right above this hunk is still valid (it is for current Nvidia drivers on Win7 at least), which probably means that this patch is not a good idea.

4 5

Re: [PATCH 2/3] user32: Added more dialog owner tests.
by Marvin 29 Feb '16

29 Feb '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=20971 Your paranoid android. === w7u (32 bit msg) === msg.c:8926: Test failed: did not get expected count for minimum timeout (51 != ~100). === w7pro64 (32 bit msg) === msg.c:15473: Test failed: wrong status 00400040 === w1064 (32 bit msg) === msg.c:6417: Test failed: Update region shouldn't be empty msg.c:6651: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6653: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different msg.c:6423: Test failed: Regions are different

1 0

Re: [PATCH 1/2] include: add authz.h
by Alexandre Julliard 29 Feb '16

29 Feb '16

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > +typedef struct _AUTHZ_ACCESS_REPLY > +{ > + DWORD ResultListLength; > + DWORD *SaclEvaluationResults; > + DWORD *Error; > +} AUTHZ_ACCESS_REPLY, *PAUTHZ_ACCESS_REPLY; There's a field missing here. > +BOOL WINAPI AuthzInitializeResourceManager(DWORD flags, void *access_checker, > + void *compute_dyn_groups, void *free_dyn_groups, > + const WCHAR *managername, void *handle ); That's not the correct prototype. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v4 PATCH] comctl32/tooltip: Protect TTM_ADDTOOLW from invalid text pointers
by Alexandre Julliard 29 Feb '16

29 Feb '16

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > @@ -1041,6 +1041,9 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) > if (ti->cbSize >= TTTOOLINFOW_V2_SIZE && !ti->lpszText && isW) > return FALSE; > > + if(isW && ti->lpszText && IsBadReadPtr(ti->lpszText, sizeof(WCHAR))) > + return FALSE; You want IsBadStringPtrW, and this should most likely be merged with the check above it one way or another. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 4/4] d3d10core/tests: Test swapchain buffer cycling.
by Henri Verbeet 29 Feb '16

29 Feb '16

On 24 February 2016 at 23:28, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > Testing multisampling is not possible because only > DXGI_SWAP_EFFECT_DISCARD supports multisampled swapchains and it allows > only access to buffer 0. > > Not exactly test_flip from ddraw because we can't write to the end of > the chain... > > Plenty of todo_wine in here. The read-only part is missing and texturing > from swapchain buffers doesn't work either. > > foo > Is there a d3d11 version of this as well?

1 0

Re: xcopy/tests: Reset "current directory" of current process.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Jactry Zeng <jzeng(a)codeweavers.com> writes: > @@ -97,4 +99,5 @@ START_TEST(xcopy) > > DeleteFileA("xcopy1"); > RemoveDirectoryA("xcopytest"); > + SetCurrentDirectoryW(curdir); Restoring the directory at process exit is not useful. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: shell32/tests: Reset "current directory" of current process.
by Alexandre Julliard 29 Feb '16

29 Feb '16

Jactry Zeng <jzeng(a)codeweavers.com> writes: > @@ -1882,6 +1884,7 @@ static void test_ITEMIDLIST_format(void) { > } > > IShellFolder_Release(psfPersonal); > + SetCurrentDirectoryW(curdir); > } You'd need to do that on the various error returns too. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/2] ntoskrnl.exe: Track drivers created with IoCreateDriver
by Sebastian Lackner 29 Feb '16

29 Feb '16

On 26.02.2016 21:22, Aric Stewart wrote: > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > dlls/ntoskrnl.exe/ntoskrnl.c | 64 +++++++++++++++++++++++++++++++++----------- > 1 file changed, 48 insertions(+), 16 deletions(-) > > > > 0002-ntoskrnl.exe-Track-drivers-created-with-IoCreateDriver.txt > > > diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c > index 3bee2bf..49c8cab 100644 > --- a/dlls/ntoskrnl.exe/ntoskrnl.c > +++ b/dlls/ntoskrnl.exe/ntoskrnl.c > @@ -72,6 +72,16 @@ static DWORD request_thread; > static DWORD client_tid; > static DWORD client_pid; > > +typedef struct _created_driver { > + struct list entry; > + > + UNICODE_STRING driver_name; > + DRIVER_OBJECT *driver_obj; > + DRIVER_EXTENSION *driver_extension; Isn't it possible to add the DRIVER_OBJECT and DRIVER_EXTENSION struct directly (without pointer), to avoid multiple memory allocations? I would also suggest to use a more meaningful name than "created_driver", and you also don't really need the typedef. Something like "struct wine_driver" would make more sense for example, but probably you have a better idea. ;) > +} created_driver; > + > +struct list created_drivers = LIST_INIT(created_drivers); > + > #ifdef __i386__ > #define DEFINE_FASTCALL1_ENTRYPOINT( name ) \ > __ASM_STDCALL_FUNC( name, 4, \ > @@ -818,36 +828,47 @@ PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG majorfunc, PDEVICE_OBJECT device, > */ > NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) > { > - DRIVER_OBJECT *driver; > - DRIVER_EXTENSION *extension; > + created_driver *driver; > NTSTATUS status; > > TRACE("(%s, %p)\n", debugstr_us(name), init); > > if (!(driver = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, > - sizeof(*driver) + sizeof(*extension) ))) > + sizeof(*driver) ))) > + return STATUS_NO_MEMORY; > + > + if (!(driver->driver_obj = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, > + sizeof(*driver->driver_obj) + sizeof(*driver->driver_extension) ))) > + { > + RtlFreeHeap( GetProcessHeap(), 0, driver ); > return STATUS_NO_MEMORY; > + } > > - if ((status = RtlDuplicateUnicodeString( 1, name, &driver->DriverName ))) > + if ((status = RtlDuplicateUnicodeString( 1, name, &driver->driver_name ))) > { > + RtlFreeHeap( GetProcessHeap(), 0, driver->driver_obj ); > RtlFreeHeap( GetProcessHeap(), 0, driver ); > return status; > } > > - extension = (DRIVER_EXTENSION *)(driver + 1); > - driver->Size = sizeof(*driver); > - driver->DriverInit = init; > - driver->DriverExtension = extension; > - extension->DriverObject = driver; > - extension->ServiceKeyName = driver->DriverName; > + driver->driver_extension = (DRIVER_EXTENSION *)((BYTE*)driver->driver_obj + sizeof(*driver->driver_obj)); > + driver->driver_obj->DriverName = driver->driver_name; > + driver->driver_obj->Size = sizeof(*driver->driver_obj); > + driver->driver_obj->DriverInit = init; > + driver->driver_obj->DriverExtension = driver->driver_extension; > + driver->driver_extension->DriverObject = driver->driver_obj; > + driver->driver_extension->ServiceKeyName = driver->driver_name; > > - status = driver->DriverInit( driver, name ); > + status = driver->driver_obj->DriverInit( driver->driver_obj, name ); > > if (status) > { > - RtlFreeUnicodeString( &driver->DriverName ); > + RtlFreeUnicodeString( &driver->driver_name ); > + RtlFreeHeap( GetProcessHeap(), 0, driver->driver_obj ); > RtlFreeHeap( GetProcessHeap(), 0, driver ); > } > + > + list_add_tail( &created_drivers, &driver->entry ); Such a global list will need locking. > return status; > } > > @@ -855,12 +876,23 @@ NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) > /*********************************************************************** > * IoDeleteDriver (NTOSKRNL.EXE.@) > */ > -void WINAPI IoDeleteDriver( DRIVER_OBJECT *driver ) > +void WINAPI IoDeleteDriver( DRIVER_OBJECT *driver_object ) > { > - TRACE("(%p)\n", driver); > + created_driver *driver, *next; > + > + TRACE("(%p)\n", driver_object); > + By putting the driver_object in the same struct, you could use CONTAINING_RECORD here. Also, a lock will be required while unlinking the driver from the list. > + LIST_FOR_EACH_ENTRY_SAFE(driver, next, &created_drivers, created_driver, entry) > + { > + if (driver->driver_obj == driver_object) > + { > + list_remove( &driver->entry ); > + RtlFreeUnicodeString( &driver->driver_name); > + break; > + } > + } > > - RtlFreeUnicodeString( &driver->DriverName ); > - RtlFreeHeap( GetProcessHeap(), 0, driver ); > + RtlFreeHeap( GetProcessHeap(), 0, driver_object ); > } > > > > >

2 2

Re: [PATCH] programs/winedevice.exe: Use IoCreateDriver and IoDeleteDriver
by Sebastian Lackner 29 Feb '16

29 Feb '16

On 26.02.2016 21:15, Aric Stewart wrote: > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > programs/winedevice/device.c | 55 ++++++++++++++++++++------------------------ > 1 file changed, 25 insertions(+), 30 deletions(-) > > > > 0001-programs-winedevice.exe-Use-IoCreateDriver-and-IoDelet.txt > > > diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c > index 94132ed..f6dd678 100644 > --- a/programs/winedevice/device.c > +++ b/programs/winedevice/device.c > @@ -43,8 +43,8 @@ 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; Most of it looks fine, but isn't the plan to get rid of global variables? Do you plan to remove it again in follow-up patches? > > /* find the LDR_MODULE corresponding to the driver module */ > static LDR_MODULE *find_ldr_module( HMODULE module ) > @@ -133,38 +133,35 @@ error: > }

2 1

Re: [PATCH] packet: create packet.dll and Implement PacketGetAdapterNames(try 7)
by André Hentschel 27 Feb '16

27 Feb '16

Am 26.02.2016 um 02:35 schrieb Jianqiu Zhang: > > Hi, still some problems: see the mail by slackner on try 6 missing blank lines I pointed out meanwhile you can totally omit empty_str no need for brackets around single lines Best regards

1 0

Re: shell32/tests: Reset "current directory" of current process.
by Marvin 27 Feb '16

27 Feb '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=20931 Your paranoid android. === w1064 (32 bit shlfolder) === shlfolder.c:1591: Test failed: IShellFolder_GetDisplayNameOf(NULL) failed! hr = 80070057

1 0

Re: windowscodecs/tests: Use todo_wine_if() in tests.
by Frédéric Delanoy 27 Feb '16

27 Feb '16

Arf, forget this one, bad title. My bad. Frédéric On Sat, Feb 27, 2016 at 2:42 PM, Frédéric Delanoy <frederic.delanoy(a)gmail.com> wrote: > Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> > --- > dlls/dxgi/tests/device.c | 20 ++++---------------- > 1 file changed, 4 insertions(+), 16 deletions(-) > > diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c > index dd5da83..7b052d3 100644 > --- a/dlls/dxgi/tests/device.c > +++ b/dlls/dxgi/tests/device.c > @@ -478,19 +478,13 @@ static void test_createswapchain(void) > hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); > ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); > > ...

1 0

[PATCH] comdlg32: Use SetDlgItemInt() instead of writing number manually.
by carlo.bramix＠libero.it 27 Feb '16

27 Feb '16

Hello friends, I have sent this patch: https://source.winehq.org/patches/data/119492 but it has been put in "Formatting" state and I cannot understand why. Could you help me and tell me what's wrong, so I will use more attention next time? Thank you very much. Sincerely, Carlo Bramini.

3 2

[GSoC] Idea: Implement functions from Concurrency namespace
by YongHao Hu 27 Feb '16

27 Feb '16

Hello, folks. I'm YongHao Hu. I participated in GSoC of Wine last year and most of the work are finished. This year I want to implement functions from Concurrency namespace[1]. As Wine had already implemented class Concurrency::critical_section[2], SpinWait and Concurrency::details::_GetConcurrency, and I had found information in Microsoft open-source project for cloud-based client-server communication in native code using a modern asynchronous C++ API design[3] which are helpful for the implementation, I think that I am able to handle this project. By now, I had made some patches as my proof of concept.[4] There are many bugs[4-8] relied on functions from Concurrency namespace, this project would fix some bugs and benefit wine's behavior on many software. By making an appropriate proposal, I think the project's work can satisfy GSoC's requirement. Thank you for reading this email. I will be grateful for any advice you can provide. [1]: https://msdn.microsoft.com/en-us/library/dd492819.aspx [2]: https://msdn.microsoft.com/en-us/library/dd492843.aspx [3]: https://github.com/Microsoft/cpprestsdk [4]: https://github.com/YongHaoWu/wine-hub/commits/Concurrency [5]: https://bugs.winehq.org/show_bug.cgi?id=37887 [6]: https://bugs.winehq.org/show_bug.cgi?id=37997 [7]: https://bugs.winehq.org/show_bug.cgi?id=39685 [8]: https://bugs.winehq.org/show_bug.cgi?id=34676 [9]: https://bugs.winehq.org/show_bug.cgi?id=37976

3 6

Wine Mono release plans
by Vincent Povirk 26 Feb '16

26 Feb '16

Hi everyone, With Wine moving to a yearly stable release series, I thought it would make sense to base Wine Mono updates on that schedule. My general plan is to create a branch of Wine Mono after each new development series of Wine begins. After this branch is made, there will be no more merges from upstream Mono (barring some compelling changes that can't easily be cherry-picked). Build fixes and obviously correct bug fixes for related platforms will be cherry-picked from upstream, as will changes that look especially relevant to Wine. If you want to suggest a specific change for Wine Mono (whether it's upstream or not), email me or send a pull request to one of my repositories on github. I've made a wine-mono-4.6 branch for this on github (https://github.com/madewokherd/wine-mono/tree/wine-mono-4.6) and there are 4.6.0 packages on dl.winehq.org (http://dl.winehq.org/wine/wine-mono/4.6.0/). I plan to send patches to update Wine to use this version shortly, but as always you can install it early if you want by using 'wine64 msiexec' (or just 'wine msiexec' if you have a 32-bit prefix). Merges from upstream Mono will still be made on the master branch, and I will work to keep Wine compatible with the master branch as the development cycle goes on. However, no releases will be made from the master branch. Each Wine Mono series will be compatible with the corresponding development series of Wine, and the stable series before and after. Thus all Wine Mono 4.6.x versions should work with Wine 1.8.x, 1.9.x, or 2.0.x. I'm not sure if I will continue to publish changelogs for each release. In this case, the only major changes in 4.6.0 are the update from upstream and the ability to function on a basic level in a 64-bit Wine process.

1 0

Re: [PATCH] winex11: Don't create a temporary context each time X11DRV_wglBindTexImageARB is called.
by Matteo Bruni 26 Feb '16

26 Feb '16

2016-02-25 16:22 GMT+01:00 Miklós Máté <mtmkls(a)gmail.com>: > Theoretically wglBindTexImageARB is supposed to be a fast > render-to-texture method, and creating a new context is anything but fast. > > This fixes horrible performance in Star Wars > Knights of the Old Republic when post-process effects are enabled. > > Signed-off-by: Miklós Máté <mtmkls(a)gmail.com> > --- > dlls/winex11.drv/opengl.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c > index 99befde..d2b72cf 100644 > --- a/dlls/winex11.drv/opengl.c > +++ b/dlls/winex11.drv/opengl.c > @@ -235,6 +235,8 @@ struct wgl_pbuffer > GLenum texture_type; > GLuint texture; > int texture_level; > + GLXContext tmp_context; > + int has_tmp_context; > }; You don't need the "has_tmp_context" field, the struct is zeroed at allocation and you can just check if the context is non-zero. You do need to store the context which was current at the time tmp_context was last created though (see below). > > enum dc_gl_type > @@ -2940,12 +2942,15 @@ static BOOL X11DRV_wglBindTexImageARB( struct wgl_pbuffer *object, int iBuffer ) > } > > TRACE("drawable=%lx, context=%p\n", object->drawable, prev_context); > - tmp_context = pglXCreateNewContext(gdi_display, object->fmt->fbconfig, object->fmt->render_type, prev_context, True); > + if (!object->has_tmp_context) { > + object->tmp_context = pglXCreateNewContext(gdi_display, object->fmt->fbconfig, object->fmt->render_type, prev_context, True); > + object->has_tmp_context = 1; > + } As I mentioned in my previous reply, the temporary context is shared with prev_context (which is correct, second to last parameter of glXCreateNewContext()) and that means it has to be recreated if prev_context changes between calls to wglBindTexImageARB. So please store prev_context in object and destroy and recreate the temporary context if the current prev_context is different.

1 0

Re: [PATCH 2/2] authz: Stub functions AuthzAccessCheck, AuthzFreeContext, AuthzInitializeContextFromSid, AuthzInitializeContextFromToken
by Sebastian Lackner 26 Feb '16

26 Feb '16

On 25.02.2016 08:50, Alistair Leslie-Hughes wrote: > From: Zhenbo Li <litimetal(a)gmail.com> > > Moved defines to authz.h I will assume you typed the definitions in patch 1 yourself, and did not move them from Zhenbo Lis patch - otherwise a remark about authorship would be necessary in 1/2. > Minor cleanup of parameter names. > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/authz/authz.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ > dlls/authz/authz.spec | 8 +++---- > 2 files changed, 62 insertions(+), 4 deletions(-) >

2 2

Re: [PATCH 2/2] Programs: Load device drivers of the same group into the same winedevice process
by Sebastian Lackner 26 Feb '16

26 Feb '16

On 24.02.2016 15:16, Aric Stewart wrote: > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > programs/services/services.c | 124 ++++++++++++++++++++++++++++ > programs/winedevice/device.c | 191 ++++++++++++++++++++++++++++++++++++------- > 2 files changed, 286 insertions(+), 29 deletions(-) > Although the general idea seems fine, the patches are still very hacky, and I fear we need a better method to communicate between services and winedevices - a separate mailslot communication doesn't seem like a good idea. The main issues I still see: * Instead of two separate communication channels, we should implement marshalling of data structures, and return them for example in the ServiceCtrlHandler callback. Depending on the exact mechanism, special care has to be taken to ensure the process is up and running before sending control commands. * Currently wine supports loading of both 32-bit and 64-bit drivers. This needs special care in both patch 1 and patch 2. A winedevice process with the wrong architecture will not be able to load the driver. * programs/services should be able to track the services correctly. Unfortunately it seems like the advapi32 functions do not offer any nice method to add additional services after startup. Maybe we could add a wine-specific extension here? * Proper locking is required before accessing the database or services structures. Those are technical issues though, and can be fixed of course. I'm currently trying a couple of own ideas, and will share them as soon as they do something useful. ;) Regards, Sebastian

2 1

Re: [PATCH] configure: Check for __builtin_ms_va_list on all x86_64 platforms.
by Alexandre Julliard 26 Feb '16

26 Feb '16

Charles Davis <cdavis5x(a)gmail.com> writes: > If we're running configure, we're probably not going to be using Visual > C++, even on Windows. Everywhere else, we need this for variadic > argument lists to work. You could probably unify the Mac OS case with the x86_64 one, instead of adding another check for the build host. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] winex11: Don't create a temporary context each time X11DRV_wglBindTexImageARB is called.
by Ken Thomases 26 Feb '16

26 Feb '16

On Feb 25, 2016, at 9:22 AM, Miklós Máté <mtmkls(a)gmail.com> wrote: > > Theoretically wglBindTexImageARB is supposed to be a fast > render-to-texture method, and creating a new context is anything but fast. > > This fixes horrible performance in Star Wars > Knights of the Old Republic when post-process effects are enabled. > > Signed-off-by: Miklós Máté <mtmkls(a)gmail.com> > --- > dlls/winex11.drv/opengl.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) You need to destroy the temporary context when the pbuffer object is destroyed in X11DRV_wglDestroyPbufferARB(). -Ken

1 0

Re: user32: Preserve beginning of extra data for MDI windows.
by Marvin 26 Feb '16

26 Feb '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=20905 Your paranoid android. === w7u (32 bit msg) === msg.c:8803: Test failed: did not get expected count for minimum timeout (54 != ~100). === w1064 (32 bit msg) === msg.c:6294: Test failed: Update region shouldn't be empty msg.c:6528: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6530: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6300: Test failed: Regions are different msg.c:6300: Test failed: Regions are different msg.c:6300: Test failed: Regions are different

2 1

Re: user32: Always enable owner window in EndDialog.
by Marvin 25 Feb '16

25 Feb '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=20897 Your paranoid android. === w1064 (32 bit msg) === msg.c:6290: Test failed: Update region shouldn't be empty msg.c:6524: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6526: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different

1 0

Re: user32: Always enable owner window in EndDialog.
by Alexandre Julliard 25 Feb '16

25 Feb '16

Jacek Caban <jacek(a)codeweavers.com> writes: > @@ -12245,6 +12245,7 @@ static void test_EndDialog(void) > hactive = GetForegroundWindow(); > ok(hdlg == hactive, "Wrong window has focus (%p != %p)\n", hdlg, hactive); > EndDialog(hdlg, 0); > + ok(IsWindowEnabled(hparent), "parent is not enabled\n"); > hactive = GetForegroundWindow(); > ok(hparent == hactive, "Wrong window has focus (parent != active) (active: %p, parent: %p, dlg: %p, other: %p)\n", hactive, hparent, hdlg, hother); > DestroyWindow(hdlg); It would be interesting to test what happens if the dialog is not the active window. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH] packet: create packet.dll and Implement PacketGetAdapterNames(try 6)
by Sebastian Lackner 25 Feb '16

25 Feb '16

On 25.02.2016 15:55, Jianqiu Zhang wrote: > > 0001-packet-create-packet.dll-and-Implement-PacketGetAdapte.txt > > > From 9853273e566d9ae34bbfef459a730e3701d54d22 Mon Sep 17 00:00:00 2001 > From: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > Date: Sun, 14 Feb 2016 17:27:37 +0800 > Subject: [PATCH] packet: create packet.dll and Implement PacketGetAdapterNames > > Signed-off-by: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > --- > configure.ac | 7 +++-- > dlls/packet/Makefile.in | 5 +++ > dlls/packet/packet.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++ > dlls/packet/packet.spec | 32 +++++++++++++++++++ > dlls/wpcap/Makefile.in | 1 + > 5 files changed, 124 insertions(+), 2 deletions(-) > create mode 100644 dlls/packet/Makefile.in > create mode 100644 dlls/packet/packet.c > create mode 100644 dlls/packet/packet.spec > > diff --git a/configure.ac b/configure.ac > index c9445e7..b61a5c2 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -1185,8 +1185,10 @@ then > AC_CHECK_LIB(pcap,pcap_create,[AC_SUBST(PCAP_LIBS,["-lpcap"])]) > fi > WINE_NOTICE_WITH(pcap,[test "x$ac_cv_lib_pcap_pcap_create" != xyes], > - [pcap ${notice_platform}development files not found, wpcap won't be supported.]) > + [pcap ${notice_platform}development files not found, wpcap and packet won't be supported.]) > test "x$ac_cv_lib_pcap_pcap_create" != xyes && enable_wpcap=${enable_wpcap:-no} > +test "x$ac_cv_lib_pcap_pcap_create" != xyes && enable_packet=${enable_packet:-no} > + > > dnl **** Check for libxml2 **** > > @@ -3180,6 +3182,7 @@ WINE_CONFIG_DLL(opengl32,,[implib]) > WINE_CONFIG_TEST(dlls/opengl32/tests) > WINE_CONFIG_DLL(packager,,[clean]) > WINE_CONFIG_TEST(dlls/packager/tests) > +WINE_CONFIG_DLL(packet) > WINE_CONFIG_DLL(pdh,,[implib]) > WINE_CONFIG_TEST(dlls/pdh/tests) > WINE_CONFIG_DLL(photometadatahandler) > @@ -3388,7 +3391,7 @@ WINE_CONFIG_TEST(dlls/wmp/tests) > WINE_CONFIG_DLL(wmvcore) > WINE_CONFIG_DLL(wnaspi32,,[implib]) > WINE_CONFIG_DLL(wow32,enable_win16,[implib]) > -WINE_CONFIG_DLL(wpcap) > +WINE_CONFIG_DLL(wpcap,,[implib]) > WINE_CONFIG_DLL(ws2_32,,[implib]) > WINE_CONFIG_TEST(dlls/ws2_32/tests) > WINE_CONFIG_DLL(wshom.ocx,,[clean]) > diff --git a/dlls/packet/Makefile.in b/dlls/packet/Makefile.in > new file mode 100644 > index 0000000..9caced8 > --- /dev/null > +++ b/dlls/packet/Makefile.in > @@ -0,0 +1,5 @@ > +MODULE = packet.dll > +IMPORTS = wpcap > + > +C_SRCS = \ > + packet.c > diff --git a/dlls/packet/packet.c b/dlls/packet/packet.c > new file mode 100644 > index 0000000..0e9ff97 > --- /dev/null > +++ b/dlls/packet/packet.c > @@ -0,0 +1,81 @@ > +#include "config.h" > + > +#include "windows.h" > +#include "wine/debug.h" > + > +#include "pcap.h" As pointed out on IRC yesterday, the system pcap.h header file declares functions with the wrong calling convention. You would have to add a separate wine header file, or directly use the linux pcap library (without going through wpcap). > + > +WINE_DEFAULT_DEBUG_CHANNEL(packet); > + > +BOOLEAN CDECL PacketGetAdapterNames(char *name_list, ULONG *size) > +{ > + pcap_if_t *alldevs, *ptr; > + char errbuf[PCAP_ERRBUF_SIZE]; > + int min_desc_size, min_name_size, min_size, desc_offset, name_offset; > + DWORD ret; > + char empty_str[] = ""; > + > + TRACE("(%p, %p)\n", name_list, size); > + > + ret = pcap_findalldevs(&alldevs, errbuf); > + > + if (ret) > + { > + pcap_freealldevs(alldevs); > + return FALSE; > + } > + ptr = alldevs; > + min_name_size = min_desc_size = min_size = 0; > + while (ptr) > + { > + /* Work around bug in libpcap ptr->description == NULL when no description got */ > + if (ptr->description == NULL) > + { > + ptr->description = empty_str; > + } > + > + min_name_size += strlen(ptr->name) + 1; > + min_desc_size += strlen(ptr->description) + 1; > + ptr = ptr->next; > + } > + > + min_size = min_name_size + min_desc_size + 2; > + > + if (!name_list || *size < min_size) > + { > + ptr = alldevs; > + while (ptr) > + { > + if (!strcmp(ptr->description, "")) > + { > + ptr->description = NULL; It is not really clear to me why you change ->description to an empty string, just to change it back here. If its only for the size computation, why not just handle this case separately? > + } > + ptr = ptr->next; > + } > + SetLastError(ERROR_INSUFFICIENT_BUFFER); > + pcap_freealldevs(alldevs); > + *size = min_size; As pointed out in one of the previous mails, the official packet.dll doesn't seem to do that (at least the versions I found). > + return FALSE; > + } > + ptr = alldevs; > + desc_offset = name_offset = 0; > + while (ptr) > + { > + strcpy(name_list + name_offset, ptr->name); > + strcpy(name_list + min_name_size + desc_offset + 1, ptr->description); > + name_offset += strlen(ptr->name) + 1; > + desc_offset += strlen(ptr->description) + 1; > + > + /* Work around bug in libpcap ptr->description == NULL when no description got */ > + if(!strcmp(ptr->description, "")) > + { > + ptr->description = NULL; > + } > + ptr = ptr->next; > + } > + name_list[min_name_size] = '\0'; > + name_list[min_size - 1] = '\0'; > + > + pcap_freealldevs(alldevs); > + return TRUE; > +} > diff --git a/dlls/packet/packet.spec b/dlls/packet/packet.spec > new file mode 100644 > index 0000000..32b9bc0 > --- /dev/null > +++ b/dlls/packet/packet.spec > @@ -0,0 +1,32 @@ > +@ stub PacketAllocatePacket > +@ stub PacketCloseAdapter > +@ stub PacketFreePacket > +@ cdecl PacketGetAdapterNames(ptr ptr) > +@ stub PacketGetAirPcapHandle > +@ stub PacketGetDriverVersion > +@ stub PacketGetNetInfoEx > +@ stub PacketGetNetType > +@ stub PacketGetReadEvent > +@ stub PacketGetStats > +@ stub PacketGetStatsEx > +@ stub PacketGetVersion > +@ stub PacketInitPacket > +@ stub PacketIsDumpEnded > +@ stub PacketLibraryVersion > +@ stub PacketOpenAdapter > +@ stub PacketReceivePacket > +@ stub PacketRequest > +@ stub PacketSendPacket > +@ stub PacketSendPackets > +@ stub PacketSetBpf > +@ stub PacketSetBuff > +@ stub PacketSetDumpLimits > +@ stub PacketSetDumpName > +@ stub PacketSetHwFilter > +@ stub PacketSetLoopbackBehavior > +@ stub PacketSetMinToCopy > +@ stub PacketSetMode > +@ stub PacketSetNumWrites > +@ stub PacketSetReadTimeout > +@ stub PacketSetSnapLen > +@ stub PacketStopDriver > diff --git a/dlls/wpcap/Makefile.in b/dlls/wpcap/Makefile.in > index 91b4a95..e9794cf 100644 > --- a/dlls/wpcap/Makefile.in > +++ b/dlls/wpcap/Makefile.in > @@ -1,6 +1,7 @@ > MODULE = wpcap.dll > DELAYIMPORTS = ws2_32 > EXTRALIBS = $(PCAP_LIBS) > +IMPORTLIB = wpcap > > C_SRCS = \ > wpcap.c > -- 2.7.1 > > >

1 0

Re: [PATCH 1/2] opengl: don't create a tmp context for glCopyTexImage2D
by Ken Thomases 25 Feb '16

25 Feb '16

On Feb 23, 2016, at 11:37 AM, Miklós Máté <mtmkls(a)gmail.com> wrote: > > It works fine without the tmp context, and Mesa's wgl state tracker doesn't > do that either. Theoretically wglBindTexImageARB is supposed to be a fast > render-to-texture method, and creating a new context is anything but fast. I don't know the history of this code, but there are comments and a FIXME strongly suggesting that, even as is, it doesn't completely work. So, you need to do a thorough investigation for why the code was written this way. I note that use_render_texture_emulation is always true, these days, so maybe things have changed. I'm not sure why that variable exists. Also see notes below. > diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c > index 99befde..871cfc1 100644 > --- a/dlls/winex11.drv/opengl.c > +++ b/dlls/winex11.drv/opengl.c > @@ -2922,10 +2922,8 @@ static BOOL X11DRV_wglBindTexImageARB( struct wgl_pbuffer *object, int iBuffer ) > > if (use_render_texture_emulation) { > static BOOL initialized = FALSE; > - int prev_binded_texture = 0; > GLXContext prev_context; > Drawable prev_drawable; > - GLXContext tmp_context; > > prev_context = pglXGetCurrentContext(); > prev_drawable = pglXGetCurrentDrawable(); > @@ -2940,21 +2938,15 @@ static BOOL X11DRV_wglBindTexImageARB( struct wgl_pbuffer *object, int iBuffer ) > } > > TRACE("drawable=%lx, context=%p\n", object->drawable, prev_context); > - tmp_context = pglXCreateNewContext(gdi_display, object->fmt->fbconfig, object->fmt->render_type, prev_context, True); > - > - opengl_funcs.gl.p_glGetIntegerv(object->texture_bind_target, &prev_binded_texture); > > /* Switch to our pbuffer */ > - pglXMakeCurrent(gdi_display, object->drawable, tmp_context); > + pglXMakeCurrent(gdi_display, object->drawable, prev_context); prev_context is precisely the current context. So, there should be no need to make it current. > > - /* Make sure that the prev_binded_texture is set as the current texture state isn't shared between contexts. > - * After that upload the pbuffer texture data. */ > - opengl_funcs.gl.p_glBindTexture(object->texture_target, prev_binded_texture); > + /* Upload the pbuffer texture data. */ > opengl_funcs.gl.p_glCopyTexImage2D(object->texture_target, 0, object->use_render_texture, 0, 0, object->width, object->height, 0); > > /* Switch back to the original drawable and upload the pbuffer-texture */ > pglXMakeCurrent(gdi_display, prev_drawable, prev_context); It shouldn't be necessary to "restore" prev_context as the current context, since you never switched to a temporary context. The prev_context and prev_drawable variables should go away entirely. It seems to me that this entire function boils down to little more than a wrapper around glCopyTexImage2D(). I'm not familiar enough with wglBindTexImageARB() to know if that makes sense. -Ken

3 5

Re: [PATCH 2/2] desktop: add 1280x960 resolution
by Matteo Bruni 25 Feb '16

25 Feb '16

2016-02-23 18:37 GMT+01:00 Miklós Máté <mtmkls(a)gmail.com>: > This enables high resolution setting in Anachronox, when Wine is configured > to emulate a virtual desktop. The game only supports 640x480 and 1280x960. > > Signed-off-by: Miklós Máté <mtmkls(a)gmail.com> > --- > dlls/winex11.drv/desktop.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c > index 603e19f..2d8c039 100644 > --- a/dlls/winex11.drv/desktop.c > +++ b/dlls/winex11.drv/desktop.c > @@ -37,8 +37,8 @@ static unsigned int dd_mode_count; > static unsigned int max_width; > static unsigned int max_height; > > -static const unsigned int widths[] = {320, 400, 512, 640, 800, 1024, 1152, 1280, 1400, 1600}; > -static const unsigned int heights[] = {200, 300, 384, 480, 600, 768, 864, 1024, 1050, 1200}; > +static const unsigned int widths[] = {320, 400, 512, 640, 800, 1024, 1152, 1280, 1280, 1400, 1600}; > +static const unsigned int heights[] = {200, 300, 384, 480, 600, 768, 864, 960, 1024, 1050, 1200}; > #define NUM_DESKTOP_MODES (sizeof(widths) / sizeof(widths[0])) I would replace those two arrays with an array of structs i.e. something like: static const struct { unsigned int width; unsigned int height; } desktop_modes[] = { {320, 200}, ... }; changing the rest accordingly. Not sure if there are other concerns with this patch. I guess we could add more modes (e.g. 1366x768, 1280x800, 1920x1080, 1920x1200, 2560x1440, 2560x1600, maybe even more from https://en.wikipedia.org/wiki/Graphics_display_resolution or similar). I don't think there is a problem with maintaining a list here (or, at least, I don't see any way to do without). I trust someone else will correct me if I'm utterly wrong.

1 0

Re: [PATCH] d3dx: D3DXQuaternionToAxisAngle should not crash on NULLs in output parameters.
by Matteo Bruni 25 Feb '16

25 Feb '16

2016-02-25 11:36 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/math.c | 12 ++++++++---- > dlls/d3dx9_36/tests/math.c | 5 +++++ > 2 files changed, 13 insertions(+), 4 deletions(-) > > diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c > index 5e8d51a..123bd2f 100644 > --- a/dlls/d3dx9_36/math.c > +++ b/dlls/d3dx9_36/math.c > @@ -1652,10 +1652,14 @@ void WINAPI D3DXQuaternionToAxisAngle(const D3DXQUATERNION *pq, D3DXVECTOR3 *pax > { > TRACE("pq %p, paxis %p, pangle %p\n", pq, paxis, pangle); > > - paxis->x = pq->x; > - paxis->y = pq->y; > - paxis->z = pq->z; > - *pangle = 2.0f * acosf(pq->w); > + if (paxis) > + { > + paxis->x = pq->x; > + paxis->y = pq->y; > + paxis->z = pq->z; > + } > + if (pangle) > + *pangle = 2.0f * acosf(pq->w); > } > > /*_________________D3DXVec2_____________________*/ > diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c > index ac4475d..a4e24da 100644 > --- a/dlls/d3dx9_36/tests/math.c > +++ b/dlls/d3dx9_36/tests/math.c > @@ -1022,6 +1022,11 @@ static void D3DXQuaternionTest(void) > D3DXQuaternionToAxisAngle(&nul,&axis,&angle); > expect_vec3(expectedvec,axis); > ok(relative_error(angle, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, angle); > +/* test NULLs in output parameters */ > + D3DXQuaternionToAxisAngle(&nul,&axis,NULL); > + D3DXQuaternionToAxisAngle(&nul,NULL,&angle); > + expect_vec3(expectedvec,axis); > + ok(relative_error(angle, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, angle); > } Please indent the comment, or maybe (better IMO) just drop it altogether. Be consistent with whitespace after the comma and no whitespace before the ')'. Yes, I know, the code right above is broken exactly in the same way...

1 0

Re: [PATCH] msi: Files with the same version need to check file/hash as well
by Hans Leidekker 25 Feb '16

25 Feb '16

Hi Alistair, > diff --git a/dlls/msi/files.c b/dlls/msi/files.c > index 9b46762..0285a7e 100644 > --- a/dlls/msi/files.c > +++ b/dlls/msi/files.c > @@ -120,18 +120,11 @@ static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *fil > debugstr_w(file->File), debugstr_w(file->Version), > HIWORD(file_version->dwFileVersionMS), LOWORD(file_version->dwFileVersionMS), > HIWORD(file_version->dwFileVersionLS), LOWORD(file_version->dwFileVersionLS)); > - state = msifs_overwrite; > - } > - else > - { > - TRACE("keeping %s (new version %s old version %u.%u.%u.%u)\n", > - debugstr_w(file->File), debugstr_w(file->Version), > - HIWORD(file_version->dwFileVersionMS), LOWORD(file_version->dwFileVersionMS), > - HIWORD(file_version->dwFileVersionLS), LOWORD(file_version->dwFileVersionLS)); > - state = msifs_present; > + return msifs_overwrite; > } > + > msi_free( file_version ); > - return state; > + /* Fall through to check the size and hash */ Please add tests for all sensible combinations of version, size and hash.

1 0

Re: [PATCH 1/4] msvcp110: Add _Thrd_detach implementation
by Piotr Caban 25 Feb '16

25 Feb '16

On 02/25/16 10:12, Piotr Caban wrote: > Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> > --- > dlls/msvcp110/msvcp110.spec | 2 +- > dlls/msvcp120/msvcp120.spec | 2 +- > dlls/msvcp120/tests/msvcp120.c | 12 +++++++++++- > dlls/msvcp120_app/msvcp120_app.spec | 2 +- > dlls/msvcp90/misc.c | 5 +++++ > 5 files changed, 19 insertions(+), 4 deletions(-) Please ignore this patches, 64-bit tests are not working.

1 0

Re: [PATCH v3] ntdll: Finish serial reads of size 0 immediately.
by Marvin 25 Feb '16

25 Feb '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=20877 Your paranoid android. === wxppro (32 bit comm) === comm.c:861: Test failed: WaitCommEvent failed with a timeout comm.c:872: recovering after WAIT_TIMEOUT... comm.c:882: Test failed: WaitCommEvent error 0 comm.c:883: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:887: WaitCommEvent for EV_TXEMPTY took 1500 ms (timeout 1500) comm.c:888: Test failed: WaitCommEvent used 1500 ms for waiting comm.c:1553: test_AbortWaitCts timeout 500 handle 00000770 comm.c:1520: Changing CommMask on the fly for handle 00000770 after timeout 500 === w2008s64 (32 bit comm) === comm.c:861: Test failed: WaitCommEvent failed with a timeout comm.c:872: recovering after WAIT_TIMEOUT... comm.c:882: Test failed: WaitCommEvent error 0 comm.c:883: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:887: WaitCommEvent for EV_TXEMPTY took 1500 ms (timeout 1500) comm.c:888: Test failed: WaitCommEvent used 1500 ms for waiting comm.c:1553: test_AbortWaitCts timeout 500 handle 000000BC comm.c:1520: Changing CommMask on the fly for handle 000000BC after timeout 500 === w2008s64 (64 bit comm) === comm.c:861: Test failed: WaitCommEvent failed with a timeout comm.c:872: recovering after WAIT_TIMEOUT... comm.c:882: Test failed: WaitCommEvent error 0 comm.c:883: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:887: WaitCommEvent for EV_TXEMPTY took 1500 ms (timeout 1500) comm.c:888: Test failed: WaitCommEvent used 1500 ms for waiting

1 0

Re: [PATCH] packet: create packet.dll and Implement PacketGetAdapterNames(try 5)
by André Hentschel 25 Feb '16

25 Feb '16

Am 23.02.2016 um 09:44 schrieb Jianqiu Zhang: > According to advice frome André Hentschel, implement packet.dll using > the method of calling wine wpcap function, rewrite > PacketGetAdapterNames. > > > > > > From 691679b504530c38c400813bacbc416c28028655 Mon Sep 17 00:00:00 2001 > From: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > Date: Sun, 14 Feb 2016 17:27:37 +0800 > Subject: [PATCH] packet: create packet.dll and Implement PacketGetAdapterNames > > Signed-off-by: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > --- > configure.ac | 7 ++-- > dlls/packet/Makefile.in | 5 +++ > dlls/packet/packet.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++ > dlls/packet/packet.spec | 32 +++++++++++++++++++ > dlls/wpcap/Makefile.in | 1 + > 5 files changed, 128 insertions(+), 2 deletions(-) > create mode 100644 dlls/packet/Makefile.in > create mode 100644 dlls/packet/packet.c > create mode 100644 dlls/packet/packet.spec > > diff --git a/configure.ac b/configure.ac > index c9445e7..b61a5c2 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -1185,8 +1185,10 @@ then > AC_CHECK_LIB(pcap,pcap_create,[AC_SUBST(PCAP_LIBS,["-lpcap"])]) > fi > WINE_NOTICE_WITH(pcap,[test "x$ac_cv_lib_pcap_pcap_create" != xyes], > - [pcap ${notice_platform}development files not found, wpcap won't be supported.]) > + [pcap ${notice_platform}development files not found, wpcap and packet won't be supported.]) > test "x$ac_cv_lib_pcap_pcap_create" != xyes && enable_wpcap=${enable_wpcap:-no} > +test "x$ac_cv_lib_pcap_pcap_create" != xyes && enable_packet=${enable_packet:-no} > + > > dnl **** Check for libxml2 **** > > @@ -3180,6 +3182,7 @@ WINE_CONFIG_DLL(opengl32,,[implib]) > WINE_CONFIG_TEST(dlls/opengl32/tests) > WINE_CONFIG_DLL(packager,,[clean]) > WINE_CONFIG_TEST(dlls/packager/tests) > +WINE_CONFIG_DLL(packet) > WINE_CONFIG_DLL(pdh,,[implib]) > WINE_CONFIG_TEST(dlls/pdh/tests) > WINE_CONFIG_DLL(photometadatahandler) > @@ -3388,7 +3391,7 @@ WINE_CONFIG_TEST(dlls/wmp/tests) > WINE_CONFIG_DLL(wmvcore) > WINE_CONFIG_DLL(wnaspi32,,[implib]) > WINE_CONFIG_DLL(wow32,enable_win16,[implib]) > -WINE_CONFIG_DLL(wpcap) > +WINE_CONFIG_DLL(wpcap,,[implib]) > WINE_CONFIG_DLL(ws2_32,,[implib]) > WINE_CONFIG_TEST(dlls/ws2_32/tests) > WINE_CONFIG_DLL(wshom.ocx,,[clean]) > diff --git a/dlls/packet/Makefile.in b/dlls/packet/Makefile.in > new file mode 100644 > index 0000000..9caced8 > --- /dev/null > +++ b/dlls/packet/Makefile.in > @@ -0,0 +1,5 @@ > +MODULE = packet.dll > +IMPORTS = wpcap > + > +C_SRCS = \ > + packet.c > diff --git a/dlls/packet/packet.c b/dlls/packet/packet.c > new file mode 100644 > index 0000000..2b002ec > --- /dev/null > +++ b/dlls/packet/packet.c > @@ -0,0 +1,85 @@ > +#include "config.h" > + > +#include "windows.h" > +#include "wine/debug.h" > + > +#include "pcap.h" > + > +WINE_DEFAULT_DEBUG_CHANNEL(packet); > + > +BOOLEAN CDECL PacketGetAdapterNames(char *name_list, ULONG *size) > +{ > + pcap_if_t *alldevs, *ptr; > + char errbuf[PCAP_ERRBUF_SIZE]; > + int min_desc_size, min_name_size, min_size, desc_offset, name_offset; > + DWORD ret; > + > + TRACE("(%p, %p)\n", name_list, size); > + > + ret = pcap_findalldevs(&alldevs, errbuf); > + > + TRACE("ret = %d, alldevs = %p\n", ret, alldevs); Only useful for debugging > + > + if(ret) > + { > + pcap_freealldevs(alldevs); > + return FALSE; > + } > + ptr = alldevs; > + min_name_size = min_desc_size = min_size = 0; > + while(ptr) some blank lines would be great above, also we normally use a space between C keywords (if, while, ...) and the parenthesis > + { > + /* Work around bug in libpcap ptr->description == NULL when no description got */ > + if(ptr->description == NULL) > + { > + ptr->description = (char *)HeapAlloc(GetProcessHeap(), 0, sizeof(char)); > + *(ptr->description) = '\0'; Can't we simply use a static const "" here? That also would avoid the hack later to free the heap space > + } > + > + min_name_size += strlen(ptr->name) + 1; > + min_desc_size += strlen(ptr->description) + 1; > + ptr = ptr->next; > + } > + > + min_size = min_name_size + min_desc_size + 2; > + > + if(!name_list || *size < min_size) > + { > + ptr = alldevs; > + while(ptr) > + { > + if(!strcmp(ptr->description, "")) > + { > + HeapFree(GetProcessHeap(), 0, ptr->description); > + ptr->description = NULL; > + } > + ptr = ptr->next; > + } > + SetLastError(ERROR_INSUFFICIENT_BUFFER); > + pcap_freealldevs(alldevs); > + *size = min_size; > + return FALSE; > + } > + ptr = alldevs; > + desc_offset = name_offset = 0; > + while(ptr) > + { > + strcpy(name_list + name_offset, ptr->name); > + strcpy(name_list + min_name_size + desc_offset + 1, ptr->description); > + name_offset += strlen(ptr->name) + 1; > + desc_offset += strlen(ptr->description) + 1; > + > + /* Work around bug in libpcap ptr->description == NULL when no description got */ > + if(!strcmp(ptr->description, "")) > + { > + HeapFree(GetProcessHeap(), 0, ptr->description); > + ptr->description = NULL; > + } > + ptr = ptr->next; > + } > + name_list[min_name_size] = '\0'; > + name_list[min_size - 1] = '\0'; > + > + pcap_freealldevs(alldevs); > + return TRUE; > +} > diff --git a/dlls/packet/packet.spec b/dlls/packet/packet.spec > new file mode 100644 > index 0000000..32b9bc0 > --- /dev/null > +++ b/dlls/packet/packet.spec > @@ -0,0 +1,32 @@ > +@ stub PacketAllocatePacket > +@ stub PacketCloseAdapter > +@ stub PacketFreePacket > +@ cdecl PacketGetAdapterNames(ptr ptr) > +@ stub PacketGetAirPcapHandle > +@ stub PacketGetDriverVersion > +@ stub PacketGetNetInfoEx > +@ stub PacketGetNetType > +@ stub PacketGetReadEvent > +@ stub PacketGetStats > +@ stub PacketGetStatsEx > +@ stub PacketGetVersion > +@ stub PacketInitPacket > +@ stub PacketIsDumpEnded > +@ stub PacketLibraryVersion > +@ stub PacketOpenAdapter > +@ stub PacketReceivePacket > +@ stub PacketRequest > +@ stub PacketSendPacket > +@ stub PacketSendPackets > +@ stub PacketSetBpf > +@ stub PacketSetBuff > +@ stub PacketSetDumpLimits > +@ stub PacketSetDumpName > +@ stub PacketSetHwFilter > +@ stub PacketSetLoopbackBehavior > +@ stub PacketSetMinToCopy > +@ stub PacketSetMode > +@ stub PacketSetNumWrites > +@ stub PacketSetReadTimeout > +@ stub PacketSetSnapLen > +@ stub PacketStopDriver > diff --git a/dlls/wpcap/Makefile.in b/dlls/wpcap/Makefile.in > index 91b4a95..e9794cf 100644 > --- a/dlls/wpcap/Makefile.in > +++ b/dlls/wpcap/Makefile.in > @@ -1,6 +1,7 @@ > MODULE = wpcap.dll > DELAYIMPORTS = ws2_32 > EXTRALIBS = $(PCAP_LIBS) > +IMPORTLIB = wpcap > > C_SRCS = \ > wpcap.c > -- > 2.7.1 >

2 1

Re: bthprops.cpl: add BluetoothFindFirstRadio/BluetoothFindRadioClose stubs (try 2)
by Dmitry Timoshkov 25 Feb '16

25 Feb '16

Austin English <austinenglish(a)gmail.com> wrote: > +/********************************************************************* > + * BluetoothFindFirstRadio > + */ > +HBLUETOOTH_RADIO_FIND WINAPI BluetoothFindFirstRadio(BLUETOOTH_FIND_RADIO_PARAMS *params, HANDLE *radio) > +{ > + FIXME("(%p %p): stub!\n", params, radio); > + *radio = NULL; > + SetLastError(ERROR_NO_MORE_ITEMS); > + return NULL; > +} > + > +HBLUETOOTH_RADIO_FIND WINAPI BluetoothFindRadioClose(HBLUETOOTH_RADIO_FIND find) > +{ > + FIXME("(%p): stub!\n", find); > + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); > + return FALSE; > +} Is there a reason that first API has a comment while second does not? Also, both APIs have the same return type but you return NULL vs. FALSE. -- Dmitry.

1 0

Re: [PATCH] mshtml: Fixed tests on some IE versions.
by Marvin 24 Feb '16

24 Feb '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=20862 Your paranoid android. === wxppro (32 bit) === No test summary line found === w2003std (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w7pro64 (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === w864 (32 bit) === No test summary line found === w1064 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found === w7pro64 (64 bit) === No test summary line found === w864 (64 bit) === No test summary line found === w1064 (64 bit) === No test summary line found

1 0

Re: [PATCH v2] ntdll: Finish serial reads of size 0 immediately.
by Alexandre Julliard 24 Feb '16

24 Feb '16

Alex Henrie <alexhenrie24(a)gmail.com> writes: > @@ -854,11 +857,11 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, > goto done; > } > } > - else if (type == FD_TYPE_SERIAL || type == FD_TYPE_DEVICE) > + else if (type == FD_TYPE_SERIAL) > { > - if (async_read && (!offset || offset->QuadPart < 0)) > + if (!length) > { > - status = STATUS_INVALID_PARAMETER; > + status = STATUS_SUCCESS; > goto done; I think it would be cleaner to use the same code path as the other types (calling read() first) instead of adding a special case for serial. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: user32: Ignore WM_CHILDACTIVATE on disabled windows in DefMDIChildProc.
by Marvin 24 Feb '16

24 Feb '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=20854 Your paranoid android. === w1064 (32 bit msg) === msg.c:6356: Test failed: Update region shouldn't be empty msg.c:6590: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6592: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6362: Test failed: Regions are different msg.c:6362: Test failed: Regions are different msg.c:6362: Test failed: Regions are different

1 0

Re: [PATCH v2] winex11.drv: Make the GL context current even if no drawables were given.
by Ken Thomases 24 Feb '16

24 Feb '16

On Feb 23, 2016, at 7:46 PM, Charles Davis <cdavis5x(a)gmail.com> wrote: > - if (ret) > - { > - NtCurrentTeb()->glContext = ctx; > - ctx->has_been_current = TRUE; > - ctx->hdc = hdc; > - ctx->drawables[0] = gl->drawable; > - ctx->drawables[1] = gl->drawable; > - ctx->refresh_drawables = FALSE; > - goto done; > - } > + if (ret) > + { > + NtCurrentTeb()->glContext = ctx; > + ctx->has_been_current = TRUE; > + ctx->hdc = NULL; > + ctx->drawables[0] = drawable; > + ctx->drawables[1] = drawable; > + ctx->refresh_drawables = FALSE; > + } You lost the assignment of hdc to ctx->hdc. -Ken

1 0

Re: [PATCH] d3d10core/tests: Silence absolute value warnings. (Clang)
by Henri Verbeet 23 Feb '16

23 Feb '16

On 19 February 2016 at 23:50, Charles Davis <cdavis5x(a)gmail.com> wrote: > Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> > --- For what it's worth, writing something like "Silence ... warnings" in the subject line is a good way to get a patch rejected on principle. However, we do have similar casts in the d3d9 tests because there's actually an issue, albeit a pretty pedantic one. (Unsigned to signed conversion is implementation defined for values that can't be represented with the signed type, but any implementation we care about is going to do the right thing.) I'll also use the occasion to note that I have my reservations about LLVM/Clang as a project.

1 0

Re: [PATCH 4/8] wined3d: Simplify FBO cleanup on resource destruction.
by Henri Verbeet 23 Feb '16

23 Feb '16

On 14 February 2016 at 21:33, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > @@ -65,18 +66,21 @@ static void surface_cleanup(struct wined3d_surface *surface) > if (surface->rb_multisample) > { > TRACE("Deleting multisample renderbuffer %u.\n", surface->rb_multisample); > + context_gl_resource_released(device, surface->rb_multisample, TRUE); > gl_info->fbo_ops.glDeleteRenderbuffers(1, &surface->rb_multisample); I'm not sure it would necessarily be much better, but one alternative would be to make the context do the deletion.

2 2

Re: [PATCH 5/5 try2] msvcp120/tests: Run _Unlink tests inside temp directory
by Marvin 23 Feb '16

23 Feb '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=20825 Your paranoid android. === w2008s64 (64 bit msvcp120) === msvcp120.c:1975: Test failed: pad_copy.cnd = FEFEFEFEFEFEFEFE msvcp120.c:1976: Test failed: pad_copy.mtx = FEFEFEFEFEFEFEFE msvcp120.c:1981: Test failed: pad_copy.vtable was set msvcp120.c:1982: Test failed: pad_copy.cnd = FEFEFEFEFEFEFEFE msvcp120.c:1983: Test failed: pad_copy.mtx = FEFEFEFEFEFEFEFE

1 0

Re: [PATCH 4/5 try2] msvcp120: Added _Pad class tests
by Marvin 23 Feb '16

23 Feb '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=20824 Your paranoid android. === w2008s64 (64 bit msvcp120) === msvcp120.c:1968: Test failed: pad_copy.cnd = FEFEFEFEFEFEFEFE msvcp120.c:1969: Test failed: pad_copy.mtx = FEFEFEFEFEFEFEFE msvcp120.c:1974: Test failed: pad_copy.vtable was set msvcp120.c:1975: Test failed: pad_copy.cnd = FEFEFEFEFEFEFEFE msvcp120.c:1976: Test failed: pad_copy.mtx = FEFEFEFEFEFEFEFE

1 0

Re: [PATCH 2/2] winex11.drv: Make the GL context current even if no drawables were given.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Charles Davis <cdavis5x(a)gmail.com> writes: > @@ -1833,26 +1833,29 @@ static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx) > return TRUE; > } > > - if ((gl = get_gl_drawable( WindowFromDC( hdc ), hdc ))) > + if (!hdc || (gl = get_gl_drawable( WindowFromDC( hdc ), hdc ))) > { > - if (ctx->fmt != gl->format) > + if (gl && ctx->fmt != gl->format) > { > WARN( "mismatched pixel format hdc %p %p ctx %p %p\n", hdc, gl->format, ctx, ctx->fmt ); > SetLastError( ERROR_INVALID_PIXEL_FORMAT ); > goto done; > } > > - TRACE("hdc %p drawable %lx fmt %p ctx %p %s\n", hdc, gl->drawable, gl->format, ctx->ctx, > - debugstr_fbconfig( gl->format->fbconfig )); > + if (gl) > + TRACE("hdc %p drawable %lx fmt %p ctx %p %s\n", hdc, gl->drawable, gl->format, ctx->ctx, > + debugstr_fbconfig( gl->format->fbconfig )); > + else > + TRACE("ctx %p (no drawable)\n", ctx->ctx); > > - ret = pglXMakeCurrent(gdi_display, gl->drawable, ctx->ctx); > + ret = pglXMakeCurrent(gdi_display, gl ? gl->drawable : None, ctx->ctx); > if (ret) > { > NtCurrentTeb()->glContext = ctx; > ctx->has_been_current = TRUE; > ctx->hdc = hdc; > - ctx->drawables[0] = gl->drawable; > - ctx->drawables[1] = gl->drawable; > + ctx->drawables[0] = gl ? gl->drawable : 0; > + ctx->drawables[1] = gl ? gl->drawable : 0; You really want a separate code path instead of adding pointer checks everywhere. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 2/2] ntdll: Improve invalid parameter handling in NtAccessCheck. (try 3)
by Alexandre Julliard 23 Feb '16

23 Feb '16

Qian Hong <qhong(a)codeweavers.com> writes: > @@ -1629,8 +1630,28 @@ NtAccessCheck( > > status = wine_server_call( req ); > > - *ReturnLength = FIELD_OFFSET( PRIVILEGE_SET, Privilege ) + reply->privileges_len; > - PrivilegeSet->PrivilegeCount = reply->privileges_len / sizeof(LUID_AND_ATTRIBUTES); > + return_length = FIELD_OFFSET( PRIVILEGE_SET, Privilege ) + reply->privileges_len; > + if (return_length < sizeof(PRIVILEGE_SET)) > + return_length = sizeof(PRIVILEGE_SET); > + > + if (*ReturnLength == 0) > + { > + *ReturnLength = return_length; > + return STATUS_BUFFER_TOO_SMALL; > + } > + > + if (!PrivilegeSet) > + return STATUS_ACCESS_VIOLATION; It doesn't make sense to test this after it has already been passed to the server, what's more with an invalid length. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] wined3d: bind default sampler object when setting sampler state with no texture.
by Matteo Bruni 23 Feb '16

23 Feb '16

2016-02-20 15:00 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > When sampler state was applied and no stage texture was present in state, no glBindSampler > was issued for the stage after dummy texture was bound, and previously bound > sampler was still active. This could result in undefined behaviour, especially if previously > bound sampler was a shadow sample (this caused warnings from Nvidia driver). > > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/wined3d/state.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c > index 60bfd41..aa13a95 100644 > --- a/dlls/wined3d/state.c > +++ b/dlls/wined3d/state.c > @@ -3627,6 +3627,11 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state > else > { > context_bind_texture(context, GL_NONE, 0); > + if (gl_info->supported[ARB_SAMPLER_OBJECTS]) > + { > + GL_EXTCALL(glBindSampler(mapped_stage, 0)); > + checkGLcall("glBindSampler"); > + } > } > } > > -- > 2.5.0 Henri is away this week so this patch will probably have to wait until he's back. FWIW I think this patch is fine, thank you.

2 1

Re: [PATCH 3/4] msvcp110: Add _Pad implementation
by Sebastian Lackner 22 Feb '16

22 Feb '16

On 22.02.2016 19:31, Piotr Caban wrote: > /* ??4_Pad@std@@QAEAAV01@ABV01@@Z */ > @@ -901,8 +907,12 @@ _Pad* __thiscall _Pad_ctor(_Pad *this) > DEFINE_THISCALL_WRAPPER(_Pad_op_assign, 8) > _Pad* __thiscall _Pad_op_assign(_Pad *this, const _Pad *copy) > { > - FIXME("(%p %p) stub\n", this, copy); > - return NULL; > + TRACE("(%p %p)\n", this, copy); > + > + this->cnd = copy->cnd; > + this->mtx = copy->mtx; > + this->launched = copy->launched; > + return this; > } The assignment of cnd and mtx looks a bit suspicious. Does that really work as expected (especially when the dtor is called later)?

2 1

Re: [PATCH 2/2 v2] winecoreaudio.drv: Don't print 32-bit values as long integers. (Clang)
by Andrew Eikum 22 Feb '16

22 Feb '16

I don't feel really strongly, but given the choice between OSStatus and int, I prefer OSStatus since it matches the API return type. It's one less thing for future code readers to wonder about. Chip, I think a search-and-replace script will fix this pretty easily. This seems to work in vim: :%s/%lx$.*$, sc/%x\1, (int)sc/ Along with a careful manual review of each change and a check for any OSStatus not named 'sc'. Andrew On Mon, Feb 22, 2016 at 01:00:14AM -0700, Charles Davis wrote: > Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> > --- > Try 2: Go back to casting for AudioDeviceIDs. > > The status prints are too numerous. I'm not changing them back to casts. > > dlls/winecoreaudio.drv/mmdevdrv.c | 84 +++++++++++++++++++-------------------- > 1 file changed, 42 insertions(+), 42 deletions(-) > > diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c > index 60ff3d9..e586c8f 100644 > --- a/dlls/winecoreaudio.drv/mmdevdrv.c > +++ b/dlls/winecoreaudio.drv/mmdevdrv.c > @@ -388,7 +388,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, > AudioDeviceID *devices; > AudioDeviceID default_id; > AudioObjectPropertyAddress addr; > - OSStatus sc; > + int sc; > int i, ndevices; > > TRACE("%d %p %p %p\n", flow, ids, num, def_index); > @@ -406,7 +406,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, > sc = AudioObjectGetPropertyData(kAudioObjectSystemObject, &addr, 0, > NULL, &size, &default_id); > if(sc != noErr){ > - WARN("Getting _DefaultInputDevice property failed: %lx\n", sc); > + WARN("Getting _DefaultInputDevice property failed: %x\n", sc); > default_id = -1; > } > > @@ -414,7 +414,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, > sc = AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &addr, 0, > NULL, &devsize); > if(sc != noErr){ > - WARN("Getting _Devices property size failed: %lx\n", sc); > + WARN("Getting _Devices property size failed: %x\n", sc); > return osstatus_to_hresult(sc); > } > > @@ -425,7 +425,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, > sc = AudioObjectGetPropertyData(kAudioObjectSystemObject, &addr, 0, NULL, > &devsize, devices); > if(sc != noErr){ > - WARN("Getting _Devices property failed: %lx\n", sc); > + WARN("Getting _Devices property failed: %x\n", sc); > HeapFree(GetProcessHeap(), 0, devices); > return osstatus_to_hresult(sc); > } > @@ -462,7 +462,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, > sc = AudioObjectGetPropertyDataSize(devices[i], &addr, 0, NULL, &size); > if(sc != noErr){ > WARN("Unable to get _StreamConfiguration property size for " > - "device %lu: %lx\n", devices[i], sc); > + "device %u: %x\n", (unsigned int)devices[i], sc); > continue; > } > > @@ -480,7 +480,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, > &size, buffers); > if(sc != noErr){ > WARN("Unable to get _StreamConfiguration property for " > - "device %lu: %lx\n", devices[i], sc); > + "device %u: %x\n", (unsigned int)devices[i], sc); > HeapFree(GetProcessHeap(), 0, buffers); > continue; > } > @@ -502,8 +502,8 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, > sc = AudioObjectGetPropertyData(devices[i], &addr, 0, NULL, > &size, &name); > if(sc != noErr){ > - WARN("Unable to get _Name property for device %lu: %lx\n", > - devices[i], sc); > + WARN("Unable to get _Name property for device %u: %x\n", > + (unsigned int)devices[i], sc); > continue; > } > > @@ -528,7 +528,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, > *def_index = *num; > > TRACE("device %u: id %s key %u%s\n", *num, debugstr_w((*ids)[*num]), > - (unsigned int)devices[i], (*def_index == *num) ? " (default)" : ""); > + devices[i], (*def_index == *num) ? " (default)" : ""); > > (*num)++; > } > @@ -607,7 +607,7 @@ static AudioComponentInstance get_audiounit(EDataFlow dataflow, AudioDeviceID ad > AudioComponentInstance unit; > AudioComponent comp; > AudioComponentDescription desc; > - OSStatus sc; > + int sc; > > memset(&desc, 0, sizeof(desc)); > desc.componentType = kAudioUnitType_Output; > @@ -621,7 +621,7 @@ static AudioComponentInstance get_audiounit(EDataFlow dataflow, AudioDeviceID ad > > sc = AudioComponentInstanceNew(comp, &unit); > if(sc != noErr){ > - WARN("AudioComponentInstanceNew failed: %lx\n", sc); > + WARN("AudioComponentInstanceNew failed: %x\n", sc); > return NULL; > } > > @@ -632,7 +632,7 @@ static AudioComponentInstance get_audiounit(EDataFlow dataflow, AudioDeviceID ad > sc = AudioUnitSetProperty(unit, kAudioOutputUnitProperty_EnableIO, > kAudioUnitScope_Input, 1, &enableio, sizeof(enableio)); > if(sc != noErr){ > - WARN("Couldn't enable I/O on input element: %lx\n", sc); > + WARN("Couldn't enable I/O on input element: %x\n", sc); > AudioComponentInstanceDispose(unit); > return NULL; > } > @@ -641,7 +641,7 @@ static AudioComponentInstance get_audiounit(EDataFlow dataflow, AudioDeviceID ad > sc = AudioUnitSetProperty(unit, kAudioOutputUnitProperty_EnableIO, > kAudioUnitScope_Output, 0, &enableio, sizeof(enableio)); > if(sc != noErr){ > - WARN("Couldn't disable I/O on output element: %lx\n", sc); > + WARN("Couldn't disable I/O on output element: %x\n", sc); > AudioComponentInstanceDispose(unit); > return NULL; > } > @@ -1107,7 +1107,7 @@ static OSStatus feed_cb(AudioConverterRef converter, UInt32 *nframes, AudioBuffe > static void capture_resample(ACImpl *This) > { > UINT32 resamp_period_frames = MulDiv(This->period_frames, This->dev_desc.mSampleRate, This->fmt->nSamplesPerSec); > - OSStatus sc; > + int sc; > > /* the resampling process often needs more source frames than we'd > * guess from a straight conversion using the sample rate ratio. so > @@ -1131,7 +1131,7 @@ static void capture_resample(ACImpl *This) > sc = AudioConverterFillComplexBuffer(This->converter, feed_cb, > This, &wanted_frames, &converted_list, NULL); > if(sc != noErr){ > - WARN("AudioConverterFillComplexBuffer failed: %lx\n", sc); > + WARN("AudioConverterFillComplexBuffer failed: %x\n", sc); > break; > } > > @@ -1215,18 +1215,18 @@ static OSStatus ca_capture_cb(void *user, AudioUnitRenderActionFlags *flags, > static void dump_adesc(const char *aux, AudioStreamBasicDescription *desc) > { > TRACE("%s: mSampleRate: %f\n", aux, desc->mSampleRate); > - TRACE("%s: mBytesPerPacket: %ld\n", aux, desc->mBytesPerPacket); > - TRACE("%s: mFramesPerPacket: %ld\n", aux, desc->mFramesPerPacket); > - TRACE("%s: mBytesPerFrame: %ld\n", aux, desc->mBytesPerFrame); > - TRACE("%s: mChannelsPerFrame: %ld\n", aux, desc->mChannelsPerFrame); > - TRACE("%s: mBitsPerChannel: %ld\n", aux, desc->mBitsPerChannel); > + TRACE("%s: mBytesPerPacket: %u\n", aux, (unsigned int)desc->mBytesPerPacket); > + TRACE("%s: mFramesPerPacket: %u\n", aux, (unsigned int)desc->mFramesPerPacket); > + TRACE("%s: mBytesPerFrame: %u\n", aux, (unsigned int)desc->mBytesPerFrame); > + TRACE("%s: mChannelsPerFrame: %u\n", aux, (unsigned int)desc->mChannelsPerFrame); > + TRACE("%s: mBitsPerChannel: %u\n", aux, (unsigned int)desc->mBitsPerChannel); > } > > static HRESULT ca_setup_audiounit(EDataFlow dataflow, AudioComponentInstance unit, > const WAVEFORMATEX *fmt, AudioStreamBasicDescription *dev_desc, > AudioConverterRef *converter) > { > - OSStatus sc; > + int sc; > HRESULT hr; > > if(dataflow == eCapture){ > @@ -1245,7 +1245,7 @@ static HRESULT ca_setup_audiounit(EDataFlow dataflow, AudioComponentInstance uni > sc = AudioUnitGetProperty(unit, kAudioUnitProperty_StreamFormat, > kAudioUnitScope_Input, 1, dev_desc, &size); > if(sc != noErr){ > - WARN("Couldn't get unit format: %lx\n", sc); > + WARN("Couldn't get unit format: %x\n", sc); > return osstatus_to_hresult(sc); > } > dump_adesc("hardware", dev_desc); > @@ -1258,13 +1258,13 @@ static HRESULT ca_setup_audiounit(EDataFlow dataflow, AudioComponentInstance uni > sc = AudioUnitSetProperty(unit, kAudioUnitProperty_StreamFormat, > kAudioUnitScope_Output, 1, dev_desc, sizeof(*dev_desc)); > if(sc != noErr){ > - WARN("Couldn't set unit format: %lx\n", sc); > + WARN("Couldn't set unit format: %x\n", sc); > return osstatus_to_hresult(sc); > } > > sc = AudioConverterNew(dev_desc, &desc, converter); > if(sc != noErr){ > - WARN("Couldn't create audio converter: %lx\n", sc); > + WARN("Couldn't create audio converter: %x\n", sc); > return osstatus_to_hresult(sc); > } > }else{ > @@ -1276,7 +1276,7 @@ static HRESULT ca_setup_audiounit(EDataFlow dataflow, AudioComponentInstance uni > sc = AudioUnitSetProperty(unit, kAudioUnitProperty_StreamFormat, > kAudioUnitScope_Input, 0, dev_desc, sizeof(*dev_desc)); > if(sc != noErr){ > - WARN("Couldn't set format: %lx\n", sc); > + WARN("Couldn't set format: %x\n", sc); > return osstatus_to_hresult(sc); > } > } > @@ -1291,7 +1291,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, > { > ACImpl *This = impl_from_IAudioClient(iface); > HRESULT hr; > - OSStatus sc; > + int sc; > int i; > > TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags, > @@ -1383,7 +1383,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, > sc = AudioUnitSetProperty(This->unit, kAudioOutputUnitProperty_SetInputCallback, > kAudioUnitScope_Output, 1, &input, sizeof(input)); > if(sc != noErr){ > - WARN("Couldn't set callback: %lx\n", sc); > + WARN("Couldn't set callback: %x\n", sc); > AudioConverterDispose(This->converter); > This->converter = NULL; > CoTaskMemFree(This->fmt); > @@ -1401,7 +1401,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, > sc = AudioUnitSetProperty(This->unit, kAudioUnitProperty_SetRenderCallback, > kAudioUnitScope_Input, 0, &input, sizeof(input)); > if(sc != noErr){ > - WARN("Couldn't set callback: %lx\n", sc); > + WARN("Couldn't set callback: %x\n", sc); > CoTaskMemFree(This->fmt); > This->fmt = NULL; > OSSpinLockUnlock(&This->lock); > @@ -1411,7 +1411,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, > > sc = AudioUnitInitialize(This->unit); > if(sc != noErr){ > - WARN("Couldn't initialize: %lx\n", sc); > + WARN("Couldn't initialize: %x\n", sc); > if(This->converter){ > AudioConverterDispose(This->converter); > This->converter = NULL; > @@ -1426,7 +1426,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, > * a while to return */ > sc = AudioOutputUnitStart(This->unit); > if(sc != noErr){ > - WARN("Unit failed to start: %lx\n", sc); > + WARN("Unit failed to start: %x\n", sc); > if(This->converter){ > AudioConverterDispose(This->converter); > This->converter = NULL; > @@ -1515,7 +1515,7 @@ static HRESULT ca_get_max_stream_latency(ACImpl *This, UInt32 *max) > AudioObjectPropertyAddress addr; > AudioStreamID *ids; > UInt32 size; > - OSStatus sc; > + int sc; > int nstreams, i; > > addr.mScope = This->scope; > @@ -1525,7 +1525,7 @@ static HRESULT ca_get_max_stream_latency(ACImpl *This, UInt32 *max) > sc = AudioObjectGetPropertyDataSize(This->adevid, &addr, 0, NULL, > &size); > if(sc != noErr){ > - WARN("Unable to get size for _Streams property: %lx\n", sc); > + WARN("Unable to get size for _Streams property: %x\n", sc); > return osstatus_to_hresult(sc); > } > > @@ -1535,7 +1535,7 @@ static HRESULT ca_get_max_stream_latency(ACImpl *This, UInt32 *max) > > sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, &size, ids); > if(sc != noErr){ > - WARN("Unable to get _Streams property: %lx\n", sc); > + WARN("Unable to get _Streams property: %x\n", sc); > HeapFree(GetProcessHeap(), 0, ids); > return osstatus_to_hresult(sc); > } > @@ -1551,7 +1551,7 @@ static HRESULT ca_get_max_stream_latency(ACImpl *This, UInt32 *max) > sc = AudioObjectGetPropertyData(ids[i], &addr, 0, NULL, > &size, &latency); > if(sc != noErr){ > - WARN("Unable to get _Latency property: %lx\n", sc); > + WARN("Unable to get _Latency property: %x\n", sc); > continue; > } > > @@ -1570,7 +1570,7 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface, > ACImpl *This = impl_from_IAudioClient(iface); > UInt32 latency, stream_latency, size; > AudioObjectPropertyAddress addr; > - OSStatus sc; > + int sc; > HRESULT hr; > > TRACE("(%p)->(%p)\n", This, out); > @@ -1593,7 +1593,7 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface, > sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, > &size, &latency); > if(sc != noErr){ > - WARN("Couldn't get _Latency property: %lx\n", sc); > + WARN("Couldn't get _Latency property: %x\n", sc); > OSSpinLockUnlock(&This->lock); > return osstatus_to_hresult(sc); > } > @@ -1730,7 +1730,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, > { > ACImpl *This = impl_from_IAudioClient(iface); > WAVEFORMATEXTENSIBLE *fmt; > - OSStatus sc; > + int sc; > UInt32 size; > Float64 rate; > AudioBufferList *buffers; > @@ -1756,7 +1756,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, > sc = AudioObjectGetPropertyDataSize(This->adevid, &addr, 0, NULL, &size); > if(sc != noErr){ > CoTaskMemFree(fmt); > - WARN("Unable to get size for _StreamConfiguration property: %lx\n", sc); > + WARN("Unable to get size for _StreamConfiguration property: %x\n", sc); > return osstatus_to_hresult(sc); > } > > @@ -1771,7 +1771,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, > if(sc != noErr){ > CoTaskMemFree(fmt); > HeapFree(GetProcessHeap(), 0, buffers); > - WARN("Unable to get _StreamConfiguration property: %lx\n", sc); > + WARN("Unable to get _StreamConfiguration property: %x\n", sc); > return osstatus_to_hresult(sc); > } > > @@ -1788,7 +1788,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, > sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, &size, &rate); > if(sc != noErr){ > CoTaskMemFree(fmt); > - WARN("Unable to get _NominalSampleRate property: %lx\n", sc); > + WARN("Unable to get _NominalSampleRate property: %x\n", sc); > return osstatus_to_hresult(sc); > } > fmt->Format.nSamplesPerSec = rate; > @@ -2820,7 +2820,7 @@ static const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl = > static HRESULT ca_setvol(ACImpl *This, UINT32 index) > { > Float32 level; > - OSStatus sc; > + int sc; > > if(This->session->mute) > level = 0.; > @@ -2842,7 +2842,7 @@ static HRESULT ca_setvol(ACImpl *This, UINT32 index) > sc = AudioUnitSetParameter(This->unit, kHALOutputParam_Volume, > kAudioUnitScope_Global, 0, level, 0); > if(sc != noErr) > - WARN("Couldn't set volume: %lx\n", sc); > + WARN("Couldn't set volume: %x\n", sc); > > return S_OK; > } > -- > 2.7.1 > > >

1 0

Re: user32: Always enable owner window in EndDialog.
by Marvin 22 Feb '16

22 Feb '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=20807 Your paranoid android. === w1064 (32 bit msg) === msg.c:6290: Test failed: Update region shouldn't be empty msg.c:6524: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6526: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different

1 0

Re: wine/test.h: Compare winetest_platform to the same value everywhere.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Francois Gouget <fgouget(a)free.fr> writes: > todo_wine*() should have the same pltform check as broken(), win_skip() > and main(). The idea is that the tests are a description of the Windows APIs, not of a specific implementation. There can potentially be other implementations of the same APIs (for instance in ReactOS). broken() is a property of the Windows implementation, so it checks for the Windows platform. todo_wine is a property specific to the Wine implementation, so it checks for Wine. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] configure: Look for iODBC if we can't find unixODBC.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Charles Davis <cdavis5x(a)gmail.com> writes: > iODBC is another ODBC implementation for Unix. It comes by default with > Mac OS. > > Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> I haven't checked the Mac version, but at least on Linux the SQLWCHAR definition is incompatible, which means it can't be used as a simple replacement. -- Alexandre Julliard julliard(a)winehq.org

2 1

Success in todo depending on the Wine platform
by Francois Gouget 22 Feb '16

22 Feb '16

What should we do if a test succeeds in a todo_wine on Mac but fails on Linux, FreeBSD and Solaris. Specifically I'm thinking about this test: /* Check if we have some return values */ trace("WorkingSetSize : %ld\n", pvi.WorkingSetSize); todo_wine ok( pvi.WorkingSetSize > 0, "Expected a WorkingSetSize > 0\n"); Which the following commit caused to succeed on OSX: commit 1f9fe124b2bd7e69dad5c90b7897380e32d43481 Author: Snorri Sturluson <snorri.sturluson(a)ccpgames.com> Date: Thu Jan 28 17:22:10 2016 +0000 ntdll: Fill in memory counters under OS X. I find it pretty ironic that the OSX results, which already have more than their fair share or failures, are saddled with one extra failure when it is in fact the only Wine platform where the test succeeds! I guess implementing fill_VM_COUNTERS() on Linux, FreeBSD and Solaris would be one solution. It might not even be that hard depending on how correct you want the implementation to be. But do we have other solutions? I initially thought setting WINETEST_PLATFORM to Linux, FreeBSD, etc. could do the trick. But it currently it is only ever be set to Windows or Wine. Even worse, todo_wine explicitly checks if it is set to "wine" so anything else would break it. Should todo_wine check for 'not windows' instead? -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Computers are like airconditioners They stop working properly if you open WINDOWS

3 3

Re: [PATCH 2/2] winecoreaudio.drv: Don't print 32-bit values as long integers. (Clang)
by Bruno Jesus 22 Feb '16

22 Feb '16

On Sat, Feb 20, 2016 at 4:18 AM, Charles Davis <cdavis5x(a)gmail.com> wrote: > > Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> > --- > I couldn't get rid of all the casts. In particular, some of them are of a > system-defined structure that we obviously can't change. > > dlls/winecoreaudio.drv/mmdevdrv.c | 84 +++++++++++++++++++-------------------- > 1 file changed, 42 insertions(+), 42 deletions(-) > > diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c > index 60ff3d9..90124bc 100644 > --- a/dlls/winecoreaudio.drv/mmdevdrv.c > +++ b/dlls/winecoreaudio.drv/mmdevdrv.c > @@ -385,10 +385,10 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, > GUID **guids, UINT *num, UINT *def_index) > { > UInt32 devsize, size; > - AudioDeviceID *devices; > + unsigned int *devices; > AudioDeviceID default_id; > AudioObjectPropertyAddress addr; > - OSStatus sc; > + int sc; > int i, ndevices; Hi, Charles. I usually don't review patches but it feels weird to me that you are changing the type of the variable because AudioObjectGetPropertyData expects an AudioDeviceID and not an unsigned int. Even if they are the same I believe using the correct type is better. The same for OSStatus which is the return for AudioObjectGetPropertyData. Best wishes, Bruno

6 7

advapi32: add stub for AddAuditAccessObjectAce
by Louis Lenders 22 Feb '16

22 Feb '16

>Also I think it's better to do a little bit more and forward them to >ntdll Rtl* calls, like some existing calls already do, it's safe to >assume prototype are the same between the two. Hi Nicolai, RtlAddAuditAccessObjectAce and other are still not implemented in ntdll (and ntdll.spec) Am i right that you suggest to write the stubs for Rtl* in ntdll, and then forward advapi32 calls to Rtl* functions? Regards Louis

2 1

Re: [PATCH v2] ntdll: Finish serial reads of size 0 immediately.
by Marvin 21 Feb '16

21 Feb '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=20800 Your paranoid android. === w2003std (32 bit comm) === comm.c:861: Test failed: WaitCommEvent failed with a timeout comm.c:872: recovering after WAIT_TIMEOUT... comm.c:882: Test failed: WaitCommEvent error 0 comm.c:883: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:887: WaitCommEvent for EV_TXEMPTY took 1500 ms (timeout 1500) comm.c:888: Test failed: WaitCommEvent used 1500 ms for waiting comm.c:1553: test_AbortWaitCts timeout 500 handle 00000760 comm.c:1520: Changing CommMask on the fly for handle 00000760 after timeout 500 === w2008s64 (64 bit comm) === comm.c:861: Test failed: WaitCommEvent failed with a timeout comm.c:872: recovering after WAIT_TIMEOUT... comm.c:882: Test failed: WaitCommEvent error 0 comm.c:883: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:887: WaitCommEvent for EV_TXEMPTY took 1500 ms (timeout 1500) comm.c:888: Test failed: WaitCommEvent used 1500 ms for waiting

1 0

Re: [PATCH 7/8] wined3d: Rotate through swapchain buffers.
by Henri Verbeet 21 Feb '16

21 Feb '16

On 14 February 2016 at 21:33, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > Going back to square one and moving around texture resources. Anything > that's based on reassigning client library resources will make d3d11 > deferred contexts very difficult. > > So far I'm only moving around RGB textures and invalidating everything > else for simplicity. Does this do the right thing for multi-sampled swapchains?

2 2

RFC: Precompiled Headers for Wine Build (GSoC?)
by Kyle Auble 21 Feb '16

21 Feb '16

Hey everyone, Although I'm a student again, I don't really have the time or chops to apply for GSoC, at least not this year. I was randomly looking up things the other day though when I came across precompiled headers. I don't remember seeing any sight of them when I studied wine code in the past, and all I found on the mailing list was this: https://www.winehq.org/pipermail/wine-devel/2004-July/027933.html It might not be a hard-enough task to warrant a GSoC grant, and I don't know enough about the details to add an entry to the wiki (Would precompiled headers work for wine? Does wine actually use them already?) I just thought I would mention it because if it makes sense for the project, it might be an interesting change with a big payoff for build times. Kyle

5 6

Re: shell32/tests: Test ShellExecute()'s URL handling.
by Marvin 21 Feb '16

21 Feb '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=20796 Your paranoid android. === wvistau64 (32 bit shlexec) === shlexec.c:1588: Test failed: ShellExecuteEx(mask="0x808040", file="C:\Users\Public\Documents\shell32_test.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wt1045.tmp\wt1046.tmp" abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxy") WaitForSingleObject(hProcess) returned 258 shlexec.c:1979: Test failed: ShellExecuteEx(mask="0x8640", file="shlproto://%TMPDIR%/bar") WaitForSingleObject returned 258 shlexec.c:1983: Test failed: ShellExecuteEx(mask="0x8640", file="shlproto://%TMPDIR%/bar") argvA3 expected 'URL', but key not found or empty shlexec.c:1984: Test failed: ShellExecuteEx(mask="0x8640", file="shlproto://%TMPDIR%/bar") argvA4 expected 'shlproto://C:\Users\winetest\AppData\Local\Temp\wt1045.tmp/bar', but key not found or empty

1 0

Re: user32/tests: Use todo_wine_if() in tests
by Marvin 20 Feb '16

20 Feb '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=20778 Your paranoid android. === w1064 (32 bit msg) === msg.c:6290: Test failed: Update region shouldn't be empty msg.c:6524: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6526: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different

1 0

Re: reg: Fail if the data value passed with REG_DWORD will cause an overflow
by Alexandre Julliard 20 Feb '16

20 Feb '16

Hugh McMaster <hugh.mcmaster(a)outlook.com> writes: > @@ -243,8 +243,17 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r > { > LPWSTR rest; > DWORD val; > + BOOL overflow = FALSE; > + if (data[1] == 'x') > + { > + WCHAR *ptr = &data[2]; > + while (*ptr == '0') > + ptr++; > + if (strlenW(ptr) > 8) > + overflow = TRUE; > + } > val = strtoulW(data, &rest, (data[1] == 'x') ? 16 : 10); You won't be able to catch base 10 overflows this way. It probably needs a more general solution (and some more test cases...) -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: urlmon/tests: Use todo_wine_if() in tests
by Marvin 19 Feb '16

19 Feb '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=20745 Your paranoid android. === w1064 (32 bit misc) === misc.c:756: Test failed: [52] wrong mime: L"image/x-icon"

1 0

Re: winmm/tests: Use todo_wine_if() in tests
by Marvin 19 Feb '16

19 Feb '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=20744 Your paranoid android. === w1064 (32 bit midi) === midi.c:290: Test failed: midiOutOpen(dev=0) rc=MMSYSERR_ERROR midi.c:489: Test failed: midiStreamOpen(dev=-2) rc=MMSYSERR_ERROR midi.c:290: Test failed: midiOutOpen(dev=-1) rc=MMSYSERR_ERROR midi.c:489: Test failed: midiStreamOpen(dev=-2) rc=MMSYSERR_ERROR === w1064 (32 bit mci) === mci: unhandled exception c0000005 at 7698851A

1 0

Re: [PATCH] packet: create packet.dll and Implement GetAdapterNames(try 4)
by Sebastian Lackner 19 Feb '16

19 Feb '16

Thanks for sending an updated version of your patch. I have some more comments below. Nevertheless, before you spent too much time to fix all the issues, I would suggest to discuss with André first, if packet.dll is acceptable for Wine. One reason why we might consider adding it is because the original version heavily reads information from the registry (SYSTEM\\CurrentControlSet), which is not populated by Wine, but still there might be alternative ways to solve it. If we really reimplement this DLL, we might also need tests in the long term, otherwise its difficult to say if everything is implemented correctly. On 18.02.2016 14:21, Jianqiu Zhang wrote: > > 0001-packet-create-packet.dll-and-Implement-GetAdapterNames.txt > > > From 06eb579dba41bc473429d262150677687f1f092a Mon Sep 17 00:00:00 2001 > From: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > Date: Sun, 14 Feb 2016 17:27:37 +0800 > Subject: [PATCH] packet: create packet.dll and Implement GetAdapterNames > > Signed-off-by: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > --- > configure.ac | 7 +++++++ > dlls/packet/Makefile.in | 5 +++++ > dlls/packet/packet.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++ > dlls/packet/packet.spec | 32 ++++++++++++++++++++++++++++ > 4 files changed, 100 insertions(+) > create mode 100644 dlls/packet/Makefile.in > create mode 100644 dlls/packet/packet.c > create mode 100644 dlls/packet/packet.spec > > diff --git a/configure.ac b/configure.ac > index c9445e7..504d46e 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -69,6 +69,8 @@ AC_ARG_WITH(osmesa, AS_HELP_STRING([--without-osmesa],[do not use the OSMesa > AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss],[do not use the OSS sound support])) > AC_ARG_WITH(pcap, AS_HELP_STRING([--without-pcap],[do not use the Packet Capture library]), > [if test "x$withval" = "xno"; then ac_cv_header_pcap_pcap_h=no; fi]) > +AC_ARG_WITH(packet, AS_HELP_STRING([--without-packet],[do not use the Packet DLL]), > + [if test "x$withval" = "xno"; then ac_cv_header_pcap_pcap_h=no; fi]) You can leave this part out, packet.dll does not require separate dependencies. > AC_ARG_WITH(png, AS_HELP_STRING([--without-png],[do not use PNG])) > AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]), > [if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi]) > @@ -1186,7 +1188,11 @@ then > fi > WINE_NOTICE_WITH(pcap,[test "x$ac_cv_lib_pcap_pcap_create" != xyes], > [pcap ${notice_platform}development files not found, wpcap won't be supported.]) > +WINE_NOTICE_WITH(packet,[test "x$ac_cv_lib_pcap_pcap_create" != xyes], > + [pcap ${notice_platform}development files not found, packet won't be supported.]) A separate WINE_NOTICE_WITH is also not necessary. Instead just modify the existing one, for example: """pcap ${notice_platform}development files not found, wpcap and packet won't be supported.""" > test "x$ac_cv_lib_pcap_pcap_create" != xyes && enable_wpcap=${enable_wpcap:-no} > +test "x$ac_cv_lib_pcap_pcap_create" != xyes && enable_packet=${enable_packet:-no} > + > > dnl **** Check for libxml2 **** > > @@ -3389,6 +3395,7 @@ WINE_CONFIG_DLL(wmvcore) > WINE_CONFIG_DLL(wnaspi32,,[implib]) > WINE_CONFIG_DLL(wow32,enable_win16,[implib]) > WINE_CONFIG_DLL(wpcap) > +WINE_CONFIG_DLL(packet) These lines are alphabetically sorted, so you would have to insert it at a different position. Please note that you can also use ./tools/make_makefiles to add this line for you, after you have added files for a new dll to git. > WINE_CONFIG_DLL(ws2_32,,[implib]) > WINE_CONFIG_TEST(dlls/ws2_32/tests) > WINE_CONFIG_DLL(wshom.ocx,,[clean]) > diff --git a/dlls/packet/Makefile.in b/dlls/packet/Makefile.in > new file mode 100644 > index 0000000..cecf07c > --- /dev/null > +++ b/dlls/packet/Makefile.in > @@ -0,0 +1,5 @@ > +MODULE = packet.dll > +IMPORTS = iphlpapi > + > +C_SRCS = \ > + packet.c > diff --git a/dlls/packet/packet.c b/dlls/packet/packet.c > new file mode 100644 > index 0000000..1074067 > --- /dev/null > +++ b/dlls/packet/packet.c > @@ -0,0 +1,56 @@ > +#include "config.h" > + > +#include "windows.h" > +#include "wine/debug.h" > + > +#include "iphlpapi.h" > + > +WINE_DEFAULT_DEBUG_CHANNEL(packet); > + > +BOOLEAN CDECL PacketGetAdapterNames(char *name_list, ULONG *size) > +{ > + IP_ADAPTER_INFO *adInfo, *adInfoList = NULL; > + DWORD errcode; > + ULONG needsize = 0, minDescLen = 0, minAdNameLen = 0, minTotLen = 0, nameOffset, descOffset; > + > + TRACE("name_list %p &size %p size %d\n", name_list, size, *size); > + > + errcode = GetAdaptersInfo(adInfoList, &needsize); > + adInfoList = HeapAlloc(GetProcessHeap(), 0, needsize); > + if(adInfoList == NULL) return FALSE; > + > + errcode = GetAdaptersInfo(adInfoList, &needsize); > + if(errcode) > + { > + HeapFree(GetProcessHeap(), 0, adInfoList); > + SetLastError(errcode); > + return FALSE; > + } > + for(adInfo = adInfoList; adInfo != NULL; adInfo = adInfo->Next) > + { > + minAdNameLen += lstrlenA(adInfo->AdapterName) + 1; > + minDescLen += lstrlenA(adInfo->Description) + 1; Usually a direct invocation of strlen() is preferred in the wine source. > + } > + minTotLen = minAdNameLen + minDescLen + 2; > + if(name_list == NULL || *size < minTotLen) > + { > + SetLastError(ERROR_INSUFFICIENT_BUFFER); > + HeapFree(GetProcessHeap(), 0, adInfoList); > + *size = minTotLen; When looking through the original implementation of packet.dll, I do not see any location which changes *size. > + return FALSE; > + } > + > + nameOffset = descOffset = 0; > + for(adInfo = adInfoList; adInfo != NULL; adInfo = adInfo->Next) > + { > + lstrcpyA(name_list + nameOffset, adInfo->AdapterName); > + lstrcpyA(name_list + minAdNameLen + descOffset + 1, adInfo->Description); > + nameOffset += lstrlenA(adInfo->AdapterName) + 1; > + descOffset += lstrlenA(adInfo->Description) + 1; strcpy / strlen would be preferred here. > + } > + name_list[minAdNameLen] = '\0'; > + name_list[minTotLen - 1] = '\0'; > + > + HeapFree(GetProcessHeap(), 0, adInfoList); > + return TRUE; > +} > diff --git a/dlls/packet/packet.spec b/dlls/packet/packet.spec > new file mode 100644 > index 0000000..32b9bc0 > --- /dev/null > +++ b/dlls/packet/packet.spec > @@ -0,0 +1,32 @@ > +@ stub PacketAllocatePacket > +@ stub PacketCloseAdapter > +@ stub PacketFreePacket > +@ cdecl PacketGetAdapterNames(ptr ptr) > +@ stub PacketGetAirPcapHandle > +@ stub PacketGetDriverVersion > +@ stub PacketGetNetInfoEx > +@ stub PacketGetNetType > +@ stub PacketGetReadEvent > +@ stub PacketGetStats > +@ stub PacketGetStatsEx > +@ stub PacketGetVersion > +@ stub PacketInitPacket > +@ stub PacketIsDumpEnded > +@ stub PacketLibraryVersion > +@ stub PacketOpenAdapter > +@ stub PacketReceivePacket > +@ stub PacketRequest > +@ stub PacketSendPacket > +@ stub PacketSendPackets > +@ stub PacketSetBpf > +@ stub PacketSetBuff > +@ stub PacketSetDumpLimits > +@ stub PacketSetDumpName > +@ stub PacketSetHwFilter > +@ stub PacketSetLoopbackBehavior > +@ stub PacketSetMinToCopy > +@ stub PacketSetMode > +@ stub PacketSetNumWrites > +@ stub PacketSetReadTimeout > +@ stub PacketSetSnapLen > +@ stub PacketStopDriver > -- 2.7.1 > > >

2 1

Re: [PATCH 1/2] msvcrt: Don't close HANDLE if stdout or stderr is sharing it
by Qian Hong 19 Feb '16

19 Feb '16

Hi Piotr, Thanks for your work! I didn't have time to improve the patches so I didn't sent it upstream, I appreciate a lot for your work, now I can remove it from my todo list :)

1 0

Re: [PATCH 1/2] msvcp110: Add tr2_sys__Unlink implementation and test.(resend)
by Marvin 19 Feb '16

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

2 1

Re: [PATCH 2/2] msvcp110: Add tr2_sys__Stat_wchar and tr2_sys__Lstat_wchar implementation and test.(resend)
by Marvin 19 Feb '16

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

1 0

Re: msctf/tests: Use todo_wine_if() in tests
by Marvin 19 Feb '16

19 Feb '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=20718 Your paranoid android. === w1064 (32 bit inputprocessor) === inputprocessor.c:787: Test failed: Deactivation came unexpectedly

1 0

[RFC PATCH 2/2] Load device drivers of the same group into the same winedevice process
by Aric Stewart 19 Feb '16

19 Feb '16

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- programs/services/services.c | 94 +++++++++++++++++++++++++++++-- programs/winedevice/device.c | 128 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 204 insertions(+), 18 deletions(-)

1 0

[RFC PATCH 1/2] programs/services: Break services into Loader groups
by Aric Stewart 19 Feb '16

19 Feb '16

Sebastian was requesting that multiple drivers be able to be loaded into the same winedevice process. Discussing this with Alexandre he expressed that instead of my approach to the plug and play manager as a service it may be more proper to have it be a kernel driver that then depends on other drivers being loaded into the same process. So here is a proposed process to allow this to happen. Right now these 2 patches depend on my moving the driver loading code, but that is not a hard dependency at all, it would be relatively straight forward to be able to keep all the driver loading code into winedevice and still have these patches. This is a request for comment before submitting it to wine-patches. Also to decide if we should move the driver loading or not, as that does affect what set of patches are submitted. -aric Sort the groups by the service's tag to start in order --- programs/services/services.c | 101 ++++++++++++++++++++++++++++++++----------- 1 file changed, 75 insertions(+), 26 deletions(-)

1 0

Re: [PATCH] kernel32: Use setprogname(3) to set the program name if available.
by Alexandre Julliard 19 Feb '16

19 Feb '16

Charles Davis <cdavis5x(a)gmail.com> writes: > @@ -1118,21 +1118,29 @@ static void set_process_name( int argc, char *argv[] ) > { > #ifdef HAVE_SETPROCTITLE > setproctitle("-%s", argv[1]); > -#endif > - > -#ifdef HAVE_PRCTL > +#elif defined(HAVE_PRCTL) || defined(HAVE_SETPROGNAME) > int i, offset; > char *p, *prctl_name = argv[1]; > char *end = argv[argc-1] + strlen(argv[argc-1]) + 1; > - > -#ifndef PR_SET_NAME > -# define PR_SET_NAME 15 > +#ifdef HAVE_SETPROGNAME > + static char progname[PATH_MAX]; > #endif > > if ((p = strrchr( prctl_name, '\\' ))) prctl_name = p + 1; > if ((p = strrchr( prctl_name, '/' ))) prctl_name = p + 1; > > +#ifdef HAVE_SETPROGNAME > + lstrcpynA( progname, prctl_name, sizeof(progname)/sizeof(progname[0]) ); > + progname[PATH_MAX-1] = 0; > + setprogname( progname ); > + if (1) > +#elif defined(HAVE_PRCTL) > +#ifndef PR_SET_NAME > +# define PR_SET_NAME 15 > +#endif > + > if (prctl( PR_SET_NAME, prctl_name ) != -1) > +#endif This is becoming hard to follow, please try to clean up these #ifdefs a little. Also you shouldn't need to make a copy, it can point directly into argv. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: advapi32: add stub for AddAuditAccessObjectAce
by Nikolay Sivov 19 Feb '16

19 Feb '16

On 19.02.2016 11:40, Piet Jankbal wrote: > For bug https://bugs.winehq.org/show_bug.cgi?id=39918 > <https://bugs.winehq.org/show_bug.cgi?id=29862> > > > Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> > > > > This should be marked as a part of series, as they depend on each other. Also I think it's better to do a little bit more and forward them to ntdll Rtl* calls, like some existing calls already do, it's safe to assume prototype are the same between the two.

1 0

Re: advapi32: add stub for AddAuditAccessObjectAce
by Austin English 19 Feb '16

19 Feb '16

On Fri, Feb 19, 2016 at 2:40 AM, Piet Jankbal <xerox.xerox2000x(a)gmail.com> wrote: > For bug https://bugs.winehq.org/show_bug.cgi?id=39918 > > > Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> The name on your email, the named on the signed off by, and the name on the patch are all different. Why? -- -Austin

1 0

Re: [4/4] ntdll: Set correct number of arguments for breakpoint exceptions.
by Marvin 19 Feb '16

19 Feb '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=20712 Your paranoid android. === wvistau64 (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x2e0000/0x2e0001 exception: unhandled exception 80000004 at 002E0000 exception.c:490: Test failed: 42: Unexpected eip 0x77baed97/0x2e0001 === w7u (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x3f0000/0x3f0001 exception: unhandled exception 80000004 at 003F0000 exception.c:490: Test failed: 42: Unexpected eip 0x77cde34f/0x3f0001 === w1064 (32 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9) === w1064 (64 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

1 0

Re: [3/4] ntdll: Fix up instruction pointer in context for EXCEPTION_BREAKPOINT on x86_64.
by Marvin 19 Feb '16

19 Feb '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=20711 Your paranoid android. === wvistau64 (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x3c0000/0x3c0001 exception: unhandled exception 80000004 at 003C0000 exception.c:490: Test failed: 42: Unexpected eip 0x77baed97/0x3c0001 === w7u (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x2f0000/0x2f0001 exception: unhandled exception 80000004 at 002F0000 exception.c:490: Test failed: 42: Unexpected eip 0x77cde34f/0x2f0001 === w1064 (32 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9) === w1064 (64 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

1 0

Re: [2/4] ntdll/tests: Add separate tests for exception handling of int $0x3.
by Marvin 19 Feb '16

19 Feb '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=20710 Your paranoid android. === wvistau64 (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x2c0000/0x2c0001 exception: unhandled exception 80000004 at 002C0000 exception.c:490: Test failed: 42: Unexpected eip 0x77baed97/0x2c0001 === w7u (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x2f0000/0x2f0001 exception: unhandled exception 80000004 at 002F0000 exception.c:490: Test failed: 42: Unexpected eip 0x77cde34f/0x2f0001 === w1064 (32 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9) === w1064 (64 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

1 0

Re: [1/4] ntdll/tests: Add additional tests for instruction pointer in debug service tests.
by Marvin 19 Feb '16

19 Feb '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=20709 Your paranoid android. === wvistau64 (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x3c0000/0x3c0001 exception: unhandled exception 80000004 at 003C0000 exception.c:490: Test failed: 42: Unexpected eip 0x77baed97/0x3c0001 === w7u (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x700000/0x700001 exception: unhandled exception 80000004 at 00700000 exception.c:490: Test failed: 42: Unexpected eip 0x77cde34f/0x700001 === w1064 (32 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9) === w1064 (64 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

1 0

Re: [PATCH] kernel32/tests: Additional test for GetStringTypeW() and Zl/Zp categories
by Marvin 18 Feb '16

18 Feb '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=20683 Your paranoid android. === w1064 (32 bit locale) === locale.c:2365: Test failed: LCMapStringEx should fail with bad locale name locale.c:2366: Test failed: unexpected error code -559038737 locale.c:2457: Test failed: Expected lcid == 0, got got 00001000, error -559038737 locale.c:4175: Test failed: IsValidLocaleName should have failed locale.c:4177: Test failed: IsValidLocaleName should have failed locale.c:4542: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4544: Test failed: For id 7, Expected IVC, got ''

2 1

Re: [PATCH] secur32: Don't print 32-bit values as long integers. (Clang)
by Ken Thomases 18 Feb '16

18 Feb '16

On Feb 18, 2016, at 2:20 PM, Charles Davis <cdavis5x(a)gmail.com> wrote: > > Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> > --- > dlls/secur32/schannel_macosx.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) In several other places throughout this file, the same problem was solved by casting to long in the logging call. Of course, that means that Clang doesn't warn about those. I don't mind your approach, but I think this should be handled consistently throughout the file, one way or the other. -Ken

2 1

Re: [PATCH 1/2 v2] winemac.drv: Actually make the GL context current even if no drawables were given.
by Ken Thomases 18 Feb '16

18 Feb '16

On Feb 18, 2016, at 3:17 AM, Charles Davis <cdavis5x(a)gmail.com> wrote: > @@ -3108,7 +3108,7 @@ static BOOL macdrv_wglMakeContextCurrentARB(HDC draw_hdc, HDC read_hdc, struct w > (InterlockedCompareExchange(&context->update_swap_interval, FALSE, TRUE) || pbuffer != context->draw_pbuffer)) > set_swap_interval(context, 0); > } > - else > + else if (draw_hdc) > { > WARN("no window or pbuffer for DC\n"); > LeaveCriticalSection(&dc_pbuffers_section); I would prefer an explicit "if (!draw_hdc && !read_hdc) { /* clear context->draw_... */ } else" be introduced before the "if ((hwnd = WindowFromDC(draw_hdc)))". First, from my reading of the spec, a NULL draw_hdc and a non-NULL read_hdc should still be an error. Second, burying the logic in the pbuffer branch seems obscure. Thanks, Ken

1 0

Re: [PATCH] kernelbase: Add dll with forwards to kernel32.dll
by Nikolay Sivov 18 Feb '16

18 Feb '16

On 18.02.2016 19:36, Detlef Riekenberg wrote: > +#@ stdcall CancelThreadpoolIo ntdll.TpCancelAsyncIoOperation > +@ stub CancelThreadpoolIo Hi. I think for new dll it's fine to have a stub, even if kernel32 does not have it. Why did you keep commented forward to ntdll too?

1 0

Re: [PATCH 2/2 v3] user32: Add more dialog creation message tests
by Dmitry Timoshkov 18 Feb '16

18 Feb '16

Piotr Caban <piotr(a)codeweavers.com> wrote: > Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> > --- > dlls/user32/tests/msg.c | 72 > +++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 72 insertions(+) It's getting better, but again doesn't show a lot of details. Please add parameters for most of the recorded messages in the sequence, in particular EM_SETSEL and WM_GETDLGCODE are the mandatory ones. Also, in order to see the origin of EM_SETSEL I'd suggest to call DefDlgProc() manually and use defwndproc_counter around it together with the defwinproc flag. -- Dmitry.

3 10

Re: [PATCH 1/3] msvcp110: Add tr2_sys__Symlink implementation and test.(try 2)
by Piotr Caban 18 Feb '16

18 Feb '16

On 02/18/16 10:54, YongHao Hu wrote: > + delete_flag = 1; > + for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { > + errno = 0xdeadbeef; > + SetLastError(0xdeadbeef); > + ret = p_tr2_sys__Symlink(tests[i].existing_path, tests[i].new_path); > + if(ret==ERROR_PRIVILEGE_NOT_HELD || ret==ERROR_INVALID_FUNCTION) { > + delete_flag = 0; > + win_skip("Privilege not held or symbolic link not supported, skipping symbolic link tests.\n"); > + break; If second symlink creation fails we'll end up with some not deleted files while all tests are succeeding. I'm not sure if it's a real issue. I also think that it will be better if you remove the delete_flag variable. Something like this will be better in my opinion: ret = p_tr2_sys__Symlink(tests[i].existing_path, tests[i].new_path); if(!i && (ret==ERROR_PRIVILEGE_NOT_HELD || ret==ERROR_INVALID_FUNCTION)) { win_skip(...); ret = p_tr2_sys__Remove_dir("tr2_test_dir"); ok(ret == 1, "tr2_sys__Remove_dir(): expect 1 got %d\n", ret); return; } ok(ret == ERROR_SUCCESS, ...); > + if(tests[i].is_todo) > + todo_wine ok(ret == tests[i].last_error, "tr2_sys__Symlink(): test %d expect: %d, got %d\n", i+1, tests[i].last_error, ret); > + else > + ok(ret == tests[i].last_error, "tr2_sys__Symlink(): test %d expect: %d, got %d\n", i+1, tests[i].last_error, ret); Please use todo_wine_if here. Thanks, Piotr

2 2

Re: mshtml/tests: Trace the buffer when it is unexpectedly changed in mshtml:protocol.
by Jacek Caban 18 Feb '16

18 Feb '16

On 02/18/16 03:14, Francois Gouget wrote: > Signed-off-by: Francois Gouget <fgouget(a)free.fr> > --- > dlls/mshtml/tests/protocol.c | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-) > > diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c > index f9803df..9a511ba 100644 > --- a/dlls/mshtml/tests/protocol.c > +++ b/dlls/mshtml/tests/protocol.c > @@ -397,7 +397,7 @@ static void test_res_protocol(void) > hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_DOMAIN, 0, buf, > sizeof(buf)/sizeof(buf[0]), &size, 0); > ok(hres == S_OK || hres == E_FAIL, "ParseUrl failed: %08x\n", hres); > - ok(buf[0] == '?', "buf changed\n"); > + ok(buf[0] == '?', "buf changed buf[0]='%c'\n", buf[0]); > Why don't you use wine_dbgstr_w here? Thanks, Jacek

1 0

Re: ntdll/tests: Add more tests for calling int $0x2d on x86 and x86_64. (v2)
by Marvin 18 Feb '16

18 Feb '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=20657 Your paranoid android. === wvistau64 (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x2c0000/0x2c0001 exception: unhandled exception 80000004 at 002C0000 exception.c:490: Test failed: 42: Unexpected eip 0x77baed97/0x2c0001 === w7u (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x2f0000/0x2f0001 exception: unhandled exception 80000004 at 002F0000 exception.c:490: Test failed: 42: Unexpected eip 0x77cde34f/0x2f0001 === w1064 (32 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9) === w1064 (64 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

1 0

Re: [3/3] ntdll: Add more tests for calling int $0x2d on x86 and x86_64.
by Marvin 18 Feb '16

18 Feb '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=20653 Your paranoid android. === wvistau64 (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x3e0000/0x3e0001 exception: unhandled exception 80000004 at 003E0000 exception.c:490: Test failed: 42: Unexpected eip 0x77baed97/0x3e0001 === w7u (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x2f0000/0x2f0001 exception: unhandled exception 80000004 at 002F0000 exception.c:490: Test failed: 42: Unexpected eip 0x77cde34f/0x2f0001 === w1064 (32 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9) === w1064 (64 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

1 0

Re: [PATCH] packet: create packet.dll and Implement GetAdapterNames(try 3)
by Sebastian Lackner 18 Feb '16

18 Feb '16

On 18.02.2016 11:15, Jianqiu Zhang wrote: > From 4810b411a8b76ce09356da0333d5aef434e30465 Mon Sep 17 00:00:00 2001 > From: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > Date: Sun, 14 Feb 2016 17:27:37 +0800 > Subject: [PATCH] packet: create packet.dll and Implement GetAdapterNames > > Signed-off-by: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> It seems your mail client corrupted the patch. To workaround that, you can send your patch as attachment. Also, you either attached the wrong version of your patch, or missed some of the feedback I gave in the last reply. The memory leaks and ordinals in the spec file are still present for example.

1 0

Re: ntdll/tests: Add more tests for calling int $0x2d on x86 and x86_64. (v2)
by Marvin 18 Feb '16

18 Feb '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=20657 Your paranoid android. === wvistau64 (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x2d0000/0x2d0001 exception: unhandled exception 80000004 at 002D0000 exception.c:490: Test failed: 42: Unexpected eip 0x77baed97/0x2d0001 === w7u (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x2f0000/0x2f0001 exception: unhandled exception 80000004 at 002F0000 exception.c:490: Test failed: 42: Unexpected eip 0x77cde34f/0x2f0001 === w1064 (32 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9) === w1064 (64 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

2 1

Re: [2/3] ntdll: Implement handling of int $0x2d for x86_64.
by Sebastian Lackner 18 Feb '16

18 Feb '16

On 18.02.2016 09:58, Sebastian Lackner wrote: > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > dlls/ntdll/signal_x86_64.c | 53 +++++++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 51 insertions(+), 2 deletions(-) > I'd like to add the remark, that depending on the logic of the anti-debugger trick, more work is necessary for proper int $0x2d support on x86_64. What we also need is the equivalent of http://source.winehq.org/git/wine.git/patch/eab168cf9eaa6ed9f8800b25155d329… for x86_64. I'll take care of that when I know that the first three patches are fine.

1 0

Re: [3/3] ntdll: Add more tests for calling int $0x2d on x86 and x86_64.
by Marvin 18 Feb '16

18 Feb '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=20653 Your paranoid android. === wvistau64 (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x2c0000/0x2c0001 exception: unhandled exception 80000004 at 002C0000 exception.c:490: Test failed: 42: Unexpected eip 0x77baed97/0x2c0001 === w7u (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x3f0000/0x3f0001 exception: unhandled exception 80000004 at 003F0000 exception.c:490: Test failed: 42: Unexpected eip 0x77cde34f/0x3f0001 === w1064 (32 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9) === w1064 (64 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

1 0

Re: [PATCH 2/2] ntdll: Improve invalid parameter handling in NtAccessCheck. (try 3)
by Marvin 18 Feb '16

18 Feb '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=20648 Your paranoid android. === w1064 (32 bit security) === security.c:3945: Test failed: MACHINE\Software owner SID (S-1-5-18) != Administrators SID (S-1-5-32-544). security.c:3986: Test failed: Builtin Users ACE has unexpected flags (0x12 != 0xa) security.c:3990: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:3999: Test failed: Builtin Admins ACE has unexpected flags (0x12 != 0x0)

1 0

Re: [PATCH 1/2] advapi32/tests: Add more invalid parameter tests for AccessCheck. (try 3)
by Marvin 18 Feb '16

18 Feb '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=20647 Your paranoid android. === w1064 (32 bit security) === security.c:3964: Test failed: MACHINE\Software owner SID (S-1-5-18) != Administrators SID (S-1-5-32-544). security.c:4005: Test failed: Builtin Users ACE has unexpected flags (0x12 != 0xa) security.c:4009: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:4018: Test failed: Builtin Admins ACE has unexpected flags (0x12 != 0x0)

1 0

Re: [PATCH 2/3] ntdll: Improve invalid parameter handling in NtAccessCheck. (try 2)
by Alexandre Julliard 18 Feb '16

18 Feb '16

Qian Hong <qhong(a)codeweavers.com> writes: > @@ -1586,7 +1586,16 @@ NtAccessCheck( > SecurityDescriptor, ClientToken, DesiredAccess, GenericMapping, > PrivilegeSet, ReturnLength, GrantedAccess, AccessStatus); > > - if (!PrivilegeSet || !ReturnLength) > + if (!ReturnLength) > + return STATUS_ACCESS_VIOLATION; > + > + if (*ReturnLength == 0) > + { > + *ReturnLength = sizeof(PRIVILEGE_SET); Shouldn't this depend on the number of privileges to be returned? -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: shell32/tests: Only look for Explorer windows for the progman tests.
by Marvin 18 Feb '16

18 Feb '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=20640 Your paranoid android. === w2003std (32 bit progman_dde) === progman_dde.c:383: Test failed: Window "C:\Documents and Settings\All Users\Start Menu\Programs\Group1" was not created in 45 seconds - assumed failure. [S_G:12]

1 0

Re: crypt32/tests: Clarify some base64 test failed messages.
by Marvin 18 Feb '16

18 Feb '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=20639 Your paranoid android. === w1064 (32 bit base64) === base64.c:342: Test failed: Expected ERROR_INVALID_DATA, got ret=1 le=13 base64.c:342: Test failed: Expected ERROR_INVALID_DATA, got ret=1 le=13 base64.c:342: Test failed: Expected ERROR_INVALID_DATA, got ret=1 le=13 === w1064 (64 bit base64) === base64.c:342: Test failed: Expected ERROR_INVALID_DATA, got ret=1 le=13 base64.c:342: Test failed: Expected ERROR_INVALID_DATA, got ret=1 le=13 base64.c:342: Test failed: Expected ERROR_INVALID_DATA, got ret=1 le=13

1 0

Re: mshtml/tests: Trace the buffer when it is unexpectedly changed in mshtml:protocol.
by Marvin 18 Feb '16

18 Feb '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=20637 Your paranoid android. === w1064 (32 bit protocol) === protocol.c:723: Test failed: buf changed buf[0]='' === w1064 (64 bit protocol) === protocol.c:723: Test failed: buf changed buf[0]=''

1 0

Re: schedsvc/tests: Recognize Windows 10's RPC version.
by Marvin 18 Feb '16

18 Feb '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=20636 Your paranoid android. === w1064 (32 bit rpcapi) === rpcapi.c:151: Test failed: expected ERROR_FILE_NOT_FOUND, got 0

1 0

Re: mshtml/tests: Use todo_wine_if() in tests
by Marvin 17 Feb '16

17 Feb '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=20627 Your paranoid android. === wvistau64 (32 bit htmldoc) === htmldoc.c:5329: Test failed: elem == NULL

1 0

Re: [PATCH] comctl32/tooltip: Protect TTM_ADDTOOLW from invalid text pointers (resend)
by Alexandre Julliard 17 Feb '16

17 Feb '16

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > @@ -1076,10 +1077,19 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) > toolPtr->lpszText = LPSTR_TEXTCALLBACKW; > } > else if (isW) { > - INT len = lstrlenW (ti->lpszText); > - TRACE("add text %s!\n", debugstr_w(ti->lpszText)); > - toolPtr->lpszText = Alloc ((len + 1)*sizeof(WCHAR)); > - strcpyW (toolPtr->lpszText, ti->lpszText); > + __TRY > + { > + INT len = lstrlenW (ti->lpszText); > + TRACE("add text %s!\n", debugstr_w(ti->lpszText)); > + toolPtr->lpszText = Alloc ((len + 1)*sizeof(WCHAR)); > + strcpyW (toolPtr->lpszText, ti->lpszText); > + } > + __EXCEPT_PAGE_FAULT > + { > + WARN("Invalid lpszText.\n"); > + return FALSE; You can't just return like that without cleaning up. -- Alexandre Julliard julliard(a)winehq.org

3 3

Re: [PATCH] winemac.drv: Actually make the GL context current even if no drawables were given.
by Ken Thomases 17 Feb '16

17 Feb '16

On Feb 16, 2016, at 1:50 PM, Charles Davis <cdavis5x(a)gmail.com> wrote: > > The spec for GL_ARB_framebuffer_object (and thus, OpenGL 3.x and up) is > quite clear on what happens when a context is made current with no > drawable(s). In fact, the WGL_ARB_create_context extension amends > WGL_ARB_make_current_read (as well as the base spec for wglMakeCurrent) > specifically to allow this. > > Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> > --- > dlls/winemac.drv/cocoa_opengl.m | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m > index ec2b191..4694dfd 100644 > --- a/dlls/winemac.drv/cocoa_opengl.m > +++ b/dlls/winemac.drv/cocoa_opengl.m > @@ -235,7 +235,10 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) > } > > if (context) > + { > [context removeFromViews:YES]; > + [context makeCurrentContext]; > + } > } I don't think this can be sufficient. The logic in macdrv_wglMakeContextCurrentARB() essentially means that macdrv_make_context_current() will never be called with a NULL view and a non-NULL context. The "if" statement that you're changing is mostly just extra safety and, as things stand, shouldn't ever execute its statement. -Ken

1 0

Re: [PATCH] gdi32: Declare our intent explicitly to the compiler.
by Michael Stefaniuc 17 Feb '16

17 Feb '16

On 02/17/2016 10:27 AM, Charles Davis wrote: > Clang warns about this abs(3) call because the argument is of > unsigned type. Apparently, though, this is actually a signed value > that just happens to be stored in a DWORD. (Then why is this > parameter to ExtCreatePen() a DWORD?) > > In any case, quiesce this warning with a cast. Well, clang is wrong here. abs() takes a signed integer and the implicit cast from unsigned to signed is perfectly valid C. The policy in Wine is to not uglify the code just to silence misguided static analyzers. And other static code checkers might complain about the superfluous and unneeded explicit cast (I'm working on and off on that). bye michael > > Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> --- > dlls/gdi32/pen.c | 2 +- 1 file changed, 1 insertion(+), 1 > deletion(-) > > diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index > 2ae2f2b..cf4b080 100644 --- a/dlls/gdi32/pen.c +++ > b/dlls/gdi32/pen.c @@ -195,7 +195,7 @@ HPEN WINAPI ExtCreatePen( > DWORD style, DWORD width, if (logbrush.lbStyle == BS_DIBPATTERN) > logbrush.lbStyle = BS_DIBPATTERNPT; > > penPtr->logpen.elpPenStyle = style; - penPtr->logpen.elpWidth = > abs(width); + penPtr->logpen.elpWidth = abs((int)width); > penPtr->logpen.elpBrushStyle = logbrush.lbStyle; > penPtr->logpen.elpColor = logbrush.lbColor; penPtr->logpen.elpHatch > = brush->lbHatch;

2 2

Re: [PATCH] wined3d: Implement conversion function for paletted format
by Henri Verbeet 17 Feb '16

17 Feb '16

On 16 February 2016 at 21:15, Sergey Isakov <isakov-sl(a)bk.ru> wrote: > This function is required by game Urban Assault. http://www.old-games.com/download/5663/urban-assault > Bug 37398. > With the patch the game is working. > Stefan already described in the bug report why this is suspicious. This would need tests to show this is needed and correct.

1 0

Re: [v2] user32: Use IsTextUnicode instead of a helper.
by Jactry Zeng 17 Feb '16

17 Feb '16

Sorry, please ignore this patch. I find another bug of Wine's IsTextUnicode. So I can't use it directly. 2016-02-16 16:13 GMT+08:00 Jactry Zeng <jzeng(a)codeweavers.com>: > Hi, > > This patch try to fix tests in patch 119212: > http://source.winehq.org/patches/data/119212 > > I'm not very sure is IsTextUnicode(IS_TEXT_UNICODE_STATISTICS) good > enough for dealing with all cases may be fed by DDE. But it works > for all cases we have in dlls/user32/tests/dde.c . > > ChangeLog: > - Use IS_TEXT_UNICODE_STATISTICS. > > > Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> > --- > dlls/user32/dde_server.c | 15 ++++----------- > dlls/user32/tests/dde.c | 20 ++++++++++---------- > 2 files changed, 14 insertions(+), 21 deletions(-) > > > > > > -- Regards, Jactry Zeng

1 0

Re: [PATCH] advapi32: Don't print 32-bit values as long integers.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Charles Davis <cdavis5x(a)gmail.com> writes: > diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c > index 10e58eb..ff763ee 100644 > --- a/dlls/advapi32/cred.c > +++ b/dlls/advapi32/cred.c > @@ -260,7 +260,7 @@ static DWORD mac_read_credential_from_item(SecKeychainItemRef item, BOOL require > } > if (status != noErr) > { > - WARN("SecKeychainItemCopyAttributesAndData returned status %ld\n", status); > + WARN("SecKeychainItemCopyAttributesAndData returned status %d\n", (int)status); It would probably be better to change the type instead of adding casts everywhere. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 5/6] wined3d: Enable SM5 shaders in the GLSL backend.
by Henri Verbeet 17 Feb '16

17 Feb '16

On 16 February 2016 at 20:48, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > + /* FIXME: Check for the extensions required for SM5 support > + * (ARB_compute_shader, ARB_tessellation_shader, ARB_gpu_shader5, ...) as > + * soon as we introduce them. */ > if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) && gl_info->supported[WINED3D_GL_VERSION_3_2] > && gl_info->supported[ARB_SHADER_BIT_ENCODING] && gl_info->supported[ARB_SAMPLER_OBJECTS]) > - shader_model = 4; > + shader_model = 5; I'd rather not do this without at least a check for the GL and GLSL versions. It would potentially create the kind of situation where some applications start working a little bit and then stop working once we add the proper check.

1 0

Re: [PATCH 3/6] d3d11: Accept SM5 shaders.
by Henri Verbeet 17 Feb '16

17 Feb '16

On 16 February 2016 at 20:48, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c > index 0e277fc..61dbd4b 100644 > --- a/dlls/d3d11/shader.c > +++ b/dlls/d3d11/shader.c > @@ -389,7 +389,7 @@ static HRESULT d3d_vertex_shader_init(struct d3d_vertex_shader *shader, struct d > desc.byte_code = shader_info.shader_code; > desc.input_signature = &input_signature; > desc.output_signature = &output_signature; > - desc.max_version = 4; > + desc.max_version = 5; I think this should depend on the feature level. I.e., I'd expect creating a SM5 shader to fail on a D3D_FEATURE_LEVEL_10_0 device. (And we'd need feature level support to properly skip the test in patch 6/6, otherwise creating the device would succeed on SM4 hardware, but creating the shader would fail.)

1 0

Re: [PATCH 1/6] wined3d: Add a setting to check relative addressing indices when accessing uniforms.
by Henri Verbeet 17 Feb '16

17 Feb '16

On 16 February 2016 at 20:48, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > @@ -2258,9 +2258,25 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * > if (reg->idx[0].rel_addr) > { > if (reg->idx[0].offset) > - sprintf(register_name, "%s_c[%s + %u]", prefix, rel_param0.param_str, reg->idx[0].offset); > + { > + if (wined3d_settings.check_float_constants) > + sprintf(register_name, "(%s + %u >= 0 && %s + %u < %u ? %s_c[%s + %u] : vec4(0.0))", > + rel_param0.param_str, reg->idx[0].offset, > + rel_param0.param_str, reg->idx[0].offset, shader->limits->constant_float, > + prefix, rel_param0.param_str, reg->idx[0].offset); > + else > + sprintf(register_name, "%s_c[%s + %u]", prefix, > + rel_param0.param_str, reg->idx[0].offset); > + } > else > - sprintf(register_name, "%s_c[%s]", prefix, rel_param0.param_str); > + { > + if (wined3d_settings.check_float_constants) > + sprintf(register_name, "(%s >= 0 && %s < %u ? %s_c[%s] : vec4(0.0))", > + rel_param0.param_str, rel_param0.param_str, shader->limits->constant_float, > + prefix, rel_param0.param_str); > + else > + sprintf(register_name, "%s_c[%s]", prefix, rel_param0.param_str); > + } > } > else > { I'd probably just drop the optimization for 0 offsets for check_float_constants. I.e.: if (wined3d_settings.check_float_constants) ... else if (reg->idx[0].offset) ... else ...

1 0

Re: [PATCH] gdi32/tests: Check values returned from GetPath
by Huw Davies 17 Feb '16

17 Feb '16

On Wed, Feb 17, 2016 at 02:01:25PM +1100, Alistair Leslie-Hughes wrote: > diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c > index 6804a96..b3f164d 100644 > --- a/dlls/gdi32/tests/metafile.c > +++ b/dlls/gdi32/tests/metafile.c > @@ -3361,12 +3361,46 @@ static void test_emf_polybezier(void) > DeleteEnhMetaFile(hemf); > } > > +static const unsigned char EMF_PATH_BITS[] = > +{ > + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0xdd, 0xff, 0xff, 0xff, 0xdd, 0xff, 0xff, 0xff, > + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, > + 0xe0, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, > + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x05, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, > + 0xc4, 0x01, 0x00, 0x00, 0x69, 0x01, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0xe3, 0xe3, 0x06, 0x00, > + 0x1c, 0x83, 0x05, 0x00, 0x3b, 0x00, 0x00, 0x00, > + 0x08, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00, > + 0x10, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, > + 0x32, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, > + 0x10, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, > + 0x96, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, > + 0x10, 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, 0x00, > + 0x96, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, > + 0x10, 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, 0x00, > + 0x32, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, > + 0x10, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, > + 0x32, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, > + 0x08, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, > + 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 > +}; > + > static void test_emf_GetPath(void) > { > HDC hdcMetafile; > HENHMETAFILE hemf; > BOOL ret; > int size; > + POINT *points; > + BYTE *types; > > SetLastError(0xdeadbeef); > hdcMetafile = CreateEnhMetaFileA(GetDC(0), NULL, NULL, NULL); > @@ -3387,10 +3421,37 @@ static void test_emf_GetPath(void) > > size = GetPath(hdcMetafile, NULL, NULL, 0); > todo_wine ok( size == 5, "GetPath returned %d.\n", size); > + if(size == 5) > + { > + points = HeapAlloc(GetProcessHeap(), 0, size * sizeof(POINT)); > + types = HeapAlloc(GetProcessHeap(), 0, size ); > + > + GetPath(hdcMetafile, points, types, size); > + > + ok(types[0] == PT_MOVETO, "unexpected value %d\n", types[0]); > + ok(points[0].x == 50 && points[0].y == 50, "unexpected point (%d,%d)\n", points[0].x, points[0].y); > + ok(types[1] == PT_LINETO, "unexpected value %d\n", types[1]); > + ok(points[1].x == 50 && points[1].y == 150, "unexpected point (%d,%d)\n", points[1].x, points[1].y); > + ok(types[2] == PT_LINETO, "unexpected value %d\n", types[2]); > + ok(points[2].x == 150 && points[2].y == 150, "unexpected point (%d,%d)\n", points[2].x, points[2].y); > + ok(types[3] == PT_LINETO, "unexpected value %d\n", types[3]); > + ok(points[3].x == 150 && points[3].y == 50, "unexpected point (%d,%d)\n", points[3].x, points[3].y); > + ok(types[4] == PT_LINETO, "unexpected value %d\n", types[4]); > + ok(points[4].x == 50 && points[4].y == 50, "unexpected point (%d,%d)\n", points[4].x, points[4].y); > + > + HeapFree(GetProcessHeap(), 0, points); > + HeapFree(GetProcessHeap(), 0, types); > + } > > hemf = CloseEnhMetaFile(hdcMetafile); > ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError()); > > + if (compare_emf_bits(hemf, EMF_PATH_BITS, sizeof(EMF_PATH_BITS), "test_emf_GetPath", FALSE) != 0) > + { > + dump_emf_bits(hemf, "test_emf_GetPath"); > + dump_emf_records(hemf, "test_emf_GetPath"); > + } > + > DeleteEnhMetaFile(hemf); > } > Please add a Rectangle() call to the path building code. This will show that the metafile doesn't just consist of path elements. Also, as discussed yesterday, please add a similar test for wmfs (this could be a separate patch). Thanks, Huw.

1 0

Re: [PATCH 3/3] advapi32/tests: Add more invalid parameter tests for NtAccessCheck.
by Marvin 17 Feb '16

17 Feb '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=20604 Your paranoid android. === w1064 (32 bit security) === security.c:4011: Test failed: MACHINE\Software owner SID (S-1-5-18) != Administrators SID (S-1-5-32-544). security.c:4052: Test failed: Builtin Users ACE has unexpected flags (0x12 != 0xa) security.c:4056: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:4065: Test failed: Builtin Admins ACE has unexpected flags (0x12 != 0x0)

1 0

Re: [PATCH 1/2] advapi32/tests: Add invalid paramater tests for AccessCheck.
by Sebastian Lackner 17 Feb '16

17 Feb '16

On 15.02.2016 21:52, Qian Hong wrote: > > Signed-off-by: Qian Hong <qhong(a)codeweavers.com> > --- > dlls/advapi32/tests/security.c | 53 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 53 insertions(+) > > > > 0001-advapi32-tests-Add-invalid-paramater-tests-for-AccessC.txt > > > diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c > index 742ede1..69c0f77 100644 > --- a/dlls/advapi32/tests/security.c > +++ b/dlls/advapi32/tests/security.c > @@ -1411,6 +1411,59 @@ static void test_AccessCheck(void) > GetLastError()); > trace("AccessCheck with MAXIMUM_ALLOWED got Access 0x%08x\n", Access); > > + /* Null PrivSet with null PrivSetLen pointer */ > + SetLastError(0xdeadbeef); > + Access = AccessStatus = 0x1abe11ed; > + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, > + NULL, NULL, &Access, &AccessStatus); > + err = GetLastError(); > + ok(!ret && err == ERROR_NOACCESS, "AccessCheck should have " > + "failed with ERROR_NOACCESS, instead of %d\n", err); > + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, > + "Access and/or AccessStatus were changed!\n"); > + > + /* Null PrivSet with zero PrivSetLen */ > + SetLastError(0xdeadbeef); > + Access = AccessStatus = 0x1abe11ed; > + PrivSetLen = 0; > + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, > + 0, &PrivSetLen, &Access, &AccessStatus); > + err = GetLastError(); > +todo_wine > + ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " > + "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); > +todo_wine > + ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d, expects %d\n", PrivSetLen, sizeof(PRIVILEGE_SET)); This will lead to compile warnings on 64-bit. > + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, > + "Access and/or AccessStatus were changed!\n"); > + > + /* Valid PrivSet with zero PrivSetLen */ > + SetLastError(0xdeadbeef); > + Access = AccessStatus = 0x1abe11ed; > + PrivSetLen = 0; > + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, > + PrivSet, &PrivSetLen, &Access, &AccessStatus); > + err = GetLastError(); > +todo_wine > + ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " > + "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); > +todo_wine > + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, > + "Access and/or AccessStatus were changed!\n"); > + > + PrivSetLen = FIELD_OFFSET(PRIVILEGE_SET, Privilege[16]); > + > + /* Null PrivSet with valid PrivSetLen */ > + SetLastError(0xdeadbeef); > + Access = AccessStatus = 0x1abe11ed; > + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, > + 0, &PrivSetLen, &Access, &AccessStatus); > + err = GetLastError(); > + ok(!ret && err == ERROR_NOACCESS, "AccessCheck should have " > + "failed with ERROR_NOACCESS, instead of %d\n", err); > + ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, > + "Access and/or AccessStatus were changed!\n"); > + > /* Access denied by SD */ > SetLastError(0xdeadbeef); > Access = AccessStatus = 0x1abe11ed; > > >

2 2

Re: [PATCH 2/3] ntdll: Improve invalid parameter handling in NtAccessCheck. (try 2)
by Marvin 17 Feb '16

17 Feb '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=20603 Your paranoid android. === w1064 (32 bit security) === security.c:3892: Test failed: MACHINE\Software owner SID (S-1-5-18) != Administrators SID (S-1-5-32-544). security.c:3933: Test failed: Builtin Users ACE has unexpected flags (0x12 != 0xa) security.c:3937: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:3946: Test failed: Builtin Admins ACE has unexpected flags (0x12 != 0x0)

1 0

Re: [PATCH 2/2] ntdll: Improve invalid paramater handling in NtAccessCheck.
by Sebastian Lackner 17 Feb '16

17 Feb '16

On 15.02.2016 21:53, Qian Hong wrote: > > Signed-off-by: Qian Hong <qhong(a)codeweavers.com> > --- > dlls/advapi32/tests/security.c | 4 ---- > dlls/ntdll/sec.c | 11 ++++++++++- > 2 files changed, 10 insertions(+), 5 deletions(-) > > > > 0002-ntdll-Improve-invalid-paramater-handling-in-NtAccessCh.txt > > > diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c > index 69c0f77..08666dd 100644 > --- a/dlls/advapi32/tests/security.c > +++ b/dlls/advapi32/tests/security.c > @@ -1429,10 +1429,8 @@ static void test_AccessCheck(void) > ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, > 0, &PrivSetLen, &Access, &AccessStatus); > err = GetLastError(); > -todo_wine > ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " > "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); > -todo_wine > ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d, expects %d\n", PrivSetLen, sizeof(PRIVILEGE_SET)); > ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, > "Access and/or AccessStatus were changed!\n"); > @@ -1444,10 +1442,8 @@ todo_wine > ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, > PrivSet, &PrivSetLen, &Access, &AccessStatus); > err = GetLastError(); > -todo_wine > ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " > "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); > -todo_wine > ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, > "Access and/or AccessStatus were changed!\n"); > > diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c > index 125c86e..c32ae0c 100644 > --- a/dlls/ntdll/sec.c > +++ b/dlls/ntdll/sec.c > @@ -1586,7 +1586,16 @@ NtAccessCheck( > SecurityDescriptor, ClientToken, DesiredAccess, GenericMapping, > PrivilegeSet, ReturnLength, GrantedAccess, AccessStatus); > > - if (!PrivilegeSet || !ReturnLength) > + if (!ReturnLength) > + return STATUS_ACCESS_VIOLATION; > + > + if (*ReturnLength == 0) > + { > + *ReturnLength = sizeof(PRIVILEGE_SET); > + return STATUS_BUFFER_TOO_SMALL; > + } This looks a bit hacky. The code below assumes that *ReturnLength > FIELD_OFFSET( PRIVILEGE_SET, Privilege ), so it would be interesting to know what happens for sizes 0 ... 8. > + > + if (!PrivilegeSet) > return STATUS_ACCESS_VIOLATION; > > SERVER_START_REQ( access_check ) > > >

3 2

Re: [PATCH 1/3] advapi32/tests: Add more invalid parameter tests for AccessCheck.
by Marvin 17 Feb '16

17 Feb '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=20602 Your paranoid android. === w1064 (32 bit security) === security.c:3905: Test failed: MACHINE\Software owner SID (S-1-5-18) != Administrators SID (S-1-5-32-544). security.c:3946: Test failed: Builtin Users ACE has unexpected flags (0x12 != 0xa) security.c:3950: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:3959: Test failed: Builtin Admins ACE has unexpected flags (0x12 != 0x0)

1 0

Re: [PATCH] gdi32: Remove no-op abs(3) call.
by Huw Davies 17 Feb '16

17 Feb '16

On Tue, Feb 16, 2016 at 01:55:34PM -0700, Charles Davis wrote: > Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> > --- > dlls/gdi32/pen.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c > index 2ae2f2b..6793934 100644 > --- a/dlls/gdi32/pen.c > +++ b/dlls/gdi32/pen.c > @@ -195,7 +195,7 @@ HPEN WINAPI ExtCreatePen( DWORD style, DWORD width, > if (logbrush.lbStyle == BS_DIBPATTERN) logbrush.lbStyle = BS_DIBPATTERNPT; > > penPtr->logpen.elpPenStyle = style; > - penPtr->logpen.elpWidth = abs(width); > + penPtr->logpen.elpWidth = width; > penPtr->logpen.elpBrushStyle = logbrush.lbStyle; > penPtr->logpen.elpColor = logbrush.lbColor; > penPtr->logpen.elpHatch = brush->lbHatch; This breaks a test: ../../../tools/runtest -q -P wine -T ../../.. -M gdi32.dll -p gdi32_test.exe.so pen && touch pen.ok pen.c:440: Test failed: expected 123, got ffffff85 width is actually treated as signed. Huw.

1 0

Re: [PATCH] advapi32, ntdll: Skip test_redirection tests if there is not enough privileges
by Marvin 17 Feb '16

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

1 0

Re: [PATCH] advapi32, ntdll: Skip test_redirection tests if there is not enough privileges
by Marvin 17 Feb '16

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

1 0

[GSoC Things] Want to make wpcap.dll become more usable on wine
by Jianqiu Zhang 17 Feb '16

17 Feb '16

Hi, I am working on improving and implementing more functions for wpcap.dll on wine wpcap is the Windows version of pcap, Packet Capture Library for wireshark and other network analyzing software, I have done some research on it, In wine we cannot use the windows kernel driver, but winpcap actually use it, so I follow the wine wpcap code and try to add more wrapper to wpcap, Here is the patch I' ve submitted and was add to wine-staging, https://github.com/wine-compholio/wine-staging/tree/master/patches/wpcap-Se… One of the most difficult point is , there aren't many applications using wpcap.dll, I cannot found plenty of them, According to fracting(Hong Qian) 's suggestions, Dr.com , a Client for many Chinese university students to gain access to cernet uses wpcap, If wpcap.dll can improved to make it available for Dr.Com , maybe many university students using Linux can gain access to cernet. I will try to improve wpcap.dll in two different ways: 1. Use wine wpcap.dll , and write wrappers 2. Write packet.dll which is needed by native wpcap.dll, and then use native wpcap.dll I will write testcase for the new dll packet.dll. Is there andy sugesstions on this idea? Any suggesstions are appreciated Thanks Jianqiu

3 3

Re: [PATCH] usp10/tests: Use todo_wine_if() in tests
by Marvin 16 Feb '16

16 Feb '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=20594 Your paranoid android. === w1064 (32 bit usp10) === usp10.c:1423: Test failed: 0: uJustification incorrect (0) usp10.c:1423: Test failed: 1: uJustification incorrect (0) usp10.c:1423: Test failed: 2: uJustification incorrect (0) usp10.c:1423: Test failed: 3: uJustification incorrect (0) usp10.c:1423: Test failed: 4: uJustification incorrect (0) usp10.c:1423: Test failed: 5: uJustification incorrect (0) usp10.c:1423: Test failed: 6: uJustification incorrect (0) usp10.c:1423: Test failed: 7: uJustification incorrect (0) usp10.c:1423: Test failed: 8: uJustification incorrect (0) usp10.c:1423: Test failed: 9: uJustification incorrect (0) usp10.c:1439: Test failed: 3: uJustification incorrect (0) usp10.c:1439: Test failed: 5: fDiacritic incorrect (1) usp10.c:1439: Test failed: 5: fZeroWidth incorrect (1) usp10.c:1439: Test failed: 15: fDiacritic incorrect (1) usp10.c:1439: Test failed: 15: fZeroWidth incorrect (1)

1 0

Re: [PATCH] wininet/tests: Use todo_wine_if() in tests
by Marvin 16 Feb '16

16 Feb '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=20593 Your paranoid android. === w1064 (32 bit internet) === internet.c:1507: Test failed: Got 0, expected 1223 (12042) internet.c:1512: Test failed: Got 0, expected 1223 (12042) internet.c:1521: Test failed: Got 0, expected 1223 (12042) internet.c:1074: Test failed: expected ret == 0, got 87

1 0

Re: [PATCH] ws2_32/tests: Use todo_wine_if() in tests
by Marvin 16 Feb '16

16 Feb '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=20591 Your paranoid android. === w7pro64 (32 bit sock) === sock.c:7731: Test failed: bytesReturned isn't supposed to be 1 sock.c:7777: Test failed: Waiting for timeout failed with 0 + errno 997

1 0

Re: [v2] d3d8/tests: Use todo_wine_if() in tests
by Marvin 16 Feb '16

16 Feb '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=20589 Your paranoid android. === w1064 (32 bit device) === device.c:2725: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2730: Test failed: The focus window is active. device.c:2738: Test failed: Got unexpected hr 0x88760869. device.c:2742: Test failed: Got unexpect screen size 800x600. device.c:2757: Test failed: Expected message 0x47 for window 0, but didn't receive it, i=1. device.c:2766: Test failed: Got unexpect screen size 800x600. device.c:2779: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2787: Test failed: Got unexpect width 640. device.c:2788: Test failed: Got unexpect height 480.

1 0

Re: [v2] d3d9/tests: Use todo_wine_if() in tests
by Marvin 16 Feb '16

16 Feb '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=20588 Your paranoid android. === w1064 (32 bit d3d9ex) === d3d9ex.c:2347: Test failed: Got unexpected hr 0, i=0. d3d9ex.c:2349: Test failed: Got unexpected hr 0, i=0. d3d9ex.c:2347: Test failed: Got unexpected hr 0, i=1. d3d9ex.c:2349: Test failed: Got unexpected hr 0, i=1.

1 0

Re: [PATCH 6/6] d3d11/tests: Test relative addressing in constant buffers.
by Marvin 16 Feb '16

16 Feb '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=20572 Your paranoid android. === wvistau64 (32 bit d3d11) === d3d11.c:5365: Test failed: Failed to create vertex shader, hr 0x80070057. d3d11.c:5367: Test failed: Failed to create pixel shader, hr 0x80070057. d3d11: unhandled exception c0000005 at 74199C9F === w2008s64 (32 bit d3d11) === d3d11.c:5365: Test failed: Failed to create vertex shader, hr 0x80070057. d3d11.c:5367: Test failed: Failed to create pixel shader, hr 0x80070057. d3d11: unhandled exception c0000005 at 74179C9F === wvistau64 (64 bit d3d11) === d3d11.c:5365: Test failed: Failed to create vertex shader, hr 0x80070057. d3d11.c:5367: Test failed: Failed to create pixel shader, hr 0x80070057. d3d11: unhandled exception c0000005 at 0000000074AAFCBB === w2008s64 (64 bit d3d11) === d3d11.c:5365: Test failed: Failed to create vertex shader, hr 0x80070057. d3d11.c:5367: Test failed: Failed to create pixel shader, hr 0x80070057. d3d11: unhandled exception c0000005 at 0000000073DAFCBB

1 0

Re: [v4] shell32: fix two bugs in IQueryAssocations
by Marvin 16 Feb '16

16 Feb '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=20568 Your paranoid android. === w2003std (32 bit assoc) === assoc.c:122: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:174: Test failed: assoc.c:122: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:178: Test failed: assoc.c:122: Test failed: GetString returned 0x80070002, expected 0x80070483 assoc.c:183: Test failed: assoc.c:122: Test failed: GetString returned 0x80070002, expected 0x80070483 assoc.c:184: Test failed: assoc.c:122: Test failed: GetString returned 0x80070002, expected 0x80070483 assoc.c:185: Test failed:

2 1

Re: d3d9/tests: Use todo_wine_if() in tests
by Henri Verbeet 16 Feb '16

16 Feb '16

On 16 February 2016 at 12:31, Frédéric Delanoy <frederic.delanoy(a)gmail.com> wrote: > Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> > --- > dlls/d3d9/tests/device.c | 20 ++++---------------- > dlls/d3d9/tests/visual.c | 22 ++++------------------ > 2 files changed, 8 insertions(+), 34 deletions(-) > Why did you do this for some tests, but not others? (E.g. you modify test_window_style() for d3d9, but not for d3d9ex.)

2 1

Re: [PATCH 2/2] mscoree: Implement ICorRuntimeHost::CreateDomain{, Ex}(). (try 4)
by Vincent Povirk 16 Feb '16

16 Feb '16

It doesn't seem to work. According to the test program, GetDefaultDomain and CreateDomain are returning the same IUnknown. :( Maybe we need to set the thread domain somehow in RuntimeHost_Invoke?

1 0

Re: ddraw/tests: Use todo_wine_if() in tests
by Marvin 16 Feb '16

16 Feb '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=20563 Your paranoid android. === w1064 (32 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw1) === ddraw1.c:2209: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit d3d) === d3d.c:2329: Test failed: Unexpected destination texture level pixels; 2031 differences at 0 level d3d.c:2329: Test failed: Unexpected destination texture level pixels; 518 differences at 1 level d3d.c:2329: Test failed: Unexpected destination texture level pixels; 138 differences at 2 level d3d.c:2329: Test failed: Unexpected destination texture level pixels; 46 differences at 3 level d3d.c:2513: Test failed: Unexpected destination texture level pixels; 257 differences d3d.c:2660: Test failed: Unexpected destination texture level pixels; 256 differences at 2 level d3d.c:2660: Test failed: Unexpected destination texture level pixels; 64 differences at 3 level d3d.c:2660: Test failed: Unexpected destination texture level pixels; 16 differences at 4 level d3d.c:2660: Test failed: Unexpected destination texture level pixels; 4 differences at 5 level === w1064 (32 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

XInput: Comments on core and further steps
by Juan Jose Gonzalez 16 Feb '16

16 Feb '16

Hi, I just published a patch with my xinput core implementation. If anyone is interested in an evdev (linux) backend I could publish that too, but I guess it won't make it into wine due to the tendency towards the HID architecture. A rough overview on how it's supposed to be used can be read in the README file from the second patch. Let me know what you think. The next step would be to implement a backend that uses hid.dll. Using HID devices should be fairly straightforward. There are, however, two parts that I haven't figured out yet: - How can we find new devices? The current work for the HID architecture seems to have tackled the hotplugging problem. Can the XInput HID backend get notified when a new controller gets plugged in? Should it just poll for new devices using SetupDi functions or something similar? - How do we map a controller's buttons and axes to the corresponding XInput ones? This has to be done per controller model. My evdev backend has a lookup list that matches controllers to a certain mapping using some selection criteria (Name, Vendor ID, etc.). My idea was to load the mappings from the registry, but for this to be usable by regular users, a GUI would have to be implemented to create those registry entries. Any ideas are welcome. Juan

4 10

Re: [PATCH 2/2 v4] user32: Add more dialog creation message tests
by Marvin 16 Feb '16

16 Feb '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=20560 Your paranoid android. === wvistau64 (32 bit msg) === msg.c:13904: Test failed: 10: WaitForSingleObject failed msg.c:13904: Test failed: 11: WaitForSingleObject failed === w1064 (32 bit msg) === msg.c:6290: Test failed: Update region shouldn't be empty msg.c:6524: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6526: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different

1 0

Re: [PATCH 6/8] wined3d: Remove fbo_entry->d3d_depth_stencil.
by Henri Verbeet 16 Feb '16

16 Feb '16

On 14 February 2016 at 21:33, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > Instead of storing the format flags we could store the depth and stencil > attachments as separate objects in the key. However, I don't think it is > worth making the key bigger. The depth and stencil attachment will > always be the same object. Another option would be to merge it with the "attached" field in to a "flags" field.

1 0

Re: [PATCH 1/8] wined3d: Retrieve FBO attachments from GL in context_check_fbo_status.
by Henri Verbeet 16 Feb '16

16 Feb '16

On 14 February 2016 at 21:33, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > + if (gl_info->supported[EXT_FRAMEBUFFER_MULTISAMPLE]) > + gl_info->fbo_ops.glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_SAMPLES, &samples); > + else > + samples = 1; I don't think this will do the right thing in core contexts, or if only ARB_framebuffer_object is supported. > + gl_info->fbo_ops.glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_INTERNAL_FORMAT, &fmt); > + FIXME("\t%s: renderbuffer %d, %dx%d, %d samples, format %x.\n", > + debug_fboattachment(attachment), name, width, height, samples, fmt); The '\t' is from the original code of course, but please just replace it with spaces. > + FIXME("\t%s: %s texture %d, %dx%d, format %x.\n", debug_fboattachment(attachment), > + tex_type_str, name, width, height, fmt); %#x for hexadecimal, please. > +#define FBOATTACHMENT_TO_STR(u) case u: return #u The existing functions are a bit of a mess in this regard, but I'd prefer "WINED3D_TO_STR" for new functions. > + FIXME("Unrecognied FBO status 0x%08x\n", attachment); > + return "unrecognized"; The FIXME has room for improvement. You could also consider doing something like "return wine_dbg_sprintf("unknown attachment %#x", attachment);"

1 0

Patch assignment notifications
by Alexandre Julliard 16 Feb '16

16 Feb '16

Folks, I've now added automated email notifications for when you are assigned patches to review. I've tried to make it not too annoying for frequent reviewers, and hopefully easy to filter. Please let me know what you think. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/2 v3] user32: Add more dialog creation message tests
by Marvin 16 Feb '16

16 Feb '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=20553 Your paranoid android. === w1064 (32 bit msg) === msg.c:6290: Test failed: Update region shouldn't be empty msg.c:6524: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6526: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different

1 0

Re: [PATCH 2/2 v2] user32: Add more dialog creation message tests
by Dmitry Timoshkov 16 Feb '16

16 Feb '16

Hi Piotr, this test doesn't actually provide any proof for the 1/2 patch. I'd expect to see a test that checks also the messages sent/received by edit control. -- Dmitry.

2 1

Re: [PATCH 2/2 v2] user32: Add more dialog creation message tests
by Marvin 16 Feb '16

16 Feb '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=20550 Your paranoid android. === w7u (32 bit msg) === msg.c:8799: Test failed: did not get expected count for minimum timeout (54 != ~100). === w1064 (32 bit msg) === msg.c:6290: Test failed: Update region shouldn't be empty msg.c:6524: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6526: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different

1 0

Re: [v3 PATCH] gdi32: Support Begin/End Path for metafile DCs
by Huw Davies 16 Feb '16

16 Feb '16

On Tue, Feb 16, 2016 at 09:28:06PM +1100, Alistair Leslie-Hughes wrote: > From: Dmitry Timoshkov <dmitry(a)baikal.ru> > > Correct failed test. > Updated Author/signoffs. > v3 - Removed Dmitry signoff on request. > > Fixes https://bugs.winehq.org/show_bug.cgi?id=39185 > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/gdi32/enhmfdrv/dc.c | 4 +++- > dlls/gdi32/path.c | 20 +++++++++++++++++++- > dlls/gdi32/tests/metafile.c | 2 +- > 3 files changed, 23 insertions(+), 3 deletions(-) > > diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c > index e09cd0b..166b6b2 100644 > --- a/dlls/gdi32/path.c > +++ b/dlls/gdi32/path.c ... > @@ -1513,6 +1523,14 @@ static BOOL pathdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const REC > struct path_physdev *physdev = get_path_physdev( dev ); > unsigned int idx, ggo_flags = GGO_NATIVE; > POINT offset = {0, 0}; > + DWORD type; > + > + type = GetObjectType(dev->hdc); > + if (type == OBJ_METADC || type == OBJ_ENHMETADC) > + { > + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pExtTextOut ); > + return next->funcs->pExtTextOut( next, x, y, flags, lprc, str, count, dx ); > + } > > if (!count) return TRUE; > if (flags & ETO_GLYPH_INDEX) ggo_flags |= GGO_GLYPH_INDEX; Why the special treatment for ExtTextOut()? I can believe we may need to do something with Begin/EndPath, but why this? Dmitry, is this the reason you don't want to send it? Huw.

2 6

Re: [PATCH 5/5] ntdll: Add special handling for int $0x2d exceptions.
by Sebastian Lackner 16 Feb '16

16 Feb '16

Thanks for working on this. I assume you already saw the new test failures, those should be fixed of course. Besides that I have some more remarks on the patch: On 12.02.2016 18:52, Henri Verbeet wrote: > Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> > --- > dlls/ntdll/signal_i386.c | 14 +++++++++++++- > dlls/ntdll/tests/exception.c | 38 +++++++++++++++++++++++--------------- > 2 files changed, 36 insertions(+), 16 deletions(-) > > diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c > index a3abbff..46f932a 100644 > --- a/dlls/ntdll/signal_i386.c > +++ b/dlls/ntdll/signal_i386.c > @@ -2072,8 +2072,20 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) > case TRAP_x86_PROTFLT: /* General protection fault */ > case TRAP_x86_UNKNOWN: /* Unknown fault code */ > { > + CONTEXT *win_context = get_exception_context( rec ); > WORD err = get_error_code(context); > - if (!err && (rec->ExceptionCode = is_privileged_instr( get_exception_context(rec) ))) break; > + if (!err && (rec->ExceptionCode = is_privileged_instr( win_context ))) break; > + if ((err & 7) == 2 && (err >> 3) == 0x2d) /* int $0x2d */ > + { Int 0x2d is not just a special way to raise a breakpoint, its actually a kernel interface to send commands to the debugger. EAX contains the command value, other registers contain the arguments. An proper implementation is not necessary I guess, but at least for small values of EAX which are assigned to commands we would need better test coverage. Most anti- debugger tricks set EAX = 0 which is not tested at all so far. > + win_context->Eip += 3; > + rec->ExceptionCode = EXCEPTION_BREAKPOINT; > + rec->ExceptionAddress = (char *)win_context->Eip; > + rec->NumberParameters = is_wow64 ? 1 : 3; > + rec->ExceptionInformation[0] = EAX_sig(context); > + rec->ExceptionInformation[1] = ECX_sig(context); > + rec->ExceptionInformation[2] = EDX_sig(context); > + break; > + } > rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; > rec->NumberParameters = 2; > rec->ExceptionInformation[0] = 0; > diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c > index d6a610e..57b201a 100644 > --- a/dlls/ntdll/tests/exception.c > +++ b/dlls/ntdll/tests/exception.c > @@ -219,6 +219,11 @@ static const struct exception > > { { 0xf1, 0x90, 0xc3 }, /* icebp; nop; ret */ > 1, 1, FALSE, STATUS_SINGLE_STEP, 0 }, > + { { 0xb8, 0xb8, 0xb8, 0xb8, 0xb8, /* mov $0xb8b8b8b8, %eax */ > + 0xb9, 0xb9, 0xb9, 0xb9, 0xb9, /* mov $0xb9b9b9b9, %ecx */ > + 0xba, 0xba, 0xba, 0xba, 0xba, /* mov $0xbabababa, %edx */ > + 0xcd, 0x2d, 0xc3 }, /* int $0x2d; ret */ > + 17, 0, FALSE, STATUS_BREAKPOINT, 3, { 0xb8b8b8b8, 0xb9b9b9b9, 0xbabababa } }, > }; Could you maybe also provide a testcase when a debugger is attached? I would expect that it behaves different then. Actually it should not even produce an exception then because the exception is transparently translated into a debug event, like wine already does for debug strings for example. > > static int got_exception; > @@ -473,7 +478,7 @@ static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *fram > CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) > { > const struct exception *except = *(const struct exception **)(frame + 1); > - unsigned int i, entry = except - exceptions; > + unsigned int i, parameter_count, entry = except - exceptions; > > got_exception++; > trace( "exception %u: %x flags:%x addr:%p\n", > @@ -482,20 +487,23 @@ static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *fram > ok( rec->ExceptionCode == except->status || > (except->alt_status != 0 && rec->ExceptionCode == except->alt_status), > "%u: Wrong exception code %x/%x\n", entry, rec->ExceptionCode, except->status ); > - ok( rec->ExceptionAddress == (char*)code_mem + except->offset, > - "%u: Wrong exception address %p/%p\n", entry, > - rec->ExceptionAddress, (char*)code_mem + except->offset ); > - > - if (except->alt_status == 0 || rec->ExceptionCode != except->alt_status) > - { > - ok( rec->NumberParameters == except->nb_params, > - "%u: Wrong number of parameters %u/%u\n", entry, rec->NumberParameters, except->nb_params ); > - } > + ok( context->Eip == (DWORD_PTR)code_mem + except->offset, > + "%u: Unexpected eip %#x/%#lx\n", entry, > + context->Eip, (DWORD_PTR)code_mem + except->offset ); > + ok( rec->ExceptionAddress == (char*)context->Eip || > + (rec->ExceptionCode == STATUS_BREAKPOINT && rec->ExceptionAddress == (char*)context->Eip + 1), I would prefer an exact test for ExceptionAddress here, off-by-one errors in exception handling would be kinda odd. > + "%u: Unexpected exception address %p/%p\n", entry, > + rec->ExceptionAddress, (char*)context->Eip ); > + > + if (except->status == STATUS_BREAKPOINT && is_wow64) > + parameter_count = 1; > + else if (except->alt_status == 0 || rec->ExceptionCode != except->alt_status) > + parameter_count = except->nb_params; > else > - { > - ok( rec->NumberParameters == except->alt_nb_params, > - "%u: Wrong number of parameters %u/%u\n", entry, rec->NumberParameters, except->nb_params ); > - } > + parameter_count = except->alt_nb_params; > + > + ok( rec->NumberParameters == parameter_count, > + "%u: Unexpected parameter count %u/%u\n", entry, rec->NumberParameters, parameter_count ); > > /* Most CPUs (except Intel Core apparently) report a segment limit violation */ > /* instead of page faults for accesses beyond 0xffffffff */ > @@ -530,7 +538,7 @@ static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *fram > > skip_params: > /* don't handle exception if it's not the address we expected */ > - if (rec->ExceptionAddress != (char*)code_mem + except->offset) return ExceptionContinueSearch; > + if (context->Eip != (DWORD_PTR)code_mem + except->offset) return ExceptionContinueSearch; > > context->Eip += except->length; > return ExceptionContinueExecution; >

2 3

Re: advapi32/tests: Use todo_wine_if() in tests
by Marvin 16 Feb '16

16 Feb '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=20532 Your paranoid android. === w1064 (32 bit security) === security.c:3753: Test failed: MACHINE\Software owner SID (S-1-5-18) != Administrators SID (S-1-5-32-544). security.c:3794: Test failed: Builtin Users ACE has unexpected flags (0x12 != 0xa) security.c:3798: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:3807: Test failed: Builtin Admins ACE has unexpected flags (0x12 != 0x0)

1 0

Re: user32: Select text control content while setting initial dialog focus
by Dmitry Timoshkov 16 Feb '16

16 Feb '16

Piotr Caban <piotr(a)codeweavers.com> wrote: > --- a/dlls/user32/dialog.c > +++ b/dlls/user32/dialog.c > @@ -707,7 +707,11 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, > focus = GetNextDlgTabItem( hwnd, 0, FALSE ); > if (!focus) focus = GetNextDlgGroupItem( hwnd, 0, FALSE ); > if (focus) > + { > + if (SendMessageW( focus, WM_GETDLGCODE, 0, 0 ) & DLGC_HASSETSEL) > + SendMessageW( focus, EM_SETSEL, 0, -1 ); > SetFocus( focus ); > + } > } Selecting the text on SetFocus() is the job of DefDlgProc(), it's worth to investigate why it doesn't work. -- Dmitry.

2 4

Re: [PATCH] mscoree: Implement ICorRuntimeHost::CreateDomain{, Ex}(). (try 3)
by Vincent Povirk 16 Feb '16

16 Feb '16

Sadly, we can't add any tests that use Mono, because it doesn't work in 64-bit Wine.

2 1

Re: [v2 PATCH] gdi32: Support Begin/End Path for metafile DCs
by Dmitry Timoshkov 16 Feb '16

16 Feb '16

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > From: Dmitry Timoshkov <dmitry(a)baikal.ru> > > Correct failed test. > Updated Author/signoffs. > > Fixes https://bugs.winehq.org/show_bug.cgi?id=39185 > > Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Please resend the patch without my sign-off. -- Dmitry.

1 0

Re: [PATCH] gdi32: Support Begin/End Path for metafile DCs
by Dmitry Timoshkov 16 Feb '16

16 Feb '16

Hi Alistair, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > Based off Dmitry Timoshkov patch. > > Fixes https://bugs.winehq.org/show_bug.cgi?id=39185 It's an exact copy of my patch with just one hunk removed (without which the tests won't pass under Wine). So it's not just "based", it's a plain copy. It would be fine if you sent it in two parts: first under my name (but in that case you need at least my sign-off), and next patch with your test case. -- Dmitry.

1 1

Re: [PATCH 6/7] ntdll: Add special handling for int $0x2d exceptions.
by Sebastian Lackner 16 Feb '16

16 Feb '16

On 15.02.2016 18:18, Henri Verbeet wrote: > Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> > --- > dlls/ntdll/signal_i386.c | 29 ++++++++++++++++++++++++++++- > dlls/ntdll/tests/exception.c | 38 +++++++++++++++++++++++--------------- > 2 files changed, 51 insertions(+), 16 deletions(-) > If possible please group only related patches in the future. According to the testbot, it still introduces test failures: http://source.winehq.org/patches/data/119233.testfail Also, I'm not sure if you saw https://www.winehq.org/pipermail/wine-devel/2016-February/111675.html where I gave some additional feedback. If you have any questions, feel free to ask. Best regards, Sebastian

1 0

Re: ws2_32/tests: Add tests for getsockopt() with SO_SNDBUF and SO_RCVBUF optname.
by Bruno Jesus 16 Feb '16

16 Feb '16

On Tue, Feb 16, 2016 at 9:30 AM, Sebastian Lackner <sebastian(a)fds-team.de> wrote: > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > > @Bruno: As far as I remember you were working on a fix for this, what is > the progress? > Hi, Sebastian. Unfortunately since December I'm buried by real life work and I thought I could restart working in Wine on February but that was not possible. My solution to this is still theoretical, I didn't write any code yet. The solution is to cache the values of SO_RCVBUF, SO_SNDBU, SO_REUSEADDR and SO_ACCEPTCONN. Why? SO_RCVBUF and SO_SNBUF are messed by Linux kernel. So we would cache the requested value and return a min() between what we have in the cache and what we read back from the kernel. This would solve this problem and not require #ifdef. SO_REUSEADDR because Windows does not have TIME_WAIT at all, so all sockets would be created with SO_REUSEADDR in the server and we would take care of it manually. There is a long standing uTorrent bug about this. SO_ACCEPTCONN is bugged in OSX, it is never updated by the kernel so it is useless and always fail. To solve this we would set the cache to 1 when listen() is called and return the cache instead of asking for the kernel. I'm still reading all bugs and emails so I'm aware of your divide by 2 solution and I really don't mind if it gets accepted as it is ready and mine is still months to come. Best wishes, Bruno

1 0

Re: ws2_32/tests: Add tests for getsockopt() with SO_SNDBUF and SO_RCVBUF optname.
by Marvin 16 Feb '16

16 Feb '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=20513 Your paranoid android. === w7pro64 (32 bit sock) === sock.c:7750: Test failed: bytesReturned isn't supposed to be 1 sock.c:7774: Test failed: GetOverlappedResult failed, error 0

2 1

Re: user32: Select text control content while setting initial dialog focus
by Hugh McMaster 16 Feb '16

16 Feb '16

On Tue, 16 Feb 2016 08:04:35 +0800, Dmitry Timoshkov wrote: >>Piotr Caban wrote: >> --- a/dlls/user32/dialog.c >> +++ b/dlls/user32/dialog.c >> @@ -707,7 +707,11 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, >> focus = GetNextDlgTabItem( hwnd, 0, FALSE ); >> if (!focus) focus = GetNextDlgGroupItem( hwnd, 0, FALSE ); >> if (focus) >> + { >> + if (SendMessageW( focus, WM_GETDLGCODE, 0, 0 ) & DLGC_HASSETSEL) >> + SendMessageW( focus, EM_SETSEL, 0, -1 ); >> SetFocus( focus ); >> + } >> } > >Selecting the text on SetFocus() is the job of DefDlgProc(), it's worth >to investigate why it doesn't work. I'm guessing this doesn't work for the same (or similar) reasons as with the combo box issue. -- Hugh McMaster

1 0

Re: shell32/tests: Take into account the Windows 10 DDE race condition.
by Marvin 16 Feb '16

16 Feb '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=20511 Your paranoid android. === wvistau64 (32 bit shlexec) === shlexec.c:1685: Test failed: ShellExecute(verb="QuotedLowerL", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.shlexec") WaitForSingleObject returned 258 shlexec.c:1714: Test failed: ShellExecute(verb="QuotedLowerL", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.shlexec") argvA3 expected 'QuotedLowerL', but key not found or empty shlexec.c:1722: Test failed: ShellExecute(verb="QuotedLowerL", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.shlexec") argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.shlexec', but key not found or empty shlexec.c:1714: Test failed: ShellExecute(verb="QuotedUpperL", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.shlexec") argvA3 expected 'QuotedUpperL', got 'QuotedLowerL' shlexec.c:1685: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\masked file.shlexec") WaitForSingleObject returned 258 shlexec.c:1714: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\masked file.shlexec") argvA3 expected 'Open', but key not found or empty shlexec.c:1722: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\masked file.shlexec") argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\masked file.shlexec', but key not found or empty shlexec.c:2456: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2473: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde" failed: rc=2 err=2 shlexec.c:2456: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail=""%1"", ddeexec="[open("%1")]", app="shlexec", topic="dde" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2473: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail=""%1"", ddeexec="[open("%1")]", app="shlexec", topic="dde" failed: rc=2 err=2 shlexec.c:2456: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="%1", ddeexec="[open(%1)]", app="shlexec", topic="dde" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2473: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="%1", ddeexec="[open(%1)]", app="shlexec", topic="dde" failed: rc=2 err=2 shlexec.c:2456: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde", ifexec="[ifexec("%1")]" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2473: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde", ifexec="[ifexec("%1")]" failed: rc=2 err=2 shlexec.c:2456: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2473: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec" failed: rc=2 err=2 shlexec.c:2456: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", topic="dde" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2473: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", topic="dde" failed: rc=2 err=2 shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.exe", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test2 file.exe", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.exe param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail=""C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.exe"", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail=""C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.exe" param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test2 file.exe param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail=""C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test2 file.exe"", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail=""C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test2 file.exe" param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test2", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test2 param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\notexist.exe", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\notexist.exe param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail="cmd", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail="cmd param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail="xyzwxyzwxyz", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2570: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test file.sde") Assoc ext=".sde", verb="Open", rawcmd="1", cmdtail="xyzwxyzwxyz param", ddeexec="[test]", topic="shlexec" ShlexecVar expected 'Present', but key not found or empty shlexec.c:2855: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\wtD46E.tmp" Exec") ShlexecVar expected 'Present', but key not found or empty shlexec.c:2858: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\wtD46E.tmp" Exec") argvA3 expected 'Exec', but key not found or empty shlexec.c:2859: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\wtD46E.tmp" Exec") longPath expected 'C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test2.exe', but key not found or empty shlexec.c:2863: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\wtD46E.tmp" Exec") ShlexecVar expected 'Present', but key not found or empty shlexec.c:2868: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\wtD46E.tmp" Exec", dir="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp") WaitForSingleObject returned 258 shlexec.c:2868: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\wtD46E.tmp" Exec", dir="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp") ShlexecVar expected 'Present', but key not found or empty shlexec.c:2871: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\wtD46E.tmp" Exec", dir="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp") argvA3 expected 'Exec', but key not found or empty shlexec.c:2872: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\wtD46E.tmp" Exec", dir="C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp") longPath expected 'C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test2.exe', but key not found or empty shlexec.c:2876: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\wtD46E.tmp" Exec", dir="%TMPDIR%") ShlexecVar expected 'Present', but key not found or empty shlexec.c:2880: Test failed: ShellExecuteEx(mask="0x808640", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\wtD46E.tmp" Exec", dir="%TMPDIR%") WaitForSingleObject returned 258 shlexec.c:2880: Test failed: ShellExecuteEx(mask="0x808640", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\wtD46E.tmp" Exec", dir="%TMPDIR%") ShlexecVar expected 'Present', but key not found or empty shlexec.c:2883: Test failed: ShellExecuteEx(mask="0x808640", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\wtD46E.tmp" Exec", dir="%TMPDIR%") argvA3 expected 'Exec', but key not found or empty shlexec.c:2884: Test failed: ShellExecuteEx(mask="0x808640", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\wtD46E.tmp" Exec", dir="%TMPDIR%") longPath expected 'C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\test2.exe', but key not found or empty shlexec.c:2889: Test failed: ShellExecuteEx(mask="0x808440", file="test2.exe", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp\wtD46E.tmp" Exec", dir="C:\Users\Public\Documents:C:\Users\winetest\AppData\Local\Temp\wtD45E.tmp") ShlexecVar expected 'Present', but key not found or empty

1 0

Re: advapi32/tests: Use todo_wine_if() in tests
by Marvin 16 Feb '16

16 Feb '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=20503 Your paranoid android. === w1064 (32 bit security) === security.c:3753: Test failed: MACHINE\Software owner SID (S-1-5-18) != Administrators SID (S-1-5-32-544). security.c:3794: Test failed: Builtin Users ACE has unexpected flags (0x12 != 0xa) security.c:3798: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:3807: Test failed: Builtin Admins ACE has unexpected flags (0x12 != 0x0)

1 0

Re: wininet/tests: Use todo_wine_if() in tests
by Marvin 15 Feb '16

15 Feb '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=20501 Your paranoid android. === w1064 (32 bit http) === http.c:524: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:524: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:524: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:524: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:524: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1763: Test failed: Expected 2, got 4 http.c:1764: Test failed: Expected CRLF, got ' http.c:2398: Test failed: count was wrong http.c:2399: Test failed: http data wrong, got: Garbage: Header http.c:3062: Test failed: HttpAddRequestHeaders succeeded http.c:3063: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3068: Test failed: code = 200, expected 400 http.c:3068: Test failed: unexpected status code 200, expected 400 http.c:3068: Test failed: unexpected status code 200, expected 400 http.c:524: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1

1 0

Re: crypt32/tests: Use todo_wine_if() in tests
by Marvin 15 Feb '16

15 Feb '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=20499 Your paranoid android. === w1064 (32 bit chain) === chain.c:128: Test failed: Expected CRYPT_E_NOT_FOUND, got 00000002 === w864 (64 bit store) === store.c:2596: Test failed: CertAddCertificateContextToStore failed store.c:2597: Test failed: Unexpected cert3 store: unhandled exception c0000005 at 000000000044D8EE

1 0

Re: [PATCH] packet: create packet.dll and Implement GetAdapterNames
by Sebastian Lackner 15 Feb '16

15 Feb '16

I am not sure if André wants to have this dll in wine, but nevertheless, here some comments. On 14.02.2016 16:10, Jianqiu Zhang wrote: > From dfc572cd1b1cdf51b84a5e367d054473c3c3e99d Mon Sep 17 00:00:00 2001 > From: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > Date: Sun, 14 Feb 2016 17:27:37 +0800 > Subject: [PATCH] packet: create packet.dll and Implement GetAdapterNames > > Signed-off-by: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > --- > dlls/packet/Makefile.in | 5 ++++ > dlls/packet/packet.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++ > dlls/packet/packet.spec | 32 +++++++++++++++++++++++++ Changes to configure.ac are missing. In this case its especially critical because compilation of packet.dll would have to be disabled, when pcap header files are not present. Take a look at how its done for wpcap.dll. > 3 files changed, 100 insertions(+) > create mode 100644 dlls/packet/Makefile.in > create mode 100644 dlls/packet/packet.c > create mode 100644 dlls/packet/packet.spec > > diff --git a/dlls/packet/Makefile.in b/dlls/packet/Makefile.in > new file mode 100644 > index 0000000..6ab9f08 > --- /dev/null > +++ b/dlls/packet/Makefile.in > @@ -0,0 +1,5 @@ > +MODULE = packet.dll > +DELAYIMPORTS = iphlpapi A regular import would make more sense here. > + > +C_SRCS = \ > + packet.c > diff --git a/dlls/packet/packet.c b/dlls/packet/packet.c > new file mode 100644 > index 0000000..c6d1568 > --- /dev/null > +++ b/dlls/packet/packet.c > @@ -0,0 +1,63 @@ > +#include "config.h" > +#include "wine/port.h" > + > +#include <stdarg.h> > + > +#include "windef.h" > +#include "winbase.h" > +#include "windows.h" > +#include "wine/debug.h" > + > +#include "winsock2.h" > +#include "iphlpapi.h" > +#include "ntddndis.h" > + > +#include <pcap/pcap.h> For the first patch, you will most likely not need all those headers. You should add them in later patches, whenever you implement a function which needs them. > + > +WINE_DEFAULT_DEBUG_CHANNEL(packet); > + > +BOOLEAN PacketGetAdapterNames(char *nameList, PULONG pSize) The calling convention (CDECL, WINAPI) is missing. Also, variable names are usually lower-case only, and without "p" prefix. Types like P* or LP* should also be avoided in the wine source. > +{ > + IP_ADAPTER_INFO *adInfo, *adInfoList = NULL; > + DWORD errcode; > + ULONG needsize = 0, minDescLen = 0, minAdNameLen = 0, minTotLen = 0, nameOffset, descOffset; > + > + TRACE("nameList %p &size %p size %d\n", nameList, pSize, *pSize); > + > + errcode = GetAdaptersInfo(adInfoList, &needsize); > + adInfoList = HeapAlloc(GetProcessHeap(), 0, needsize); Its a matter of taste, but checking return values for HeapAlloc functions usually does not hurt. > + > + TRACE("Get the needed space(%d) for adInfo\n", needsize); > + > + errcode = GetAdaptersInfo(adInfoList, &needsize); > + if(errcode) > + { You are leaking memory here. The same applies for a couple of other return paths. > + SetLastError(errcode); > + return FALSE; > + } > + for(adInfo = adInfoList; adInfo != NULL; adInfo = adInfo->Next) > + { > + minAdNameLen += lstrlenA(adInfo->AdapterName) + 1; > + minDescLen += lstrlenA(adInfo->Description) + 1; > + } > + minTotLen = minAdNameLen + minDescLen + 2; > + TRACE("minAdNameLen = %d, minDescLen = %d\n", minAdNameLen, minDescLen); Such a trace is only useful during debugging. > + if(nameList == NULL || *pSize < minTotLen) > + { > + SetLastError(ERROR_INSUFFICIENT_BUFFER); > + *pSize = minTotLen; > + return FALSE; > + } > + > + nameOffset = descOffset = 0; > + for(adInfo = adInfoList; adInfo != NULL; adInfo = adInfo->Next) > + { > + lstrcpyA(nameList + nameOffset, adInfo->AdapterName); > + lstrcpyA(nameList + minAdNameLen + descOffset + 1, adInfo->Description); > + nameOffset += lstrlenA(adInfo->AdapterName) + 1; > + descOffset += lstrlenA(adInfo->Description) + 1; > + } > + nameList[minAdNameLen] = '\0'; > + nameList[minTotLen - 1] = '\0'; > + return TRUE; > +} > diff --git a/dlls/packet/packet.spec b/dlls/packet/packet.spec > new file mode 100644 > index 0000000..b7f2781 > --- /dev/null > +++ b/dlls/packet/packet.spec > @@ -0,0 +1,32 @@ > + 1 stub PacketAllocatePacket Wine does not care about exact ordinal numbers. You can mark them all as "@". > + 2 stub PacketCloseAdapter > + 3 stub PacketFreePacket > + 4 cdecl PacketGetAdapterNames(str long) The first parameter is a buffer which is filled out by the function, so 'ptr' would make more sense. The second parameter is a pointer, not long. > + 5 stub PacketGetAirPcapHandle > + 6 stub PacketGetDriverVersion > + 7 stub PacketGetNetInfoEx > + 8 stub PacketGetNetType > + 9 stub PacketGetReadEvent > +10 stub PacketGetStats > +11 stub PacketGetStatsEx > +12 stub PacketGetVersion > +13 stub PacketInitPacket > +14 stub PacketIsDumpEnded > +15 stub PacketLibraryVersion > +16 stub PacketOpenAdapter > +17 stub PacketReceivePacket > +18 stub PacketRequest > +19 stub PacketSendPacket > +20 stub PacketSendPackets > +21 stub PacketSetBpf > +22 stub PacketSetBuff > +23 stub PacketSetDumpLimits > +24 stub PacketSetDumpName > +25 stub PacketSetHwFilter > +26 stub PacketSetLoopbackBehavior > +27 stub PacketSetMinToCopy > +28 stub PacketSetMode > +29 stub PacketSetNumWrites > +30 stub PacketSetReadTimeout > +31 stub PacketSetSnapLen > +32 stub PacketStopDriver > > > >

1 0

Re: [PATCH] mscoree: Implement ICorRuntimeHost::CreateDomain{, Ex}(). (try 2)
by Vincent Povirk 15 Feb '16

15 Feb '16

I wrote a test program (attached), and it doesn't work: CreateDomain failed, hr=80004002 I didn't investigate, but I remember the issue I ran into when I tried to implement this. AppDomain.CreateDomain doesn't return a "real" AppDomain object, it returns a TransparentProxy, and the TransparentProxy doesn't support the _AppDomain interface. The real AppDomain object lives in the newly-created appdomain. I think you could get the real AppDomain and an IUnknown pointer for it if you used the newly-created MonoDomain, but I suspect the MonoDomain pointer you're getting is also wrong. Also, I'm not sure it's necessary to lock the RuntimeHost while creating the new AppDomain, it should only be needed when accessing the list.

1 1

Re: [PATCH 2/2] ntdll: Improve invalid paramater handling in NtAccessCheck.
by Marvin 15 Feb '16

15 Feb '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=20489 Your paranoid android. === w1064 (32 bit security) === security.c:3802: Test failed: MACHINE\Software owner SID (S-1-5-18) != Administrators SID (S-1-5-32-544). security.c:3843: Test failed: Builtin Users ACE has unexpected flags (0x12 != 0xa) security.c:3847: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:3856: Test failed: Builtin Admins ACE has unexpected flags (0x12 != 0x0)

1 0

Re: [PATCH 1/2] advapi32/tests: Add invalid paramater tests for AccessCheck.
by Marvin 15 Feb '16

15 Feb '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=20488 Your paranoid android. === w1064 (32 bit security) === security.c:3806: Test failed: MACHINE\Software owner SID (S-1-5-18) != Administrators SID (S-1-5-32-544). security.c:3847: Test failed: Builtin Users ACE has unexpected flags (0x12 != 0xa) security.c:3851: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:3860: Test failed: Builtin Admins ACE has unexpected flags (0x12 != 0x0)

1 0

Re: [PATCH] kernel32/tests: Use todo_wine_if() in tests
by Marvin 15 Feb '16

15 Feb '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=20487 Your paranoid android. === w1064 (32 bit locale) === locale.c:2365: Test failed: LCMapStringEx should fail with bad locale name locale.c:2366: Test failed: unexpected error code -559038737 locale.c:2457: Test failed: Expected lcid == 0, got got 00001000, error -559038737 locale.c:4167: Test failed: IsValidLocaleName should have failed locale.c:4169: Test failed: IsValidLocaleName should have failed locale.c:4534: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4536: Test failed: For id 7, Expected IVC, got '' === w1064 (32 bit loader) === loader.c:2733: Test failed: Test 0: ResolveDelayLoadedAPI failed loader.c:2734: Test failed: Test 0: expected 74374550, got 00000000 loader.c:2733: Test failed: Test 1: ResolveDelayLoadedAPI failed loader.c:2734: Test failed: Test 1: expected 72BC2CF0, got 00000000 loader.c:2733: Test failed: Test 2: ResolveDelayLoadedAPI failed loader.c:2734: Test failed: Test 2: expected 74372DC0, got 00000000 loader.c:2741: Test failed: Test 3: ResolveDelayLoadedAPI succeeded with 00000000 loader.c:2742: Test failed: Test 3: Wrong callback count: 0 loader.c:2741: Test failed: Test 4: ResolveDelayLoadedAPI succeeded with 00000000 loader.c:2742: Test failed: Test 4: Wrong callback count: 0 loader.c:1820: Test failed: expected STILL_ACTIVE, got 195 loader.c:1855: Test failed: expected STILL_ACTIVE, got 195

1 0

Re: [PATCH 6/7] ntdll: Add special handling for int $0x2d exceptions.
by Marvin 15 Feb '16

15 Feb '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=20482 Your paranoid android. === wvistau64 (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x3d0000/0x3d0001 exception: unhandled exception 80000004 at 003D0000 exception.c:490: Test failed: 42: Unexpected eip 0x77baed97/0x3d0001 === w7u (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x3f0000/0x3f0001 exception: unhandled exception 80000004 at 003F0000 exception.c:490: Test failed: 42: Unexpected eip 0x77cde34f/0x3f0001 === w1064 (32 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9) === w1064 (64 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

1 0

Re: opengl32: Ensure extension tables generated by make_opengl contain earliest GL_VERSION for each function.
by Matteo Bruni 15 Feb '16

15 Feb '16

2016-02-13 0:21 GMT+01:00 Sebastian Lackner <sebastian(a)fds-team.de>: > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > > A couple of functions (glBindBufferBase, glBindBufferRange, glGetIntegeri_v) are listed > in multiple feature levels. The current implementation of ./make_opengl does not handle > this correctly, so depending on the order of elements in the hash table, a different > GL_VERSION_* string is added to the extension registry. Spotted by accident when I noticed > that the output changes each time I regenerate OpenGL files. ;) > > The good news: Luckily the hash tables were sorted "correctly" when Matteo bumped the > version the last time, so the version in the Wine source tree is fine. Actually at the time there was only one version token listed for those functions. This weird thing with two functions (not sure why both 3.0 and 3.1 are specified) appeared in the XML shortly after our latest update IIRC. > > If some perl experts out there know a better way to fix it, or if I'm violating any perl > style rules I'm not aware of, feel free to send an improved version. ;) > > dlls/opengl32/make_opengl | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl > index 2b15f58..ec782ed 100755 > --- a/dlls/opengl32/make_opengl > +++ b/dlls/opengl32/make_opengl > @@ -692,12 +692,14 @@ sub parse_file($$) > } > > # generate extension functions from norm functions, if they are newer than the category > - while (my ($k, $v) = each(%{$data->{feature}})) { > + my %features = %{$data->{feature}}; > + foreach (sort keys %features) { > + my ($k, $v) = %features{$_}; > if (!$norm_categories{$k} && $v->{api} =~ /^gl(\||$)/) > { > for my $req (@{$v->{require}}) { > for (keys %{$req->{command}}) { > - if (!$norm_functions{$_}) { > + if (!$ext_functions{$_} && !$norm_functions{$_}) { > $ext_functions{$_} = [ $functions{$_}[0], $functions{$_}[1], [ $k ] ]; > } > } > -- > 2.7.1 I'm not a perl expert by any means but I guess it's fine. BTW I had tackled this in a slightly different way: diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 2b15f58..64e3bc6 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -698,7 +698,12 @@ sub parse_file($$) for my $req (@{$v->{require}}) { for (keys %{$req->{command}}) { if (!$norm_functions{$_}) { - $ext_functions{$_} = [ $functions{$_}[0], $functions{$_}[1], [ $k ] ]; + if (!$ext_functions{$_}) { + $ext_functions{$_} = [ $functions{$_}[0], $functions{$_}[1], [ $k ] ]; + } + else { + push @{$ext_functions{$_}->[2]}, $k; + } } } } I.e. store all the versions in the table. I guess your version is a bit better in that it avoids multiple version tokens. AFAICS there is another problem with make_opengl and the current XML files though: type GLint64 is not handled and that breaks the traces inside the wrapper functions. That's trivially fixed by adding an entry for GLint64 in the %debug_conv array. FWIW I didn't send my version of the patch at the time I wrote it because I had in mind to send it together with a fix for bug 38402. Of course I never got around to complete it and well... I had a very quick look at your fix for that bug and it looks okay, thank you.

1 0

Re: urlmon: Use todo_wine_if in uri.c tests.
by Marvin 15 Feb '16

15 Feb '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=20474 Your paranoid android. === w1064 (32 bit uri) === uri.c:7615: Test failed: Expected google.com.uk but got L"com.uk" on uri_tests[71].str_props[3]. uri.c:7615: Test failed: Expected google.uk.1 but got L"uk.1" on uri_tests[73].str_props[3]. uri.c:7613: Test failed: GetPropertyBSTR returned 0x00000000, expected 0x00000001. On uri_tests[76].str_props[3]. uri.c:7615: Test failed: Expected but got L".uk" on uri_tests[76].str_props[3]. uri.c:7615: Test failed: Expected google.com.[] but got L"com.[]" on uri_tests[77].str_props[3]. uri.c:7800: Test failed: Error: Expected google.com.uk but got L"com.uk" on uri_tests[71]. uri.c:7800: Test failed: Error: Expected google.uk.1 but got L"uk.1" on uri_tests[73]. uri.c:7798: Test failed: Error: GetDomain returned 0x00000000, expected 0x00000001 on uri_tests[76]. uri.c:7800: Test failed: Error: Expected but got L".uk" on uri_tests[76]. uri.c:7800: Test failed: Error: Expected google.com.[] but got L"com.[]" on uri_tests[77]. uri.c:8080: Test failed: Error: Expected a length of 13 but got 6 on uri_tests[71].str_props[3]. uri.c:8080: Test failed: Error: Expected a length of 11 but got 4 on uri_tests[73].str_props[3]. uri.c:8078: Test failed: Error: GetPropertyLength returned 0x00000000, expected 0x00000001 on uri_tests[76].str_props[3]. uri.c:8080: Test failed: Error: Expected a length of 0 but got 3 on uri_tests[76].str_props[3]. uri.c:8080: Test failed: Error: Expected a length of 13 but got 6 on uri_tests[77].str_props[3]. uri.c:8147: Test failed: Error: Received flag for property 3 when not expected on uri_tests[76]. uri.c:8197: Test failed: Error: Wasn't expecting to have property 3 on uri_tests[76]. uri.c:10487: Test failed: Error: Expected google.com.uk but got L"com.uk" instead on uri_parse_tests[42]. uri.c:10490: Test failed: Error: Expected 13, but got 6 instead on uri_parse_tests[42].

1 0

Re: [PATCH] ntdll: Finish serial reads of size 0 immediately.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Alex Henrie <alexhenrie24(a)gmail.com> writes: > diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c > index 3883e5a..1e37ce3 100644 > --- a/dlls/ntdll/file.c > +++ b/dlls/ntdll/file.c > @@ -883,7 +883,8 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, > status = length ? STATUS_END_OF_FILE : STATUS_SUCCESS; > goto done; > case FD_TYPE_SERIAL: > - break; > + status = STATUS_SUCCESS; What if the requested size wasn't 0? That probably needs a test case too. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v4 PATCH] user32/test: Color message isn't sent during startup for buttons
by Alexandre Julliard 15 Feb '16

15 Feb '16

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > +static void test_dlg_settext(void) > +{ > + int ret; > + > + ret = DialogBoxParamA(GetModuleHandleA(NULL), "EDIT_READONLY_DIALOG", NULL, test_dlg_settext_proc, 0); > + ok(ret == 0, "expected 0, got %d\n", ret); > + todo_wine ok(!color_message_called, "Unexpected color message\n"); It would be better to do this without depending on a dialog, particularly one that is meant to be used by the edit tests. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v4 PATCH] user32/test: Color message isn't sent during startup for buttons
by Marvin 15 Feb '16

15 Feb '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=20463 Your paranoid android. === w1064 (32 bit msg) === msg.c:6290: Test failed: Update region shouldn't be empty msg.c:6524: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6526: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different === w1064 (64 bit msg) === msg.c:6868: Test failed: WmParentOnlyPaint: 1: the msg sequence is not complete: expected 0000 - actual 001a

1 0

Re: [PATCH 3/7] reg: Fail if the data for REG_DWORD cannot be converted into a DWORD
by Alexandre Julliard 15 Feb '16

15 Feb '16

Hugh McMaster <hugh.mcmaster(a)outlook.com> writes: > @@ -376,6 +376,12 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, > if (data) > reg_data = get_regdata(data,reg_type,separator,&reg_count); > > + if (!reg_data && reg_type == REG_DWORD) > + { > + RegCloseKey(subkey); > + return 1; > + } Shouldn't this fail for other types too? -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [1/2 resend] user32/tests: Test DDE end to end with Chinese text which has latin characters begin.
by Alexandre Julliard 15 Feb '16

15 Feb '16

Jactry Zeng <jzeng(a)codeweavers.com> writes: > Superseded patch 118355. > > For bug 38888: https://bugs.winehq.org/show_bug.cgi?id=38888 > > Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> > --- > dlls/user32/tests/dde.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 45 insertions(+) It doesn't work here: ../../../tools/runtest -q -P wine -T ../../.. -M user32.dll -p user32_test.exe.so dde && touch dde.ok dde.c:2573: Test failed: Expected L"abc?", got L"a", msg_index=29 Makefile:306: recipe for target 'dde.ok' failed -- Alexandre Julliard julliard(a)winehq.org

2 1

reg: Fail if REG_DWORD is passed with no data or if the data cannot be converted to a DWORD
by Hugh McMaster 15 Feb '16

15 Feb '16

Please ignore this patch (119156). It is not entirely correct. -- Hugh McMaster

1 0

Re: [v3] shell32: fix two bugs in IQueryAssocations
by Marvin 15 Feb '16

15 Feb '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=20444 Your paranoid android. === w2003std (32 bit assoc) === assoc.c:122: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:122: Test failed: assoc.c:330: Tests skipped: IApplicationAssociationRegistration not supported: 0x80040154 === wvistau64 (32 bit assoc) === assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:282: L"txtfile" === w2008s64 (32 bit assoc) === assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:282: L"txtfile" === w7u (32 bit assoc) === assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:282: L"txtfile" === w7pro64 (32 bit assoc) === assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:282: L"txtfile" === w8 (32 bit assoc) === assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:282: L"txtfile" === w864 (32 bit assoc) === assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:282: L"txtfile" === w1064 (32 bit assoc) === assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:136: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:136: Test failed: assoc.c:282: L"txtfile" === wvistau64 (64 bit assoc) === assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:282: L"txtfile" === w2008s64 (64 bit assoc) === assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:282: L"txtfile" === w7pro64 (64 bit assoc) === assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:282: L"txtfile" === w864 (64 bit assoc) === assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:282: L"txtfile" === w1064 (64 bit assoc) === assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:122: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:122: Test failed: assoc.c:282: L"txtfile"

1 0

Re: [PATCH] ntdll: Finish serial reads of size 0 immediately.
by Marvin 14 Feb '16

14 Feb '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=20438 Your paranoid android. === w2008s64 (32 bit comm) === comm.c:861: Test failed: WaitCommEvent failed with a timeout comm.c:872: recovering after WAIT_TIMEOUT... comm.c:882: Test failed: WaitCommEvent error 0 comm.c:883: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:887: WaitCommEvent for EV_TXEMPTY took 1500 ms (timeout 1500) comm.c:888: Test failed: WaitCommEvent used 1500 ms for waiting comm.c:1553: test_AbortWaitCts timeout 500 handle 000000BC comm.c:1520: Changing CommMask on the fly for handle 000000BC after timeout 500 === w7pro64 (64 bit comm) === comm.c:861: Test failed: WaitCommEvent failed with a timeout comm.c:872: recovering after WAIT_TIMEOUT... comm.c:882: Test failed: WaitCommEvent error 0 comm.c:883: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:887: WaitCommEvent for EV_TXEMPTY took 1513 ms (timeout 1500) comm.c:888: Test failed: WaitCommEvent used 1513 ms for waiting

1 0

Re: [PATCH 2/2] wpcap: Fix crash on pcap_loop(try 3)
by Alexandre Julliard 14 Feb '16

14 Feb '16

André Hentschel <nerv(a)dawncrow.de> writes: > Am 12.02.2016 um 06:31 schrieb Jianqiu Zhang: >> From 12ecf0983d9355e3f1b4781645503cb4fb65e599 Mon Sep 17 00:00:00 2001 >> From: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> >> Date: Tue, 5 Jan 2016 09:12:42 +0800 >> Subject: [PATCH 2/2] wpcap: Fix crash on pcap_loop >> > > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Was there a reason you didn't use a simple stack variable originally? -- Alexandre Julliard julliard(a)winehq.org

3 3

Re: [PATCH] shell32: fix two bugs in IQueryAssocations
by Nikolay Sivov 13 Feb '16

13 Feb '16

On 14.02.2016 2:19, Theodore Dubois wrote: > Basically, returns the correct value for > ASSOCSTR_FRIENDLYDOCNAME and ASSOCSTR_DEFAULTICON > when passed a ProgID instead of a file extension. > > Also adds some tests to make sure it works. > > Signed-off-by: Theodore Dubois <tblodt(a)icloud.com> > --- > dlls/shell32/assoc.c | 146 +++++++++++++++++++++++++-------------------- > dlls/shell32/tests/assoc.c | 71 +++++++++++++++++++++- > 2 files changed, 151 insertions(+), 66 deletions(-) > > diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c > index 90d00a8..2667ffe 100644 > --- a/dlls/shell32/assoc.c > +++ b/dlls/shell32/assoc.c > @@ -63,6 +63,7 @@ typedef struct > LONG ref; > HKEY hkeySource; > HKEY hkeyProgID; > + LPWSTR pszAssocName; > } IQueryAssociationsImpl; Why do you need this? It's not used anywhere as far as I can tell. > > typedef struct > @@ -88,6 +89,8 @@ static inline struct enumassochandlers *impl_from_IEnumAssocHandlers(IEnumAssocH > return CONTAINING_RECORD(iface, struct enumassochandlers, IEnumAssocHandlers_iface); > } > > +static HRESULT ASSOC_GetValue(HKEY hkey, const WCHAR *name, void **data, DWORD *data_size); > + > /************************************************************************** > * IQueryAssociations_QueryInterface > * > @@ -152,6 +155,7 @@ static ULONG WINAPI IQueryAssociations_fnRelease(IQueryAssociations *iface) > TRACE("Destroying IQueryAssociations (%p)\n", This); > RegCloseKey(This->hkeySource); > RegCloseKey(This->hkeyProgID); > + HeapFree(GetProcessHeap(), 0, (LPVOID)This->pszAssocName); > SHFree(This); > } No need for a cast. > > @@ -186,20 +190,30 @@ static HRESULT WINAPI IQueryAssociations_fnInit( > LONG ret; > > TRACE("(%p)->(%d,%s,%p,%p)\n", iface, > - cfFlags, > - debugstr_w(pszAssoc), > - hkeyProgid, > - hWnd); > + cfFlags, > + debugstr_w(pszAssoc), > + hkeyProgid, > + hWnd); No need for that either. > + > + This->pszAssocName = HeapAlloc(GetProcessHeap(), 0, (strlenW(pszAssoc) + 10001) * sizeof(WCHAR)); Seriously? > - *data = HeapAlloc(GetProcessHeap(), 0, size); > + *data = HeapAlloc(GetProcessHeap(), 0, size + 100); What is that? > if (!*data) > return E_OUTOFMEMORY; > ret = RegQueryValueExW(hkey, name, 0, NULL, (LPBYTE)*data, &size); > @@ -507,33 +550,16 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( > > case ASSOCSTR_FRIENDLYDOCNAME: > { > - WCHAR *pszFileType; > - DWORD ret; > - DWORD size; > + WCHAR *docName; > + > + if (This->hkeyProgID == NULL) { > + > + } And that? > diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c > index 8aa2535..1ba4261 100644 > --- a/dlls/shell32/tests/assoc.c > +++ b/dlls/shell32/tests/assoc.c > @@ -91,6 +91,8 @@ struct assoc_getstring_test > }; > > static const WCHAR httpW[] = {'h','t','t','p',0}; > +static const WCHAR dot_urlW[] = {'.','u','r','l',0}; > +static const WCHAR InternetShortcutW[] = {'I','n','t','e','r','n','e','t','S','h','o','r','t','c','u','t',0}; > static const WCHAR badW[] = {'b','a','d','b','a','d',0}; > > static struct assoc_getstring_test getstring_tests[] = > @@ -135,7 +137,7 @@ static void test_IQueryAssociations_GetString(void) > else > { > ok(hr == ptr->hr, "%d: GetString failed, 0x%08x\n", i, hr); > - ok(len > ptr->len, "%d: got needed length %d\n", i, len); > + ok(len >= ptr->len, "%d: got needed length %d\n", i, len); > } Why '>' was enough before? > + getstring_test(0, NULL, test_progid_key, ASSOCSTR_DEFAULTICON, NULL, S_OK, test_iconW); > + If it's only called with 0 flags, there's no need in this argument. > + //RegDeleteKeyExW(HKEY_CLASSES_ROOT, test_extensionW, KEY_WOW64_32KEY, 0); > + //RegDeleteKeyExW(HKEY_CLASSES_ROOT, test_progidW, KEY_WOW64_32KEY, 0); > +} Leftovers? > + > static void test_IQueryAssociations_Init(void) > { > IQueryAssociations *assoc; > @@ -229,6 +297,7 @@ START_TEST(assoc) > if (hr == S_OK) > { > test_IQueryAssociations_QueryInterface(); > + test_IQueryAssociations_GetString_results(); > test_IQueryAssociations_GetString(); > test_IQueryAssociations_Init(); Please merge this with existing *_GetString().

2 1

Re: shell32/tests: Fix an ok() call so it shows which DDE test caused the failure.
by Marvin 13 Feb '16

13 Feb '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=20416 Your paranoid android. === wvistau64 (64 bit shlexec) === shlexec.c:2178: Test failed: ShellExecuteEx(mask="0x808040", file="C:/Users/winetest/AppData/Local/Temp/wtD2D8.tmp/test_shortcut_exe.lnk") WaitForSingleObject(hProcess) returned 258 shlexec.c:2178: Test failed: ShellExecuteEx(mask="0x808040", file="C:/Users/winetest/AppData/Local/Temp/wtD2D8.tmp/test_shortcut_exe.lnk") child returned 259

1 0

Re: [PATCH] shell32: fix two bugs in IQueryAssocations
by Marvin 13 Feb '16

13 Feb '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=20415 Your paranoid android. === wxppro (32 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 === w2003std (32 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070002, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070002, expected 0x0 === wvistau64 (32 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" === w2008s64 (32 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" === w7u (32 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 === w7pro64 (32 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" === w8 (32 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 === w864 (32 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" === w1064 (32 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" assoc.c:178: Test failed: GetString returned L"C:\\windows\\SysWow64\\shell32.dll,1", expected L"C:\\windows\\system32\\shell32.dll,1" === wvistau64 (64 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 === w2008s64 (64 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 === w7pro64 (64 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 === w864 (64 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 === w1064 (64 bit assoc) === assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:171: Test failed: GetString returned 0x80070483, expected 0x0 assoc.c:175: Test failed: GetString returned 0x80070483, expected 0x0

1 0

Re: [4/5] ntdll/tests: Fix flags passed to VirtualFree in exception tests.
by Marvin 13 Feb '16

13 Feb '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=20412 Your paranoid android. === wvistau64 (32 bit exception) === exception.c:485: Test failed: 42: Wrong exception address 003D0000/003D0001 exception: unhandled exception 80000004 at 003D0000 exception.c:485: Test failed: 42: Wrong exception address 77BAED97/003D0001 === w7u (32 bit exception) === exception.c:485: Test failed: 42: Wrong exception address 002F0000/002F0001 exception: unhandled exception 80000004 at 002F0000 exception.c:485: Test failed: 42: Wrong exception address 77CDE34F/002F0001 === w1064 (32 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9) === w1064 (64 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

2 1

Re: [1/5] kernel32/tests: Add test to show that CompareStringW aborts on first non-matching character.
by Marvin 13 Feb '16

13 Feb '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=20409 Your paranoid android. === w1064 (32 bit locale) === locale.c:2383: Test failed: LCMapStringEx should fail with bad locale name locale.c:2384: Test failed: unexpected error code -559038737 locale.c:2475: Test failed: Expected lcid == 0, got got 00001000, error -559038737 locale.c:4198: Test failed: IsValidLocaleName should have failed locale.c:4200: Test failed: IsValidLocaleName should have failed locale.c:4565: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4567: Test failed: For id 7, Expected IVC, got ''

2 1

Re: wineboot: Create serial comm registry keys
by Sebastian Lackner 12 Feb '16

12 Feb '16

On 12.02.2016 00:32, André Hentschel wrote: > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > > For https://bugs.winehq.org/show_bug.cgi?id=11811 > > > programs/wineboot/wineboot.c | 39 +++++++++++++++++++++++++++++++++++++++ > 1 file changed, 39 insertions(+) > Are you sure there are no keys for com ports >= 10? In general, such serial ports are also possible. Nevertheless, more important: If I don't miss anything, the user still has to manually create a symlink in dosdevices/, otherwise this method will not work. Accessing serial ports on the other hand doesn't require any manual configuration when get_default_com_device() recognizes them (and the user has access). What is the benefit when it still requires manual user interaction?

2 5

Re: [PATCH 1/2] wpcap: Implement pcap_dump_open and pcap_dump(try 5)
by André Hentschel 12 Feb '16

12 Feb '16

Hi, great to see you continue your work :) But you missed a lot of valuable hints from Sebastian in try 4 and 5 What I need to add is that I'd still like to see the pcap_close function in the same patch and a TRACE in pcap_dump. In pcap_dump you could also remove the return as it is a void function, but the file isn't consistent in that regard anyway. Thinking twice, the pcap_dump function should maybe be a seperate patch, while the pcap_close function really should go in this one. Am 12.02.2016 um 17:14 schrieb Jianqiu Zhang: > From 2c90ac326c3eb2d58c95a219616b6789e98499ef Mon Sep 17 00:00:00 2001 > From: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > Date: Thu, 29 Oct 2015 15:33:28 +0800 > Subject: [PATCH 1/2] wpcap: Implement pcap_dump_open and pcap_dump > > Signed-off-by: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > --- > dlls/wpcap/wpcap.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ > dlls/wpcap/wpcap.spec | 4 ++-- > 2 files changed, 46 insertions(+), 2 deletions(-) > > diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c > index ae9e482..b3bb6a5 100644 > --- a/dlls/wpcap/wpcap.c > +++ b/dlls/wpcap/wpcap.c > @@ -18,10 +18,13 @@ > * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > */ > > +#include "ntstatus.h" > +#define WIN32_NO_STATUS > #include <pcap/pcap.h> > #include "winsock2.h" > #include "windef.h" > #include "winbase.h" > +#include "winternl.h" > #include "wine/debug.h" > > WINE_DEFAULT_DEBUG_CHANNEL(wpcap); > @@ -339,3 +342,44 @@ int CDECL wine_wsockinit(void) > if (WSAStartup(MAKEWORD(1,1), &wsadata)) return -1; > return 0; > } > + > +pcap_dumper_t* CDECL wine_pcap_dump_open(pcap_t *p, const char *fname) > +{ > + UNICODE_STRING nt_name, dospathW; > + ANSI_STRING fname_dos; > + ANSI_STRING fname_unix; > + pcap_dumper_t *dumper_data; > + NTSTATUS status; > + TRACE("(%p %s)\n", p, fname); > + RtlInitAnsiString(&fname_dos, fname); > + status = RtlAnsiStringToUnicodeString(&dospathW, &fname_dos, TRUE); > + if (status) > + { > + SetLastError(RtlNtStatusToDosError(status)); > + return NULL; > + } > + if (!RtlDosPathNameToNtPathName_U(dospathW.Buffer, &nt_name, NULL, NULL)) > + { > + RtlFreeUnicodeString(&dospathW); > + SetLastError(ERROR_PATH_NOT_FOUND); > + return NULL; > + } > + status = wine_nt_to_unix_file_name(&nt_name, &fname_unix, FILE_OPEN_IF, FALSE); > + if (status && status != STATUS_NO_SUCH_FILE) > + { > + RtlFreeUnicodeString(&dospathW); > + RtlFreeUnicodeString(&nt_name); > + SetLastError(RtlNtStatusToDosError(status)); > + return NULL; > + } > + RtlFreeUnicodeString(&nt_name); > + RtlFreeUnicodeString(&dospathW); > + dumper_data = pcap_dump_open(p, fname_unix.Buffer); > + RtlFreeAnsiString(&fname_unix); > + return dumper_data; > +} > + > +void CDECL wine_pcap_dump(u_char *user, const struct pcap_pkthdr *h, const u_char *sp) > +{ > + return pcap_dump(user, h, sp); > +} > diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec > index 66303b4..541fc49 100644 > --- a/dlls/wpcap/wpcap.spec > +++ b/dlls/wpcap/wpcap.spec > @@ -16,12 +16,12 @@ > @ cdecl pcap_datalink_val_to_description(long) wine_pcap_datalink_val_to_description > @ cdecl pcap_datalink_val_to_name(long) wine_pcap_datalink_val_to_name > @ cdecl pcap_dispatch(ptr long ptr ptr) wine_pcap_dispatch > -@ stub pcap_dump > +@ cdecl pcap_dump(ptr ptr ptr) wine_pcap_dump > @ stub pcap_dump_close > @ stub pcap_dump_file > @ stub pcap_dump_flush > @ stub pcap_dump_ftell > -@ stub pcap_dump_open > +@ cdecl pcap_dump_open(ptr str) wine_pcap_dump_open > @ stub pcap_file > @ stub pcap_fileno > @ cdecl pcap_findalldevs(ptr ptr) wine_pcap_findalldevs > -- > 2.7.1 > > >

1 0

Re: [PATCH] dwrite: Fix typos, and fix definition of Mac LangCodes for Welsh and up.
by Nikolay Sivov 12 Feb '16

12 Feb '16

On 12.02.2016 12:00, Charles Davis wrote: > Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> > --- > dlls/dwrite/opentype.c | 39 ++++++++++++++++++++++++++++++++++++--- > 1 file changed, 36 insertions(+), 3 deletions(-) > > diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c > index 5b29c21..7d59bf8 100644 > --- a/dlls/dwrite/opentype.c > +++ b/dlls/dwrite/opentype.c > @@ -470,7 +470,7 @@ enum TT_NAME_MAC_LANGUAGE_ID > TT_NAME_MAC_LANGID_LAO, > TT_NAME_MAC_LANGID_VIETNAMESE, > TT_NAME_MAC_LANGID_INDONESIAN, > - TT_NAME_MAC_LANGID_TAGALONG, > + TT_NAME_MAC_LANGID_TAGALOG, > TT_NAME_MAC_LANGID_MALAY_ROMAN, > TT_NAME_MAC_LANGID_MALAY_ARABIC, > TT_NAME_MAC_LANGID_AMHARIC, > @@ -483,11 +483,11 @@ enum TT_NAME_MAC_LANGUAGE_ID > TT_NAME_MAC_LANGID_NYANJA, > TT_NAME_MAC_LANGID_MALAGASY, > TT_NAME_MAC_LANGID_ESPERANTO, > - TT_NAME_MAC_LANGID_WELSH, > + TT_NAME_MAC_LANGID_WELSH = 128, > TT_NAME_MAC_LANGID_BASQUE, > TT_NAME_MAC_LANGID_CATALAN, > TT_NAME_MAC_LANGID_LATIN, > - TT_NAME_MAC_LANGID_QUENCHUA, > + TT_NAME_MAC_LANGID_QUECHUA, > TT_NAME_MAC_LANGID_GUARANI, > TT_NAME_MAC_LANGID_AYMARA, > TT_NAME_MAC_LANGID_TATAR, Hi, typos come from https://www.microsoft.com/typography/otspec/name.htm, thanks for fixing this. Broken indexing is something I missed though. I'm curious how did you spot this? Is there some fonts around that use id >= 128 on mac?

2 1

Re: [PATCH 5/5] ntdll: Add special handling for int $0x2d exceptions.
by Marvin 12 Feb '16

12 Feb '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=20397 Your paranoid android. === wvistau64 (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x340000/0x340001 exception: unhandled exception 80000004 at 00340000 exception.c:490: Test failed: 42: Unexpected eip 0x77baed97/0x340001 === w7u (32 bit exception) === exception.c:490: Test failed: 42: Unexpected eip 0x3f0000/0x3f0001 exception: unhandled exception 80000004 at 003F0000 exception.c:490: Test failed: 42: Unexpected eip 0x77cde34f/0x3f0001 === w1064 (32 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9) === w1064 (64 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

1 0

[PATCH 1/2] wpcap: Implement pcap_dump_open and pcap_dump(try 4)
by Jianqiu Zhang 12 Feb '16

12 Feb '16

From 4e905186d67501943897e517a4a1cdfffe45993b Mon Sep 17 00:00:00 2001 From: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> Date: Thu, 29 Oct 2015 15:33:28 +0800 Subject: [PATCH 1/2] wpcap: Implement pcap_dump_open and pcap_dump Signed-off-by: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> --- dlls/wpcap/wpcap.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wpcap/wpcap.spec | 4 ++-- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index ae9e482..b3bb6a5 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -18,10 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "ntstatus.h" +#define WIN32_NO_STATUS #include <pcap/pcap.h> #include "winsock2.h" #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wpcap); @@ -339,3 +342,44 @@ int CDECL wine_wsockinit(void) if (WSAStartup(MAKEWORD(1,1), &wsadata)) return -1; return 0; } + +pcap_dumper_t* CDECL wine_pcap_dump_open(pcap_t *p, const char *fname) +{ + UNICODE_STRING nt_name, dospathW; + ANSI_STRING fname_dos; + ANSI_STRING fname_unix; + pcap_dumper_t *dumper_data; + NTSTATUS status; + TRACE("(%p %s)\n", p, fname); + RtlInitAnsiString(&fname_dos, fname); + status = RtlAnsiStringToUnicodeString(&dospathW, &fname_dos, TRUE); + if (status) + { + SetLastError(RtlNtStatusToDosError(status)); + return NULL; + } + if (!RtlDosPathNameToNtPathName_U(dospathW.Buffer, &nt_name, NULL, NULL)) + { + RtlFreeUnicodeString(&dospathW); + SetLastError(ERROR_PATH_NOT_FOUND); + return NULL; + } + status = wine_nt_to_unix_file_name(&nt_name, &fname_unix, FILE_OPEN_IF, FALSE); + if (status && status != STATUS_NO_SUCH_FILE) + { + RtlFreeUnicodeString(&dospathW); + RtlFreeUnicodeString(&nt_name); + SetLastError(RtlNtStatusToDosError(status)); + return NULL; + } + RtlFreeUnicodeString(&nt_name); + RtlFreeUnicodeString(&dospathW); + dumper_data = pcap_dump_open(p, fname_unix.Buffer); + RtlFreeAnsiString(&fname_unix); + return dumper_data; +} + +void CDECL wine_pcap_dump(u_char *user, const struct pcap_pkthdr *h, const u_char *sp) +{ + return pcap_dump(user, h, sp); +} diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 66303b4..541fc49 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -16,12 +16,12 @@ @ cdecl pcap_datalink_val_to_description(long) wine_pcap_datalink_val_to_description @ cdecl pcap_datalink_val_to_name(long) wine_pcap_datalink_val_to_name @ cdecl pcap_dispatch(ptr long ptr ptr) wine_pcap_dispatch -@ stub pcap_dump +@ cdecl pcap_dump(ptr ptr ptr) wine_pcap_dump @ stub pcap_dump_close @ stub pcap_dump_file @ stub pcap_dump_flush @ stub pcap_dump_ftell -@ stub pcap_dump_open +@ cdecl pcap_dump_open(ptr str) wine_pcap_dump_open @ stub pcap_file @ stub pcap_fileno @ cdecl pcap_findalldevs(ptr ptr) wine_pcap_findalldevs -- 2.7.1

1 1

Re: [v3 PATCH] user32/test: Color message isn't sent during startup for buttons.
by Alexandre Julliard 12 Feb '16

12 Feb '16

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > v3 > Correct patch title. > hok is correct for the scenario being tested. > > If this isn't the correct location for the test, please let me know. It isn't, edit.c is for testing the edit control, surprisingly ;-) I'd suggest to put it in msg.c, there are already several WM_CTLCOLOR* tests in there. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [2/2] kernel32/tests: Add additional tests for CompareStringA.
by Marvin 12 Feb '16

12 Feb '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=20380 Your paranoid android. === w1064 (32 bit locale) === locale.c:2353: Test failed: LCMapStringEx should fail with bad locale name locale.c:2354: Test failed: unexpected error code -559038737 locale.c:2445: Test failed: Expected lcid == 0, got got 00001000, error -559038737 locale.c:4168: Test failed: IsValidLocaleName should have failed locale.c:4170: Test failed: IsValidLocaleName should have failed locale.c:4535: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4537: Test failed: For id 7, Expected IVC, got ''

2 1

Re: [PATCH 1/2] wpcap: Implement pcap_dump_open and pcap_dump(try 3)
by Sebastian Lackner 12 Feb '16

12 Feb '16

On 12.02.2016 06:31, Jianqiu Zhang wrote: > From ba4fa665f40975587c8aeb132f853afa4c28b4ca Mon Sep 17 00:00:00 2001 > From: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > Date: Thu, 29 Oct 2015 15:33:28 +0800 > Subject: [PATCH 1/2] wpcap: Implement pcap_dump_open and pcap_dump > > Signed-off-by: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > --- > dlls/wpcap/wpcap.c | 43 +++++++++++++++++++++++++++++++++++++++++++ > dlls/wpcap/wpcap.spec | 4 ++-- > 2 files changed, 45 insertions(+), 2 deletions(-) > > diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c > index ae9e482..074c495 100644 > --- a/dlls/wpcap/wpcap.c > +++ b/dlls/wpcap/wpcap.c > @@ -22,6 +22,8 @@ > #include "winsock2.h" > #include "windef.h" > #include "winbase.h" > +#include "winternl.h" > +#include "ntstatus.h" As you already found out, this leads to build failures / warnings. You have to include "ntstatus.h" in the beginning, and then #define WIN32_NO_STATUS to avoid the duplicate definitions from other files. > #include "wine/debug.h" > > WINE_DEFAULT_DEBUG_CHANNEL(wpcap); > @@ -339,3 +341,44 @@ int CDECL wine_wsockinit(void) > if (WSAStartup(MAKEWORD(1,1), &wsadata)) return -1; > return 0; > } > + The code below should be technically fine, so it depends on André if its acceptable as-is or if more cleanup is necessary. I would like to point out a couple more opportunities to make it easier to read. > +pcap_dumper_t* CDECL wine_pcap_dump_open(pcap_t *p, const char *fname) > +{ > + UNICODE_STRING nt_name, dospathW; With more consistent variable names it would be easier to recognize W and ansi strings. > + ANSI_STRING fname_dos; > + ANSI_STRING fname_unix; This could go into a single line. > + pcap_dumper_t *dumper_data; > + NTSTATUS status; > + TRACE("(%p %s)\n", p, fname); Some linebreaks in front and after the TRACE would not hurt, to make it more readable. > + RtlInitAnsiString(&fname_dos, fname); > + status = RtlAnsiStringToUnicodeString(&dospathW, &fname_dos, TRUE); > + if (status) > + { > + SetLastError(RtlNtStatusToDosError(status)); > + return NULL; > + } > + if (!RtlDosPathNameToNtPathName_U(dospathW.Buffer, &nt_name, NULL, NULL)) > + { > + RtlFreeUnicodeString(&dospathW); > + SetLastError(ERROR_PATH_NOT_FOUND); > + return NULL; > + } > + status = wine_nt_to_unix_file_name(&nt_name, &fname_unix, FILE_OPEN_IF, FALSE); You can move the RtlFreeUnicodeString(.) functions here to avoid code duplication. > + if (status && status != STATUS_NO_SUCH_FILE) > + { > + RtlFreeUnicodeString(&dospathW); > + RtlFreeUnicodeString(&nt_name); > + SetLastError(RtlNtStatusToDosError(status)); > + return NULL; > + } > + RtlFreeUnicodeString(&nt_name); > + RtlFreeUnicodeString(&dospathW); > + dumper_data = pcap_dump_open(p, fname_unix.Buffer); > + RtlFreeAnsiString(&fname_unix); > + return dumper_data; > +} > + > +void CDECL wine_pcap_dump(u_char *user, const struct pcap_pkthdr *h, const u_char *sp) > +{ > + return pcap_dump(user, h, sp); > +} > diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec > index 66303b4..541fc49 100644 > --- a/dlls/wpcap/wpcap.spec > +++ b/dlls/wpcap/wpcap.spec > @@ -16,12 +16,12 @@ > @ cdecl pcap_datalink_val_to_description(long) wine_pcap_datalink_val_to_description > @ cdecl pcap_datalink_val_to_name(long) wine_pcap_datalink_val_to_name > @ cdecl pcap_dispatch(ptr long ptr ptr) wine_pcap_dispatch > -@ stub pcap_dump > +@ cdecl pcap_dump(ptr ptr ptr) wine_pcap_dump > @ stub pcap_dump_close > @ stub pcap_dump_file > @ stub pcap_dump_flush > @ stub pcap_dump_ftell > -@ stub pcap_dump_open > +@ cdecl pcap_dump_open(ptr str) wine_pcap_dump_open > @ stub pcap_file > @ stub pcap_fileno > @ cdecl pcap_findalldevs(ptr ptr) wine_pcap_findalldevs > > > >

1 0

Re: [PATCH 2/2] wpcap: Fix crash on pcap_loop(try 2)
by Sebastian Lackner 12 Feb '16

12 Feb '16

On 11.02.2016 09:55, Jianqiu Zhang wrote: > From 359272d74611e2c4a6ab1e3eb452cb277043b6d2 Mon Sep 17 00:00:00 2001 > From: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > Date: Tue, 5 Jan 2016 09:12:42 +0800 > Subject: [PATCH 2/2] wpcap: Fix crash on pcap_loop > > Signed-off-by: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > --- > dlls/wpcap/wpcap.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c > index e03e18e..3b0f618 100644 > --- a/dlls/wpcap/wpcap.c > +++ b/dlls/wpcap/wpcap.c > @@ -99,7 +99,6 @@ static void pcap_handler_callback(u_char *user_data, const struct pcap_pkthdr *h > TRACE("(%p %p %p)\n", user_data, h, p); > pcb = (PCAP_HANDLER_CALLBACK *)user_data; > pcb->pfn_cb(pcb->user_data, h, p); > - HeapFree(GetProcessHeap(), 0, pcb); > TRACE("Callback COMPLETED\n"); > } > > @@ -111,11 +110,14 @@ int CDECL wine_pcap_dispatch(pcap_t *p, int cnt, > > if (callback) > { > + int res = 0; You can remove the initialization here. In fact some analyzers will warn about double-initialization when you do that although its not really necessary. > PCAP_HANDLER_CALLBACK *pcb; > pcb = HeapAlloc(GetProcessHeap(), 0, sizeof(PCAP_HANDLER_CALLBACK)); > pcb->pfn_cb = callback; > pcb->user_data = user; > - return pcap_dispatch(p, cnt, pcap_handler_callback, (unsigned char*)pcb); > + res = pcap_dispatch(p, cnt, pcap_handler_callback, (unsigned char *)pcb); > + HeapFree(GetProcessHeap(), 0, pcb); > + return res; > } > > return pcap_dispatch(p, cnt, NULL, user); > @@ -204,11 +206,14 @@ int CDECL wine_pcap_loop(pcap_t *p, int cnt, > > if (callback) > { > + int res = 0; Same here. > PCAP_HANDLER_CALLBACK *pcb; > pcb = HeapAlloc(GetProcessHeap(), 0, sizeof(PCAP_HANDLER_CALLBACK)); > pcb->pfn_cb = callback; > pcb->user_data = user; > - return pcap_loop(p, cnt, pcap_handler_callback, (unsigned char*)pcb); > + res = pcap_loop(p, cnt, pcap_handler_callback, (unsigned char *)pcb); > + HeapFree(GetProcessHeap(), 0, pcb); > + return res; > } > > return pcap_loop(p, cnt, NULL, user); > > > >

2 2

Re: [PATCH 3/5] wined3d: Check relative addressing indices when accessing uniforms in GLSL shaders.
by Stefan Dösinger 11 Feb '16

11 Feb '16

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 > + sprintf(register_name, "(%s + %u >= 0 && > %s + %u < %u ? %s_c[%s + %u] : vec4(0.0))", Did you do any testing on the performance impact of this? This seems like something where it's convenient to sacrifice performance everywhere for a corner case, but later on we wonder why games are unplayably slow. Keep in mind that currently it's pretty difficult to be GPU limited. With the CSMT patches you'll have a higher chance of being GPU limited, but there's no guarantee of course. dx10+ GPUs don't return 0.0 reliably on Windows here. My Geforce GPUs returned the int constants at c[-32] to c[-48]. I think there are additional options of increasing our odds of behaving like Windows. E.g. with constant buffers we could create a buffer that matches the hardware page size (which we can't query, I know) and fill everything except the 256 d3d9 constants with zeroes. If the out of bounds read falls into the buffer we get a zero. If not, the hardware should detect the invalid read and I'd expect it to return zero due to exactly this d3d requirement. Also I think d3d9 HW should "just work" in this regard because only 256 registers exist. Yes, I am aware that there are more games than just The Witcher that are affected by this problem. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWvPcoAAoJEN0/YqbEcdMwUJwQAI4eKz1YGS4N/VzSAt/7QlT+ xq6KOrGGjkbJCjtW97R16hisqLTrNqmq80qvHAPHX0Nh2Pa5Dcx9sbbgryGEsSfm ExzAKuMUSPsNch9mb5+72zXYn71UCRmBZxcfkt/NwQSD8qfhQD13OdxhQrWordMJ ZKphTjiBk7/O2gA6myxt7QcbFYjLHuee6kA909EF0tEpfjQ2Zeu+OsvTUnKbpQ1o P/nUU8goFpn0yom3X07dnjXkDUnvpuyK2d+5Mgp2xt9sHya0gGN5dbTNnRyEPs7O IwmWEUzVTQxEJYakASjZxA+3FlkzJrCZUHKufWNWMwPSFFCThuF/JXEoFb4+khW9 uVW0J73q257JibOvWg1AsJwGumn+5jKtXqrAO0WZlshxDx6iudN8RMEv2RngeMeo SFzYWfzHgLfHYmCeGVpPGqc9H3ThTukvymi3bBitqv0t/Zp7cXQ8fh0ghHNdRiEw 6ygzJxUJay3CRr9VKm/8hUaJBHCFdZOYjEk1z5IpgJhS4igeab7bE/z6KenCiY08 0/Mpb7UnUnrKb229u0fwEMyJSUHt8FkSf5tJBi4Bnl11qfDJdBccUc/5HuYB2Puk XfbWNHUDZA6clW/G2MumekuyUi9F4QIWypUrsqgBaWgJ+xxTzmm3UCOQkc4uv9as h5IrX0kN1CRYpBMwurXg =K2RI -----END PGP SIGNATURE-----

3 2

Re: (v2) uxtheme: test and fix CloseThemeData with invalid handle value
by Sebastian Lackner 11 Feb '16

11 Feb '16

On 11.02.2016 20:34, Piet Jankbal wrote: > Now hopefully with correct signed-off statement. I lost my old > email-account, that's why i've sent it from new account (with fake-name, > now it should appear with my correct name) > > Hi, this fixes https://bugs.winehq.org/show_bug.cgi?id=29862 > > Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com > <https://www.winehq.org/mailman/listinfo/wine-patches>> > > > > > > signed off: Louis Lenders > > The author is still not correct, and there is a ">" missing at the end of the Signed-off-by line. You can also add a "From: ..." line at the beginning if you can't change the author in your mail client.

1 0

Re: kernel32: return a dummy value in GetSystemPreferredUILanguages
by Marvin 11 Feb '16

11 Feb '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=20339 Your paranoid android. === w1064 (32 bit locale) === locale.c:2339: Test failed: LCMapStringEx should fail with bad locale name locale.c:2340: Test failed: unexpected error code -559038737 locale.c:2431: Test failed: Expected lcid == 0, got got 00001000, error -559038737 locale.c:4154: Test failed: IsValidLocaleName should have failed locale.c:4156: Test failed: IsValidLocaleName should have failed locale.c:4521: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4523: Test failed: For id 7, Expected IVC, got ''

2 1

Re: [PATCH] comdlg32/tests: Simplify a test using todo_wine_if()
by Marvin 11 Feb '16

11 Feb '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=20372 Your paranoid android. === wvistau64 (32 bit filedlg) === filedlg.c:1052: Test failed: TestFilter (*.abc;*.def): expected TRUE filedlg.c:1058: Test failed: TestFilter (*.abc;*.def): Filename is deadbeef, expected deadbeef.abc

1 0

Re: [PATCH] advapi32/tests: Simplify tests using todo_wine_if()
by Marvin 11 Feb '16

11 Feb '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=20371 Your paranoid android. === w1064 (32 bit security) === security.c:3753: Test failed: MACHINE\Software owner SID (S-1-5-18) != Administrators SID (S-1-5-32-544). security.c:3794: Test failed: Builtin Users ACE has unexpected flags (0x12 != 0xa) security.c:3798: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:3807: Test failed: Builtin Admins ACE has unexpected flags (0x12 != 0x0)

1 0

GSoC Ideas page
by André Hentschel 11 Feb '16

11 Feb '16

Hi, please update https://wiki.winehq.org/Summer_Of_Code with your Ideas and mention yourself as possible mentor where appropriate. Some things can be dropped I think, OpenMP maybe? Thanks!

5 5

Re: [PATCH 1/2] wpcap: Implement pcap_dump_open and pcap_dump(try 2)
by Sebastian Lackner 11 Feb '16

11 Feb '16

I'm not the maintainer of wpcap, nevertheless I hope its fine to give some suggestions how to improve the code. On 11.02.2016 09:55, Jianqiu Zhang wrote: > From 770a1250794833aa7d9a9596a7fc56bfc19c65f0 Mon Sep 17 00:00:00 2001 > From: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > Date: Thu, 29 Oct 2015 15:33:28 +0800 > Subject: [PATCH 1/2] wpcap: Implement pcap_dump_open and pcap_dump > > Signed-off-by: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> > --- > dlls/wpcap/wpcap.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ > dlls/wpcap/wpcap.spec | 4 ++-- > 2 files changed, 56 insertions(+), 2 deletions(-) > > diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c > index ae9e482..e03e18e 100644 > --- a/dlls/wpcap/wpcap.c > +++ b/dlls/wpcap/wpcap.c > @@ -22,6 +22,8 @@ > #include "winsock2.h" > #include "windef.h" > #include "winbase.h" > +#include "winternl.h" > +#include "ntstatus.h" > #include "wine/debug.h" > > WINE_DEFAULT_DEBUG_CHANNEL(wpcap); > @@ -40,6 +42,8 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); > #define PCAP_SRC_IFLOCAL 3 > #endif > > +#define MAX_LENGTH 1024 In this case copying is not necessary at all. In other cases you would want to use MAX_PATH instead of own definitions. > + > void CDECL wine_pcap_breakloop(pcap_t *p) > { > TRACE("(%p)\n", p); > @@ -339,3 +343,53 @@ int CDECL wine_wsockinit(void) > if (WSAStartup(MAKEWORD(1,1), &wsadata)) return -1; > return 0; > } > + > +pcap_dumper_t* CDECL wine_pcap_dump_open(pcap_t *p, const char *fname) > +{ > + UNICODE_STRING nt_name, dospathW; > + ANSI_STRING fname_dos; > + ANSI_STRING fname_unix; > + CHAR fpath[MAX_LENGTH] = { 0 }; You don't need this char array (see comment below). > + NTSTATUS res; Not really critical, but "status" is often a bit more meaningful. > + TRACE("(%p %s)\n", p, fname); > + RtlInitAnsiString(&fname_dos, fname); > + res = RtlAnsiStringToUnicodeString(&dospathW, &fname_dos, TRUE); > + if(res) Minor issue, but the coding style in this file seems to be with a space between "if" and "(". > + { > + SetLastError(RtlNtStatusToDosError(res)); > + return NULL; > + } > + if(!RtlDosPathNameToNtPathName_U(dospathW.Buffer, &nt_name, NULL, NULL)) > + { > + RtlFreeUnicodeString(&dospathW); > + SetLastError(ERROR_FILENAME_EXCED_RANGE); Basically all places in wine use ERROR_PATH_NOT_FOUND in this case. > + return NULL; > + } > + res = wine_nt_to_unix_file_name(&nt_name, &fname_unix, FILE_OPEN_IF, FALSE); > + if(res) > + { > + if(res == STATUS_NO_SUCH_FILE) > + SetLastError(ERROR_SUCCESS); Setting error code in case of success is not useful. > + else > + { > + RtlFreeUnicodeString(&dospathW); > + RtlFreeUnicodeString(&nt_name); > + SetLastError(RtlNtStatusToDosError(res)); > + return NULL; > + } > + } > + else > + { > + SetLastError(ERROR_FILE_EXISTS); Similar to above, we don't care about the error code in case of success. > + } > + memcpy(fpath, fname_unix.Buffer, fname_unix.Length); > + RtlFreeUnicodeString(&nt_name); > + RtlFreeUnicodeString(&dospathW); > + RtlFreeAnsiString(&fname_unix); > + return pcap_dump_open(p, fpath); Instead of copying the string, please store the return value of pcap_dump_open in a variable. > +} > + > +void CDECL wine_pcap_dump(u_char *user, const struct pcap_pkthdr *h, const u_char *sp) > +{ > + return pcap_dump(user, h, sp); > +} > diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec > index 66303b4..541fc49 100644 > --- a/dlls/wpcap/wpcap.spec > +++ b/dlls/wpcap/wpcap.spec > @@ -16,12 +16,12 @@ > @ cdecl pcap_datalink_val_to_description(long) wine_pcap_datalink_val_to_description > @ cdecl pcap_datalink_val_to_name(long) wine_pcap_datalink_val_to_name > @ cdecl pcap_dispatch(ptr long ptr ptr) wine_pcap_dispatch > -@ stub pcap_dump > +@ cdecl pcap_dump(ptr ptr ptr) wine_pcap_dump > @ stub pcap_dump_close > @ stub pcap_dump_file > @ stub pcap_dump_flush > @ stub pcap_dump_ftell > -@ stub pcap_dump_open > +@ cdecl pcap_dump_open(ptr str) wine_pcap_dump_open > @ stub pcap_file > @ stub pcap_fileno > @ cdecl pcap_findalldevs(ptr ptr) wine_pcap_findalldevs > > > >

1 0

Re: [v2 PATCH] user32/text: Show Color message isn't send during startup
by Alexandre Julliard 11 Feb '16

11 Feb '16

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > @@ -214,6 +218,12 @@ static INT_PTR CALLBACK edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPA > PostMessageA(hdlg, WM_USER, 0xdeadbeef, 2); > break; > > + /* Set Text During startup */ > + case 11: > + SendMessageA(hok, WM_SETTEXT, 0, (WPARAM)"Testing"); > + PostMessageA(hdlg, WM_USER, 0xdeadbeef, 2); > + break; Why are you setting the text on a button, and not touching the edit control? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/3] msvcp110: Add tr2_sys__Symlink implementation and test.
by Piotr Caban 11 Feb '16

11 Feb '16

On 01/11/16 14:56, YongHao Hu wrote: > + delete_flag = 1; > + for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { > + errno = 0xdeadbeef; > + SetLastError(0xdeadbeef); > + ret = p_tr2_sys__Symlink(tests[i].existing_path, tests[i].new_path); > + if(ret==ERROR_PRIVILEGE_NOT_HELD || ret==ERROR_INVALID_FUNCTION) { > + delete_flag = 0; > + tests[i].last_error = ret; > + win_skip("Privilege not held or symbolic link not supported, skipping symbolic link tests.\n"); I think it would be nicer if the tests are really skipped in this case. Please detect such case and return from the function instead of adding workarounds in the code for it. Thanks, Piotr

2 3

Re: [PATCH 1/2] wpcap: Implement pcap_dump_open and pcap_dump
by André Hentschel 11 Feb '16

11 Feb '16

Hi, Sorry for the delay, but I haven't noticed that I got assigned for reviewing. Could you please tell me the name of the application so I can do some testing? Further reviewing inlined below: Am 07.01.2016 um 09:49 schrieb Jianqiu Zhang: > + > +pcap_dumper_t* CDECL wine_pcap_dump_open(pcap_t *p, const char *fname) > +{ > + return pcap_dump_open(p, fname); > +} This can't work, the wpcap function might be called with fname set to "C:\dump.pcap" and the native function will be confused by that. > +void CDECL wine_pcap_dump(u_char *user, const struct pcap_pkthdr *h, const u_char *sp) > +{ > + return pcap_dump(user, h, sp); > +} This should work, but where are pcap_dump_close and friends? > diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec > index 0e1e208..d7efd5e 100644 > --- a/dlls/wpcap/wpcap.spec > +++ b/dlls/wpcap/wpcap.spec > @@ -16,12 +16,12 @@ > @ cdecl pcap_datalink_val_to_description(long) wine_pcap_datalink_val_to_description > @ cdecl pcap_datalink_val_to_name(long) wine_pcap_datalink_val_to_name > @ cdecl pcap_dispatch(ptr long ptr ptr) wine_pcap_dispatch > -@ stub pcap_dump > +@ cdecl pcap_dump(str ptr str) wine_pcap_dump Should be (ptr ptr ptr), there are no strings to be displayed

3 9

Re: [PATCH] user32/tests: Simplify some tests using todo_wine_if()
by Marvin 11 Feb '16

11 Feb '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=20354 Your paranoid android. === w8 (32 bit sysparams) === sysparams.c:2488: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2499: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1 === w864 (32 bit sysparams) === sysparams.c:2488: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2499: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1 === w1064 (32 bit monitor) === monitor.c:248: Test failed: Unexpected ChangeDisplaySettingsEx() return code for resolution[0]: -2 monitor.c:248: Test failed: Unexpected ChangeDisplaySettingsEx() return code for resolution[2]: -2 === w1064 (32 bit msg) === msg.c:6290: Test failed: Update region shouldn't be empty msg.c:6524: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6526: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different msg.c:6296: Test failed: Regions are different === w2008s64 (32 bit win) === win.c:8627: Test failed: Expected foreground window 00020078, got 00030040

1 0

Re: [PATCH] gdi32/tests: Simplify tests using todo_wine_if()
by Marvin 11 Feb '16

11 Feb '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=20353 Your paranoid android. === wvistau64 (32 bit font) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

1 0

Re: [3/3] advapi32/tests: Add tests for Win8 pseudo handles.
by Marvin 11 Feb '16

11 Feb '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=20338 Your paranoid android. === w1064 (32 bit security) === security.c:3774: Test failed: MACHINE\Software owner SID (S-1-5-18) != Administrators SID (S-1-5-32-544). security.c:3815: Test failed: Builtin Users ACE has unexpected flags (0x12 != 0xa) security.c:3819: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:3828: Test failed: Builtin Admins ACE has unexpected flags (0x12 != 0x0)

2 1

Re: [PATCH 5/7] wined3d: Copy channel info for typed formats from typeless formats.
by Henri Verbeet 10 Feb '16

10 Feb '16

On 10 February 2016 at 02:14, Józef Kucia <jkucia(a)codeweavers.com> wrote: > @@ -1436,8 +1408,7 @@ static inline int getFmtIdx(enum wined3d_format_id format_id) > { > /* First check if the format is at the position of its value. > * This will catch the argb formats before the loop is entered. */ > - if (format_id < (sizeof(formats) / sizeof(*formats)) > - && formats[format_id].id == format_id) > + if (format_id < ARRAY_SIZE(formats) && formats[format_id].id == format_id) > { > return format_id; > } > @@ -1445,10 +1416,10 @@ static inline int getFmtIdx(enum wined3d_format_id format_id) > { > unsigned int i; > > - for (i = 0; i < (sizeof(formats) / sizeof(*formats)); ++i) > - { > + for (i = 0; i < ARRAY_SIZE(formats); ++i) > if (formats[i].id == format_id) return i; > - } > + for (i = 0; i < ARRAY_SIZE(typed_formats); ++i) > + if (typed_formats[i].id == format_id) return ARRAY_SIZE(formats) + i; > } > return -1; > } I'm not sure this is really the way to go. I'd prefer to just reorder things in such a way that the format id is the index in all cases except for FourCC formats. Patch 7/7 goes a long way in that direction, but to me it looks more complicated than just having a small table to remap the FourCC formats to an index. One additional advantage would be that we could then also remap e.g. DXT2 and DXT3 to BC2. E.g.: struct { enum wined3d_format_id id; unsigned int idx; } remap[] = { {UYVY, FOURCC_BASE} {YUY2, FOURCC_BASE + 1} {YV12, FOURCC_BASE + 2} {DXT1, BC1}, {DXT2, BC2}, {DXT3, BC2}, {DXT4, BC3}, {DXT5, BC3}, };

2 2

Re: [PATCH 7/7] wined3d: Use format id as index in formats table whenever possible.
by Henri Verbeet 10 Feb '16

10 Feb '16

On 10 February 2016 at 02:14, Józef Kucia <jkucia(a)codeweavers.com> wrote: > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> > --- > dlls/wined3d/utils.c | 182 +++++++++++++++++++++++++++++++-------------------- > 1 file changed, 110 insertions(+), 72 deletions(-) > For what it's worth, I think there are a number of places that could just use wined3d_get_format(). If you did that as a separate patch before this one, this one could be a bit smaller.

1 0

Re: [PATCH 4/7] wined3d: Introduce table with typed format channels.
by Henri Verbeet 10 Feb '16

10 Feb '16

On 10 February 2016 at 02:14, Józef Kucia <jkucia(a)codeweavers.com> wrote: > +enum wined3d_channel_type > +{ > + C_UNUSED, > + C_UNORM, > + C_SNORM, > + C_UINT, > + C_SINT, > + C_FLOAT, > + C_DEPTH, > + C_STENCIL > +}; These would need to be called something like WINED3D_CHANNEL_TYPE_UNORM, etc. Those are a bit longer to type, but we could use a scheme similar to the opcode table in shader_sm4.c to keep the table readable. (Perhaps "I" -> SINT, "i" -> SNORM, "S" -> STENCIL, etc.) > +struct wined3d_typed_format_info > { > enum wined3d_format_id id; > enum wined3d_format_id typeless_id; > + enum wined3d_channel_type red_channel; > + enum wined3d_channel_type green_channel; > + enum wined3d_channel_type blue_channel; > + enum wined3d_channel_type alpha_channel; > }; Just a thought, but would it make things easier if the channel types were an array? It would probably make sense for struct wined3d_format at least to have something like struct { unsigned int size; unsigned int offset; enum wined3d_channel_type type; } channels[4];

1 0

Re: [PATCH 3/7] wined3d: Add remaining sRGB formats.
by Henri Verbeet 10 Feb '16

10 Feb '16

On 10 February 2016 at 02:14, Józef Kucia <jkucia(a)codeweavers.com> wrote: > diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h > index df95da9..f314af3 100644 > --- a/include/wine/wined3d.h > +++ b/include/wine/wined3d.h > @@ -214,6 +214,13 @@ enum wined3d_format_id > WINED3DFMT_B5G5R5A1_UNORM, > WINED3DFMT_B8G8R8A8_UNORM, > WINED3DFMT_B8G8R8X8_UNORM, > + WINED3DFMT_B8G8R8A8_TYPELESS, > + WINED3DFMT_B8G8R8A8_UNORM_SRGB, > + WINED3DFMT_B8G8R8X8_TYPELESS, > + WINED3DFMT_B8G8R8X8_UNORM_SRGB, > + WINED3DFMT_BC7_TYPELESS, > + WINED3DFMT_BC7_UNORM, > + WINED3DFMT_BC7_UNORM_SRGB, Not an issue with this patch per se, but note that these aren't actually usable by anything until you update the conversion functions in dxgi and d3d11. (And I notice debug_dxgi_format() is missing a few formats as well.)

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