November 2011 - Wine-commits

Francois Gouget : include: Move the DDE_xxx macros to dde.rh.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: d1e85a0f1f76ff9048b74651f7c8adae16d93af3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e85a0f1f76ff9048b74651f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 14 10:03:20 2011 +0100 include: Move the DDE_xxx macros to dde.rh. --- include/Makefile.in | 1 + include/dde.h | 12 +----------- include/dde.rh | 32 ++++++++++++++++++++++++++++++++ include/winresrc.h | 2 +- 4 files changed, 35 insertions(+), 12 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index ddc07ba..00e9cf4 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -203,6 +203,7 @@ SRCDIR_INCLUDES = \ dciddi.h \ dciman.h \ dde.h \ + dde.rh \ ddeml.h \ ddk/compstui.h \ ddk/hidsdi.h \ diff --git a/include/dde.h b/include/dde.h index 117b428..508c1ea 100644 --- a/include/dde.h +++ b/include/dde.h @@ -34,17 +34,7 @@ extern "C" { #define WINUSERAPI DECLSPEC_IMPORT #endif -#define WM_DDE_INITIATE 0x3E0 -#define WM_DDE_TERMINATE 0x3E1 -#define WM_DDE_ADVISE 0x3E2 -#define WM_DDE_UNADVISE 0x3E3 -#define WM_DDE_ACK 0x3E4 -#define WM_DDE_DATA 0x3E5 -#define WM_DDE_REQUEST 0x3E6 -#define WM_DDE_POKE 0x3E7 -#define WM_DDE_EXECUTE 0x3E8 -#define WM_DDE_LAST WM_DDE_EXECUTE -#define WM_DDE_FIRST WM_DDE_INITIATE +#include <dde.rh> /* DDEACK: wStatus in WM_DDE_ACK message */ typedef struct diff --git a/include/dde.rh b/include/dde.rh new file mode 100644 index 0000000..23076a8 --- /dev/null +++ b/include/dde.rh @@ -0,0 +1,32 @@ +/* + * Copyright 1995, Technion, Israel Institute of Technology + * Electrical Eng, Software Lab. + * Author: Michael Veksler. + * Purpose: dde declarations + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WM_DDE_INITIATE 0x3E0 +#define WM_DDE_TERMINATE 0x3E1 +#define WM_DDE_ADVISE 0x3E2 +#define WM_DDE_UNADVISE 0x3E3 +#define WM_DDE_ACK 0x3E4 +#define WM_DDE_DATA 0x3E5 +#define WM_DDE_REQUEST 0x3E6 +#define WM_DDE_POKE 0x3E7 +#define WM_DDE_EXECUTE 0x3E8 +#define WM_DDE_LAST WM_DDE_EXECUTE +#define WM_DDE_FIRST WM_DDE_INITIATE diff --git a/include/winresrc.h b/include/winresrc.h index e179217..2f99661 100644 --- a/include/winresrc.h +++ b/include/winresrc.h @@ -37,7 +37,7 @@ #include <winuser.rh> #include <commctrl.rh> -/* FIXME: #include <dde.rh> */ +#include <dde.rh> #include <winnt.rh> #include <dlgs.h> #include <winver.h>

1 0

Francois Gouget : include: Update commctrl. rh and remove duplication with commctrl.h.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: b078248120e194052301e8fd771ddb91e676a7a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b078248120e194052301e8fd7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 14 10:04:20 2011 +0100 include: Update commctrl.rh and remove duplication with commctrl.h. --- include/commctrl.h | 158 +-------------------------------------------------- include/commctrl.rh | 127 +++++++++++++++++++++++------------------ 2 files changed, 72 insertions(+), 213 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b078248120e194052301e…

1 0

Stefan Dösinger : ddraw/tests: Add a test for YV12 partial block locks and lock offsets.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: a9c72d8772b322eec5513c0d399148f7de5d8732 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c72d8772b322eec5513c0d3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 13 21:44:27 2011 +0200 ddraw/tests: Add a test for YV12 partial block locks and lock offsets. --- dlls/ddraw/tests/overlay.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/overlay.c b/dlls/ddraw/tests/overlay.c index 4f1ac92..6288be1 100644 --- a/dlls/ddraw/tests/overlay.c +++ b/dlls/ddraw/tests/overlay.c @@ -1,7 +1,7 @@ /* * Unit tests for DirectDraw overlay functions * - * Copyright (C) 2008 Stefan Dösinger for CodeWeavers + * Copyright (C) 2008,2011 Stefan Dösinger for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -195,6 +195,9 @@ static void yv12_test(void) HRESULT hr; DDSURFACEDESC2 desc; IDirectDrawSurface7 *surface; + char *base; + RECT rect = {13, 17, 14, 18}; + unsigned int offset; surface = create_overlay(256, 256, MAKEFOURCC('Y','V','1','2')); if(!surface) { @@ -217,6 +220,20 @@ static void yv12_test(void) /* The overlay pitch seems to have 256 byte alignment */ ok((U1(desc).lPitch & 0xff) == 0, "Expected 256 byte aligned pitch, got %u\n", U1(desc).lPitch); + base = desc.lpSurface; + + hr = IDirectDrawSurface7_Unlock(surface, NULL); + ok(hr == DD_OK, "IDirectDrawSurface7_Unlock returned 0x%08x, expected DD_OK\n", hr); + + /* YV12 uses 2x2 blocks with 6 bytes per block(4*Y, 1*U, 1*V). Unlike other block-based formats like DXT + * the entire Y channel is stored in one big chunk of memory, followed by the chroma channels. So + * partial locks do not really make sense. Show that they are allowed nevertheless and the offset points + * into the luminance data */ + hr = IDirectDrawSurface7_Lock(surface, &rect, &desc, 0, NULL); + ok(hr == DD_OK, "Partial lock of a YV12 surface returned 0x%08x, expected DD_OK\n", hr); + offset = ((const char *) desc.lpSurface - base); + ok(offset == rect.top * U1(desc).lPitch + rect.left, "Expected %u byte offset from partial lock, got %u\n", + rect.top * U1(desc).lPitch + rect.left, offset); hr = IDirectDrawSurface7_Unlock(surface, NULL); ok(hr == DD_OK, "IDirectDrawSurface7_Unlock returned 0x%08x, expected DD_OK\n", hr);

1 0

Stefan Dösinger : ddraw/tests: Add a YV12 blit test.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: edfeec60b164caccf6375cff91b3fc142fe2dbd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edfeec60b164caccf6375cff9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 8 23:05:08 2011 +0100 ddraw/tests: Add a YV12 blit test. --- dlls/ddraw/tests/overlay.c | 49 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/overlay.c b/dlls/ddraw/tests/overlay.c index 6288be1..ded7c5a 100644 --- a/dlls/ddraw/tests/overlay.c +++ b/dlls/ddraw/tests/overlay.c @@ -194,10 +194,10 @@ static void yv12_test(void) { HRESULT hr; DDSURFACEDESC2 desc; - IDirectDrawSurface7 *surface; + IDirectDrawSurface7 *surface, *dst; char *base; RECT rect = {13, 17, 14, 18}; - unsigned int offset; + unsigned int offset, y; surface = create_overlay(256, 256, MAKEFOURCC('Y','V','1','2')); if(!surface) { @@ -220,7 +220,23 @@ static void yv12_test(void) /* The overlay pitch seems to have 256 byte alignment */ ok((U1(desc).lPitch & 0xff) == 0, "Expected 256 byte aligned pitch, got %u\n", U1(desc).lPitch); + /* Fill the surface with some data for the blit test */ base = desc.lpSurface; + /* Luminance */ + for (y = 0; y < desc.dwHeight; y++) + { + memset(base + desc.lPitch * y, 0x10, desc.dwWidth); + } + /* V */ + for (; y < desc.dwHeight + desc.dwHeight / 4; y++) + { + memset(base + desc.lPitch * y, 0x20, desc.dwWidth); + } + /* U */ + for (; y < desc.dwHeight + desc.dwHeight / 2; y++) + { + memset(base + desc.lPitch * y, 0x30, desc.dwWidth); + } hr = IDirectDrawSurface7_Unlock(surface, NULL); ok(hr == DD_OK, "IDirectDrawSurface7_Unlock returned 0x%08x, expected DD_OK\n", hr); @@ -237,6 +253,35 @@ static void yv12_test(void) hr = IDirectDrawSurface7_Unlock(surface, NULL); ok(hr == DD_OK, "IDirectDrawSurface7_Unlock returned 0x%08x, expected DD_OK\n", hr); + dst = create_overlay(256, 256, MAKEFOURCC('Y','V','1','2')); + if (!dst) + { + /* Windows XP with a Radeon X1600 GPU refuses to create a second overlay surface, + * DDERR_NOOVERLAYHW, making the blit tests moot */ + skip("Could not create a second YV12 surface, skipping blit test\n"); + goto cleanup; + } + + hr = IDirectDrawSurface7_Blt(dst, NULL, surface, NULL, 0, NULL); + ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned 0x%08x, expected DD_OK\n", hr); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectDrawSurface7_Lock(dst, NULL, &desc, 0, NULL); + ok(hr == DD_OK, "IDirectDrawSurface7_Lock returned 0x%08x, expected DD_OK\n", hr); + + base = desc.lpSurface; + ok(base[0] == 0x10, "Y data is 0x%02x, expected 0x10\n", base[0]); + base += desc.dwHeight * desc.lPitch; + todo_wine ok(base[0] == 0x20, "V data is 0x%02x, expected 0x20\n", base[0]); + base += desc.dwHeight / 4 * desc.lPitch; + todo_wine ok(base[0] == 0x30, "U data is 0x%02x, expected 0x30\n", base[0]); + + hr = IDirectDrawSurface7_Unlock(dst, NULL); + ok(hr == DD_OK, "IDirectDrawSurface7_Unlock returned 0x%08x, expected DD_OK\n", hr); + + IDirectDrawSurface7_Release(dst); +cleanup: IDirectDrawSurface7_Release(surface); }

1 0

Matteo Bruni : wined3d: Fix post-pixelshader blending test.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 56c9952ee66dc5a7ec5281d874d8f9abe486c418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56c9952ee66dc5a7ec5281d87… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Nov 9 22:16:36 2011 +0100 wined3d: Fix post-pixelshader blending test. --- dlls/wined3d/utils.c | 123 ++++++++++++++++++++++++++----------------------- 1 files changed, 65 insertions(+), 58 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 246c9bc..baf2548 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1080,7 +1080,7 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined } glEnable(GL_BLEND); - glClearColor(0, 0, 0, 1); + glClearColor(0.0f, 0.0f, 0.0f, 1.0f); glClear(GL_COLOR_BUFFER_BIT); if (glGetError() == GL_INVALID_FRAMEBUFFER_OPERATION) { @@ -1088,65 +1088,72 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined TRACE("Format doesn't support post-pixelshader blending.\n"); format->flags &= ~WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING; } - - glViewport(0, 0, 16, 16); - glDisable(GL_LIGHTING); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - - /* Draw a full-black quad */ - glBegin(GL_TRIANGLE_STRIP); - glColor4ub(0x00, 0x00, 0x00, 0xff); - glVertex3f(-1.0f, -1.0f, 0.0f); - glColor4ub(0x00, 0x00, 0x00, 0xff); - glVertex3f(1.0f, -1.0f, 0.0f); - glColor4ub(0x00, 0x00, 0x00, 0xff); - glVertex3f(-1.0f, 1.0f, 0.0f); - glColor4ub(0x00, 0x00, 0x00, 0xff); - glVertex3f(1.0f, 1.0f, 0.0f); - glEnd(); - - /* Draw a half-transparent red quad */ - glBegin(GL_TRIANGLE_STRIP); - glColor4ub(0xff, 0x00, 0x00, 0x80); - glVertex3f(-1.0f, -1.0f, 0.0f); - glColor4ub(0xff, 0x00, 0x00, 0x80); - glVertex3f(1.0f, -1.0f, 0.0f); - glColor4ub(0xff, 0x00, 0x00, 0x80); - glVertex3f(-1.0f, 1.0f, 0.0f); - glColor4ub(0xff, 0x00, 0x00, 0x80); - glVertex3f(1.0f, 1.0f, 0.0f); - glEnd(); - - glGenTextures(1, &tex2); - glBindTexture(GL_TEXTURE_2D, tex2); - - glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 0, 0, 16, 16, 0); - glGetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, readback); - checkGLcall("Post-pixelshader blending check"); - - color = readback[7 * 16 + 7]; - a = color >> 24; - r = (color & 0x00ff0000) >> 16; - - if (format->red_mask && (r < 0x7b || r > 0x84)) - match = FALSE; - /* If the alpha component is more than 1 bit */ - else if ((format->alpha_mask & (format->alpha_mask - 1)) && (a < 0x9f || a > 0xdf)) - match = FALSE; - if (!match) + else { - TRACE("Format doesn't support post-pixelshader blending.\n"); - TRACE("Color output: %#x\n", color); - format->flags &= ~WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING; - } + glViewport(0, 0, 16, 16); + glDisable(GL_LIGHTING); + glMatrixMode(GL_MODELVIEW); + glLoadIdentity(); + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + + /* Draw a full-black quad */ + glBegin(GL_TRIANGLE_STRIP); + glColor4ub(0x00, 0x00, 0x00, 0xff); + glVertex3f(-1.0f, -1.0f, 0.0f); + glColor4ub(0x00, 0x00, 0x00, 0xff); + glVertex3f(1.0f, -1.0f, 0.0f); + glColor4ub(0x00, 0x00, 0x00, 0xff); + glVertex3f(-1.0f, 1.0f, 0.0f); + glColor4ub(0x00, 0x00, 0x00, 0xff); + glVertex3f(1.0f, 1.0f, 0.0f); + glEnd(); + + /* Draw a half-transparent red quad */ + glBegin(GL_TRIANGLE_STRIP); + glColor4ub(0xff, 0x00, 0x00, 0x80); + glVertex3f(-1.0f, -1.0f, 0.0f); + glColor4ub(0xff, 0x00, 0x00, 0x80); + glVertex3f(1.0f, -1.0f, 0.0f); + glColor4ub(0xff, 0x00, 0x00, 0x80); + glVertex3f(-1.0f, 1.0f, 0.0f); + glColor4ub(0xff, 0x00, 0x00, 0x80); + glVertex3f(1.0f, 1.0f, 0.0f); + glEnd(); + + glGenTextures(1, &tex2); + glBindTexture(GL_TEXTURE_2D, tex2); + + glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 0, 0, 16, 16, 0); + glGetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, readback); + checkGLcall("Post-pixelshader blending check"); + + color = readback[7 * 16 + 7]; + a = color >> 24; + r = (color & 0x00ff0000) >> 16; + + if (format->red_mask && (r < 0x7b || r > 0x84)) + match = FALSE; + /* If the alpha component is more than 1 bit */ + else if ((format->alpha_mask & (format->alpha_mask - 1)) && (a < 0x9f || a > 0xdf)) + match = FALSE; + if (!match) + { + TRACE("Format doesn't support post-pixelshader blending.\n"); + TRACE("Color output: %#x\n", color); + format->flags &= ~WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING; + } + else + { + TRACE("Format supports post-pixelshader blending.\n"); + format->flags |= WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING; + } - glBindTexture(GL_TEXTURE_2D, tex); - glDeleteTextures(1, &tex2); + glBindTexture(GL_TEXTURE_2D, tex); + glDeleteTextures(1, &tex2); + } if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || gl_info->supported[EXT_PACKED_DEPTH_STENCIL])

1 0

Matteo Bruni : wined3d: Skip blending test on some texture formats.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 62a2ad3d0f8d8435619924a6ff4a19adf94c16cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=62a2ad3d0f8d8435619924a6f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Nov 9 22:16:37 2011 +0100 wined3d: Skip blending test on some texture formats. It doesn't make sense to test NULL and P8, while the luminance formats right now aren't really tested anyway (and "incidentally" that also workarounds a Nvidia drivers bug). --- dlls/wined3d/utils.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index baf2548..d61172e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1061,7 +1061,9 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined } if (status == GL_FRAMEBUFFER_COMPLETE && ((format->flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING) - || !(gl_info->quirks & WINED3D_QUIRK_LIMITED_TEX_FILTERING))) + || !(gl_info->quirks & WINED3D_QUIRK_LIMITED_TEX_FILTERING)) + && format->id != WINED3DFMT_NULL && format->id != WINED3DFMT_P8_UINT + && format->glFormat != GL_LUMINANCE && format->glFormat != GL_LUMINANCE_ALPHA) { GLuint rb, tex2; DWORD readback[16 * 16], color;

1 0

Aric Stewart : usp10: Add some additional Latin script ranges.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: e6ee421e88f9ac4819e7cdb540501eff2cfe369b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6ee421e88f9ac4819e7cdb54… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Nov 11 08:52:27 2011 -0600 usp10: Add some additional Latin script ranges. --- dlls/usp10/usp10.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index a811cad..4ac7b8f 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -114,6 +114,31 @@ static const scriptRange scriptRanges[] = { { Script_Latin, 0x1e00, 0x1eff, 0, 0}, /* Greek Extended: U+1F00–U+1FFF */ { Script_Greek, 0x1f00, 0x1fff, 0, 0}, + /* General Punctuation: U+2000 –U+206f */ + /* Superscripts and Subscripts : U+2070 –U+209f */ + /* Currency Symbols : U+20a0 –U+20cf */ + { Script_Latin, 0x2000, 0x20cf, 0, 0}, + /* Letterlike Symbols : U+2100 –U+214f */ + /* Number Forms : U+2150 –U+218f */ + /* Arrows : U+2190 –U+21ff */ + /* Mathematical Operators : U+2200 –U+22ff */ + /* Miscellaneous Technical : U+2300 –U+23ff */ + /* Control Pictures : U+2400 –U+243f */ + /* Optical Character Recognition : U+2440 –U+245f */ + /* Enclosed Alphanumerics : U+2460 –U+24ff */ + /* Box Drawing : U+2500 –U+25ff */ + /* Block Elements : U+2580 –U+259f */ + /* Geometric Shapes : U+25a0 –U+25ff */ + /* Miscellaneous Symbols : U+2600 –U+26ff */ + /* Dingbats : U+2700 –U+27bf */ + /* Miscellaneous Mathematical Symbols-A : U+27c0 –U+27ef */ + /* Supplemental Arrows-A : U+27f0 –U+27ff */ + { Script_Latin, 0x2100, 0x27ff, 0, 0}, + /* Supplemental Arrows-B : U+2900 –U+297f */ + /* Miscellaneous Mathematical Symbols-B : U+2980 –U+29ff */ + /* Supplemental Mathematical Operators : U+2a00 –U+2aff */ + /* Miscellaneous Symbols and Arrows : U+2b00 –U+2bff */ + { Script_Latin, 0x2900, 0x2bff, 0, 0}, /* Latin Extended-C: U+2C60–U+2C7F */ { Script_Latin, 0x2c60, 0x2c7f, 0, 0}, /* Georgian: U+2D00–U+2D2F */

1 0

Matej Špindler : ws2_32: Test GetAddrInfo with zero port.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 2e5718ba95fadc8f4d0441cb3ca511bcec66a4cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e5718ba95fadc8f4d0441cb3… Author: Matej Špindler <spindler.matej(a)gmail.com> Date: Fri Nov 11 13:58:47 2011 +0100 ws2_32: Test GetAddrInfo with zero port. --- dlls/ws2_32/tests/sock.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7a64e0e..237bc86 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4152,6 +4152,7 @@ static void test_GetAddrInfoW(void) static const WCHAR port[] = {'8','0',0}; static const WCHAR empty[] = {0}; static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; + static const WCHAR zero[] = {'0',0}; int ret; ADDRINFOW *result, hint; @@ -4176,6 +4177,24 @@ static void test_GetAddrInfoW(void) } pFreeAddrInfoW(result); + result = NULL; + ret = pGetAddrInfoW(NULL, zero, NULL, &result); + todo_wine + { + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + } + pFreeAddrInfoW(result); + + result = NULL; + ret = pGetAddrInfoW(empty, zero, NULL, &result); + todo_wine + { + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + } + pFreeAddrInfoW(result); + ret = pGetAddrInfoW(localhost, NULL, NULL, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); pFreeAddrInfoW(result);

1 0

André Hentschel : tapi32: Implement tapiGetLocationInfoW.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: b4c3fcd17a7c91ca985c8422b16c6409d63251c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4c3fcd17a7c91ca985c8422b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 13 17:23:46 2011 +0100 tapi32: Implement tapiGetLocationInfoW. --- dlls/tapi32/assisted.c | 87 +++++++++++++++++++++++++++++++++-------------- dlls/tapi32/tapi32.spec | 1 + 2 files changed, 62 insertions(+), 26 deletions(-) diff --git a/dlls/tapi32/assisted.c b/dlls/tapi32/assisted.c index 27a0c4c..9e68a5c 100644 --- a/dlls/tapi32/assisted.c +++ b/dlls/tapi32/assisted.c @@ -2,6 +2,7 @@ * TAPI32 Assisted Telephony * * Copyright 1999 Andreas Mohr + * Copyright 2011 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -29,50 +30,61 @@ #include "winreg.h" #include "objbase.h" #include "tapi.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(tapi); /*********************************************************************** - * tapiGetLocationInfo (TAPI32.@) + * tapiGetLocationInfoW (TAPI32.@) */ -DWORD WINAPI tapiGetLocationInfoA(LPSTR lpszCountryCode, LPSTR lpszCityCode) +DWORD WINAPI tapiGetLocationInfoW(LPWSTR countrycode, LPWSTR citycode) { HKEY hkey, hsubkey; DWORD currid; DWORD valsize; DWORD type; DWORD bufsize; - BYTE buf[100]; - char szlockey[20]; - if(!RegOpenKeyA(HKEY_LOCAL_MACHINE, - "Software\\Microsoft\\Windows\\CurrentVersion\\Telephony\\Locations", - &hkey) != ERROR_SUCCESS) { + BYTE buf[200]; + WCHAR szlockey[20]; + + static const WCHAR currentidW[] = {'C','u','r','r','e','n','t','I','D',0}; + static const WCHAR locationW[] = {'L','o','c','a','t','i','o','n','%','u',0}; + static const WCHAR areacodeW[] = {'A','r','e','a','C','o','d','e',0}; + static const WCHAR countryW[] = {'C','o','u','n','t','r','y',0}; + static const WCHAR fmtW[] = {'%','u',0}; + + static const WCHAR locations_keyW[] = + {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'T','e','l','e','p','h','o','n','y','\\','L','o','c','a','t','i','o','n','s',0}; + + if(!RegOpenKeyW(HKEY_LOCAL_MACHINE, locations_keyW, &hkey) != ERROR_SUCCESS) { valsize = sizeof( DWORD); - if(!RegQueryValueExA(hkey, "CurrentID", 0, &type, (LPBYTE) &currid, - &valsize) && type == REG_DWORD) { + if(!RegQueryValueExW(hkey, currentidW, 0, &type, (LPBYTE) &currid, &valsize) && + type == REG_DWORD) { /* find a subkey called Location1, Location2... */ - sprintf( szlockey, "Location%u", currid); - if( !RegOpenKeyA( hkey, szlockey, &hsubkey)) { - if( lpszCityCode) { + sprintfW( szlockey, locationW, currid); + if( !RegOpenKeyW( hkey, szlockey, &hsubkey)) { + if( citycode) { bufsize=sizeof(buf); - if( !RegQueryValueExA( hsubkey, "AreaCode", 0, &type, buf, - &bufsize) && type == REG_SZ) { - lstrcpynA( lpszCityCode, (char *) buf, 8); + if( !RegQueryValueExW( hsubkey, areacodeW, 0, &type, buf, &bufsize) && + type == REG_SZ) { + lstrcpynW( citycode, (WCHAR *) buf, 8); } else - lpszCityCode[0] = '\0'; + citycode[0] = '\0'; } - if( lpszCountryCode) { + if( countrycode) { bufsize=sizeof(buf); - if( !RegQueryValueExA( hsubkey, "Country", 0, &type, buf, - &bufsize) && type == REG_DWORD) - snprintf( lpszCountryCode, 8, "%u", *(LPDWORD) buf ); + if( !RegQueryValueExW( hsubkey, countryW, 0, &type, buf, &bufsize) && + type == REG_DWORD) + snprintfW( countrycode, 8, fmtW, *(LPDWORD) buf ); else - lpszCountryCode[0] = '\0'; + countrycode[0] = '\0'; } - TRACE("(%p \"%s\", %p \"%s\"): success.\n", - lpszCountryCode, debugstr_a(lpszCountryCode), - lpszCityCode, debugstr_a(lpszCityCode)); + TRACE("(%p \"%s\", %p \"%s\"): success.\n", countrycode, debugstr_w(countrycode), + citycode, debugstr_w(citycode)); RegCloseKey( hkey); RegCloseKey( hsubkey); return 0; /* SUCCESS */ @@ -80,11 +92,34 @@ DWORD WINAPI tapiGetLocationInfoA(LPSTR lpszCountryCode, LPSTR lpszCityCode) } RegCloseKey( hkey); } - WARN("(%p, %p): failed (no telephony registry entries?).\n", - lpszCountryCode, lpszCityCode); + WARN("(%p, %p): failed (no telephony registry entries?).\n", countrycode, citycode); return TAPIERR_REQUESTFAILED; } + +/*********************************************************************** + * tapiGetLocationInfoA (TAPI32.@) + */ +DWORD WINAPI tapiGetLocationInfoA(LPSTR countrycode, LPSTR citycode) +{ + DWORD ret, len; + LPWSTR country, city; + + len = MultiByteToWideChar( CP_ACP, 0, countrycode, -1, NULL, 0 ); + country = HeapAlloc( GetProcessHeap(), 0, len ); + MultiByteToWideChar( CP_ACP, 0, countrycode, -1, country, len ); + + len = MultiByteToWideChar( CP_ACP, 0, citycode, -1, NULL, 0 ); + city = HeapAlloc( GetProcessHeap(), 0, len ); + MultiByteToWideChar( CP_ACP, 0, citycode, -1, city, len ); + + ret = tapiGetLocationInfoW(country, city); + + HeapFree( GetProcessHeap(), 0, city ); + HeapFree( GetProcessHeap(), 0, country ); + return ret; +} + /*********************************************************************** * tapiRequestMakeCall (TAPI32.@) */ diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec index ce7a04d..b95f86f 100644 --- a/dlls/tapi32/tapi32.spec +++ b/dlls/tapi32/tapi32.spec @@ -160,6 +160,7 @@ @ stdcall phoneShutdown(long) @ stdcall tapiGetLocationInfo(str str) tapiGetLocationInfoA @ stdcall tapiGetLocationInfoA(str str) +@ stdcall tapiGetLocationInfoW(wstr wstr) @ stub tapiRequestDrop @ stdcall tapiRequestMakeCall(str str str str) tapiRequestMakeCallA @ stdcall tapiRequestMakeCallA(str str str str)

1 0

Juan Lang : iphlpapi: Implement retrieving IPv4 addresses using getifaddrs, when available.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 25b014b6e73138db8087ee290c1b9a65fa15db15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b014b6e73138db8087ee290… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Nov 13 12:37:43 2011 -0800 iphlpapi: Implement retrieving IPv4 addresses using getifaddrs, when available. --- dlls/iphlpapi/ifenum.c | 120 ++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 101 insertions(+), 19 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index a0d7577..d84caed 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -670,6 +670,102 @@ DWORD getInterfaceEntryByName(const char *name, PMIB_IFROW entry) return ret; } +static DWORD getIPAddrRowByName(PMIB_IPADDRROW ipAddrRow, const char *ifName, + const struct sockaddr *sa) +{ + DWORD ret, bcast; + + ret = getInterfaceIndexByName(ifName, &ipAddrRow->dwIndex); + memcpy(&ipAddrRow->dwAddr, sa->sa_data + 2, sizeof(DWORD)); + ipAddrRow->dwMask = getInterfaceMaskByName(ifName); + /* the dwBCastAddr member isn't the broadcast address, it indicates whether + * the interface uses the 1's broadcast address (1) or the 0's broadcast + * address (0). + */ + bcast = getInterfaceBCastAddrByName(ifName); + ipAddrRow->dwBCastAddr = (bcast & ipAddrRow->dwMask) ? 1 : 0; + /* FIXME: hardcoded reasm size, not sure where to get it */ + ipAddrRow->dwReasmSize = 65535; + ipAddrRow->unused1 = 0; + ipAddrRow->wType = 0; + return ret; +} + +#ifdef HAVE_IFADDRS_H + +/* Counts the IPv4 addresses in the system using the return value from + * getifaddrs, returning the count. + */ +static DWORD countIPv4Addresses(struct ifaddrs *ifa) +{ + DWORD numAddresses = 0; + + for (; ifa; ifa = ifa->ifa_next) + if (ifa->ifa_addr && ifa->ifa_addr->sa_family == AF_INET) + numAddresses++; + return numAddresses; +} + +DWORD getNumIPAddresses(void) +{ + DWORD numAddresses = 0; + struct ifaddrs *ifa; + + if (!getifaddrs(&ifa)) + { + numAddresses = countIPv4Addresses(ifa); + freeifaddrs(ifa); + } + return numAddresses; +} + +DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags) +{ + DWORD ret; + + if (!ppIpAddrTable) + ret = ERROR_INVALID_PARAMETER; + else + { + struct ifaddrs *ifa; + + if (!getifaddrs(&ifa)) + { + DWORD size = sizeof(MIB_IPADDRTABLE); + DWORD numAddresses = countIPv4Addresses(ifa); + + if (numAddresses > 1) + size += (numAddresses - 1) * sizeof(MIB_IPADDRROW); + *ppIpAddrTable = HeapAlloc(heap, flags, size); + if (*ppIpAddrTable) + { + DWORD i = 0; + struct ifaddrs *ifp; + + ret = NO_ERROR; + (*ppIpAddrTable)->dwNumEntries = numAddresses; + for (ifp = ifa; !ret && ifp; ifp = ifp->ifa_next) + { + if (!ifp->ifa_addr || ifp->ifa_addr->sa_family != AF_INET) + continue; + + ret = getIPAddrRowByName(&(*ppIpAddrTable)->table[i], ifp->ifa_name, + ifp->ifa_addr); + i++; + } + } + else + ret = ERROR_OUTOFMEMORY; + freeifaddrs(ifa); + } + else + ret = ERROR_INVALID_PARAMETER; + } + return ret; +} + +#else + /* Enumerates the IP addresses in the system using SIOCGIFCONF, returning * the count to you in *pcAddresses. It also returns to you the struct ifconf * used by the call to ioctl, so that you may process the addresses further. @@ -763,7 +859,7 @@ DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags) size += (numAddresses - 1) * sizeof(MIB_IPADDRROW); *ppIpAddrTable = HeapAlloc(heap, flags, size); if (*ppIpAddrTable) { - DWORD i = 0, bcast; + DWORD i = 0; caddr_t ifPtr; ret = NO_ERROR; @@ -777,24 +873,8 @@ DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags) if (ifr->ifr_addr.sa_family != AF_INET) continue; - ret = getInterfaceIndexByName(ifr->ifr_name, - &(*ppIpAddrTable)->table[i].dwIndex); - memcpy(&(*ppIpAddrTable)->table[i].dwAddr, ifr->ifr_addr.sa_data + 2, - sizeof(DWORD)); - (*ppIpAddrTable)->table[i].dwMask = - getInterfaceMaskByName(ifr->ifr_name); - /* the dwBCastAddr member isn't the broadcast address, it indicates - * whether the interface uses the 1's broadcast address (1) or the - * 0's broadcast address (0). - */ - bcast = getInterfaceBCastAddrByName(ifr->ifr_name); - (*ppIpAddrTable)->table[i].dwBCastAddr = - (bcast & (*ppIpAddrTable)->table[i].dwMask) ? 1 : 0; - /* FIXME: hardcoded reasm size, not sure where to get it */ - (*ppIpAddrTable)->table[i].dwReasmSize = 65535; - - (*ppIpAddrTable)->table[i].unused1 = 0; - (*ppIpAddrTable)->table[i].wType = 0; + ret = getIPAddrRowByName(&(*ppIpAddrTable)->table[i], ifr->ifr_name, + &ifr->ifr_addr); i++; } } @@ -806,6 +886,8 @@ DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags) return ret; } +#endif + #ifdef HAVE_IFADDRS_H ULONG v6addressesFromIndex(DWORD index, SOCKET_ADDRESS **addrs, ULONG *num_addrs) {

1 0