- wine-devel - winehq.org

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

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