wine-commits March 2013

wine-commits@winehq.org

2 participants
531 discussions

Detlef Riekenberg : kernel32/tests: Fix failures with virtual Drives ( AppVirt Client).
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: 3826193f33fbbf726dd02d4a2187f3117f0bd0ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=3826193f33fbbf726dd02d4a2… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Mar 11 00:11:22 2013 +0100 kernel32/tests: Fix failures with virtual Drives (AppVirt Client). --- dlls/kernel32/tests/drive.c | 43 ++++++++++++++++--------------------------- 1 files changed, 16 insertions(+), 27 deletions(-) diff --git a/dlls/kernel32/tests/drive.c b/dlls/kernel32/tests/drive.c index 14c0cf2..ca6cb44 100644 --- a/dlls/kernel32/tests/drive.c +++ b/dlls/kernel32/tests/drive.c @@ -114,16 +114,12 @@ static void test_GetDiskFreeSpaceA(void) drive, ret, GetLastError()); else { - ok(ret || - GetLastError() == ERROR_NOT_READY || - GetLastError() == ERROR_INVALID_FUNCTION || - GetLastError() == ERROR_INVALID_DRIVE || - GetLastError() == ERROR_PATH_NOT_FOUND || - GetLastError() == ERROR_REQUEST_ABORTED || - GetLastError() == ERROR_NETNAME_DELETED || - GetLastError() == ERROR_UNRECOGNIZED_VOLUME, - "GetDiskFreeSpaceA(%s): ret=%d GetLastError=%d\n", - drive, ret, GetLastError()); + + if (!ret) + /* GetDiskFreeSpaceA() should succeed, but it can fail with too many + different GetLastError() results to be usable for a ok() */ + trace("GetDiskFreeSpaceA(%s) failed with %d\n", drive, GetLastError()); + if( GetVersion() & 0x80000000) /* win3.0 through winME */ ok( total_clusters <= 65535, @@ -135,14 +131,12 @@ static void test_GetDiskFreeSpaceA(void) tot.QuadPart = sectors_per_cluster; tot.QuadPart = (tot.QuadPart * bytes_per_sector) * total_clusters; ret = pGetDiskFreeSpaceExA( drive, &d, &totEx, NULL); - ok( ret || - GetLastError() == ERROR_NOT_READY || - GetLastError() == ERROR_INVALID_FUNCTION || - GetLastError() == ERROR_PATH_NOT_FOUND || - GetLastError() == ERROR_REQUEST_ABORTED || - GetLastError() == ERROR_NETNAME_DELETED || - GetLastError() == ERROR_UNRECOGNIZED_VOLUME, - "GetDiskFreeSpaceExA( %s ) failed. GetLastError=%d\n", drive, GetLastError()); + + if (!ret) + /* GetDiskFreeSpaceExA() should succeed, but it can fail with too many + different GetLastError() results to be usable for a ok() */ + trace("GetDiskFreeSpaceExA(%s) failed with %d\n", drive, GetLastError()); + ok( bytes_per_sector == 0 || /* empty cd rom drive */ totEx.QuadPart <= tot.QuadPart, "GetDiskFreeSpaceA should report at least as much bytes on disk %s as GetDiskFreeSpaceExA\n", drive); @@ -196,15 +190,10 @@ static void test_GetDiskFreeSpaceW(void) ok(!ret && GetLastError() == ERROR_PATH_NOT_FOUND, "GetDiskFreeSpaceW(%c): ret=%d GetLastError=%d\n", drive[0], ret, GetLastError()); - else - ok( ret || - GetLastError() == ERROR_NOT_READY || - GetLastError() == ERROR_INVALID_FUNCTION || - GetLastError() == ERROR_PATH_NOT_FOUND || - GetLastError() == ERROR_REQUEST_ABORTED || - GetLastError() == ERROR_UNRECOGNIZED_VOLUME, - "GetDiskFreeSpaceW(%c): ret=%d GetLastError=%d\n", - drive[0], ret, GetLastError()); + else if (!ret) + /* GetDiskFreeSpaceW() should succeed, but it can fail with too many + different GetLastError() results to be usable for a ok() */ + trace("GetDiskFreeSpaceW(%c) failed with %d\n", drive[0], GetLastError()); } logical_drives >>= 1; }

1 0

Ken Thomases : winemac: Override -[NSOpenGLContext clearDrawable] to not hide the GL surface.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: 4d51a688e37d070d6345587d63facbc630a43a3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d51a688e37d070d6345587d6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 10 17:38:30 2013 -0500 winemac: Override -[NSOpenGLContext clearDrawable] to not hide the GL surface. This fixes a problem with flickering when repeatedly attaching and detaching a GL context from a window, such as for each WM_PAINT. --- dlls/winemac.drv/cocoa_opengl.m | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 5879b4d..f67ea89 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -38,6 +38,31 @@ [super dealloc]; } + /* On at least some versions of Mac OS X, -[NSOpenGLContext clearDrawable] has the + undesirable side effect of ordering the view's GL surface off-screen. This isn't + done when just changing the context's view to a different view (which I would + think would be analogous, since the old view and surface end up without a + context attached). So, we finesse things by first setting the context's view to + a different view (the content view of an off-screen window) and then letting the + original implementation proceed. */ + - (void) clearDrawable + { + static NSWindow* dummyWindow; + static dispatch_once_t once; + + dispatch_once(&once, ^{ + OnMainThread(^{ + dummyWindow = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 100, 100) + styleMask:NSBorderlessWindowMask + backing:NSBackingStoreBuffered + defer:NO]; + }); + }); + + [self setView:[dummyWindow contentView]]; + [super clearDrawable]; + } + @end

1 0

Ken Thomases : winemac: Don' t defer attaching OpenGL context to view if it is backed by a window device .
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: 89a4e5a6d1c77646fd397e3419a91a08533bbfb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89a4e5a6d1c77646fd397e341… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 10 17:38:25 2013 -0500 winemac: Don't defer attaching OpenGL context to view if it is backed by a window device. This fixes a problem with certain OpenGL programs which create a context very briefly before destroying it, like while handling WM_PAINT. --- dlls/winemac.drv/cocoa_opengl.m | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 66eec63..5879b4d 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -21,6 +21,7 @@ #import "cocoa_opengl.h" #include "macdrv_cocoa.h" +#include "cocoa_app.h" @interface WineOpenGLContext () @@ -97,8 +98,21 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) context.needsUpdate = FALSE; if (view) { + __block BOOL windowHasDevice; + macdrv_add_view_opengl_context(v, c); - [context setLatentView:view]; + + OnMainThread(^{ + windowHasDevice = [[view window] windowNumber] > 0; + }); + if (windowHasDevice) + { + [context setView:view]; + [context setLatentView:nil]; + } + else + [context setLatentView:view]; + [context makeCurrentContext]; } else

1 0

Andrew Talbot : dwrite: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: fd00c806bf0e3fc610412c3770c71e5eed7a5d72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd00c806bf0e3fc610412c377… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 9 21:48:49 2013 +0000 dwrite: Avoid signed-unsigned integer comparisons. --- dlls/dwrite/analyzer.c | 2 +- dlls/dwrite/font.c | 4 ++-- dlls/dwrite/main.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index a0a9008..5c692d1 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -211,7 +211,7 @@ static const struct script_range script_ranges[] = { static UINT16 get_char_script( WCHAR c ) { DWORD ch = c; - int i; + unsigned int i; for (i = 0; i < sizeof(script_ranges)/sizeof(struct script_range); i++) { diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 191397e..ec18312 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -288,7 +288,7 @@ static HRESULT WINAPI dwritefontface_GetGlyphIndices(IDWriteFontFace *iface, UIN HFONT hfont; WCHAR *str; HDC hdc; - int i; + unsigned int i; TRACE("(%p)->(%p %u %p)\n", This, codepoints, count, glyph_indices); @@ -783,7 +783,7 @@ static INT CALLBACK enum_font_families(const LOGFONTW *lf, const TEXTMETRICW *tm static void release_font_collection(IDWriteFontCollection *iface) { struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); - int i; + unsigned int i; for (i = 0; i < This->count; i++) heap_free(This->families[i]); diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index c9009a9..da023d9 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -228,7 +228,7 @@ static ULONG WINAPI localizedstrings_Release(IDWriteLocalizedStrings *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) { - int i; + unsigned int i; for (i = 0; i < This->count; i++) { heap_free(This->data[i].locale);

1 0

Andrew Talbot : joy.cpl: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: 3e2c44af7dc0c4a55c14aa4b46923dc86cf67d4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e2c44af7dc0c4a55c14aa4b4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 9 21:48:51 2013 +0000 joy.cpl: Avoid signed-unsigned integer comparisons. --- dlls/joy.cpl/main.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index dec83ff..857cb69 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -233,7 +233,7 @@ static void initialize_disabled_joysticks_list(HWND hwnd) HKEY hkey, appkey; DWORD values = 0; HRESULT hr; - int i; + DWORD i; SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_RESETCONTENT, 0, 0); @@ -394,6 +394,8 @@ static DWORD WINAPI input_thread(void *param) while (!data->stop) { int i; + unsigned int j; + poll_input(&data->joysticks[data->chosen_joystick], &state); dump_joy_state(&state, data->joysticks[data->chosen_joystick].num_buttons); @@ -412,12 +414,12 @@ static DWORD WINAPI input_thread(void *param) axes_pos[2][1] = state.lRz; /* Set pov values */ - for (i = 0; i < sizeof(pov_val)/sizeof(pov_val[0]); i++) + for (j = 0; i < sizeof(pov_val)/sizeof(pov_val[0]); j++) { - if (state.rgdwPOV[0] == pov_val[i]) + if (state.rgdwPOV[0] == pov_val[j]) { - axes_pos[3][0] = pov_pos[i][0]; - axes_pos[3][1] = pov_pos[i][1]; + axes_pos[3][0] = pov_pos[j][0]; + axes_pos[3][1] = pov_pos[j][1]; } }

1 0

Andrew Talbot : msvcp60: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: 956219b5d9801189fa18be8243dd6277410e5a68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=956219b5d9801189fa18be824… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 9 21:48:53 2013 +0000 msvcp60: Avoid signed-unsigned integer comparisons. --- dlls/msvcp60/ios.c | 2 +- dlls/msvcp60/misc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index f68bcde..64b3271 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -2456,7 +2456,7 @@ static FILE* _Fiopen_wchar(const wchar_t *name, int mode, int prot) }; int real_mode = mode & ~(OPENMODE_ate|OPENMODE__Nocreate|OPENMODE__Noreplace|OPENMODE_binary); - int mode_idx; + unsigned int mode_idx; FILE *f = NULL; TRACE("(%s %d %d)\n", debugstr_w(name), mode, prot); diff --git a/dlls/msvcp60/misc.c b/dlls/msvcp60/misc.c index 98eb9cf..a54fd28 100644 --- a/dlls/msvcp60/misc.c +++ b/dlls/msvcp60/misc.c @@ -80,7 +80,7 @@ unsigned short __cdecl wctype(const char *property) { "upper", _UPPER }, { "xdigit", _HEX } }; - int i; + unsigned int i; for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) if(!strcmp(property, properties[i].name))

1 0

Vincent Povirk : gdiplus: Fix GdipCreateBitmapFromGraphics implementation.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: 636e60b6e020a8e37e6dac03481bedcb20f3edca URL: http://source.winehq.org/git/wine.git/?a=commit;h=636e60b6e020a8e37e6dac034… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Mar 9 12:08:27 2013 -0600 gdiplus: Fix GdipCreateBitmapFromGraphics implementation. --- dlls/gdiplus/image.c | 14 +++++----- dlls/gdiplus/tests/graphics.c | 53 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index ff27334..98c0bd0 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1595,12 +1595,9 @@ GpStatus WINGDIPAPI GdipConvertToEmfPlus(const GpGraphics* ref, return NotImplemented; } -/* FIXME: this should create a bitmap in the given size with the attributes - * (resolution etc.) of the graphics object */ GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT width, INT height, GpGraphics* target, GpBitmap** bitmap) { - static int calls; GpStatus ret; TRACE("(%d, %d, %p, %p)\n", width, height, target, bitmap); @@ -1608,12 +1605,15 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT width, INT height, if(!target || !bitmap) return InvalidParameter; - if(!(calls++)) - FIXME("hacked stub\n"); - - ret = GdipCreateBitmapFromScan0(width, height, 0, PixelFormat24bppRGB, + ret = GdipCreateBitmapFromScan0(width, height, 0, PixelFormat32bppPARGB, NULL, bitmap); + if (ret == Ok) + { + GdipGetDpiX(target, &(*bitmap)->image.xres); + GdipGetDpiY(target, &(*bitmap)->image.yres); + } + return ret; } diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 08b2465..e41751a 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4282,6 +4282,58 @@ static void test_alpha_hdc(void) DeleteDC(hdc); } +static void test_bitmapfromgraphics(void) +{ + GpStatus stat; + GpGraphics *graphics = NULL; + HDC hdc = GetDC( hwnd ); + GpBitmap *bitmap = NULL; + PixelFormat format; + REAL imageres, graphicsres; + UINT width, height; + + stat = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, stat); + + stat = GdipCreateBitmapFromGraphics(12, 13, NULL, &bitmap); + expect(InvalidParameter, stat); + + stat = GdipCreateBitmapFromGraphics(12, 13, graphics, NULL); + expect(InvalidParameter, stat); + + stat = GdipCreateBitmapFromGraphics(12, 13, graphics, &bitmap); + expect(Ok, stat); + + stat = GdipGetImagePixelFormat((GpImage*)bitmap, &format); + expect(Ok, stat); + expect(PixelFormat32bppPARGB, format); + + stat = GdipGetDpiX(graphics, &graphicsres); + expect(Ok, stat); + + stat = GdipGetImageHorizontalResolution((GpImage*)bitmap, &imageres); + expect(Ok, stat); + expectf(graphicsres, imageres); + + stat = GdipGetDpiY(graphics, &graphicsres); + expect(Ok, stat); + + stat = GdipGetImageVerticalResolution((GpImage*)bitmap, &imageres); + expect(Ok, stat); + expectf(graphicsres, imageres); + + stat = GdipGetImageWidth((GpImage*)bitmap, &width); + expect(Ok, stat); + expect(12, width); + + stat = GdipGetImageHeight((GpImage*)bitmap, &height); + expect(Ok, stat); + expect(13, height); + + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -4349,6 +4401,7 @@ START_TEST(graphics) test_get_set_textrenderinghint(); test_getdc_scaled(); test_alpha_hdc(); + test_bitmapfromgraphics(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd );

1 0

Jacek Caban : wininet: Skip test_open_url_async on IEs older than 7.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: 3157534347d29b2830b3e691764bc5036dcd8663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3157534347d29b2830b3e6917… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 9 17:52:02 2013 +0100 wininet: Skip test_open_url_async on IEs older than 7. --- dlls/wininet/tests/http.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 7988de4..c2607dc 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -3662,6 +3662,16 @@ static void test_open_url_async(void) ret = InternetSetOptionA(NULL, INTERNET_OPTION_SETTINGS_CHANGED, NULL, 0); ok(ret, "InternetSetOption(INTERNET_OPTION_END_BROWSER_SESSION) failed: %u\n", GetLastError()); + /* + * Some versions of IE6 fail those tests. They pass some notification data as UNICODE string, while + * other versions never do. They also hang of following tests. We disable it for everything older + * than IE7. + */ + if(!pInternetGetSecurityInfoByURLA) { + win_skip("Skipping async open on too old wininet version.\n"); + return; + } + ctx.req = NULL; ctx.event = CreateEvent(NULL, TRUE, FALSE, "Z:_home_hans_jaman-installer.exe_ev1");

1 0

Hans Leidekker : dnsapi: Increase maximum packet size.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: 8981bbd464c1b1dc0704c9624c8955168d2e35db URL: http://source.winehq.org/git/wine.git/?a=commit;h=8981bbd464c1b1dc0704c9624… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Sat Mar 9 12:37:59 2013 +0100 dnsapi: Increase maximum packet size. --- dlls/dnsapi/query.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 2116b11..b1d80dd 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -578,13 +578,13 @@ static DNS_STATUS dns_get_serverlist( PIP4_ARRAY addrs, PDWORD len ) return ERROR_SUCCESS; } -static DNS_STATUS dns_do_query( PCSTR name, WORD type, DWORD options, - PDNS_RECORDA *result ) +#define DNS_MAX_PACKET_SIZE 4096 +static DNS_STATUS dns_do_query( PCSTR name, WORD type, DWORD options, PDNS_RECORDA *result ) { DNS_STATUS ret = DNS_ERROR_RCODE_NOT_IMPLEMENTED; unsigned int i, num; - unsigned char answer[NS_PACKETSZ]; + unsigned char answer[DNS_MAX_PACKET_SIZE]; ns_sect sections[] = { ns_s_an, ns_s_ar }; ns_msg msg;

1 0

Filip Navara : iphlpapi: Use prefixed WS_ structures to avoid misalignment on OS X builds.
by Alexandre Julliard 11 Mar '13

11 Mar '13

Module: wine Branch: master Commit: 7ca40003d2101c73e97acb5c1f1643c8ef1674c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ca40003d2101c73e97acb5c1… Author: Filip Navara <xnavara(a)volny.cz> Date: Sat Mar 9 12:04:17 2013 +0100 iphlpapi: Use prefixed WS_ structures to avoid misalignment on OS X builds. Thanks to Hans Leidekker for diagnosing the problem. --- dlls/iphlpapi/iphlpapi_main.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 600bf8c..aeb91c1 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -848,7 +848,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index if (num_v4addrs) { IP_ADAPTER_UNICAST_ADDRESS *ua; - struct sockaddr_in *sa; + struct WS_sockaddr_in *sa; aa->Flags |= IP_ADAPTER_IPV4_ENABLED; ua = aa->FirstUnicastAddress = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; for (i = 0; i < num_v4addrs; i++) @@ -860,12 +860,12 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index ua->Address.iSockaddrLength = sizeof(struct sockaddr_in); ua->Address.lpSockaddr = (SOCKADDR *)((char *)ua + ua->u.s.Length); - sa = (struct sockaddr_in *)ua->Address.lpSockaddr; - sa->sin_family = AF_INET; - sa->sin_addr.s_addr = v4addrs[i]; - sa->sin_port = 0; + sa = (struct WS_sockaddr_in *)ua->Address.lpSockaddr; + sa->sin_family = WS_AF_INET; + sa->sin_addr.S_un.S_addr = v4addrs[i]; + sa->sin_port = 0; TRACE("IPv4 %d/%d: %s\n", i + 1, num_v4addrs, - debugstr_ipv4(&sa->sin_addr.s_addr, addr_buf)); + debugstr_ipv4(&sa->sin_addr.S_un.S_addr, addr_buf)); ptr += ua->u.s.Length + ua->Address.iSockaddrLength; if (i < num_v4addrs - 1)

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
54
Older →

Jump to page:

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-commits March 2013