May 2007 - Wine-commits - list.winehq.org

Rob Shearman : wininet: Add support for SSPI authentication for HTTP.
by Alexandre Julliard 22 May '07

22 May '07

Module: wine Branch: master Commit: 4b507685e8e6a9dec26d268f6169f8b3a49ca828 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b507685e8e6a9dec26d268f6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon May 21 14:26:26 2007 +0100 wininet: Add support for SSPI authentication for HTTP. --- dlls/wininet/Makefile.in | 2 +- dlls/wininet/http.c | 344 +++++++++++++++++++++++++++++++++++++++++++++- dlls/wininet/internet.h | 4 + 3 files changed, 344 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b507685e8e6a9dec26d2…

1 0

Rob Shearman : wininet: Implement basic non-proxy authentication.
by Alexandre Julliard 22 May '07

22 May '07

Module: wine Branch: master Commit: 847cc51d3b532d68ff6effd2ece2b648de608514 URL: http://source.winehq.org/git/wine.git/?a=commit;h=847cc51d3b532d68ff6effd2e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon May 21 14:28:02 2007 +0100 wininet: Implement basic non-proxy authentication. --- dlls/wininet/http.c | 34 ++++++++++++++++++++++++++++------ 1 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 91736cf..4febb76 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -424,9 +424,13 @@ static BOOL HTTP_DoAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR pszAuthValue { SECURITY_STATUS sec_status; struct HttpAuthInfo *pAuthInfo = lpwhr->pAuthInfo; + LPWSTR password = lpwhr->lpHttpSession->lpszPassword; + LPWSTR domain_and_username = lpwhr->lpHttpSession->lpszUserName; TRACE("%s\n", debugstr_w(pszAuthValue)); + if (!domain_and_username) return FALSE; + if (!pAuthInfo) { TimeStamp exp; @@ -452,13 +456,13 @@ static BOOL HTTP_DoAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR pszAuthValue if (!is_basic_auth_value(pszAuthValue)) { SEC_WINNT_AUTH_IDENTITY_W nt_auth_identity; - WCHAR *user = strchrW(lpwhr->lpHttpSession->lpszUserName, '\\'); - WCHAR *domain = lpwhr->lpHttpSession->lpszUserName; + WCHAR *user = strchrW(domain_and_username, '\\'); + WCHAR *domain = domain_and_username; if (user) user++; else { - user = lpwhr->lpHttpSession->lpszUserName; + user = domain_and_username; domain = NULL; } nt_auth_identity.Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE; @@ -466,7 +470,7 @@ static BOOL HTTP_DoAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR pszAuthValue nt_auth_identity.UserLength = strlenW(nt_auth_identity.User); nt_auth_identity.Domain = domain; nt_auth_identity.DomainLength = domain ? user - domain - 1 : 0; - nt_auth_identity.Password = lpwhr->lpHttpSession->lpszPassword; + nt_auth_identity.Password = password; nt_auth_identity.PasswordLength = strlenW(nt_auth_identity.Password); /* FIXME: make sure scheme accepts SEC_WINNT_AUTH_IDENTITY before calling AcquireCredentialsHandle */ @@ -500,8 +504,26 @@ static BOOL HTTP_DoAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR pszAuthValue if (is_basic_auth_value(pszAuthValue)) { - FIXME("do basic authentication\n"); - return FALSE; + int userlen = WideCharToMultiByte(CP_UTF8, 0, domain_and_username, lstrlenW(domain_and_username), NULL, 0, NULL, NULL); + int passlen = WideCharToMultiByte(CP_UTF8, 0, password, lstrlenW(password), NULL, 0, NULL, NULL); + char *auth_data; + + TRACE("basic authentication\n"); + + /* length includes a nul terminator, which will be re-used for the ':' */ + auth_data = HeapAlloc(GetProcessHeap(), 0, userlen + 1 + passlen); + if (!auth_data) + return FALSE; + + WideCharToMultiByte(CP_UTF8, 0, domain_and_username, -1, auth_data, userlen, NULL, NULL); + auth_data[userlen] = ':'; + WideCharToMultiByte(CP_UTF8, 0, password, -1, &auth_data[userlen+1], passlen, NULL, NULL); + + pAuthInfo->auth_data = auth_data; + pAuthInfo->auth_data_len = userlen + 1 + passlen; + pAuthInfo->finished = TRUE; + + return TRUE; } else {

1 0

Vitaliy Margolen : ntdll: Implement RtlWriteRegistryValue and forward ntoskrnl to it.
by Alexandre Julliard 22 May '07

22 May '07

Module: wine Branch: master Commit: 311c001654b31a8031a4cccfa9675b94c44a3334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=311c001654b31a8031a4cccfa… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat May 19 10:56:51 2007 -0600 ntdll: Implement RtlWriteRegistryValue and forward ntoskrnl to it. --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/reg.c | 41 +++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/winternl.h | 1 + 4 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 3b26880..535f375 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -910,7 +910,7 @@ @ stub RtlWalkFrameChain @ stdcall RtlWalkHeap(long ptr) @ stub RtlWriteMemoryStream -@ stub RtlWriteRegistryValue +@ stdcall RtlWriteRegistryValue(long ptr ptr long ptr long) @ stub RtlZeroHeap @ stdcall RtlZeroMemory(ptr long) # @ stub RtlZombifyActivationContext diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 99a46c0..2127888 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -1334,3 +1334,44 @@ NTSTATUS WINAPI RtlDeleteRegistryValue(IN ULONG RelativeTo, IN PCWSTR Path, IN P NtClose(handle); return status; } + +/************************************************************************* + * RtlWriteRegistryValue [NTDLL.@] + * + * Sets the registry value with provided data. + * + * PARAMS + * RelativeTo [I] Registry path that path parameter refers to + * path [I] Path to the key (or handle - see RTL_GetKeyHandle) + * name [I] Name of the registry value to set + * type [I] Type of the registry key to set + * data [I] Pointer to the user data to be set + * length [I] Length of the user data pointed by data + * + * RETURNS + * STATUS_SUCCESS if the specified key is successfully set, + * or an NTSTATUS error code. + */ +NTSTATUS WINAPI RtlWriteRegistryValue( ULONG RelativeTo, PCWSTR path, PCWSTR name, + ULONG type, PVOID data, ULONG length ) +{ + HANDLE hkey; + NTSTATUS status; + UNICODE_STRING str; + + TRACE( "(%d, %s, %s) -> %d: %p [%d]\n", RelativeTo, debugstr_w(path), debugstr_w(name), + type, data, length ); + + RtlInitUnicodeString( &str, name ); + + if (RelativeTo == RTL_REGISTRY_HANDLE) + return NtSetValueKey( (HANDLE)path, &str, 0, type, data, length ); + + status = RTL_GetKeyHandle( RelativeTo, path, &hkey ); + if (status != STATUS_SUCCESS) return status; + + status = NtSetValueKey( hkey, &str, 0, type, data, length ); + NtClose( hkey ); + + return status; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index f199602..192e255 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1197,7 +1197,7 @@ @ stdcall RtlVerifyVersionInfo(ptr long double) ntdll.RtlVerifyVersionInfo @ stub RtlVolumeDeviceToDosName @ stub RtlWalkFrameChain -@ stub RtlWriteRegistryValue +@ stdcall RtlWriteRegistryValue(long ptr ptr long ptr long) ntdll.RtlWriteRegistryValue @ stub RtlZeroHeap @ stdcall RtlZeroMemory(ptr long) ntdll.RtlZeroMemory @ stdcall RtlxAnsiStringToUnicodeSize(ptr) ntdll.RtlxAnsiStringToUnicodeSize diff --git a/include/winternl.h b/include/winternl.h index 8b650a9..1580535 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2240,6 +2240,7 @@ BOOLEAN WINAPI RtlValidateHeap(HANDLE,ULONG,LPCVOID); NTSTATUS WINAPI RtlVerifyVersionInfo(const RTL_OSVERSIONINFOEXW*,DWORD,DWORDLONG); NTSTATUS WINAPI RtlWalkHeap(HANDLE,PVOID); +NTSTATUS WINAPI RtlWriteRegistryValue(ULONG,PCWSTR,PCWSTR,ULONG,PVOID,ULONG); NTSTATUS WINAPI RtlpNtCreateKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG,const UNICODE_STRING*,ULONG,PULONG); NTSTATUS WINAPI RtlpWaitForCriticalSection(RTL_CRITICAL_SECTION *);

1 0

Dmitry Timoshkov : basetsd.h: Add a bunch of PSDK compatible macros/ inline functions for 64-bit safe type conversions.
by Alexandre Julliard 22 May '07

22 May '07

Module: wine Branch: master Commit: c365747e118bdd8cf8ce2c118ba35f2a29f4422c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c365747e118bdd8cf8ce2c118… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon May 21 19:58:58 2007 +0900 basetsd.h: Add a bunch of PSDK compatible macros/inline functions for 64-bit safe type conversions. --- include/basetsd.h | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 89 insertions(+), 0 deletions(-) diff --git a/include/basetsd.h b/include/basetsd.h index 444e876..e0d04f6 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -123,6 +123,80 @@ typedef unsigned int UHALF_PTR, *PUHALF_PTR; #define MINHALF_PTR 0x80000000 #define MAXUHALF_PTR 0xffffffff +#if !defined(__midl) && !defined(__WIDL__) + +static inline ULONG32 HandleToULong(const void *h) +{ + return (ULONG_PTR)h; +} + +static inline LONG32 HandleToLong(const void *h) +{ + return (LONG_PTR)h; +} + +static inline void *ULongToHandle(ULONG32 ul) +{ + return (void *)(ULONG_PTR)ul; +} + +static inline void *LongToHandle(LONG32 l) +{ + return (void *)(LONG_PTR)l; +} + +static inline ULONG32 PtrToUlong(const void *p) +{ + return (ULONG_PTR)p; +} + +static inline LONG32 PtrToLong(const void *p) +{ + return (LONG_PTR)p; +} + +static inline UINT32 PtrToUint(const void *p) +{ + return (UINT_PTR)p; +} + +static inline INT32 PtrToInt(const void *p) +{ + return (INT_PTR)p; +} + +static inline UINT16 PtrToUshort(const void *p) +{ + return (ULONG_PTR)p; +} + +static inline INT16 PtrToShort(const void *p) +{ + return (LONG_PTR)p; +} + +static inline void *IntToPtr(INT32 i) +{ + return (void *)(INT_PTR)i; +} + +static inline void *UIntToPtr(UINT32 ui) +{ + return (void *)(UINT_PTR)ui; +} + +static inline void *LongToPtr(LONG32 l) +{ + return (void *)(LONG_PTR)l; +} + +static inline void *ULongToPtr(ULONG32 ul) +{ + return (void *)(ULONG_PTR)ul; +} + +#endif /* !__midl && !__WIDL__ */ + #else /* FIXME: defined(_WIN32) */ typedef int INT_PTR, *PINT_PTR; @@ -142,6 +216,21 @@ typedef unsigned short UHALF_PTR, *PUHALF_PTR; #define MAXHALF_PTR 0x7fff #define MINHALF_PTR 0x8000 +#define HandleToULong(h) ((ULONG)(ULONG_PTR)(h)) +#define HandleToLong(h) ((LONG)(LONG_PTR)(h)) +#define ULongToHandle(ul) ((HANDLE)(ULONG_PTR)(ul)) +#define LongToHandle(h) ((HANDLE)(LONG_PTR)(h)) +#define PtrToUlong(p) ((ULONG)(ULONG_PTR)(p)) +#define PtrToLong(p) ((LONG)(LONG_PTR)(p)) +#define PtrToUint(p) ((UINT)(UINT_PTR)(p)) +#define PtrToInt(p) ((INT)(INT_PTR)(p)) +#define PtrToUshort(p) ((USHORT)(ULONG_PTR)(p)) +#define PtrToShort(p) ((SHORT)(LONG_PTR)(p)) +#define IntToPtr(i) ((void *)(INT_PTR)((INT)i)) +#define UIntToPtr(ui) ((void *)(UINT_PTR)((UINT)ui)) +#define LongToPtr(l) ((void *)(LONG_PTR)((LONG)l)) +#define ULongToPtr(ul) ((void *)(ULONG_PTR)((ULONG)ul)) + #endif /* defined(_WIN64) || defined(_WIN32) */ typedef LONG_PTR SSIZE_T, *PSSIZE_T;

1 0

David Adam : d3drm: Implement D3DRMCreateColorRGB.
by Alexandre Julliard 21 May '07

21 May '07

Module: wine Branch: master Commit: 7eaf1fe2f5abc2cd290d59144ec5ebabe16945a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eaf1fe2f5abc2cd290d59144… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Sun May 20 16:27:30 2007 +0200 d3drm: Implement D3DRMCreateColorRGB. --- dlls/d3drm/d3drm.spec | 2 +- dlls/d3drm/math.c | 5 +++++ dlls/d3drm/tests/vector.c | 10 ++++++++++ include/d3drmdef.h | 1 + 4 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec index 69da8b6..141f933 100644 --- a/dlls/d3drm/d3drm.spec +++ b/dlls/d3drm/d3drm.spec @@ -2,7 +2,7 @@ @ stdcall D3DRMColorGetBlue(long) @ stdcall D3DRMColorGetGreen(long) @ stdcall D3DRMColorGetRed(long) -@ stub D3DRMCreateColorRGB +@ stdcall D3DRMCreateColorRGB(long long long) @ stdcall D3DRMCreateColorRGBA(long long long long) @ stdcall D3DRMMatrixFromQuaternion(ptr ptr) @ stdcall D3DRMQuaternionFromRotation(ptr ptr long) diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c index a06c024..76b73c0 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -34,6 +34,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); +/* Create a RGB color from its components */ +D3DCOLOR WINAPI D3DRMCreateColorRGB(D3DVALUE red, D3DVALUE green, D3DVALUE blue) +{ + return (D3DRMCreateColorRGBA(red, green, blue, 255.0)); +} /* Create a RGBA color from its components */ D3DCOLOR WINAPI D3DRMCreateColorRGBA(D3DVALUE red, D3DVALUE green, D3DVALUE blue, D3DVALUE alpha) { diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c index 8448879..7e2690c 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 D3DCOLOR (WINAPI * pD3DRMCreateColorRGB)(D3DVALUE, D3DVALUE, D3DVALUE); static D3DCOLOR (WINAPI * pD3DRMCreateColorRGBA)(D3DVALUE, D3DVALUE, D3DVALUE, D3DVALUE); static D3DVALUE (WINAPI * pD3DRMColorGetAlpha)(D3DCOLOR); static D3DVALUE (WINAPI * pD3DRMColorGetBlue)(D3DCOLOR); @@ -115,6 +116,7 @@ static BOOL InitFunctionPtrs(void) D3DRM_GET_PROC(D3DRMVectorSubtract) D3DRM_GET_PROC(D3DRMQuaternionFromRotation) D3DRM_GET_PROC(D3DRMQuaternionSlerp) + D3DRM_GET_PROC(D3DRMCreateColorRGB) D3DRM_GET_PROC(D3DRMCreateColorRGBA) D3DRM_GET_PROC(D3DRMColorGetAlpha) D3DRM_GET_PROC(D3DRMColorGetBlue) @@ -261,6 +263,14 @@ static void ColorTest(void) D3DCOLOR color, expected_color, got_color; D3DVALUE expected, got, red, green, blue, alpha; +/*___________D3DRMCreateColorRGB_________________________*/ + red=0.8; + green=0.3; + blue=0.55; + expected_color=0xffcc4c8c; + got_color=pD3DRMCreateColorRGB(red,green,blue); + ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color); + /*___________D3DRMCreateColorRGBA________________________*/ red=0.1; green=0.4; diff --git a/include/d3drmdef.h b/include/d3drmdef.h index bd94924..6f769f4 100644 --- a/include/d3drmdef.h +++ b/include/d3drmdef.h @@ -54,6 +54,7 @@ LPD3DVECTOR WINAPI D3DRMVectorReflect(LPD3DVECTOR, LPD3DVECTOR, LPD3DVECTOR); LPD3DVECTOR WINAPI D3DRMVectorScale(LPD3DVECTOR, LPD3DVECTOR, D3DVALUE); LPD3DVECTOR WINAPI D3DRMVectorSubtract(LPD3DVECTOR, LPD3DVECTOR, LPD3DVECTOR); +D3DCOLOR WINAPI D3DRMCreateColorRGB(D3DVALUE, D3DVALUE, D3DVALUE); D3DCOLOR WINAPI D3DRMCreateColorRGBA(D3DVALUE, D3DVALUE, D3DVALUE, D3DVALUE); D3DVALUE WINAPI D3DRMColorGetAlpha(D3DCOLOR); D3DVALUE WINAPI D3DRMColorGetBlue(D3DCOLOR);

1 0

David Adam : d3drm: Implement D3DRMColorGetBlue.
by Alexandre Julliard 21 May '07

21 May '07

Module: wine Branch: master Commit: d400728521975e4f7c533126645e195b55f6b8a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d400728521975e4f7c5331266… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Sun May 20 12:26:21 2007 +0200 d3drm: Implement D3DRMColorGetBlue. --- dlls/d3drm/d3drm.spec | 2 +- dlls/d3drm/math.c | 6 ++++++ dlls/d3drm/tests/vector.c | 8 ++++++++ include/d3drmdef.h | 1 + 4 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec index e98aae8..b7879c4 100644 --- a/dlls/d3drm/d3drm.spec +++ b/dlls/d3drm/d3drm.spec @@ -1,5 +1,5 @@ @ stub D3DRMColorGetAlpha -@ stub D3DRMColorGetBlue +@ stdcall D3DRMColorGetBlue(long) @ stdcall D3DRMColorGetGreen(long) @ stdcall D3DRMColorGetRed(long) @ stub D3DRMCreateColorRGB diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c index 786f6c1..7acd710 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -34,6 +34,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); +/* Determine the blue part of a color */ +D3DVALUE WINAPI D3DRMColorGetBlue(D3DCOLOR color) +{ + return (RGBA_GETBLUE(color)/255.0); +} + /* Determine the green part of a color */ D3DVALUE WINAPI D3DRMColorGetGreen(D3DCOLOR color) { diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c index a5f073e..7f18eef 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 * pD3DRMColorGetBlue)(D3DCOLOR); static D3DVALUE (WINAPI * pD3DRMColorGetGreen)(D3DCOLOR); static D3DVALUE (WINAPI * pD3DRMColorGetRed)(D3DCOLOR); @@ -112,6 +113,7 @@ static BOOL InitFunctionPtrs(void) D3DRM_GET_PROC(D3DRMVectorSubtract) D3DRM_GET_PROC(D3DRMQuaternionFromRotation) D3DRM_GET_PROC(D3DRMQuaternionSlerp) + D3DRM_GET_PROC(D3DRMColorGetBlue) D3DRM_GET_PROC(D3DRMColorGetGreen) D3DRM_GET_PROC(D3DRMColorGetRed) @@ -255,6 +257,12 @@ static void ColorTest(void) D3DCOLOR color; D3DVALUE expected, got; +/*___________D3DRMColorGetBlue__________________________*/ + color=0xc82a1455; + expected=1.0/3.0; + got=pD3DRMColorGetBlue(color); + ok((fabs(expected-got)<admit_error),"Expected=%f, Got=%f\n",expected,got); + /*___________D3DRMColorGetGreen_________________________*/ color=0xad971203; expected=6.0/85.0; diff --git a/include/d3drmdef.h b/include/d3drmdef.h index 19fb15c..73c661f 100644 --- a/include/d3drmdef.h +++ b/include/d3drmdef.h @@ -54,6 +54,7 @@ LPD3DVECTOR WINAPI D3DRMVectorReflect(LPD3DVECTOR, LPD3DVECTOR, LPD3DVECTOR); LPD3DVECTOR WINAPI D3DRMVectorScale(LPD3DVECTOR, LPD3DVECTOR, D3DVALUE); LPD3DVECTOR WINAPI D3DRMVectorSubtract(LPD3DVECTOR, LPD3DVECTOR, LPD3DVECTOR); +D3DVALUE WINAPI D3DRMColorGetBlue(D3DCOLOR); D3DVALUE WINAPI D3DRMColorGetGreen(D3DCOLOR); D3DVALUE WINAPI D3DRMColorGetRed(D3DCOLOR);

1 0

David Adam : d3drm: Implement D3DRMColorGetAlpha.
by Alexandre Julliard 21 May '07

21 May '07

Module: wine Branch: master Commit: d3e8c930e39e621b340bbecfc950f27e60eea2a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3e8c930e39e621b340bbecfc… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Sun May 20 12:27:13 2007 +0200 d3drm: Implement D3DRMColorGetAlpha. --- dlls/d3drm/d3drm.spec | 2 +- dlls/d3drm/math.c | 6 ++++++ dlls/d3drm/tests/vector.c | 8 ++++++++ include/d3drmdef.h | 1 + 4 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec index b7879c4..19df75c 100644 --- a/dlls/d3drm/d3drm.spec +++ b/dlls/d3drm/d3drm.spec @@ -1,4 +1,4 @@ -@ stub D3DRMColorGetAlpha +@ stdcall D3DRMColorGetAlpha(long) @ stdcall D3DRMColorGetBlue(long) @ stdcall D3DRMColorGetGreen(long) @ stdcall D3DRMColorGetRed(long) diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c index 7acd710..f660de4 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -34,6 +34,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); +/* Determine the alpha part of a color */ +D3DVALUE WINAPI D3DRMColorGetAlpha(D3DCOLOR color) +{ + return (RGBA_GETALPHA(color)/255.0); +} + /* Determine the blue part of a color */ D3DVALUE WINAPI D3DRMColorGetBlue(D3DCOLOR color) { diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c index 7f18eef..82d714b 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 * pD3DRMColorGetAlpha)(D3DCOLOR); static D3DVALUE (WINAPI * pD3DRMColorGetBlue)(D3DCOLOR); static D3DVALUE (WINAPI * pD3DRMColorGetGreen)(D3DCOLOR); static D3DVALUE (WINAPI * pD3DRMColorGetRed)(D3DCOLOR); @@ -113,6 +114,7 @@ static BOOL InitFunctionPtrs(void) D3DRM_GET_PROC(D3DRMVectorSubtract) D3DRM_GET_PROC(D3DRMQuaternionFromRotation) D3DRM_GET_PROC(D3DRMQuaternionSlerp) + D3DRM_GET_PROC(D3DRMColorGetAlpha) D3DRM_GET_PROC(D3DRMColorGetBlue) D3DRM_GET_PROC(D3DRMColorGetGreen) D3DRM_GET_PROC(D3DRMColorGetRed) @@ -257,6 +259,12 @@ static void ColorTest(void) D3DCOLOR color; D3DVALUE expected, got; +/*___________D3DRMColorGetAlpha_________________________*/ + color=0x0e4921bf; + expected=14.0/255.0; + got=pD3DRMColorGetAlpha(color); + ok((fabs(expected-got)<admit_error),"Expected=%f, Got=%f\n",expected,got); + /*___________D3DRMColorGetBlue__________________________*/ color=0xc82a1455; expected=1.0/3.0; diff --git a/include/d3drmdef.h b/include/d3drmdef.h index 73c661f..abe8949 100644 --- a/include/d3drmdef.h +++ b/include/d3drmdef.h @@ -54,6 +54,7 @@ LPD3DVECTOR WINAPI D3DRMVectorReflect(LPD3DVECTOR, LPD3DVECTOR, LPD3DVECTOR); LPD3DVECTOR WINAPI D3DRMVectorScale(LPD3DVECTOR, LPD3DVECTOR, D3DVALUE); LPD3DVECTOR WINAPI D3DRMVectorSubtract(LPD3DVECTOR, LPD3DVECTOR, LPD3DVECTOR); +D3DVALUE WINAPI D3DRMColorGetAlpha(D3DCOLOR); D3DVALUE WINAPI D3DRMColorGetBlue(D3DCOLOR); D3DVALUE WINAPI D3DRMColorGetGreen(D3DCOLOR); D3DVALUE WINAPI D3DRMColorGetRed(D3DCOLOR);

1 0

David Adam : d3drm: Implement D3DRMCreateColorRGBA.
by Alexandre Julliard 21 May '07

21 May '07

Module: wine Branch: master Commit: 21b7413deecfaed247b88512426486026cc40044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21b7413deecfaed247b885124… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Sun May 20 16:26:44 2007 +0200 d3drm: Implement D3DRMCreateColorRGBA. --- dlls/d3drm/d3drm.spec | 2 +- dlls/d3drm/math.c | 19 +++++++++++++++++++ dlls/d3drm/tests/vector.c | 33 +++++++++++++++++++++++++++++++-- include/d3drmdef.h | 1 + 4 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec index 19df75c..69da8b6 100644 --- a/dlls/d3drm/d3drm.spec +++ b/dlls/d3drm/d3drm.spec @@ -3,7 +3,7 @@ @ stdcall D3DRMColorGetGreen(long) @ stdcall D3DRMColorGetRed(long) @ stub D3DRMCreateColorRGB -@ stub D3DRMCreateColorRGBA +@ stdcall D3DRMCreateColorRGBA(long long long long) @ stdcall D3DRMMatrixFromQuaternion(ptr ptr) @ stdcall D3DRMQuaternionFromRotation(ptr ptr long) @ stdcall D3DRMQuaternionMultiply(ptr ptr ptr) diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c index f660de4..a06c024 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -34,6 +34,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); +/* Create a RGBA color from its components */ +D3DCOLOR WINAPI D3DRMCreateColorRGBA(D3DVALUE red, D3DVALUE green, D3DVALUE blue, D3DVALUE alpha) +{ + int Red, Green, Blue, Alpha; + Red=floor(red*255); + Green=floor(green*255); + Blue=floor(blue*255); + Alpha=floor(alpha*255); + if (red < 0) Red=0; + if (red > 1) Red=255; + if (green < 0) Green=0; + if (green > 1) Green=255; + if (blue < 0) Blue=0; + if (blue > 1) Blue=255; + if (alpha < 0) Alpha=0; + if (alpha > 1) Alpha=255; + return (RGBA_MAKE(Red, Green, Blue, Alpha)); +} + /* Determine the alpha part of a color */ D3DVALUE WINAPI D3DRMColorGetAlpha(D3DCOLOR color) { diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c index 82d714b..8448879 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 D3DCOLOR (WINAPI * pD3DRMCreateColorRGBA)(D3DVALUE, D3DVALUE, D3DVALUE, D3DVALUE); static D3DVALUE (WINAPI * pD3DRMColorGetAlpha)(D3DCOLOR); static D3DVALUE (WINAPI * pD3DRMColorGetBlue)(D3DCOLOR); static D3DVALUE (WINAPI * pD3DRMColorGetGreen)(D3DCOLOR); @@ -114,6 +115,7 @@ static BOOL InitFunctionPtrs(void) D3DRM_GET_PROC(D3DRMVectorSubtract) D3DRM_GET_PROC(D3DRMQuaternionFromRotation) D3DRM_GET_PROC(D3DRMQuaternionSlerp) + D3DRM_GET_PROC(D3DRMCreateColorRGBA) D3DRM_GET_PROC(D3DRMColorGetAlpha) D3DRM_GET_PROC(D3DRMColorGetBlue) D3DRM_GET_PROC(D3DRMColorGetGreen) @@ -256,8 +258,35 @@ static void QuaternionTest(void) static void ColorTest(void) { - D3DCOLOR color; - D3DVALUE expected, got; + D3DCOLOR color, expected_color, got_color; + D3DVALUE expected, got, red, green, blue, alpha; + +/*___________D3DRMCreateColorRGBA________________________*/ + red=0.1; + green=0.4; + blue=0.7; + alpha=0.58; + expected_color=0x931966b2; + got_color=pD3DRMCreateColorRGBA(red,green,blue,alpha); + ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color); + +/* if a component is <0 then, then one considers this compenent as 0. The following test proves this fact (test only with the red component). */ + red=-0.88; + green=0.4; + blue=0.6; + alpha=0.41; + expected_color=0x68006699; + got_color=pD3DRMCreateColorRGBA(red,green,blue,alpha); + ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color); + +/* if a component is >1 then, then one considers this compenent as 1. The following test proves this fact (test only with the red component). */ + red=2.37; + green=0.4; + blue=0.6; + alpha=0.41; + expected_color=0x68ff6699; + got_color=pD3DRMCreateColorRGBA(red,green,blue,alpha); + ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color); /*___________D3DRMColorGetAlpha_________________________*/ color=0x0e4921bf; diff --git a/include/d3drmdef.h b/include/d3drmdef.h index abe8949..bd94924 100644 --- a/include/d3drmdef.h +++ b/include/d3drmdef.h @@ -54,6 +54,7 @@ LPD3DVECTOR WINAPI D3DRMVectorReflect(LPD3DVECTOR, LPD3DVECTOR, LPD3DVECTOR); LPD3DVECTOR WINAPI D3DRMVectorScale(LPD3DVECTOR, LPD3DVECTOR, D3DVALUE); LPD3DVECTOR WINAPI D3DRMVectorSubtract(LPD3DVECTOR, LPD3DVECTOR, LPD3DVECTOR); +D3DCOLOR WINAPI D3DRMCreateColorRGBA(D3DVALUE, D3DVALUE, D3DVALUE, D3DVALUE); D3DVALUE WINAPI D3DRMColorGetAlpha(D3DCOLOR); D3DVALUE WINAPI D3DRMColorGetBlue(D3DCOLOR); D3DVALUE WINAPI D3DRMColorGetGreen(D3DCOLOR);

1 0

David Adam : d3drm: Implement D3DRMColorGetGreen.
by Alexandre Julliard 21 May '07

21 May '07

Module: wine Branch: master Commit: fba5b11beab2a13b75ffa23b2fe63db723b21eee URL: http://source.winehq.org/git/wine.git/?a=commit;h=fba5b11beab2a13b75ffa23b2… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Sun May 20 12:25:17 2007 +0200 d3drm: Implement D3DRMColorGetGreen. --- dlls/d3drm/d3drm.spec | 2 +- dlls/d3drm/math.c | 6 ++++++ dlls/d3drm/tests/vector.c | 8 ++++++++ include/d3drmdef.h | 1 + 4 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec index 1c937b0..e98aae8 100644 --- a/dlls/d3drm/d3drm.spec +++ b/dlls/d3drm/d3drm.spec @@ -1,6 +1,6 @@ @ stub D3DRMColorGetAlpha @ stub D3DRMColorGetBlue -@ stub D3DRMColorGetGreen +@ stdcall D3DRMColorGetGreen(long) @ stdcall D3DRMColorGetRed(long) @ stub D3DRMCreateColorRGB @ stub D3DRMCreateColorRGBA diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c index 7153eaa..786f6c1 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -34,6 +34,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); +/* Determine the green part of a color */ +D3DVALUE WINAPI D3DRMColorGetGreen(D3DCOLOR color) +{ + return (RGBA_GETGREEN(color)/255.0); +} + /* Determine the red part of a color */ D3DVALUE WINAPI D3DRMColorGetRed(D3DCOLOR color) { diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c index 582c993..a5f073e 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 * pD3DRMColorGetGreen)(D3DCOLOR); static D3DVALUE (WINAPI * pD3DRMColorGetRed)(D3DCOLOR); #define D3DRM_GET_PROC(func) \ @@ -111,6 +112,7 @@ static BOOL InitFunctionPtrs(void) D3DRM_GET_PROC(D3DRMVectorSubtract) D3DRM_GET_PROC(D3DRMQuaternionFromRotation) D3DRM_GET_PROC(D3DRMQuaternionSlerp) + D3DRM_GET_PROC(D3DRMColorGetGreen) D3DRM_GET_PROC(D3DRMColorGetRed) return TRUE; @@ -253,6 +255,12 @@ static void ColorTest(void) D3DCOLOR color; D3DVALUE expected, got; +/*___________D3DRMColorGetGreen_________________________*/ + color=0xad971203; + expected=6.0/85.0; + got=pD3DRMColorGetGreen(color); + ok((fabs(expected-got)<admit_error),"Expected=%f, Got=%f\n",expected,got); + /*___________D3DRMColorGetRed__________________________*/ color=0xb62d7a1c; expected=3.0/17.0; diff --git a/include/d3drmdef.h b/include/d3drmdef.h index 3bdec69..19fb15c 100644 --- a/include/d3drmdef.h +++ b/include/d3drmdef.h @@ -54,6 +54,7 @@ LPD3DVECTOR WINAPI D3DRMVectorReflect(LPD3DVECTOR, LPD3DVECTOR, LPD3DVECTOR); LPD3DVECTOR WINAPI D3DRMVectorScale(LPD3DVECTOR, LPD3DVECTOR, D3DVALUE); LPD3DVECTOR WINAPI D3DRMVectorSubtract(LPD3DVECTOR, LPD3DVECTOR, LPD3DVECTOR); +D3DVALUE WINAPI D3DRMColorGetGreen(D3DCOLOR); D3DVALUE WINAPI D3DRMColorGetRed(D3DCOLOR); #if defined(__cplusplus)

1 0

Dmitry Timoshkov : include/wine/debug.h: Fix compilation warning in 64-bit mode.
by Alexandre Julliard 21 May '07

21 May '07

Module: wine Branch: master Commit: 15f4bac7870cf83dc70e8dc971052506a1a72b40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15f4bac7870cf83dc70e8dc97… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon May 21 15:57:00 2007 +0900 include/wine/debug.h: Fix compilation warning in 64-bit mode. --- include/wine/debug.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index abde9d9..adab558 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -186,7 +186,7 @@ static inline const char *wine_dbgstr_w( const WCHAR *s ) static inline const char *wine_dbgstr_guid( const GUID *id ) { if (!id) return "(null)"; - if (!((INT_PTR)id >> 16)) return wine_dbg_sprintf( "<guid-0x%04x>", (INT_PTR)id & 0xffff ); + if (!((ULONG_PTR)id >> 16)) return wine_dbg_sprintf( "<guid-0x%04lx>", (ULONG_PTR)id & 0xffff ); return wine_dbg_sprintf( "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", id->Data1, id->Data2, id->Data3, id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3],

1 0