diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec index 4499211bafb..1c937b00446 100644 --- a/dlls/d3drm/d3drm.spec +++ b/dlls/d3drm/d3drm.spec @@ -1,7 +1,7 @@ @ stub D3DRMColorGetAlpha @ stub D3DRMColorGetBlue @ stub D3DRMColorGetGreen -@ stub D3DRMColorGetRed +@ stdcall D3DRMColorGetRed(long) @ stub D3DRMCreateColorRGB @ stub D3DRMCreateColorRGBA @ stdcall D3DRMMatrixFromQuaternion(ptr ptr) diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c index 1e57cf8a5f3..7153eaaebe5 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -34,6 +34,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); +/* Determine the red part of a color */ +D3DVALUE WINAPI D3DRMColorGetRed(D3DCOLOR color) +{ + return (RGBA_GETRED(color)/255.0); +} + /* Product of 2 quaternions */ LPD3DRMQUATERNION WINAPI D3DRMQuaternionMultiply(LPD3DRMQUATERNION q, LPD3DRMQUATERNION a, LPD3DRMQUATERNION b) { diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c index 0b8fa33310c..582c993206c 100644 --- a/dlls/d3drm/tests/vector.c +++ b/dlls/d3drm/tests/vector.c @@ -79,6 +79,7 @@ static LPD3DVECTOR (WINAPI * pD3DRMVectorScale)(LPD3DVECTOR, LPD3DVECTOR, D3DVAL static LPD3DVECTOR (WINAPI * pD3DRMVectorSubtract)(LPD3DVECTOR, LPD3DVECTOR, LPD3DVECTOR); static LPD3DRMQUATERNION (WINAPI * pD3DRMQuaternionFromRotation)(LPD3DRMQUATERNION, LPD3DVECTOR, D3DVALUE); static LPD3DRMQUATERNION (WINAPI * pD3DRMQuaternionSlerp)(LPD3DRMQUATERNION, LPD3DRMQUATERNION, LPD3DRMQUATERNION, D3DVALUE); +static D3DVALUE (WINAPI * pD3DRMColorGetRed)(D3DCOLOR); #define D3DRM_GET_PROC(func) \ p ## func = (void*)GetProcAddress(d3drm_handle, #func); \ @@ -110,6 +111,7 @@ static BOOL InitFunctionPtrs(void) D3DRM_GET_PROC(D3DRMVectorSubtract) D3DRM_GET_PROC(D3DRMQuaternionFromRotation) D3DRM_GET_PROC(D3DRMQuaternionSlerp) + D3DRM_GET_PROC(D3DRMColorGetRed) return TRUE; } @@ -246,6 +248,18 @@ static void QuaternionTest(void) expect_quat(q,r); } +static void ColorTest(void) +{ + D3DCOLOR color; + D3DVALUE expected, got; + +/*___________D3DRMColorGetRed__________________________*/ + color=0xb62d7a1c; + expected=3.0/17.0; + got=pD3DRMColorGetRed(color); + ok((fabs(expected-got)