April 2009 - Wine-Commits - list.winehq.org

Paul TBBle Hampson : gdi32: Remove tabs from init_system_links TRACEs.
by Alexandre Julliard April 30, 2009

April 30, 2009

Module: wine Branch: master Commit: 4b45767e2ad4c151803c681889da9acaa320ebdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b45767e2ad4c151803c68188… Author: Paul TBBle Hampson <Paul.Hampson(a)Pobox.com> Date: Thu Apr 16 00:33:14 2009 +1000 gdi32: Remove tabs from init_system_links TRACEs. --- dlls/gdi32/freetype.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5498c72..2f2c63e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1651,8 +1651,6 @@ static BOOL init_system_links(void) index = 0; while(RegEnumValueW(hkey, index++, value, &val_len, NULL, &type, (LPBYTE)data, &data_len) == ERROR_SUCCESS) { - TRACE("%s:\n", debugstr_w(value)); - memset(&fs, 0, sizeof(fs)); font_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*font_link)); psub = get_font_subst(&font_subst_list, value, -1); @@ -1663,7 +1661,7 @@ static BOOL init_system_links(void) WCHAR *face_name; CHILD_FONT *child_font; - TRACE("\t%s\n", debugstr_w(entry)); + TRACE("%s: %s\n", debugstr_w(value), debugstr_w(entry)); next = entry + strlenW(entry) + 1;

1 0

Hans Leidekker : wininet: Replace any existing content length header in HttpSendRequest.
by Alexandre Julliard April 30, 2009

April 30, 2009

Module: wine Branch: master Commit: 3fc27f67f3c02c5e203d8aec2f7867f65aa0f7f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fc27f67f3c02c5e203d8aec2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 30 09:15:11 2009 +0200 wininet: Replace any existing content length header in HttpSendRequest. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ac0b88f..9b746f5 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3277,7 +3277,7 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, if (dwContentLength || strcmpW(lpwhr->lpszVerb, szGET)) { sprintfW(contentLengthStr, szContentLength, dwContentLength); - HTTP_HttpAddRequestHeadersW(lpwhr, contentLengthStr, -1L, HTTP_ADDREQ_FLAG_ADD_IF_NEW); + HTTP_HttpAddRequestHeadersW(lpwhr, contentLengthStr, -1L, HTTP_ADDREQ_FLAG_REPLACE); lpwhr->dwBytesToWrite = dwContentLength; } if (lpwhr->lpHttpSession->lpAppInfo->lpszAgent)

1 0

André Hentschel : winemaker: Ignore quotes in source filenames.
by Alexandre Julliard April 30, 2009

April 30, 2009

Module: wine Branch: master Commit: a021e836ad8a474dbf218ac7e53f2c766229b1c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a021e836ad8a474dbf218ac7e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 29 19:42:24 2009 +0200 winemaker: Ignore quotes in source filenames. --- tools/winemaker | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 1df8fa7..5300e15 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1742,6 +1742,8 @@ sub search_from($$) } foreach my $component (@$path) { + $component=~s/^\"//; + $component=~s/\"$//; #print " looking for $component in \"$dirname\"\n"; if ($component eq ".") { # Pass it as is

1 0

Timo Kreuzer : comctl32: Change UINT to UINT_PTR in CreateToolbarEx.
by Alexandre Julliard April 30, 2009

April 30, 2009

Module: wine Branch: master Commit: b4cc117b38bb48df8d0fa52d4bf0d0bfd9c18bf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4cc117b38bb48df8d0fa52d4… Author: Timo Kreuzer <timo.kreuzer(a)web.de> Date: Wed Apr 29 12:39:56 2009 -0400 comctl32: Change UINT to UINT_PTR in CreateToolbarEx. --- dlls/comctl32/commctrl.c | 2 +- include/commctrl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 782d9b9..db0eade 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -772,7 +772,7 @@ InitCommonControlsEx (const INITCOMMONCONTROLSEX *lpInitCtrls) HWND WINAPI CreateToolbarEx (HWND hwnd, DWORD style, UINT wID, INT nBitmaps, - HINSTANCE hBMInst, UINT wBMID, LPCTBBUTTON lpButtons, + HINSTANCE hBMInst, UINT_PTR wBMID, LPCTBBUTTON lpButtons, INT iNumButtons, INT dxButton, INT dyButton, INT dxBitmap, INT dyBitmap, UINT uStructSize) { diff --git a/include/commctrl.h b/include/commctrl.h index 4727e3e..a65c9ac 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1599,7 +1599,7 @@ CreateToolbar(HWND, DWORD, UINT, INT, HINSTANCE, HWND WINAPI CreateToolbarEx(HWND, DWORD, UINT, INT, - HINSTANCE, UINT, LPCTBBUTTON, + HINSTANCE, UINT_PTR, LPCTBBUTTON, INT, INT, INT, INT, INT, UINT); HBITMAP WINAPI

1 0

Hans Leidekker : wininet: Implement InternetReadFileEx for ftp requests.
by Alexandre Julliard April 30, 2009

April 30, 2009

Module: wine Branch: master Commit: 285eeea7ef595a704eca0f4f7944fa8e8a9c6270 URL: http://source.winehq.org/git/wine.git/?a=commit;h=285eeea7ef595a704eca0f4f7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 30 09:14:36 2009 +0200 wininet: Implement InternetReadFileEx for ftp requests. --- dlls/wininet/ftp.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index ef1eef1..db0bf56 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1138,6 +1138,18 @@ static DWORD FTPFILE_ReadFile(WININETHANDLEHEADER *hdr, void *buffer, DWORD size return res>=0 ? ERROR_SUCCESS : INTERNET_ERROR_BASE; /* FIXME*/ } +static DWORD FTPFILE_ReadFileExA(WININETHANDLEHEADER *hdr, INTERNET_BUFFERSA *buffers, + DWORD flags, DWORD_PTR context) +{ + return FTPFILE_ReadFile(hdr, buffers->lpvBuffer, buffers->dwBufferLength, &buffers->dwBufferLength); +} + +static DWORD FTPFILE_ReadFileExW(WININETHANDLEHEADER *hdr, INTERNET_BUFFERSW *buffers, + DWORD flags, DWORD_PTR context) +{ + return FTPFILE_ReadFile(hdr, buffers->lpvBuffer, buffers->dwBufferLength, &buffers->dwBufferLength); +} + static BOOL FTPFILE_WriteFile(WININETHANDLEHEADER *hdr, const void *buffer, DWORD size, DWORD *written) { LPWININETFTPFILE lpwh = (LPWININETFTPFILE) hdr; @@ -1224,8 +1236,8 @@ static const HANDLEHEADERVtbl FTPFILEVtbl = { FTPFILE_QueryOption, NULL, FTPFILE_ReadFile, - NULL, - NULL, + FTPFILE_ReadFileExA, + FTPFILE_ReadFileExW, FTPFILE_WriteFile, FTPFILE_QueryDataAvailable, NULL

1 0

Nikolay Sivov : comctl32/header: Reset internal drag state on mouse up.
by Alexandre Julliard April 30, 2009

April 30, 2009

Module: wine Branch: master Commit: 4ba9e61661cdf25a13010b7be7f16e957a252ad2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ba9e61661cdf25a13010b7be… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Apr 29 21:31:05 2009 +0400 comctl32/header: Reset internal drag state on mouse up. --- dlls/comctl32/header.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index f9eba99..7e6e0ff 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1663,7 +1663,8 @@ HEADER_LButtonUp (HWND hwnd, LPARAM lParam) } else InvalidateRect(hwnd, &infoPtr->items[infoPtr->iMoveItem].rect, FALSE); - + + infoPtr->bDragging = FALSE; HEADER_SetHotDivider(hwnd, FALSE, -1); } else if (!(dwStyle&HDS_DRAGDROP) || !HEADER_IsDragDistance(infoPtr, &pt))

1 0

Paul TBBle Hampson : gdi32: Ensure font name comparisons are case-insensitive.
by Alexandre Julliard April 30, 2009

April 30, 2009

Module: wine Branch: master Commit: 0cde093fdc8fac7f157cee0557e2c9e806b5e595 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cde093fdc8fac7f157cee055… Author: Paul TBBle Hampson <Paul.Hampson(a)Pobox.com> Date: Thu Apr 16 00:13:30 2009 +1000 gdi32: Ensure font name comparisons are case-insensitive. --- dlls/gdi32/freetype.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 99626d0..5498c72 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1340,7 +1340,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ localised_family = NULL; if(!fake_family) { localised_family = get_familyname(ft_face); - if(localised_family && !strcmpW(localised_family, english_family)) { + if(localised_family && !strcmpiW(localised_family, english_family)) { HeapFree(GetProcessHeap(), 0, localised_family); localised_family = NULL; } @@ -1349,7 +1349,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ family = NULL; LIST_FOR_EACH(family_elem_ptr, &font_list) { family = LIST_ENTRY(family_elem_ptr, Family, entry); - if(!strcmpW(family->FamilyName, localised_family ? localised_family : english_family)) + if(!strcmpiW(family->FamilyName, localised_family ? localised_family : english_family)) break; family = NULL; } @@ -1410,7 +1410,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ while(face_elem_ptr) { face = LIST_ENTRY(face_elem_ptr, Face, entry); face_elem_ptr = list_next(&family->faces, face_elem_ptr); - if(!strcmpW(face->StyleName, StyleW) && + if(!strcmpiW(face->StyleName, StyleW) && (FT_IS_SCALABLE(ft_face) || ((size->y_ppem == face->size.y_ppem) && !memcmp(&fs, &face->fs, sizeof(fs)) ))) { TRACE("Already loaded font %s %s original version is %lx, this version is %lx\n", debugstr_w(family->FamilyName), debugstr_w(StyleW), @@ -3199,7 +3199,7 @@ static BOOL create_child_font_list(GdiFont *font) LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry) { - if(!strcmpW(font_link->font_name, font->name)) + if(!strcmpiW(font_link->font_name, font->name)) { TRACE("found entry in system list\n"); LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry) @@ -3220,10 +3220,10 @@ static BOOL create_child_font_list(GdiFont *font) */ if (use_default_fallback && font->charset != SYMBOL_CHARSET && font->charset != OEM_CHARSET && - strcmpW(font->name,szDefaultFallbackLink) != 0) + strcmpiW(font->name,szDefaultFallbackLink) != 0) LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry) { - if(!strcmpW(font_link->font_name,szDefaultFallbackLink)) + if(!strcmpiW(font_link->font_name,szDefaultFallbackLink)) { TRACE("found entry in default fallback list\n"); LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry)

1 0

Nikolay Sivov : comctl32/listview: Don't draw wrapped focus rectangle.
by Alexandre Julliard April 30, 2009

April 30, 2009

Module: wine Branch: master Commit: 146209381b341e37c4bd3f821a81f4a88c5fc003 URL: http://source.winehq.org/git/wine.git/?a=commit;h=146209381b341e37c4bd3f821… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Apr 29 23:04:56 2009 +0400 comctl32/listview: Don't draw wrapped focus rectangle. --- dlls/comctl32/listview.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 901893f..bfe47a3 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1412,6 +1412,13 @@ static inline BOOL LISTVIEW_GetItemW(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpL return LISTVIEW_GetItemT(infoPtr, lpLVItem, TRUE); } +/* used to handle collapse main item column case */ +static inline BOOL LISTVIEW_DrawFocusRect(const LISTVIEW_INFO *infoPtr, HDC hdc) +{ + return (infoPtr->rcFocus.left < infoPtr->rcFocus.right) ? + DrawFocusRect(hdc, &infoPtr->rcFocus) : FALSE; +} + /* Listview invalidation functions: use _only_ these functions to invalidate */ static inline BOOL is_redrawing(const LISTVIEW_INFO *infoPtr) @@ -1862,7 +1869,7 @@ static void LISTVIEW_ShowFocusRect(const LISTVIEW_INFO *infoPtr, BOOL fShow) } else { - DrawFocusRect(hdc, &infoPtr->rcFocus); + LISTVIEW_DrawFocusRect(infoPtr, hdc); } done: ReleaseDC(infoPtr->hwndSelf, hdc); @@ -4368,7 +4375,7 @@ static void LISTVIEW_Refresh(LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *prcEra /* if we have a focus rect, draw it */ if (infoPtr->bFocus) - DrawFocusRect(hdc, &infoPtr->rcFocus); + LISTVIEW_DrawFocusRect(infoPtr, hdc); } iterator_destroy(&i);

1 0

Stefan Leichter : shell32: Stub for SHParseDisplayName.
by Alexandre Julliard April 30, 2009

April 30, 2009

Module: wine Branch: master Commit: 946f3f998f80e21995214bd0fddd2054cb9ef26b URL: http://source.winehq.org/git/wine.git/?a=commit;h=946f3f998f80e21995214bd0f… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Apr 29 17:49:24 2009 +0200 shell32: Stub for SHParseDisplayName. --- dlls/shell32/pidl.c | 11 +++++++++++ dlls/shell32/shell32.spec | 1 + include/shlobj.h | 1 + 3 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index f3534d1..3e61144 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1320,6 +1320,17 @@ HRESULT WINAPI SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCI return hr; } +/************************************************************************* + * SHParseDisplayName [SHELL32.@] + */ +HRESULT WINAPI SHParseDisplayName(LPCWSTR name, IBindCtx *bindctx, LPITEMIDLIST *pidlist, + SFGAOF attr_in, SFGAOF *attr_out) +{ + FIXME("%s %p %p %d %p stub!\n", debugstr_w(name), bindctx, pidlist, attr_in, attr_out); + if(pidlist) *pidlist = NULL; + return E_NOTIMPL; +} + /************************************************************************** * * internal functions diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 5713c49..b3fc762 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -373,6 +373,7 @@ @ stdcall SHIsFileAvailableOffline(wstr ptr) @ stdcall SHLoadInProc(long) @ stdcall SHLoadNonloadedIconOverlayIdentifiers() +@ stdcall SHParseDisplayName(wstr ptr ptr long ptr) @ stdcall SHPathPrepareForWriteA(long ptr str long) @ stdcall SHPathPrepareForWriteW(long ptr wstr long) @ stdcall SHQueryRecycleBinA(str ptr) diff --git a/include/shlobj.h b/include/shlobj.h index b7efc85..df3a959 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -64,6 +64,7 @@ BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST,LPWSTR); INT WINAPI SHHandleUpdateImage(LPCITEMIDLIST); HRESULT WINAPI SHILCreateFromPath(LPCWSTR,LPITEMIDLIST*,DWORD*); HRESULT WINAPI SHLoadOLE(LPARAM); +HRESULT WINAPI SHParseDisplayName(LPCWSTR,IBindCtx*,LPITEMIDLIST*,SFGAOF,SFGAOF*); HRESULT WINAPI SHPathPrepareForWriteA(HWND,IUnknown*,LPCSTR,DWORD); HRESULT WINAPI SHPathPrepareForWriteW(HWND,IUnknown*,LPCWSTR,DWORD); #define SHPathPrepareForWrite WINELIB_NAME_AW(SHPathPrepareForWrite);

1 0

Hans Leidekker : include: Add some types and constants used in the IP helper API.
by Alexandre Julliard April 29, 2009

April 29, 2009

Module: wine Branch: master Commit: 185c441c2e6f7450f9b97d67b12a393414404b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=185c441c2e6f7450f9b97d67b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 29 11:40:11 2009 +0200 include: Add some types and constants used in the IP helper API. --- include/ipifcons.h | 29 +++++++++++ include/iptypes.h | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 164 insertions(+), 0 deletions(-) diff --git a/include/ipifcons.h b/include/ipifcons.h index b249b24..fe99b2f 100644 --- a/include/ipifcons.h +++ b/include/ipifcons.h @@ -18,6 +18,35 @@ #ifndef WINE_IPIFCONS_H__ #define WINE_IPIFCONS_H__ +#define IF_TYPE_OTHER 1 +#define IF_TYPE_REGULAR_1822 2 +#define IF_TYPE_HDH_1822 3 +#define IF_TYPE_DDN_X25 4 +#define IF_TYPE_RFC877_X25 5 +#define IF_TYPE_ETHERNET_CSMACD 6 +#define IF_TYPE_IS088023_CSMACD 7 +#define IF_TYPE_ISO88024_TOKENBUS 8 +#define IF_TYPE_ISO88025_TOKENRING 9 +#define IF_TYPE_ISO88026_MAN 10 +#define IF_TYPE_STARLAN 11 +#define IF_TYPE_PROTEON_10MBIT 12 +#define IF_TYPE_PROTEON_80MBIT 13 +#define IF_TYPE_HYPERCHANNEL 14 +#define IF_TYPE_FDDI 15 +#define IF_TYPE_LAP_B 16 +#define IF_TYPE_SDLC 17 +#define IF_TYPE_DS1 18 +#define IF_TYPE_E1 19 +#define IF_TYPE_BASIC_ISDN 20 +#define IF_TYPE_PRIMARY_ISDN 21 +#define IF_TYPE_PROP_POINT2POINT_SERIAL 22 +#define IF_TYPE_PPP 23 +#define IF_TYPE_SOFTWARE_LOOPBACK 24 +#define IF_TYPE_EON 25 +#define IF_TYPE_ETHERNET_3MBIT 26 +#define IF_TYPE_NSIP 27 +#define IF_TYPE_SLIP 28 + #define MIB_IF_TYPE_OTHER 1 #define MIB_IF_TYPE_ETHERNET 6 #define MIB_IF_TYPE_TOKENRING 9 diff --git a/include/iptypes.h b/include/iptypes.h index c0b8115..37a4b9e 100644 --- a/include/iptypes.h +++ b/include/iptypes.h @@ -84,4 +84,139 @@ typedef struct { UINT EnableDns; } FIXED_INFO, *PFIXED_INFO; +typedef enum { + IpPrefixOriginOther = 0, + IpPrefixOriginManual, + IpPrefixOriginWellKnown, + IpPrefixOriginDhcp, + IpPrefixOriginRouterAdvertisement, + IpPrefixOriginUnchanged = 16 +} IP_PREFIX_ORIGIN; + +typedef enum { + IpSuffixOriginOther = 0, + IpSuffixOriginManual, + IpSuffixOriginWellKnown, + IpSuffixOriginDhcp, + IpSuffixOriginLinkLayerAddress, + IpSuffixOriginRandom, + IpSuffixOriginUnchanged = 16 +} IP_SUFFIX_ORIGIN; + +typedef enum { + IfOperStatusUp = 1, + IfOperStatusDown, + IfOperStatusTesting, + IfOperStatusUnknown, + IfOperStatusDormant, + IfOperStatusNotPresent, + IfOperStatusLowerLayerDown +} IF_OPER_STATUS; + +typedef enum { + IpDadStateInvalid = 0, + IpDadStateTentative, + IpDadStateDuplicate, + IpDadStateDeprecated, + IpDadStatePreferred +} IP_DAD_STATE; + +#ifdef _WINSOCK2API_ + +typedef struct _IP_ADAPTER_UNICAST_ADDRESS { + union { + struct { + ULONG Length; + DWORD Flags; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + struct _IP_ADAPTER_UNICAST_ADDRESS *Next; + SOCKET_ADDRESS Address; + IP_PREFIX_ORIGIN PrefixOrigin; + IP_SUFFIX_ORIGIN SuffixOrigin; + IP_DAD_STATE DadState; + ULONG ValidLifetime; + ULONG PreferredLifetime; + ULONG LeaseLifetime; +} IP_ADAPTER_UNICAST_ADDRESS, *PIP_ADAPTER_UNICAST_ADDRESS; + +typedef struct _IP_ADAPTER_ANYCAST_ADDRESS { + union { + ULONGLONG Alignment; + struct { + ULONG Length; + DWORD Flags; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + struct _IP_ADAPTER_ANYCAST_ADDRESS *Next; + SOCKET_ADDRESS Address; +} IP_ADAPTER_ANYCAST_ADDRESS, *PIP_ADAPTER_ANYCAST_ADDRESS; + +typedef struct _IP_ADAPTER_MULTICAST_ADDRESS { + union { + ULONGLONG Alignment; + struct { + ULONG Length; + DWORD Flags; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + struct _IP_ADAPTER_MULTICAST_ADDRESS *Next; + SOCKET_ADDRESS Address; +} IP_ADAPTER_MULTICAST_ADDRESS, *PIP_ADAPTER_MULTICAST_ADDRESS; + +typedef struct _IP_ADAPTER_DNS_SERVER_ADDRESS { + union { + ULONGLONG Alignment; + struct { + ULONG Length; + DWORD Reserved; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + struct _IP_ADAPTER_DNS_SERVER_ADDRESS *Next; + SOCKET_ADDRESS Address; +} IP_ADAPTER_DNS_SERVER_ADDRESS, *PIP_ADAPTER_DNS_SERVER_ADDRESS; + +typedef struct _IP_ADAPTER_PREFIX { + union { + ULONGLONG Alignment; + struct { + ULONG Length; + DWORD Flags; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + struct _IP_ADAPTER_PREFIX *Next; + SOCKET_ADDRESS Address; + ULONG PrefixLength; +} IP_ADAPTER_PREFIX, *PIP_ADAPTER_PREFIX; + +typedef struct _IP_ADAPTER_ADDRESSES { + union { + ULONGLONG Alignment; + struct { + ULONG Length; + DWORD IfIndex; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + struct _IP_ADAPTER_ADDRESSES *Next; + PCHAR AdapterName; + PIP_ADAPTER_UNICAST_ADDRESS FirstUnicastAddress; + PIP_ADAPTER_ANYCAST_ADDRESS FirstAnycastAddress; + PIP_ADAPTER_MULTICAST_ADDRESS FirstMulticastAddress; + PIP_ADAPTER_DNS_SERVER_ADDRESS FirstDnsServerAddress; + PWCHAR DnsSuffix; + PWCHAR Description; + PWCHAR FriendlyName; + BYTE PhysicalAddress[MAX_ADAPTER_ADDRESS_LENGTH]; + DWORD PhysicalAddressLength; + DWORD Flags; + DWORD Mtu; + DWORD IfType; + IF_OPER_STATUS OperStatus; + DWORD Ipv6IfIndex; + DWORD ZoneIndices[16]; + PIP_ADAPTER_PREFIX FirstPrefix; +} IP_ADAPTER_ADDRESSES, *PIP_ADAPTER_ADDRESSES; + +#endif /* _WINSOCK2API_ */ + #endif /* WINE_IPTYPES_H_*/

1 0