Windows: minor code improvements

* mostly warnings from VS2010's Intellisense

diff --git a/libusb/os/windows_usb.c b/libusb/os/windows_usb.c
index eb9b9bd..873a9ba 100644 (file)
--- a/libusb/os/windows_usb.c
+++ b/libusb/os/windows_usb.c
@@ -672,7 +672,7 @@ static int auto_claim(struct libusb_transfer *transfer, int *interface_number, i
 
 static void auto_release(struct usbi_transfer *itransfer)
 {
-       struct windows_transfer_priv *transfer_priv = usbi_transfer_get_os_priv(itransfer);
+       struct windows_transfer_priv *transfer_priv = (struct windows_transfer_priv*)usbi_transfer_get_os_priv(itransfer);
        struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
        libusb_device_handle *dev_handle = transfer->dev_handle;
        struct windows_device_handle_priv* handle_priv = __device_handle_priv(dev_handle);
@@ -1747,7 +1747,7 @@ static void windows_destroy_device(struct libusb_device *dev)
 
 static void windows_clear_transfer_priv(struct usbi_transfer *itransfer)
 {
-       struct windows_transfer_priv *transfer_priv = usbi_transfer_get_os_priv(itransfer);
+       struct windows_transfer_priv *transfer_priv = (struct windows_transfer_priv*)usbi_transfer_get_os_priv(itransfer);
 
        usbi_free_fd(transfer_priv->pollable_fd.fd);
 #if defined(AUTO_CLAIM)
@@ -1760,7 +1760,7 @@ static int submit_bulk_transfer(struct usbi_transfer *itransfer)
 {
        struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
        struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev);
-       struct windows_transfer_priv *transfer_priv = usbi_transfer_get_os_priv(itransfer);
+       struct windows_transfer_priv *transfer_priv = (struct windows_transfer_priv*)usbi_transfer_get_os_priv(itransfer);
        struct windows_device_priv *priv = __device_priv(transfer->dev_handle->dev);
        int r;
 
@@ -1782,7 +1782,7 @@ static int submit_iso_transfer(struct usbi_transfer *itransfer)
 {
        struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
        struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev);
-       struct windows_transfer_priv *transfer_priv = usbi_transfer_get_os_priv(itransfer);
+       struct windows_transfer_priv *transfer_priv = (struct windows_transfer_priv*)usbi_transfer_get_os_priv(itransfer);
        struct windows_device_priv *priv = __device_priv(transfer->dev_handle->dev);
        int r;
 
@@ -1804,7 +1804,7 @@ static int submit_control_transfer(struct usbi_transfer *itransfer)
 {
        struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
        struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev);
-       struct windows_transfer_priv *transfer_priv = usbi_transfer_get_os_priv(itransfer);
+       struct windows_transfer_priv *transfer_priv = (struct windows_transfer_priv*)usbi_transfer_get_os_priv(itransfer);
        struct windows_device_priv *priv = __device_priv(transfer->dev_handle->dev);
        int r;
 
@@ -1915,7 +1915,7 @@ static void windows_transfer_callback(struct usbi_transfer *itransfer, uint32_t
                break;
        }
        windows_clear_transfer_priv(itransfer); // Cancel polling
-       usbi_handle_transfer_completion(itransfer, status);
+       usbi_handle_transfer_completion(itransfer, (enum libusb_transfer_status)status);
 }
 
 static void windows_handle_callback (struct usbi_transfer *itransfer, uint32_t io_result, uint32_t io_size)
@@ -2666,7 +2666,7 @@ static int winusb_submit_bulk_transfer(struct usbi_transfer *itransfer)
 {
        struct libusb_transfer *transfer = __USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
        struct libusb_context *ctx = DEVICE_CTX(transfer->dev_handle->dev);
-       struct windows_transfer_priv *transfer_priv = usbi_transfer_get_os_priv(itransfer);
+       struct windows_transfer_priv *transfer_priv = (struct windows_transfer_priv*)usbi_transfer_get_os_priv(itransfer);
        struct windows_device_handle_priv *handle_priv = __device_handle_priv(transfer->dev_handle);
        struct windows_device_priv *priv = __device_priv(transfer->dev_handle->dev);
        HANDLE winusb_handle;
@@ -2794,7 +2794,7 @@ static int winusb_abort_transfers(struct usbi_transfer *itransfer)
  * IOCTL_USB_HUB_CYCLE_PORT ioctl was removed from Vista => the best we can do is
  * cycle the pipes (and even then, the control pipe can not be reset using WinUSB)
  */
-// TODO (2nd official release): see if we can force eject the device and redetect it (reuse hotplug?)
+// TODO (post hotplug): see if we can force eject the device and redetect it (reuse hotplug?)
 static int winusb_reset_device(struct libusb_device_handle *dev_handle)
 {
        struct libusb_context *ctx = DEVICE_CTX(dev_handle->dev);

diff --git a/libusb/os/windows_usb.h b/libusb/os/windows_usb.h
index 5ad0304..4cecc33 100644 (file)
--- a/libusb/os/windows_usb.h
+++ b/libusb/os/windows_usb.h
@@ -245,7 +245,8 @@ struct driver_lookup {
  * API macros - from libusb-win32 1.x
  */
 #define DLL_DECLARE_PREFIXED(api, ret, prefix, name, args)    \
-  typedef ret (api * __dll_##name##_t)args; __dll_##name##_t prefix##name = NULL
+       typedef ret (api * __dll_##name##_t)args;                 \
+       static __dll_##name##_t prefix##name = NULL
 
 #define DLL_LOAD_PREFIXED(dll, prefix, name, ret_on_failure)  \
        do {                                                      \
@@ -276,13 +277,13 @@ DLL_DECLARE_PREFIXED(WINAPI, HRESULT, p, CLSIDFromString, (LPCOLESTR, LPCLSID));
 DLL_DECLARE_PREFIXED(WINAPI, HDEVINFO, p, SetupDiGetClassDevsA, (const GUID*, PCSTR, HWND, DWORD));
 DLL_DECLARE_PREFIXED(WINAPI, BOOL, p, SetupDiEnumDeviceInfo, (HDEVINFO, DWORD, PSP_DEVINFO_DATA));
 DLL_DECLARE_PREFIXED(WINAPI, BOOL, p, SetupDiEnumDeviceInterfaces, (HDEVINFO, PSP_DEVINFO_DATA,
-                       const GUID*, DWORD, PSP_DEVICE_INTERFACE_DATA));
+                       const GUID*, DWORD, PSP_DEVICE_INTERFACE_DATA));
 DLL_DECLARE_PREFIXED(WINAPI, BOOL, p, SetupDiGetDeviceInterfaceDetailA, (HDEVINFO, PSP_DEVICE_INTERFACE_DATA,
-                       PSP_DEVICE_INTERFACE_DETAIL_DATA_A, DWORD, PDWORD, PSP_DEVINFO_DATA));
+                       PSP_DEVICE_INTERFACE_DETAIL_DATA_A, DWORD, PDWORD, PSP_DEVINFO_DATA));
 DLL_DECLARE_PREFIXED(WINAPI, BOOL, p, SetupDiDestroyDeviceInfoList, (HDEVINFO));
 DLL_DECLARE_PREFIXED(WINAPI, HKEY, p, SetupDiOpenDevRegKey, (HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD, DWORD, REGSAM));
 DLL_DECLARE_PREFIXED(WINAPI, BOOL, p, SetupDiGetDeviceRegistryPropertyA, (HDEVINFO,
-                       PSP_DEVINFO_DATA, DWORD, PDWORD, PBYTE, DWORD, PDWORD));
+                       PSP_DEVINFO_DATA, DWORD, PDWORD, PBYTE, DWORD, PDWORD));
 DLL_DECLARE_PREFIXED(WINAPI, LONG, p, RegQueryValueExW, (HKEY, LPCWSTR, LPDWORD, LPDWORD, LPBYTE, LPDWORD));
 DLL_DECLARE_PREFIXED(WINAPI, LONG, p, RegCloseKey, (HKEY));