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

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 24 Feb '16

24 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