Merge change 8402 into donut
* changes:
Add test application
diff --git a/host/windows/.gitignore b/host/windows/.gitignore
index c73a805..dc7a154 100755
--- a/host/windows/.gitignore
+++ b/host/windows/.gitignore
@@ -1,7 +1,9 @@
-usb/api.*
*.sln
*.vcproj*
+usb/api.*
usb/Debug
usb/Release
usb/api/obj*
-usb/api/*.log
\ No newline at end of file
+usb/api/*.log
+usb/adb_winapi_test/obj*
+usb/adb_winapi_test/*.log
\ No newline at end of file
diff --git a/host/windows/usb/adb_winapi_test/BUILDME.TXT b/host/windows/usb/adb_winapi_test/BUILDME.TXT
new file mode 100755
index 0000000..9365b58
--- /dev/null
+++ b/host/windows/usb/adb_winapi_test/BUILDME.TXT
@@ -0,0 +1,19 @@
+Copyright (C) 2009 The Android Open Source Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+In order to build adb_winapi_test.dll you will need to install Windows Driver
+Kit, which can be obtained from Microsoft. Assuming that WDK is installed, you
+need to set one of the WDK's build environments, "cd" back into this directory,
+and execute "build -cbeEIFZ" to clean and rebuild this project, or you can
+execute "build -befEIF" to do a minimal build.
diff --git a/host/windows/usb/adb_winapi_test/MAKEFILE b/host/windows/usb/adb_winapi_test/MAKEFILE
new file mode 100755
index 0000000..fcd896d
--- /dev/null
+++ b/host/windows/usb/adb_winapi_test/MAKEFILE
@@ -0,0 +1,22 @@
+#
+# Copyright (C) 2009 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
+# DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source
+# file to this component. This file merely indirects to the real make file
+# that is shared by all the components of NT OS/2
+#
+!INCLUDE $(NTMAKEENV)\makefile.def
diff --git a/host/windows/usb/adb_winapi_test/SOURCES b/host/windows/usb/adb_winapi_test/SOURCES
new file mode 100755
index 0000000..ec82dee
--- /dev/null
+++ b/host/windows/usb/adb_winapi_test/SOURCES
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2009 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+TARGETNAME = adb_winapi_test
+TARGETPATH = obj
+TARGETTYPE = PROGRAM
+
+UMTYPE = console
+UMENTRY = main
+
+# Use statically linked atl libraries:
+USE_STATIC_ATL = 1
+
+# Use multithreaded libraries
+USE_LIBCMT = 1
+
+TARGETLIBS=$(SDK_LIB_PATH)\ole32.lib \
+ $(SDK_LIB_PATH)\oleaut32.lib \
+ ..\api\obj$(BUILD_ALT_DIR)\i386\AdbWinApi.lib
+
+INCLUDES=$(DDK_INC_PATH)\;$(SDK_INC_PATH)\;$(CRT_INC_PATH)\;$(ATL_INC_PATH)\api
+
+# Common C defines
+USER_C_FLAGS = $(USER_C_FLAGS) /FD /wd4100 /nologo
+
+# Turn on all warnings, and treat warnings as errors
+MSC_WARNING_LEVEL = /W4 /Wp64 /WX
+
+PRECOMPILED_CXX = 1
+PRECOMPILED_INCLUDE = stdafx.h
+PRECOMPILED_SOURCEFILE = stdafx.cpp
+
+SOURCES = adb_winapi_test.cpp
diff --git a/host/windows/usb/adb_winapi_test/adb_winapi_test.cpp b/host/windows/usb/adb_winapi_test/adb_winapi_test.cpp
new file mode 100755
index 0000000..11fcadf
--- /dev/null
+++ b/host/windows/usb/adb_winapi_test/adb_winapi_test.cpp
Binary files differ
diff --git a/host/windows/usb/adb_winapi_test/stdafx.cpp b/host/windows/usb/adb_winapi_test/stdafx.cpp
new file mode 100755
index 0000000..cc6d99c
--- /dev/null
+++ b/host/windows/usb/adb_winapi_test/stdafx.cpp
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// stdafx.cpp : source file that includes just the standard includes
+// WinUSBTest.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
diff --git a/host/windows/usb/adb_winapi_test/stdafx.h b/host/windows/usb/adb_winapi_test/stdafx.h
new file mode 100755
index 0000000..2aa9910
--- /dev/null
+++ b/host/windows/usb/adb_winapi_test/stdafx.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+// Modify the following defines if you have to target a platform prior to the ones specified below.
+// Refer to MSDN for the latest info on corresponding values for different platforms.
+#ifndef WINVER // Specifies that the minimum required platform is Windows Vista.
+#define WINVER 0x0500 // Change this to the appropriate value to target other versions of Windows.
+#endif
+
+#ifndef _WIN32_WINNT // Specifies that the minimum required platform is Windows Vista.
+#define _WIN32_WINNT 0x0500 // Change this to the appropriate value to target other versions of Windows.
+#endif
+
+#ifndef _WIN32_WINDOWS // Specifies that the minimum required platform is Windows 98.
+#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
+#endif
+
+#ifndef _WIN32_IE // Specifies that the minimum required platform is Internet Explorer 7.0.
+#define _WIN32_IE 0x0600 // Change this to the appropriate value to target other versions of IE.
+#endif
+
+#ifndef STRICT
+#define STRICT
+#endif
+
+#include <stdio.h>
+#include <tchar.h>
+
+#define _ATL_STATIC_LIB_IMPL
+#define _ATL_APARTMENT_THREADED
+#define _ATL_NO_AUTOMATIC_NAMESPACE
+#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit
+#define _ATL_ALL_WARNINGS
+
+#include <windows.h>
+#include <atlbase.h>
+
+#include <initguid.h>
+
+#pragma warning(disable: 4200)
+extern "C" {
+#include <usbdi.h>
+#include <Setupapi.h>
+}
+#pragma warning(default: 4200)
+
+extern "C" {
+#include "..\api\adb_api.h"
+}