September 2010 - Wine-Commits

Juan Lang : include: Add Vista+ fields to IP_ADAPTER_ADDRESSES.
by Alexandre Julliard Sept. 24, 2010

Sept. 24, 2010

Module: wine Branch: master Commit: 873be06c925e666863d06ae1de08229f5898abc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=873be06c925e666863d06ae1d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 14 13:03:57 2010 -0700 include: Add Vista+ fields to IP_ADAPTER_ADDRESSES. --- include/iptypes.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/include/iptypes.h b/include/iptypes.h index 82927a9..16e7ffb 100644 --- a/include/iptypes.h +++ b/include/iptypes.h @@ -28,6 +28,8 @@ #define MAX_HOSTNAME_LEN 128 #define MAX_DOMAIN_NAME_LEN 128 #define MAX_SCOPE_ID_LEN 256 +#define MAX_DHCPV6_DUID_LENGTH 130 +#define MAX_DNS_SUFFIX_STRING_LENGTH 256 #define BROADCAST_NODETYPE 1 #define PEER_TO_PEER_NODETYPE 2 @@ -180,6 +182,34 @@ typedef struct _IP_ADAPTER_PREFIX { ULONG PrefixLength; } IP_ADAPTER_PREFIX, *PIP_ADAPTER_PREFIX; +typedef struct _IP_ADAPTER_WINS_SERVER_ADDRESS_LH { + union { + ULONGLONG Alignment; + struct { + ULONG Length; + DWORD Reserved; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + struct _IP_ADAPTER_WINS_SERVER_ADDRESS_LH *Next; + SOCKET_ADDRESS Address; +} IP_ADAPTER_WINS_SERVER_ADDRESS_LH, *PIP_ADAPTER_WINS_SERVER_ADDRESS_LH; +typedef IP_ADAPTER_WINS_SERVER_ADDRESS_LH IP_ADAPTER_WINS_SERVER_ADDRESS; +typedef IP_ADAPTER_WINS_SERVER_ADDRESS_LH *PIP_ADAPTER_WINS_SERVER_ADDRESS; + +typedef struct _IP_ADAPTER_GATEWAY_ADDRESS_LH { + union { + ULONGLONG Alignment; + struct { + ULONG Length; + DWORD Reserved; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + struct _IP_ADAPTER_GATEWAY_ADDRESS_LH *Next; + SOCKET_ADDRESS Address; +} IP_ADAPTER_GATEWAY_ADDRESS_LH, *PIP_ADAPTER_GATEWAY_ADDRESS_LH; +typedef IP_ADAPTER_GATEWAY_ADDRESS_LH IP_ADAPTER_GATEWAY_ADDRESS; +typedef IP_ADAPTER_GATEWAY_ADDRESS_LH *PIP_ADAPTER_GATEWAY_ADDRESS; + #define IP_ADAPTER_DDNS_ENABLED 0x1 #define IP_ADAPTER_REGISTER_ADAPTER_SUFFIX 0x2 #define IP_ADAPTER_DHCP_ENABLED 0x4 @@ -217,6 +247,22 @@ typedef struct _IP_ADAPTER_ADDRESSES { DWORD Ipv6IfIndex; DWORD ZoneIndices[16]; PIP_ADAPTER_PREFIX FirstPrefix; + ULONG64 TransmitLinkSpeed; + ULONG64 ReceiveLinkSpeed; + PIP_ADAPTER_WINS_SERVER_ADDRESS_LH FirstWinsServerAddress; + PIP_ADAPTER_GATEWAY_ADDRESS_LH FirstGatewayAddress; + ULONG Ipv4Metric; + ULONG Ipv6Metric; + IF_LUID Luid; + SOCKET_ADDRESS Dhcpv4Server; + NET_IF_COMPARTMENT_ID CompartmentId; + NET_IF_NETWORK_GUID NetworkGuid; + NET_IF_CONNECTION_TYPE ConnectionType; + TUNNEL_TYPE TunnelType; + SOCKET_ADDRESS Dhcpv6Server; + BYTE Dhcpv6ClientDuid[MAX_DHCPV6_DUID_LENGTH]; + ULONG Dhcpv6ClientDuidLength; + ULONG Dhcpv6Iaid; } IP_ADAPTER_ADDRESSES, *PIP_ADAPTER_ADDRESSES; #endif /* _WINSOCK2API_ */

1 0

Juan Lang : include: Add GAA_FLAG_* definitions.
by Alexandre Julliard Sept. 24, 2010

Sept. 24, 2010

Module: wine Branch: master Commit: 0f89a4f878a2be7d584975d720da1a8e7436dbbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f89a4f878a2be7d584975d72… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 16 13:42:26 2010 -0700 include: Add GAA_FLAG_* definitions. --- include/iptypes.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/iptypes.h b/include/iptypes.h index 16e7ffb..8ce7df6 100644 --- a/include/iptypes.h +++ b/include/iptypes.h @@ -265,6 +265,18 @@ typedef struct _IP_ADAPTER_ADDRESSES { ULONG Dhcpv6Iaid; } IP_ADAPTER_ADDRESSES, *PIP_ADAPTER_ADDRESSES; +#define GAA_FLAG_SKIP_UNICAST 0x00000001 +#define GAA_FLAG_SKIP_ANYCAST 0x00000002 +#define GAA_FLAG_SKIP_MULTICAST 0x00000004 +#define GAA_FLAG_SKIP_DNS_SERVER 0x00000008 +#define GAA_FLAG_INCLUDE_PREFIX 0x00000010 +#define GAA_FLAG_SKIP_FRIENDLY_NAME 0x00000020 +#define GAA_FLAG_INCLUDE_WINS_INFO 0x00000040 +#define GAA_FLAG_INCLUDE_ALL_GATEWAYS 0x00000080 +#define GAA_FLAG_INCLUDE_ALL_INTERFACES 0x00000100 +#define GAA_FLAG_INCLUDE_ALL_COMPARTMENTS 0x00000200 +#define GAA_FLAG_INCLUDE_TUNNEL_BINDINGORDER 0x00000400 + #endif /* _WINSOCK2API_ */ #endif /* WINE_IPTYPES_H_*/

1 0

Juan Lang : iphlpapi: Set adapter description in GetAdaptersAddresses.
by Alexandre Julliard Sept. 24, 2010

Sept. 24, 2010

Module: wine Branch: master Commit: e192beeb0d1da9b22eea45dd6e5ee7e56eb97222 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e192beeb0d1da9b22eea45dd6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 20 09:47:25 2010 -0700 iphlpapi: Set adapter description in GetAdaptersAddresses. --- dlls/iphlpapi/iphlpapi_main.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 90101f7..d6e568f 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -768,7 +768,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD total_size = sizeof(IP_ADAPTER_ADDRESSES); total_size += IF_NAMESIZE; - total_size += IF_NAMESIZE * sizeof(WCHAR); + total_size += 2 * IF_NAMESIZE * sizeof(WCHAR); total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_v4addrs; total_size += sizeof(struct sockaddr_in) * num_v4addrs; total_size += (sizeof(IP_ADAPTER_GATEWAY_ADDRESS) + sizeof(SOCKADDR_IN)) * num_v4_gateways; @@ -796,6 +796,11 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD *dst = *src; *dst++ = 0; ptr = (char *)dst; + aa->Description = (WCHAR *)ptr; + for (src = name, dst = (WCHAR *)ptr; *src; src++, dst++) + *dst = *src; + *dst++ = 0; + ptr = (char *)dst; TRACE("%s: %d IPv4 addresses, %d IPv6 addresses:\n", name, num_v4addrs, num_v6addrs);

1 0

Juan Lang : include: Add SCOPE_LEVEL definition.
by Alexandre Julliard Sept. 24, 2010

Sept. 24, 2010

Module: wine Branch: master Commit: 8da6bb6fb3f10978931af176f89caf0aeb78d9fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8da6bb6fb3f10978931af176f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 16 13:44:48 2010 -0700 include: Add SCOPE_LEVEL definition. --- include/ws2def.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/ws2def.h b/include/ws2def.h index 585647b..00b10ab 100644 --- a/include/ws2def.h +++ b/include/ws2def.h @@ -68,4 +68,14 @@ typedef struct _SOCKET_ADDRESS_LIST { SOCKET_ADDRESS Address[1]; } SOCKET_ADDRESS_LIST, *LPSOCKET_ADDRESS_LIST; +typedef enum { + ScopeLevelInterface = 1, + ScopeLevelLink = 2, + ScopeLevelSubnet = 3, + ScopeLevelAdmin = 4, + ScopeLevelSite = 5, + ScopeLevelOrganization = 8, + ScopeLevelGlobal = 14 +} SCOPE_LEVEL; + #endif /* _WS2DEF_ */

1 0

Juan Lang : iphlpapi: Set gateway addresses in GetAdaptersAddresses.
by Alexandre Julliard Sept. 24, 2010

Sept. 24, 2010

Module: wine Branch: master Commit: f776aea60d5d79c1fbcf7994f945da833e5c342a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f776aea60d5d79c1fbcf7994f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 16 10:14:18 2010 -0700 iphlpapi: Set gateway addresses in GetAdaptersAddresses. --- dlls/iphlpapi/iphlpapi_main.c | 94 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 88 insertions(+), 6 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 6ec06e8..88b699b 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -696,34 +696,82 @@ static char *debugstr_ipv6(const struct WS_sockaddr_in6 *sin, char *buf) return buf; } +static ULONG count_v4_gateways(DWORD index, PMIB_IPFORWARDTABLE routeTable) +{ + DWORD i, num_gateways = 0; + + for (i = 0; i < routeTable->dwNumEntries; i++) + { + if (routeTable->table[i].dwForwardIfIndex == index && + routeTable->table[i].dwForwardType == MIB_IPROUTE_TYPE_INDIRECT) + num_gateways++; + } + return num_gateways; +} + +static PMIB_IPFORWARDROW findIPv4Gateway(DWORD index, + PMIB_IPFORWARDTABLE routeTable) +{ + DWORD i; + PMIB_IPFORWARDROW row = NULL; + + for (i = 0; !row && i < routeTable->dwNumEntries; i++) + { + if (routeTable->table[i].dwForwardIfIndex == index && + routeTable->table[i].dwForwardType == MIB_IPROUTE_TYPE_INDIRECT) + row = &routeTable->table[i]; + } + return row; +} + static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADDRESSES *aa, ULONG *size) { - ULONG ret, i, num_v4addrs = 0, num_v6addrs = 0, total_size; + ULONG ret, i, num_v4addrs = 0, num_v4_gateways = 0, num_v6addrs = 0, total_size; DWORD *v4addrs = NULL; SOCKET_ADDRESS *v6addrs = NULL; + PMIB_IPFORWARDTABLE routeTable = NULL; if (family == AF_INET) - ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); + { + ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, + GetProcessHeap(), 0); + if (!ret) + { + ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); + num_v4_gateways = count_v4_gateways(index, routeTable); + } + } else if (family == AF_INET6) ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); else if (family == AF_UNSPEC) { - ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); + ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, + GetProcessHeap(), 0); if (!ret) - ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); + { + ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); + num_v4_gateways = count_v4_gateways(index, routeTable); + if (!ret) + ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); + } } else { FIXME("address family %u unsupported\n", family); ret = ERROR_NO_DATA; } - if (ret) return ret; + if (ret) + { + HeapFree(GetProcessHeap(), 0, routeTable); + return ret; + } total_size = sizeof(IP_ADAPTER_ADDRESSES); total_size += IF_NAMESIZE; total_size += IF_NAMESIZE * sizeof(WCHAR); total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_v4addrs; total_size += sizeof(struct sockaddr_in) * num_v4addrs; + total_size += (sizeof(IP_ADAPTER_GATEWAY_ADDRESS) + sizeof(SOCKADDR_IN)) * num_v4_gateways; total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_v6addrs; total_size += sizeof(SOCKET_ADDRESS) * num_v6addrs; for (i = 0; i < num_v6addrs; i++) @@ -751,11 +799,44 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD TRACE("%s: %d IPv4 addresses, %d IPv6 addresses:\n", name, num_v4addrs, num_v6addrs); + if (num_v4_gateways) + { + PMIB_IPFORWARDROW adapterRow; + + if ((adapterRow = findIPv4Gateway(index, routeTable))) + { + PIP_ADAPTER_GATEWAY_ADDRESS gw; + PSOCKADDR_IN sin; + + for (gw = aa->FirstGatewayAddress; gw && gw->Next; + gw = gw->Next) + ; + if (!gw) + { + gw = (PIP_ADAPTER_GATEWAY_ADDRESS)ptr; + aa->FirstGatewayAddress = gw; + } + else + { + gw->Next = (PIP_ADAPTER_GATEWAY_ADDRESS)ptr; + gw = gw->Next; + } + gw->u.s.Length = sizeof(IP_ADAPTER_GATEWAY_ADDRESS); + ptr += sizeof(IP_ADAPTER_GATEWAY_ADDRESS); + sin = (PSOCKADDR_IN)ptr; + sin->sin_family = AF_INET; + sin->sin_port = 0; + memcpy(&sin->sin_addr, &adapterRow->dwForwardNextHop, + sizeof(DWORD)); + gw->Address.lpSockaddr = (LPSOCKADDR)sin; + gw->Address.iSockaddrLength = sizeof(SOCKADDR_IN); + ptr += sizeof(SOCKADDR_IN); + } + } if (num_v4addrs) { IP_ADAPTER_UNICAST_ADDRESS *ua; struct sockaddr_in *sa; - aa->Flags |= IP_ADAPTER_IPV4_ENABLED; ua = aa->FirstUnicastAddress = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; for (i = 0; i < num_v4addrs; i++) @@ -834,6 +915,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD else aa->OperStatus = IfOperStatusUnknown; } *size = total_size; + HeapFree(GetProcessHeap(), 0, routeTable); HeapFree(GetProcessHeap(), 0, v6addrs); HeapFree(GetProcessHeap(), 0, v4addrs); return ERROR_SUCCESS;

1 0

Juan Lang : iphlpapi: Trace parameters to GetAdaptersAddresses.
by Alexandre Julliard Sept. 24, 2010

Sept. 24, 2010

Module: wine Branch: master Commit: c297dd2facb799b0959f38c0b59a907569ae34da URL: http://source.winehq.org/git/wine.git/?a=commit;h=c297dd2facb799b0959f38c0b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 16 14:04:02 2010 -0700 iphlpapi: Trace parameters to GetAdaptersAddresses. --- dlls/iphlpapi/iphlpapi_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 88b699b..90101f7 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -927,6 +927,8 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, InterfaceIndexTable *table; ULONG i, size, total_size, ret = ERROR_NO_DATA; + TRACE("(%d, %08x, %p, %p, %p)\n", family, flags, reserved, aa, buflen); + if (!buflen) return ERROR_INVALID_PARAMETER; table = getInterfaceIndexTable();

1 0

Juan Lang : include: Define NDIS_INTERFACE_INFORMATION.
by Alexandre Julliard Sept. 24, 2010

Sept. 24, 2010

Module: wine Branch: master Commit: 1a6188e846f6ecee3409f2a12f32d047f3dd73b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a6188e846f6ecee3409f2a12… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 14 13:02:23 2010 -0700 include: Define NDIS_INTERFACE_INFORMATION. --- include/ifdef.h | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/include/ifdef.h b/include/ifdef.h index 0b52d80..80ab755 100644 --- a/include/ifdef.h +++ b/include/ifdef.h @@ -189,4 +189,39 @@ typedef enum { IfOperStatusLowerLayerDown } IF_OPER_STATUS; +typedef struct _NDIS_INTERFACE_INFORMATION { + NET_IF_OPER_STATUS ifOperStatus; + ULONG ifOperStatusFlags; + NET_IF_MEDIA_CONNECT_STATE MediaConnectState; + NET_IF_MEDIA_DUPLEX_STATE MediaDuplexState; + ULONG ifMtu; + BOOLEAN ifPromiscuousMode; + BOOLEAN ifDeviceWakeUpEnable; + ULONG64 XmitLinkSpeed; + ULONG64 RcvLinkSpeed; + ULONG64 ifLastChange; + ULONG64 ifCounterDiscontinuityTime; + ULONG64 ifInUnknownProtos; + ULONG64 ifInDiscards; + ULONG64 ifInErrors; + ULONG64 ifHCInOctets; + ULONG64 ifHCInUcastPkts; + ULONG64 ifHCInMulticastPkts; + ULONG64 ifHCInBroadcastPkts; + ULONG64 ifHCOutOctets; + ULONG64 ifHCOutUcastPkts; + ULONG64 ifHCOutMulticastPkts; + ULONG64 ifHCOutBroadcastPkts; + ULONG64 ifOutErrors; + ULONG64 ifOutDiscards; + ULONG64 ifHCInUcastOctets; + ULONG64 ifHCInMulticastOctets; + ULONG64 ifHCInBroadcastOctets; + ULONG64 ifHCOutUcastOctets; + ULONG64 ifHCOutMulticastOctets; + ULONG64 ifHCOutBroadcastOctets; + NET_IF_COMPARTMENT_ID CompartmentId; + ULONG SupportedStatistics; +} NDIS_INTERFACE_INFORMATION, *PNDIS_INTERFACE_INFORMATION; + #endif /* WINE_IFDEF_H*/

1 0

Juan Lang : include: Add ifdef.h.
by Alexandre Julliard Sept. 24, 2010

Sept. 24, 2010

Module: wine Branch: master Commit: 53db1245176080d6f102a0fd73811e60ca6f59a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53db1245176080d6f102a0fd7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 14 12:56:15 2010 -0700 include: Add ifdef.h. --- include/Makefile.in | 1 + include/ifdef.h | 182 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 183 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 391cef7..c4bb8db 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -273,6 +273,7 @@ SRCDIR_INCLUDES = \ icm.h \ icmpapi.h \ idispids.h \ + ifdef.h \ imagehlp.h \ imm.h \ in6addr.h \ diff --git a/include/ifdef.h b/include/ifdef.h new file mode 100644 index 0000000..a3f2b01 --- /dev/null +++ b/include/ifdef.h @@ -0,0 +1,182 @@ +/* WINE ifdef.h + * Copyright 2010 Juan Lang + * + * 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 + */ +#ifndef WINE_IFDEF_H +#define WINE_IFDEF_H + +typedef ULONG32 NET_IF_OBJECT_ID, *PNET_IF_OBJECT_ID; +typedef UINT32 NET_IF_COMPARTMENT_ID, *PNET_IF_COMPARTMENT_ID; +typedef GUID NET_IF_NETWORK_GUID, *PNET_IF_NETWORK_GUID; +typedef ULONG NET_IFINDEX, *PNET_IFINDEX; +typedef NET_IFINDEX IF_INDEX, *PIF_INDEX; +typedef UINT16 NET_IFTYPE, *PNET_IFTYPE; + +#define NET_IF_OPER_STATUS_DOWN_NOT_AUTHENTICATED 0x00000001 +#define NET_IF_OPER_STATUS_DOWN_NOT_MEDIA_CONNECTED 0x00000002 +#define NET_IF_OPER_STATUS_DORMANT_PAUSED 0x00000004 +#define NET_IF_OPER_STATUS_DORMANT_LOW_POWER 0x00000008 + +#define NET_IF_COMPARTMENT_ID_UNSPECIFIED 0 +#define NET_IF_COMPARTMENT_ID_PRIMARY 1 + +#define NET_IF_OID_IF_ALIAS 0x00000001 +#define NET_IF_OID_COMPARTMENT_ID 0x00000002 +#define NET_IF_OID_NETWORK_GUID 0x00000003 +#define NET_IF_OID_IF_ENTRY 0x00000004 + +#define NET_SET_UNSPECIFIED_NETWORK_GUID(x) +#define NET_IS_UNSPECIFIED_NETWORK_GUID(x) + +#define NET_SITEID_UNSPECIFIED 0 +#define NET_SITEID_MAXUSER 0x07ffffff +#define NET_SITEID_MAXSYSTEM 0x0fffffff + +#define NET_IFINDEX_UNSPECIFIED 0 +#define IFI_UNSPECIFIED NET_IFINDEX_UNSPECIFIED + +#define NET_IFLUID_UNSPECIFIED 0 + +#define NIIF_HARDWARE_INTERFACE 0x00000001 +#define NIIF_FILTER_INTERFACE 0x00000002 +#define NIIF_NDIS_WDM_INTERFACE 0x00000020 +#define NIIF_NDIS_ENDPOINT_INTERFACE 0x00000040 +#define NIIF_NDIS_ISCSI_INTERFACE 0x00000080 +#define NIIF_WAN_TUNNEL_TYPE_UNKNOWN 0xffffffff + +#define NET_BUS_NUMBER_UNKNOWN 0xffffffff +#define NET_SLOT_NUMBER_UNKNOWN 0xffffffff +#define NET_FUNCTION_NUMBER_UNKNOWN 0xffffffff + +#define IF_MAX_STRING_SIZE 256 +#define IF_MAX_PHYS_ADDRESS_LENGTH 32 + +typedef enum _NET_IF_ADMIN_STATUS { + NET_IF_ADMIN_STATUS_UP = 1, + NET_IF_ADMIN_STATUS_DOWN = 2, + NET_IF_ADMIN_STATUS_TESTING = 3 +} NET_IF_ADMIN_STATUS, *PNET_IF_ADMIN_STATUS; + +typedef enum _NET_IF_OPER_STATUS { + NET_IF_OPER_STATUS_UP = 1, + NET_IF_OPER_STATUS_DOWN = 2, + NET_IF_OPER_STATUS_TESTING = 3, + NET_IF_OPER_STATUS_UNKNOWN = 4, + NET_IF_OPER_STATUS_DORMANT = 5, + NET_IF_OPER_STATUS_NOT_PRESENT = 6, + NET_IF_OPER_STATUS_LOWER_LAYER_DOWN = 7 +} NET_IF_OPER_STATUS, *PNET_IF_OPER_STATUS; + +typedef enum _NET_IF_RCV_ADDRESS_TYPE { + NET_IF_RCV_ADDRESS_TYPE_OTHER = 1, + NET_IF_RCV_ADDRESS_TYPE_VOLATILE = 2, + NET_IF_RCV_ADDRESS_TYPE_NON_VOLATILE = 3 +} NET_IF_RCV_ADDRESS_TYPE, *PNET_IF_RCV_ADDRESS_TYPE; + +typedef struct _NET_IF_RCV_ADDRESS_LH { + NET_IF_RCV_ADDRESS_TYPE ifRcvAddressType; + USHORT ifRcvAddressLength; + USHORT ifRcvAddressOffset; +} NET_IF_RCV_ADDRESS_LH, *PNET_IF_RCV_ADDRESS_LH; +typedef NET_IF_RCV_ADDRESS_LH NET_IF_RCV_ADDRESS; +typedef NET_IF_RCV_ADDRESS_LH *PNET_IF_RCV_ADDRESS; + +typedef union _NET_LUID_LH { + ULONG64 Value; + struct { + ULONG64 Reserved : 24; + ULONG64 NetLuidIndex : 24; + ULONG64 IfType : 16; + } Info; +} NET_LUID_LH, *PNET_LUID_LH; +typedef NET_LUID_LH NET_LUID; +typedef NET_LUID *PNET_LUID; +typedef NET_LUID IF_LUID; +typedef NET_LUID *PIF_LUID; + +typedef enum _NET_IF_ACCESS_TYPE { + NET_IF_ACCESS_LOOPBACK = 1, + NET_IF_ACCESS_BROADCAST = 2, + NET_IF_ACCESS_POINT_TO_POINT = 2, + NET_IF_ACCESS_POINT_TO_MULTI_POINT = 4, + NET_IF_ACCESS_MAXIMUM = 5 +} NET_IF_ACCESS_TYPE, *PNET_IF_ACCESS_TYPE; + +typedef enum _NET_IF_DIRECTION_TYPE { + NET_IF_DIRECTION_SENDRECEIVE = 0, + NET_IF_DIRECTION_SENDONLY = 1, + NET_IF_DIRECTION_RECEIVEONLY = 2, + NET_IF_DIRECTION_MAXIMUM = 3 +} NET_IF_DIRECTION_TYPE, *PNET_IF_DIRECTION_TYPE; + +typedef enum _NET_IF_CONNECTION_TYPE { + NET_IF_CONNECTION_DEDICATED = 1, + NET_IF_CONNECTION_PASSIVE = 2, + NET_IF_CONNECTION_DEMAND = 3, + NET_IF_CONNECTION_MAXIMUM = 4, +} NET_IF_CONNECTION_TYPE, *PNET_IF_CONNECTION_TYPE; + +typedef enum _NET_IF_MEDIA_CONNECT_STATE { + MediaConnectStateUnknown = 0, + MediaConnectStateConnected = 1, + MediaConnectStateDisconnected = 2 +} NET_IF_MEDIA_CONNECT_STATE, *PNET_IF_MEDIA_CONNECT_STATE; + +typedef enum _NET_IF_MEDIA_DUPLEX_STATE { + MediaDuplexStateUnknown = 0, + MediaDuplexStateHalf = 1, + MediaDuplexStateFull = 2 +} NET_IF_MEDIA_DUPLEX_STATE, *PNET_IF_MEDIA_DUPLEX_STATE; + +typedef struct _NET_PHYSICAL_LOCATION_LH { + ULONG BusNumber; + ULONG SlotNumber; + ULONG FunctionNumber; +} NET_PHYSICAL_LOCATION_LH, *PNET_PHYSICAL_LOCATION_LH; +typedef NET_PHYSICAL_LOCATION_LH NET_PHYSICAL_LOCATION; +typedef NET_PHYSICAL_LOCATION *PNET_PHYSICAL_LOCATION; + +typedef struct _IF_COUNTED_STRING_LH { + USHORT Length; + WCHAR String[IF_MAX_STRING_SIZE + 1]; +} IF_COUNTED_STRING_LH, *PIF_COUNTED_STRING_LH; +typedef IF_COUNTED_STRING_LH IF_COUNTED_STRING; +typedef IF_COUNTED_STRING *PIF_COUNTED_STRING; + +typedef struct _IF_PHYSICAL_ADDRESS_LH { + USHORT Length; + UCHAR Address[IF_MAX_PHYS_ADDRESS_LENGTH]; +} IF_PHYSICAL_ADDRESS_LH, *PIF_PHYSICAL_ADDRESS_LH; +typedef IF_PHYSICAL_ADDRESS_LH IF_PHYSICAL_ADDRESS; +typedef IF_PHYSICAL_ADDRESS *PIF_PHYSICAL_ADDRESS; + +typedef enum { + TUNNEL_TYPE_NONE = 0, + TUNNEL_TYPE_OTHER = 1, + TUNNEL_TYPE_DIRECT = 2, + TUNNEL_TYPE_6TO4 = 11, + TUNNEL_TYPE_ISATAP = 13, + TUNNEL_TYPE_TEREDO = 14, + TUNNEL_TYPE_IPHTTPS = 15, +} TUNNEL_TYPE; + +typedef enum _IF_ADMINISTRATIVE_STATE { + IF_ADMINISTRATIVE_STATE_DISABLED = 0, + IF_ADMINISTRATIVE_STATE_ENABLED = 1, + IF_ADMINISTRATIVE_STATE_DEMANDDIAL = 2 +} IF_ADMINISTRATIVE_STATE, *PIF_ADMINISTRATIVE_STATE; + +#endif /* WINE_IFDEF_H*/

1 0

Lauri Kenttä : shell32: Update Finnish translation.
by Alexandre Julliard Sept. 24, 2010

Sept. 24, 2010

Module: wine Branch: master Commit: ebfa87b987821d76632cad50636e3543db38cc3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebfa87b987821d76632cad506… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Sep 23 23:32:40 2010 +0300 shell32: Update Finnish translation. --- dlls/shell32/shell32_Fi.rc | 61 +++++++++++++++++++++---------------------- 1 files changed, 30 insertions(+), 31 deletions(-) diff --git a/dlls/shell32/shell32_Fi.rc b/dlls/shell32/shell32_Fi.rc index 013448f..fff38b4 100644 --- a/dlls/shell32/shell32_Fi.rc +++ b/dlls/shell32/shell32_Fi.rc @@ -77,7 +77,7 @@ MENU_SHV_FILE MENU BEGIN POPUP "" BEGIN - MENUITEM "&Select" FCIDM_SHVIEW_OPEN + MENUITEM "&Valitse" FCIDM_SHVIEW_OPEN MENUITEM "&Selaa", FCIDM_SHVIEW_EXPLORE MENUITEM "&Avaa", FCIDM_SHVIEW_OPEN MENUITEM SEPARATOR @@ -94,23 +94,23 @@ END MENU_CPANEL MENU BEGIN - POPUP "&File" + POPUP "&Tiedosto" BEGIN MENUITEM SEPARATOR - MENUITEM "E&xit", IDM_CPANEL_EXIT + MENUITEM "S&ulje", IDM_CPANEL_EXIT END - POPUP "&View" + POPUP "&N�yt�" BEGIN MENUITEM "&Suuret kuvakkeet", FCIDM_SHVIEW_BIGICON MENUITEM "&Pienet kuvakkeet", FCIDM_SHVIEW_SMALLICON MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW - MENUITEM "&Tiedot", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "T&iedot", FCIDM_SHVIEW_REPORTVIEW END - POPUP "&Help" + POPUP "&Ohje" BEGIN - MENUITEM "&About Control Panel...", IDM_CPANEL_ABOUT + MENUITEM "Ti&etoja Ohjauspaneelista...", IDM_CPANEL_ABOUT END END @@ -131,17 +131,17 @@ FONT 8, "MS Shell Dlg" SHELL_ABOUT_MSGBOX DIALOG 15, 40, 220, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Tietoja %s" +CAPTION "Tietoja ohjelmasta %s" FONT 10, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 153, 133, 60, 12, WS_TABSTOP - PUSHBUTTON "Wine &license...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP + PUSHBUTTON "Winen &lisenssi...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30 LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 170, 10 LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 170, 10 - LTEXT "Running on %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 - LTEXT "Wine:n toi Sinulle:", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 + LTEXT "K�yt�ss� on versio %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 + LTEXT "Winen ovat tehneet:", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 } SHELL_RUN_DLG DIALOG 0, 0, 227, 95 @@ -150,7 +150,7 @@ CAPTION "" FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Anna ohjelma, dokumentti, tai Internet -resurssi, ja Wine avaa sen Sinulle.", 12289, 36, 11, 182, 18 + LTEXT "Anna ohjelma, dokumentti tai Internet-osoite, niin Wine avaa sen.", 12289, 36, 11, 182, 18 LTEXT "&Avaa:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP @@ -172,13 +172,13 @@ STRINGTABLE IDS_SHV_COLUMN9 "Kommentit" IDS_SHV_COLUMN10 "Omistaja" IDS_SHV_COLUMN11 "Ryhm�" - IDS_SHV_COLUMN_DELFROM "Original location" - IDS_SHV_COLUMN_DELDATE "Date deleted" + IDS_SHV_COLUMN_DELFROM "Alkuper�inen sijainti" + IDS_SHV_COLUMN_DELDATE "Poistoaika" /* special folders */ IDS_DESKTOP "Ty�p�yt�" IDS_MYCOMPUTER "Oma tietokone" - IDS_CONTROLPANEL "Control Panel" + IDS_CONTROLPANEL "Ohjauspaneeli" /* context menus */ IDS_VIEW_LARGE "&Suuret kuvakkeet" @@ -192,19 +192,18 @@ STRINGTABLE IDS_CREATEFOLDER_CAPTION "Virhe luotaessa uutta kansiota" IDS_DELETEITEM_CAPTION "Vahvista tiedoston tuhoaminen" IDS_DELETEFOLDER_CAPTION "Vahvista kansion tuhoaminen" - IDS_DELETEITEM_TEXT "Haluatko varmasti tuhota '%1':n?" + IDS_DELETEITEM_TEXT "Haluatko varmasti tuhota kohteen '%1'?" IDS_DELETEMULTIPLE_TEXT "Haluatko varmasti tuhota n�m� %1?" - IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" - IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the Trash?" - IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its content to the Trash?" - IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Trash?" - IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you want to delete it instead?" - IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" + IDS_DELETESELECTED_TEXT "Haluatko varmasti tuhota valitut kohteet?" + IDS_TRASHITEM_TEXT "Haluatko varmasti siirt�� kohteen '%1' Roskakoriin?" + IDS_TRASHFOLDER_TEXT "Haluatko varmasti siirt�� kohteen '%1' ja kaiken sen sis�ll�n Roskakoriin?" + IDS_TRASHMULTIPLE_TEXT "Haluatko varmasti siirt�� n�m� %1 kohdetta roskakoriin?" + IDS_CANTTRASH_TEXT "Kohdetta '%1' ei voida siirt�� Roskakoriin. Haluatko sen sijaan poistaa sen kokonaan?" + IDS_OVERWRITEFILE_TEXT "T�ss� kansiossa on jo tiedosto nimelt� '%1'.\n\nKorvataanko entinen tiedosto?" IDS_OVERWRITEFILE_CAPTION "Vahvista tiedoston ylikirjoitus" - IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ - "If the files in the destination folder have the same names as files in the\n"\ - "selected folder they will be replaced. Do you still want to move or copy\n"\ - "the folder?" + IDS_OVERWRITEFOLDER_TEXT "T�ss� kansiossa on jo kansio nimelt� '%1'.\n\n"\ + "Jos kohdekansiossa on samannimisi� tiedostoja kuin valitussa kansiossa,\n"\ + "ne korvataan uusilla. Jatketaanko?" /* message box strings */ IDS_RESTART_TITLE "K�ynnist� uudelleen" @@ -235,15 +234,15 @@ STRINGTABLE IDS_MYPICTURES "Omat kuvatiedostot" IDS_PROGRAM_FILES_COMMON "Ohjelmatiedostot\\Yhteiset tiedostot" IDS_COMMON_DOCUMENTS "Dokumentit" - IDS_ADMINTOOLS "K�ynnist�-valikko\\Ohjelmat\\Administrative Tools" + IDS_ADMINTOOLS "K�ynnist�-valikko\\Ohjelmat\\Hallintaty�kalut" IDS_COMMON_MUSIC "Dokumentit\\Omat musiikkitiedostot" IDS_COMMON_PICTURES "Dokumentit\\Omat kuvatiedostot" IDS_COMMON_VIDEO "Dokumentit\\Omat videotiedostot" IDS_CDBURN_AREA "Paikalliset asetukset\\Ohjelmien tiedot\\Microsoft\\CD Burning" - IDS_NEWFOLDER "New Folder" + IDS_NEWFOLDER "Uusi hakemisto" - IDS_CPANEL_TITLE "Wine Control Panel" - IDS_CPANEL_NAME "Name" - IDS_CPANEL_DESCRIPTION "Description" + IDS_CPANEL_TITLE "Winen Ohjauspaneeli" + IDS_CPANEL_NAME "Nimi" + IDS_CPANEL_DESCRIPTION "Kuvaus" }

1 0

Henri Verbeet : wined3d: Consistently use the same stateblock in state_colormat().
by Alexandre Julliard Sept. 24, 2010

Sept. 24, 2010

Module: wine Branch: master Commit: 5013ec83de5edfbc321c50eb5903d5a0e322e775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5013ec83de5edfbc321c50eb5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 23 21:33:29 2010 +0200 wined3d: Consistently use the same stateblock in state_colormat(). These should refer to the same stateblock when we're drawing, but it's still ugly. --- dlls/wined3d/state.c | 52 ++++++++++++++++++++++++------------------------- 1 files changed, 25 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1e49d36..991b068 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1234,8 +1234,9 @@ void state_fogdensity(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wi checkGLcall("glFogf(GL_FOG_DENSITY, (float) Value)"); } -static void state_colormat(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) +static void state_colormat(DWORD state_id, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { + const struct wined3d_state *state = &stateblock->state; IWineD3DDeviceImpl *device = stateblock->device; GLenum Parm = 0; @@ -1249,57 +1250,55 @@ static void state_colormat(DWORD state, IWineD3DStateBlockImpl *stateblock, stru context->num_untracked_materials = 0; if ((device->strided_streams.use_map & (1 << WINED3D_FFP_DIFFUSE)) - && stateblock->state.render_states[WINED3DRS_COLORVERTEX]) + && state->render_states[WINED3DRS_COLORVERTEX]) { TRACE("diff %d, amb %d, emis %d, spec %d\n", - stateblock->state.render_states[WINED3DRS_DIFFUSEMATERIALSOURCE], - stateblock->state.render_states[WINED3DRS_AMBIENTMATERIALSOURCE], - stateblock->state.render_states[WINED3DRS_EMISSIVEMATERIALSOURCE], - stateblock->state.render_states[WINED3DRS_SPECULARMATERIALSOURCE]); + state->render_states[WINED3DRS_DIFFUSEMATERIALSOURCE], + state->render_states[WINED3DRS_AMBIENTMATERIALSOURCE], + state->render_states[WINED3DRS_EMISSIVEMATERIALSOURCE], + state->render_states[WINED3DRS_SPECULARMATERIALSOURCE]); - if (stateblock->state.render_states[WINED3DRS_DIFFUSEMATERIALSOURCE] == WINED3DMCS_COLOR1) + if (state->render_states[WINED3DRS_DIFFUSEMATERIALSOURCE] == WINED3DMCS_COLOR1) { - if (stateblock->state.render_states[WINED3DRS_AMBIENTMATERIALSOURCE] == WINED3DMCS_COLOR1) - { + if (state->render_states[WINED3DRS_AMBIENTMATERIALSOURCE] == WINED3DMCS_COLOR1) Parm = GL_AMBIENT_AND_DIFFUSE; - } else { + else Parm = GL_DIFFUSE; - } - if (stateblock->state.render_states[WINED3DRS_EMISSIVEMATERIALSOURCE] == WINED3DMCS_COLOR1) + if (state->render_states[WINED3DRS_EMISSIVEMATERIALSOURCE] == WINED3DMCS_COLOR1) { context->untracked_materials[context->num_untracked_materials] = GL_EMISSION; context->num_untracked_materials++; } - if (stateblock->state.render_states[WINED3DRS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) + if (state->render_states[WINED3DRS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) { context->untracked_materials[context->num_untracked_materials] = GL_SPECULAR; context->num_untracked_materials++; } } - else if (stateblock->state.render_states[WINED3DRS_AMBIENTMATERIALSOURCE] == WINED3DMCS_COLOR1) + else if (state->render_states[WINED3DRS_AMBIENTMATERIALSOURCE] == WINED3DMCS_COLOR1) { Parm = GL_AMBIENT; - if (stateblock->state.render_states[WINED3DRS_EMISSIVEMATERIALSOURCE] == WINED3DMCS_COLOR1) + if (state->render_states[WINED3DRS_EMISSIVEMATERIALSOURCE] == WINED3DMCS_COLOR1) { context->untracked_materials[context->num_untracked_materials] = GL_EMISSION; context->num_untracked_materials++; } - if (stateblock->state.render_states[WINED3DRS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) + if (state->render_states[WINED3DRS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) { context->untracked_materials[context->num_untracked_materials] = GL_SPECULAR; context->num_untracked_materials++; } } - else if (stateblock->state.render_states[WINED3DRS_EMISSIVEMATERIALSOURCE] == WINED3DMCS_COLOR1) + else if (state->render_states[WINED3DRS_EMISSIVEMATERIALSOURCE] == WINED3DMCS_COLOR1) { Parm = GL_EMISSION; - if (stateblock->state.render_states[WINED3DRS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) + if (state->render_states[WINED3DRS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) { context->untracked_materials[context->num_untracked_materials] = GL_SPECULAR; context->num_untracked_materials++; } } - else if (stateblock->state.render_states[WINED3DRS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) + else if (state->render_states[WINED3DRS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) { Parm = GL_SPECULAR; } @@ -1322,32 +1321,31 @@ static void state_colormat(DWORD state, IWineD3DStateBlockImpl *stateblock, stru * tracking with glColorMaterial, so apply those here. */ switch (context->tracking_parm) { case GL_AMBIENT_AND_DIFFUSE: - glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float *)&device->updateStateBlock->state.material.Ambient); - glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, (float *)&device->updateStateBlock->state.material.Diffuse); + glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float *)&state->material.Ambient); + glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, (float *)&state->material.Diffuse); checkGLcall("glMaterialfv"); break; case GL_DIFFUSE: - glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, (float *)&device->updateStateBlock->state.material.Diffuse); + glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, (float *)&state->material.Diffuse); checkGLcall("glMaterialfv"); break; case GL_AMBIENT: - glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float *)&device->updateStateBlock->state.material.Ambient); + glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float *)&state->material.Ambient); checkGLcall("glMaterialfv"); break; case GL_EMISSION: - glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, (float *)&device->updateStateBlock->state.material.Emissive); + glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, (float *)&state->material.Emissive); checkGLcall("glMaterialfv"); break; case GL_SPECULAR: /* Only change material color if specular is enabled, otherwise it is set to black */ - if (device->stateBlock->state.render_states[WINED3DRS_SPECULARENABLE]) + if (state->render_states[WINED3DRS_SPECULARENABLE]) { - glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, - (float *)&device->updateStateBlock->state.material.Specular); + glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, (float *)&state->material.Specular); checkGLcall("glMaterialfv"); } else { static const GLfloat black[] = {0.0f, 0.0f, 0.0f, 0.0f};

1 0