LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Split AdbWinApi.dll into two dlls to remove dependency on WINUSB.DLL"

Browse Source 
which breaks the Windows SDK on Donut.

This reverts commit f855c4e846.
This commit is contained in:
Raphael
2009-08-06 20:51:11 -07:00
parent f1a0ad991b
commit 3e44f3b231
24 changed files with 24 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
host/windows/usb/api/AdbWinApi.cpp
View File

@@ -17,7 +17,6 @@
// AdbWinApi.cpp : Implementation of DLL Exports.
#include "stdafx.h"
#include "adb_api.h"
extern "C" {
int _forceCRTManifest;
@@ -25,73 +24,8 @@ int _forceMFCManifest;
int _forceAtlDllManifest;
};
/// References InstantiateWinUsbInterface declared in adb_api.cpp
extern PFN_INSTWINUSBINTERFACE InstantiateWinUsbInterface;
class CAdbWinApiModule : public CAtlDllModuleT< CAdbWinApiModule > {
public:
CAdbWinApiModule()
: CAtlDllModuleT< CAdbWinApiModule >(),
adbwinusbapi_handle_(NULL),
is_initialized_(false) {
}
~CAdbWinApiModule() {
// Unload AdbWinUsbApi.dll before we exit
if (NULL != adbwinusbapi_handle_) {
FreeLibrary(adbwinusbapi_handle_);
}
}
/** \brief Loads AdbWinUsbApi.dll and caches its InstantiateWinUsbInterface
export.
This method is called from DllMain on DLL_PROCESS_ATTACH event. In this
method we will check if WINUSB.DLL required by AdbWinUsbApi.dll is
installed, and if it is we will load AdbWinUsbApi.dll and cache address of
InstantiateWinUsbInterface routine exported from AdbWinUsbApi.dll
*/
void AttachToAdbWinUsbApi() {
// We only need to run this only once.
if (is_initialized_) {
return;
}
// Just mark that we have ran initialization.
is_initialized_ = true;
// Before we can load AdbWinUsbApi.dll we must make sure that WINUSB.DLL
// has been installed. Build path to the file.
wchar_t path_to_winusb_dll[MAX_PATH+1];
if (!GetSystemDirectory(path_to_winusb_dll, MAX_PATH)) {
return;
}
wcscat(path_to_winusb_dll, L"\\WINUSB.DLL");
if (0xFFFFFFFF == GetFileAttributes(path_to_winusb_dll)) {
// WINUSB.DLL is not installed. We don't (in fact, can't) load
// AdbWinUsbApi.dll
return;
}
// WINUSB.DLL is installed. Lets load AdbWinUsbApi.dll and cache its
// InstantiateWinUsbInterface export.
// We require that AdbWinUsbApi.dll is located in the same folder
// where AdbWinApi.dll and adb.exe are located, so by Windows
// conventions we can pass just module name, and not the full path.
adbwinusbapi_handle_ = LoadLibrary(L"AdbWinUsbApi.dll");
if (NULL != adbwinusbapi_handle_) {
InstantiateWinUsbInterface = reinterpret_cast<PFN_INSTWINUSBINTERFACE>
(GetProcAddress(adbwinusbapi_handle_, "InstantiateWinUsbInterface"));
}
}
protected:
/// Handle to the loaded AdbWinUsbApi.dll
HINSTANCE adbwinusbapi_handle_;
/// Flags whether or not this module has been initialized.
bool is_initialized_;
public:
};
CAdbWinApiModule _AtlModule;
@@ -100,12 +34,5 @@ CAdbWinApiModule _AtlModule;
extern "C" BOOL WINAPI DllMain(HINSTANCE instance,
DWORD reason,
LPVOID reserved) {
// Lets see if we need to initialize InstantiateWinUsbInterface
// variable. We do that only once, on condition that this DLL is
// being attached to the process and InstantiateWinUsbInterface
// address has not been calculated yet.
if (DLL_PROCESS_ATTACH == reason) {
_AtlModule.AttachToAdbWinUsbApi();
}
return _AtlModule.DllMain(reason, reserved);
return _AtlModule.DllMain(reason, reserved);
}