In capture_if_details_dlg_win32.c, don't define a bunch of stuff if

_NTDDNDIS_ is defined. In file_dlg_win32.c, use GetWindowLongPtr()
instead of GetWindowLong().


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28060 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 18 insertions, 16 deletions

diff --git a/gtk/capture_if_details_dlg_win32.c b/gtk/capture_if_details_dlg_win32.c
index 50f189a44f..0aa7040996 100644
--- a/gtk/capture_if_details_dlg_win32.c
+++ b/gtk/capture_if_details_dlg_win32.c
@@ -156,6 +156,7 @@ struct sockaddr_storage {
 
 
 /* Physical medium (OID_GEN_PHYSICAL_MEDIUM) */
+#ifndef _NTDDNDIS_
 typedef enum ndis_phys_medium {
 	NdisPhysicalMediumUnspecified,
 	NdisPhysicalMediumWirelessLan,
@@ -225,14 +226,6 @@ typedef enum ndis_phys_medium {
 #define OID_PNP_WAKE_UP_PATTERN_LIST		0xFD010105
 #define OID_PNP_ENABLE_WAKE_UP			0xFD010106
 
-
-/* Currently associated SSID (OID_802_11_SSID) */
-#define NDIS_ESSID_MAX_SIZE 32
-struct ndis_essid {
-	ULONG length;
-	UCHAR essid[NDIS_ESSID_MAX_SIZE];
-};
-
 /* Current infrastructure mode (OID_802_11_INFRASTRUCTURE_MODE) */
 enum network_infrastructure {
 	Ndis802_11IBSS,
@@ -283,6 +276,23 @@ enum encryption_status {
 	Ndis802_11Encryption3KeyAbsent
 };
 
+typedef struct _NDIS_802_11_FIXED_IEs
+{
+  UCHAR  Timestamp[8];
+  USHORT  BeaconInterval;
+  USHORT  Capabilities;
+} NDIS_802_11_FIXED_IEs, *PNDIS_802_11_FIXED_IEs;
+
+#endif /* _NTDDNDIS_ */
+
+
+/* Currently associated SSID (OID_802_11_SSID) */
+#define NDIS_ESSID_MAX_SIZE 32
+struct ndis_essid {
+	ULONG length;
+	UCHAR essid[NDIS_ESSID_MAX_SIZE];
+};
+
 
 /* some definitions needed for the following structs */
 #define NDIS_MAX_RATES_EX 16
@@ -320,14 +330,6 @@ struct ndis_ssid_item {
 };
 
 
-typedef struct _NDIS_802_11_FIXED_IEs
-{
-  UCHAR  Timestamp[8];
-  USHORT  BeaconInterval;
-  USHORT  Capabilities;
-} NDIS_802_11_FIXED_IEs, *PNDIS_802_11_FIXED_IEs;
-
-
 /* bssid list (OID_802_11_BSSID_LIST) */
 struct ndis_bssid_list {
 	ULONG num_items;