mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 644743 - Remove the Windows CE code for accelerometer support; r=jst
This commit is contained in:
Ehsan Akhgari
parent
ab717a320a
commit
6f46bf7f33
@ -39,333 +39,6 @@
|
||||
#include "nsIServiceManager.h"
|
||||
#include "windows.h"
|
||||
|
||||
#ifdef WINCE_WINDOWS_MOBILE
|
||||
|
||||
////////////////////////////
|
||||
// HTC
|
||||
////////////////////////////
|
||||
|
||||
|
||||
typedef struct _SENSORDATA
|
||||
{
|
||||
SHORT TiltX; // From -1000 to 1000 (about), 0 is flat
|
||||
SHORT TiltY; // From -1000 to 1000 (about), 0 is flat
|
||||
SHORT Orientation; // From -1000 to 1000 (about)
|
||||
|
||||
WORD Unknown1; // Always zero
|
||||
DWORD AngleY; // From 0 to 359
|
||||
DWORD AngleX; // From 0 to 359
|
||||
DWORD Unknown2; // Bit field?
|
||||
} SENSORDATA, *PSENSORDATA;
|
||||
|
||||
typedef HANDLE (WINAPI * HTCSensorOpen)(DWORD);
|
||||
typedef void (WINAPI * HTCSensorClose)(HANDLE);
|
||||
typedef DWORD (WINAPI * HTCSensorGetDataOutput)(HANDLE, PSENSORDATA);
|
||||
|
||||
HTCSensorOpen gHTCSensorOpen = nsnull;
|
||||
HTCSensorClose gHTCSensorClose = nsnull;
|
||||
HTCSensorGetDataOutput gHTCSensorGetDataOutput = nsnull;
|
||||
|
||||
class HTCSensor : public Sensor
|
||||
{
|
||||
public:
|
||||
HTCSensor();
|
||||
~HTCSensor();
|
||||
PRBool Startup();
|
||||
void Shutdown();
|
||||
void GetValues(double *x, double *y, double *z);
|
||||
private:
|
||||
HMODULE mLibrary;
|
||||
HANDLE mHTCHandle;
|
||||
};
|
||||
|
||||
HTCSensor::HTCSensor()
|
||||
{
|
||||
}
|
||||
|
||||
HTCSensor::~HTCSensor()
|
||||
{
|
||||
}
|
||||
|
||||
PRBool
|
||||
HTCSensor::Startup()
|
||||
{
|
||||
HMODULE hSensorLib = LoadLibraryW(L"HTCSensorSDK.dll");
|
||||
|
||||
if (!hSensorLib)
|
||||
return PR_FALSE;
|
||||
|
||||
gHTCSensorOpen = (HTCSensorOpen) GetProcAddressW(hSensorLib, L"HTCSensorOpen");
|
||||
gHTCSensorClose = (HTCSensorClose) GetProcAddressW(hSensorLib, L"HTCSensorClose");
|
||||
gHTCSensorGetDataOutput = (HTCSensorGetDataOutput) GetProcAddressW(hSensorLib,
|
||||
L"HTCSensorGetDataOutput");
|
||||
|
||||
if (gHTCSensorOpen != nsnull && gHTCSensorClose != nsnull &&
|
||||
gHTCSensorGetDataOutput != nsnull) {
|
||||
mHTCHandle = gHTCSensorOpen(1);
|
||||
if (mHTCHandle)
|
||||
return PR_TRUE;
|
||||
}
|
||||
|
||||
FreeLibrary(hSensorLib);
|
||||
mLibrary = nsnull;
|
||||
gHTCSensorOpen = nsnull;
|
||||
gHTCSensorClose = nsnull;
|
||||
gHTCSensorGetDataOutput = nsnull;
|
||||
return PR_FALSE;
|
||||
}
|
||||
|
||||
void
|
||||
HTCSensor::Shutdown()
|
||||
{
|
||||
NS_ASSERTION(mHTCHandle, "mHTCHandle should not be null at shutdown!");
|
||||
gHTCSensorClose(mHTCHandle);
|
||||
|
||||
NS_ASSERTION(mLibrary, "Shutdown called when mLibrary is null?");
|
||||
FreeLibrary(mLibrary);
|
||||
mLibrary = nsnull;
|
||||
gHTCSensorOpen = nsnull;
|
||||
gHTCSensorClose = nsnull;
|
||||
gHTCSensorGetDataOutput = nsnull;
|
||||
}
|
||||
|
||||
void
|
||||
HTCSensor::GetValues(double *x, double *y, double *z)
|
||||
{
|
||||
if (!mHTCHandle)
|
||||
return;
|
||||
|
||||
static const double htcScalingFactor = 1.0 / 1000.0 * 9.8;
|
||||
|
||||
SENSORDATA sd;
|
||||
gHTCSensorGetDataOutput(mHTCHandle, &sd);
|
||||
|
||||
*x = ((double)sd.TiltX) / 980 ;
|
||||
*y = ((double)sd.TiltY) / 980 ;
|
||||
*z = ((double)sd.Orientation) / 1000;
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////
|
||||
// Samsung
|
||||
////////////////////////////
|
||||
|
||||
/**
|
||||
* The result of an SMI SDK function call.
|
||||
*/
|
||||
typedef UINT SMI_RESULT;
|
||||
|
||||
/**
|
||||
* Common result codes.
|
||||
*/
|
||||
typedef enum
|
||||
{
|
||||
SMI_SUCCESS = 0x00000000,
|
||||
SMI_ERROR_UNKNOWN = 0x00000001,
|
||||
SMI_ERROR_DEVICE_NOT_FOUND = 0x00000002,
|
||||
SMI_ERROR_DEVICE_DISABLED = 0x00000003,
|
||||
SMI_ERROR_PERMISSION_DENIED = 0x00000004,
|
||||
SMI_ERROR_INVALID_PARAMETER = 0x00000005,
|
||||
SMI_ERROR_CANNOT_ACTIVATE_SERVER= 0x00000006,
|
||||
SMI_ACCELEROMETER_RESULT_BASE = 0x10010000,
|
||||
SMI_HAPTICS_RESULT_BASE = 0x10020000,
|
||||
SMI_LED_RESULT_BASE = 0x10030000
|
||||
} SmiResultCode;
|
||||
|
||||
/**
|
||||
* Accelerometer vector data.
|
||||
*
|
||||
*/
|
||||
typedef struct
|
||||
{
|
||||
FLOAT x; /**< X-direction value */
|
||||
FLOAT y; /**< Y-direction value */
|
||||
FLOAT z; /**< Z-direction value */
|
||||
} SmiAccelerometerVector;
|
||||
|
||||
/**
|
||||
* Specifies the capabilities of the Accelerometer device.
|
||||
*/
|
||||
typedef struct
|
||||
{
|
||||
UINT callbackPeriod; /**<The unit of the vector sampling time, in milliseconds. */
|
||||
} SmiAccelerometerCapabilities;
|
||||
|
||||
typedef SMI_RESULT (WINAPI * SmiAccelerometerGetVector)(SmiAccelerometerVector *);
|
||||
typedef void (*SmiAccelerometerHandler)(SmiAccelerometerVector accel);
|
||||
|
||||
SmiAccelerometerGetVector gSmiAccelerometerGetVector = nsnull;
|
||||
|
||||
class SMISensor : public Sensor
|
||||
{
|
||||
public:
|
||||
SMISensor();
|
||||
~SMISensor();
|
||||
PRBool Startup();
|
||||
void Shutdown();
|
||||
void GetValues(double *x, double *y, double *z);
|
||||
private:
|
||||
HMODULE mLibrary;
|
||||
};
|
||||
|
||||
SMISensor::SMISensor()
|
||||
:mLibrary(nsnull)
|
||||
{
|
||||
}
|
||||
|
||||
SMISensor::~SMISensor()
|
||||
{
|
||||
}
|
||||
|
||||
PRBool
|
||||
SMISensor::Startup()
|
||||
{
|
||||
HMODULE hSensorLib = LoadLibraryW(L"SamsungMobileSDK_1.dll");
|
||||
|
||||
if (!hSensorLib)
|
||||
return PR_FALSE;
|
||||
|
||||
gSmiAccelerometerGetVector = (SmiAccelerometerGetVector)
|
||||
GetProcAddressW(hSensorLib, L"SmiAccelerometerGetVector");
|
||||
|
||||
if (gSmiAccelerometerGetVector == nsnull) {
|
||||
FreeLibrary(hSensorLib);
|
||||
mLibrary = nsnull;
|
||||
gSmiAccelerometerGetVector = nsnull;
|
||||
return PR_FALSE;
|
||||
}
|
||||
|
||||
mLibrary = hSensorLib;
|
||||
return PR_TRUE;
|
||||
|
||||
}
|
||||
|
||||
void
|
||||
SMISensor::Shutdown()
|
||||
{
|
||||
NS_ASSERTION(mLibrary, "Shutdown called when mLibrary is null?");
|
||||
FreeLibrary(mLibrary);
|
||||
mLibrary = nsnull;
|
||||
gSmiAccelerometerGetVector = nsnull;
|
||||
}
|
||||
|
||||
void
|
||||
SMISensor::GetValues(double *x, double *y, double *z)
|
||||
{
|
||||
NS_ASSERTION(mLibrary, "mLibrary should not be null when GetValues is called");
|
||||
|
||||
SmiAccelerometerVector vector;
|
||||
vector.x = vector.y = vector.z = 0;
|
||||
SMI_RESULT result = gSmiAccelerometerGetVector(&vector);
|
||||
|
||||
// don't we have to adjust
|
||||
*x = vector.x;
|
||||
*y = vector.y;
|
||||
*z = vector.z;
|
||||
}
|
||||
|
||||
////////////////////////////
|
||||
// Toshiba TG01 / T-01A
|
||||
////////////////////////////
|
||||
|
||||
typedef struct _TS_ACCELERATION
|
||||
{
|
||||
SHORT x;
|
||||
SHORT y;
|
||||
SHORT z;
|
||||
FILETIME time;
|
||||
} TS_ACCELERATION;
|
||||
|
||||
typedef DWORD (WINAPI *TSRegisterAcceleration)(HANDLE,DWORD,DWORD*);
|
||||
typedef DWORD (WINAPI *TSDeregisterAcceleration)(DWORD);
|
||||
typedef DWORD (WINAPI *TSGetAcceleration)(DWORD,TS_ACCELERATION*);
|
||||
|
||||
TSRegisterAcceleration gTSRegisterAcceleration = nsnull;
|
||||
TSDeregisterAcceleration gTSDeregisterAcceleration = nsnull;
|
||||
TSGetAcceleration gTSGetAcceleration = nsnull;
|
||||
|
||||
class TsSensor : public Sensor
|
||||
{
|
||||
public:
|
||||
TsSensor();
|
||||
~TsSensor();
|
||||
PRBool Startup();
|
||||
void Shutdown();
|
||||
void GetValues(double *x, double *y, double *z);
|
||||
private:
|
||||
HMODULE mLibrary;
|
||||
DWORD mId;
|
||||
};
|
||||
|
||||
TsSensor::TsSensor() : mLibrary(nsnull), mId(0)
|
||||
{
|
||||
}
|
||||
|
||||
TsSensor::~TsSensor()
|
||||
{
|
||||
}
|
||||
|
||||
PRBool
|
||||
TsSensor::Startup()
|
||||
{
|
||||
HMODULE hSensorLib = LoadLibraryW(L"axcon.dll");
|
||||
|
||||
if (!hSensorLib)
|
||||
return PR_FALSE;
|
||||
|
||||
gTSRegisterAcceleration = (TSRegisterAcceleration) GetProcAddressW(hSensorLib, L"TSRegisterAcceleration");
|
||||
gTSDeregisterAcceleration = (TSDeregisterAcceleration) GetProcAddressW(hSensorLib, L"TSDeregisterAcceleration");
|
||||
gTSGetAcceleration = (TSGetAcceleration) GetProcAddressW(hSensorLib, L"TSGetAcceleration");
|
||||
|
||||
if (gTSRegisterAcceleration && gTSDeregisterAcceleration && gTSGetAcceleration) {
|
||||
if (!gTSRegisterAcceleration(GetModuleHandle(NULL), 100, &mId)) {
|
||||
mLibrary = hSensorLib;
|
||||
return PR_TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
FreeLibrary(hSensorLib);
|
||||
|
||||
mLibrary = nsnull;
|
||||
mId = 0;
|
||||
gTSRegisterAcceleration = nsnull;
|
||||
gTSDeregisterAcceleration = nsnull;
|
||||
gTSGetAcceleration = nsnull;
|
||||
|
||||
return PR_FALSE;
|
||||
}
|
||||
|
||||
void
|
||||
TsSensor::Shutdown()
|
||||
{
|
||||
NS_ASSERTION(mLibrary, "Shutdown called when mLibrary is null?");
|
||||
|
||||
gTSDeregisterAcceleration(mId);
|
||||
FreeLibrary(mLibrary);
|
||||
|
||||
mLibrary = nsnull;
|
||||
mId = 0;
|
||||
gTSRegisterAcceleration = nsnull;
|
||||
gTSDeregisterAcceleration = nsnull;
|
||||
gTSGetAcceleration = nsnull;
|
||||
}
|
||||
|
||||
void
|
||||
TsSensor::GetValues(double *x, double *y, double *z)
|
||||
{
|
||||
NS_ASSERTION(mLibrary, "mLibrary should not be null when GetValues is called");
|
||||
|
||||
TS_ACCELERATION data;
|
||||
gTSGetAcceleration(mId, &data);
|
||||
|
||||
// Value for TG-01 is landscaped
|
||||
*x = ((double)data.y) / 1000;
|
||||
*y = ((double)data.x) / 1000;
|
||||
*z = ((double)data.z) / 1000;
|
||||
}
|
||||
|
||||
#endif // WINCE_WINDOWS_MOBILE
|
||||
|
||||
#if !defined(WINCE) && !defined(WINCE_WINDOWS_MOBILE) // normal windows.
|
||||
|
||||
////////////////////////////
|
||||
@ -472,26 +145,6 @@ void nsAccelerometerSystem::Startup()
|
||||
|
||||
PRBool started = PR_FALSE;
|
||||
|
||||
#ifdef WINCE_WINDOWS_MOBILE
|
||||
|
||||
mSensor = new SMISensor();
|
||||
if (mSensor)
|
||||
started = mSensor->Startup();
|
||||
|
||||
if (!started) {
|
||||
mSensor = new HTCSensor();
|
||||
if (mSensor)
|
||||
started = mSensor->Startup();
|
||||
}
|
||||
|
||||
if (!started) {
|
||||
mSensor = new TsSensor();
|
||||
if (mSensor)
|
||||
started = mSensor->Startup();
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#if !defined(WINCE) && !defined(WINCE_WINDOWS_MOBILE) // normal windows.
|
||||
|
||||
mSensor = new ThinkPadSensor();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user