Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 32945: Implemented (from Wine): GetCalendarInfoA, GetCalendarInfoW, EnumDateFormatsW, EnumCalendarInfoA, EnumCalendarInfoW, EnumCalendarInfoExA, EnumCalendarInfoExW, FindFirstVolumeA, FindFirstVolumeW, FindNextVolumeA, FindNextVolumeW.
by dchapyshev＠svn.reactos.org 13 Apr '08

13 Apr '08

Author: dchapyshev Date: Sun Apr 13 13:20:21 2008 New Revision: 32945 URL: http://svn.reactos.org/svn/reactos?rev=32945&view=rev Log: Implemented (from Wine): GetCalendarInfoA, GetCalendarInfoW, EnumDateFormatsW, EnumCalendarInfoA, EnumCalendarInfoW, EnumCalendarInfoExA, EnumCalendarInfoExW, FindFirstVolumeA, FindFirstVolumeW, FindNextVolumeA, FindNextVolumeW. Added: trunk/reactos/dll/win32/kernel32/misc/lcformat_private.h (with props) Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c trunk/reactos/dll/win32/kernel32/misc/lcformat.c trunk/reactos/dll/win32/kernel32/misc/stubs.c Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/la… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/lang.c [iso-8859-1] Sun Apr 13 13:20:21 2008 @@ -20,12 +20,15 @@ #define NDEBUG #include <debug.h> +#include "lcformat_private.h" + /* FIXME: these are included in winnls.h, however including this file causes alot of conflicting type errors. */ #define LOCALE_RETURN_NUMBER 0x20000000 #define LOCALE_USE_CP_ACP 0x40000000 #define LOCALE_LOCALEINFOFLAGSMASK (LOCALE_NOUSEROVERRIDE|LOCALE_USE_CP_ACP|LOCALE_RETURN_NUMBER) +#define CALINFO_MAX_YEAR 2029 //static LCID SystemLocale = MAKELCID(LANG_ENGLISH, SORT_DEFAULT); @@ -95,52 +98,6 @@ return lcid; } - -/* - * @unimplemented - */ -BOOL -STDCALL -EnumCalendarInfoExA( - CALINFO_ENUMPROCEXA lpCalInfoEnumProcEx, - LCID Locale, - CALID Calendar, - CALTYPE CalType) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/* - * @unimplemented - */ -BOOL -STDCALL -EnumCalendarInfoExW( - CALINFO_ENUMPROCEXW lpCalInfoEnumProcEx, - LCID Locale, - CALID Calendar, - CALTYPE CalType) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -EnumCalendarInfoW( - CALINFO_ENUMPROCW lpCalInfoEnumProcEx, - LCID Locale, - CALID Calendar, - CALTYPE CalType) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} /************************************************************************** * EnumDateFormatsExA (KERNEL32.@) @@ -771,20 +728,38 @@ } /* - * @unimplemented + * @implemented */ int STDCALL GetCalendarInfoA( - LCID Locale, - CALID Calendar, - CALTYPE CalType, - LPSTR lpCalData, - int cchData, - LPDWORD lpValue) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + LCID lcid, + CALID Calendar, + CALTYPE CalType, + LPSTR lpCalData, + int cchData, + LPDWORD lpValue + ) +{ + int ret; + LPWSTR lpCalDataW = NULL; + + if (NLS_IsUnicodeOnlyLcid(lcid)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (cchData && + !(lpCalDataW = HeapAlloc(GetProcessHeap(), 0, cchData*sizeof(WCHAR)))) + return 0; + + ret = GetCalendarInfoW(lcid, Calendar, CalType, lpCalDataW, cchData, lpValue); + if(ret && lpCalDataW && lpCalData) + WideCharToMultiByte(CP_ACP, 0, lpCalDataW, cchData, lpCalData, cchData, NULL, NULL); + HeapFree(GetProcessHeap(), 0, lpCalDataW); + + return ret; } @@ -801,7 +776,128 @@ int cchData, LPDWORD lpValue) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + if (CalType & CAL_NOUSEROVERRIDE) + DPRINT("FIXME: flag CAL_NOUSEROVERRIDE used, not fully implemented\n"); + if (CalType & CAL_USE_CP_ACP) + DPRINT("FIXME: flag CAL_USE_CP_ACP used, not fully implemented\n"); + + if (CalType & CAL_RETURN_NUMBER) { + if (lpCalData != NULL) + DPRINT("WARNING: lpCalData not NULL (%p) when it should!\n", lpCalData); + if (cchData != 0) + DPRINT("WARNING: cchData not 0 (%d) when it should!\n", cchData); + } else { + if (lpValue != NULL) + DPRINT("WARNING: lpValue not NULL (%p) when it should!\n", lpValue); + } + + /* FIXME: No verification is made yet wrt Locale + * for the CALTYPES not requiring GetLocaleInfoA */ + switch (CalType & ~(CAL_NOUSEROVERRIDE|CAL_RETURN_NUMBER|CAL_USE_CP_ACP)) { + case CAL_ICALINTVALUE: + DPRINT("FIXME: Unimplemented caltype %d\n", CalType & 0xffff); + return E_FAIL; + case CAL_SCALNAME: + DPRINT("FIXME: Unimplemented caltype %d\n", CalType & 0xffff); + return E_FAIL; + case CAL_IYEAROFFSETRANGE: + DPRINT("FIXME: Unimplemented caltype %d\n", CalType & 0xffff); + return E_FAIL; + case CAL_SERASTRING: + DPRINT("FIXME: Unimplemented caltype %d\n", CalType & 0xffff); + return E_FAIL; + case CAL_SSHORTDATE: + return GetLocaleInfoW(Locale, LOCALE_SSHORTDATE, lpCalData, cchData); + case CAL_SLONGDATE: + return GetLocaleInfoW(Locale, LOCALE_SLONGDATE, lpCalData, cchData); + case CAL_SDAYNAME1: + return GetLocaleInfoW(Locale, LOCALE_SDAYNAME1, lpCalData, cchData); + case CAL_SDAYNAME2: + return GetLocaleInfoW(Locale, LOCALE_SDAYNAME2, lpCalData, cchData); + case CAL_SDAYNAME3: + return GetLocaleInfoW(Locale, LOCALE_SDAYNAME3, lpCalData, cchData); + case CAL_SDAYNAME4: + return GetLocaleInfoW(Locale, LOCALE_SDAYNAME4, lpCalData, cchData); + case CAL_SDAYNAME5: + return GetLocaleInfoW(Locale, LOCALE_SDAYNAME5, lpCalData, cchData); + case CAL_SDAYNAME6: + return GetLocaleInfoW(Locale, LOCALE_SDAYNAME6, lpCalData, cchData); + case CAL_SDAYNAME7: + return GetLocaleInfoW(Locale, LOCALE_SDAYNAME7, lpCalData, cchData); + case CAL_SABBREVDAYNAME1: + return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME1, lpCalData, cchData); + case CAL_SABBREVDAYNAME2: + return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME2, lpCalData, cchData); + case CAL_SABBREVDAYNAME3: + return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME3, lpCalData, cchData); + case CAL_SABBREVDAYNAME4: + return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME4, lpCalData, cchData); + case CAL_SABBREVDAYNAME5: + return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME5, lpCalData, cchData); + case CAL_SABBREVDAYNAME6: + return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME6, lpCalData, cchData); + case CAL_SABBREVDAYNAME7: + return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME7, lpCalData, cchData); + case CAL_SMONTHNAME1: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME1, lpCalData, cchData); + case CAL_SMONTHNAME2: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME2, lpCalData, cchData); + case CAL_SMONTHNAME3: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME3, lpCalData, cchData); + case CAL_SMONTHNAME4: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME4, lpCalData, cchData); + case CAL_SMONTHNAME5: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME5, lpCalData, cchData); + case CAL_SMONTHNAME6: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME6, lpCalData, cchData); + case CAL_SMONTHNAME7: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME7, lpCalData, cchData); + case CAL_SMONTHNAME8: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME8, lpCalData, cchData); + case CAL_SMONTHNAME9: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME9, lpCalData, cchData); + case CAL_SMONTHNAME10: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME10, lpCalData, cchData); + case CAL_SMONTHNAME11: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME11, lpCalData, cchData); + case CAL_SMONTHNAME12: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME12, lpCalData, cchData); + case CAL_SMONTHNAME13: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME13, lpCalData, cchData); + case CAL_SABBREVMONTHNAME1: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME1, lpCalData, cchData); + case CAL_SABBREVMONTHNAME2: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME2, lpCalData, cchData); + case CAL_SABBREVMONTHNAME3: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME3, lpCalData, cchData); + case CAL_SABBREVMONTHNAME4: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME4, lpCalData, cchData); + case CAL_SABBREVMONTHNAME5: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME5, lpCalData, cchData); + case CAL_SABBREVMONTHNAME6: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME6, lpCalData, cchData); + case CAL_SABBREVMONTHNAME7: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME7, lpCalData, cchData); + case CAL_SABBREVMONTHNAME8: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME8, lpCalData, cchData); + case CAL_SABBREVMONTHNAME9: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME9, lpCalData, cchData); + case CAL_SABBREVMONTHNAME10: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME10, lpCalData, cchData); + case CAL_SABBREVMONTHNAME11: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME11, lpCalData, cchData); + case CAL_SABBREVMONTHNAME12: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME12, lpCalData, cchData); + case CAL_SABBREVMONTHNAME13: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME13, lpCalData, cchData); + case CAL_SYEARMONTH: + return GetLocaleInfoW(Locale, LOCALE_SYEARMONTH, lpCalData, cchData); + case CAL_ITWODIGITYEARMAX: + if (lpValue) *lpValue = CALINFO_MAX_YEAR; + break; + default: DPRINT("Unknown caltype %d\n",CalType & 0xffff); + return E_FAIL; + } return 0; } Modified: trunk/reactos/dll/win32/kernel32/misc/lcformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/lc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lcformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/lcformat.c [iso-8859-1] Sun Apr 13 13:20:21 2008 @@ -37,6 +37,7 @@ #define TRACE DPRINT #define WARN DPRINT1 +#define ERR DPRINT1 #define FIXME DPRINT1 #define DATE_DATEVARSONLY 0x0100 /* only date stuff: yMdg */ @@ -1993,11 +1994,40 @@ /************************************************************************** * EnumDateFormatsW (KERNEL32.@) */ -BOOL WINAPI EnumDateFormatsW( DATEFMT_ENUMPROCW lpDateFmtEnumProc, LCID Locale, DWORD dwFlags ) -{ - FIXME("(%p, %ld, %ld): stub\n", lpDateFmtEnumProc, Locale, dwFlags); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; +BOOL WINAPI EnumDateFormatsW( DATEFMT_ENUMPROCW proc, LCID lcid, DWORD flags ) +{ + WCHAR buf[256]; + + if (!proc) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + switch (flags & ~LOCALE_USE_CP_ACP) + { + case 0: + case DATE_SHORTDATE: + if (GetLocaleInfoW(lcid, LOCALE_SSHORTDATE | (flags & LOCALE_USE_CP_ACP), buf, 256)) + proc(buf); + break; + + case DATE_LONGDATE: + if (GetLocaleInfoW(lcid, LOCALE_SLONGDATE | (flags & LOCALE_USE_CP_ACP), buf, 256)) + proc(buf); + break; + + case DATE_YEARMONTH: + if (GetLocaleInfoW(lcid, LOCALE_SYEARMONTH | (flags & LOCALE_USE_CP_ACP), buf, 256)) + proc(buf); + break; + + default: + FIXME("Unknown date format (%d)\n", flags); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + return TRUE; } /************************************************************************** @@ -2081,11 +2111,184 @@ } /****************************************************************************** + * NLS_EnumCalendarInfoAW <internal> + * Enumerates calendar information for a specified locale. + * + * PARAMS + * calinfoproc [I] Pointer to the callback + * locale [I] The locale for which to retrieve calendar information. + * This parameter can be a locale identifier created by the + * MAKELCID macro, or one of the following values: + * LOCALE_SYSTEM_DEFAULT + * Use the default system locale. + * LOCALE_USER_DEFAULT + * Use the default user locale. + * calendar [I] The calendar for which information is requested, or + * ENUM_ALL_CALENDARS. + * caltype [I] The type of calendar information to be returned. Note + * that only one CALTYPE value can be specified per call + * of this function, except where noted. + * unicode [I] Specifies if the callback expects a unicode string. + * ex [I] Specifies if the callback needs the calendar identifier. + * + * RETURNS + * Success: TRUE. + * Failure: FALSE. Use GetLastError() to determine the cause. + * + * NOTES + * When the ANSI version of this function is used with a Unicode-only LCID, + * the call can succeed because the system uses the system code page. + * However, characters that are undefined in the system code page appear + * in the string as a question mark (?). + * + * TODO + * The above note should be respected by GetCalendarInfoA. + */ +static BOOL NLS_EnumCalendarInfoAW(void *calinfoproc, LCID locale, + CALID calendar, CALTYPE caltype, BOOL unicode, BOOL ex ) +{ + WCHAR *buf, *opt = NULL, *iter = NULL; + BOOL ret = FALSE; + int bufSz = 200; /* the size of the buffer */ + + if (calinfoproc == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + buf = HeapAlloc(GetProcessHeap(), 0, bufSz); + if (buf == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + if (calendar == ENUM_ALL_CALENDARS) + { + int optSz = GetLocaleInfoW(locale, LOCALE_IOPTIONALCALENDAR, NULL, 0); + if (optSz > 1) + { + opt = HeapAlloc(GetProcessHeap(), 0, optSz * sizeof(WCHAR)); + if (opt == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto NLS_EnumCalendarInfoAW_Cleanup; + } + if (GetLocaleInfoW(locale, LOCALE_IOPTIONALCALENDAR, opt, optSz)) + iter = opt; + } + calendar = NLS_GetLocaleNumber(locale, LOCALE_ICALENDARTYPE); + } + + while (TRUE) /* loop through calendars */ + { + do /* loop until there's no error */ + { + if (unicode) + ret = GetCalendarInfoW(locale, calendar, caltype, buf, bufSz / sizeof(WCHAR), NULL); + else ret = GetCalendarInfoA(locale, calendar, caltype, (CHAR*)buf, bufSz / sizeof(CHAR), NULL); + + if (!ret) + { + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { /* so resize it */ + int newSz; + if (unicode) + newSz = GetCalendarInfoW(locale, calendar, caltype, NULL, 0, NULL) * sizeof(WCHAR); + else newSz = GetCalendarInfoA(locale, calendar, caltype, NULL, 0, NULL) * sizeof(CHAR); + if (bufSz >= newSz) + { + ERR("Buffer resizing disorder: was %d, requested %d.\n", bufSz, newSz); + goto NLS_EnumCalendarInfoAW_Cleanup; + } + bufSz = newSz; + WARN("Buffer too small; resizing to %d bytes.\n", bufSz); + buf = HeapReAlloc(GetProcessHeap(), 0, buf, bufSz); + if (buf == NULL) + goto NLS_EnumCalendarInfoAW_Cleanup; + } else goto NLS_EnumCalendarInfoAW_Cleanup; + } + } while (!ret); + + /* Here we are. We pass the buffer to the correct version of + * the callback. Because it's not the same number of params, + * we must check for Ex, but we don't care about Unicode + * because the buffer is already in the correct format. + */ + if (ex) { + ret = ((CALINFO_ENUMPROCEXW)calinfoproc)(buf, calendar); + } else + ret = ((CALINFO_ENUMPROCW)calinfoproc)(buf); + + if (!ret) { /* the callback told to stop */ + ret = TRUE; + break; + } + + if ((iter == NULL) || (*iter == 0)) /* no more calendars */ + break; + + calendar = 0; + while ((*iter >= '0') && (*iter <= '9')) + calendar = calendar * 10 + *iter++ - '0'; + + if (*iter++ != 0) + { + SetLastError(ERROR_BADDB); + ret = FALSE; + break; + } + } + +NLS_EnumCalendarInfoAW_Cleanup: + HeapFree(GetProcessHeap(), 0, opt); + HeapFree(GetProcessHeap(), 0, buf); + return ret; +} + +/****************************************************************************** * EnumCalendarInfoA [KERNEL32.@] */ BOOL WINAPI EnumCalendarInfoA( CALINFO_ENUMPROCA calinfoproc,LCID locale, CALID calendar,CALTYPE caltype ) { FIXME("(%p,0x%04lx,0x%08lx,0x%08lx),stub!\n",calinfoproc,locale,calendar,caltype); - return FALSE; -} + return NLS_EnumCalendarInfoAW(calinfoproc, locale, calendar, caltype, FALSE, FALSE); +} + +/****************************************************************************** + * EnumCalendarInfoW [KERNEL32.@] + * + * See EnumCalendarInfoAW. + */ +BOOL WINAPI EnumCalendarInfoW( CALINFO_ENUMPROCW calinfoproc,LCID locale, + CALID calendar,CALTYPE caltype ) +{ + TRACE("(%p,0x%08x,0x%08x,0x%08x)\n", calinfoproc, locale, calendar, caltype); + return NLS_EnumCalendarInfoAW(calinfoproc, locale, calendar, caltype, TRUE, FALSE); +} + +/****************************************************************************** + * EnumCalendarInfoExA [KERNEL32.@] + * + * See EnumCalendarInfoAW. + */ +BOOL WINAPI EnumCalendarInfoExA( CALINFO_ENUMPROCEXA calinfoproc,LCID locale, + CALID calendar,CALTYPE caltype ) +{ + TRACE("(%p,0x%08x,0x%08x,0x%08x)\n", calinfoproc, locale, calendar, caltype); + return NLS_EnumCalendarInfoAW(calinfoproc, locale, calendar, caltype, FALSE, TRUE); +} + +/****************************************************************************** + * EnumCalendarInfoExW [KERNEL32.@] + * + * See EnumCalendarInfoAW. + */ +BOOL WINAPI EnumCalendarInfoExW( CALINFO_ENUMPROCEXW calinfoproc,LCID locale, + CALID calendar,CALTYPE caltype ) +{ + TRACE("(%p,0x%08x,0x%08x,0x%08x)\n", calinfoproc, locale, calendar, caltype); + return NLS_EnumCalendarInfoAW(calinfoproc, locale, calendar, caltype, TRUE, TRUE); +} Added: trunk/reactos/dll/win32/kernel32/misc/lcformat_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/lc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lcformat_private.h (added) +++ trunk/reactos/dll/win32/kernel32/misc/lcformat_private.h [iso-8859-1] Sun Apr 13 13:20:21 2008 @@ -1,0 +1,15 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS System Libraries + * FILE: lib/kernel32/misc/lcformat_private.h + * PURPOSE: Win32 Kernel Libary Header + * PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) + */ + +#ifndef __LCFORMAT_PRIVATE_H +#define __LCFORMAT_PRIVATE_H + +/*lcformat.c */ +extern BOOL NLS_IsUnicodeOnlyLcid(LCID); + +#endif /* __LCFORMAT_PRIVATE_H */ Propchange: trunk/reactos/dll/win32/kernel32/misc/lcformat_private.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] Sun Apr 13 13:20:21 2008 @@ -730,8 +730,15 @@ EXECUTION_STATE esFlags ) { - STUB; - return 0; + static EXECUTION_STATE current = + ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED | ES_USER_PRESENT; + EXECUTION_STATE old = current; + + DPRINT1("(0x%x): stub, harmless.\n", esFlags); + + if (!(current & ES_CONTINUOUS) || (esFlags & ES_CONTINUOUS)) + current = esFlags; + return old; } /* @@ -785,27 +792,80 @@ BOOL STDCALL DnsHostnameToComputerNameW ( - LPCWSTR Hostname, - LPWSTR ComputerName, - LPDWORD nSize - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented + LPCWSTR hostname, + LPWSTR computername, + LPDWORD size + ) +{ + DWORD len; + + DPRINT("(%s, %p, %p): stub\n", hostname, computername, size); + + if (!hostname || !size) return FALSE; + len = lstrlenW(hostname); + + if (len > MAX_COMPUTERNAME_LENGTH) + len = MAX_COMPUTERNAME_LENGTH; + + if (*size < len) + { + *size = len; + return FALSE; + } + if (!computername) return FALSE; + + memcpy( computername, hostname, len * sizeof(WCHAR) ); + computername[len + 1] = 0; + return TRUE; +} + +/* + * @implemented */ HANDLE STDCALL FindFirstVolumeW( - LPWSTR lpszVolumeName, - DWORD cchBufferLength - ) -{ - STUB; - return 0; + LPWSTR volume, + DWORD len + ) +{ + DWORD size = 1024; + HANDLE mgr = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, 0 ); + if (mgr == INVALID_HANDLE_VALUE) return INVALID_HANDLE_VALUE; + + for (;;) + { + MOUNTMGR_MOUNT_POINT input; + MOUNTMGR_MOUNT_POINTS *output; + + if (!(output = HeapAlloc( GetProcessHeap(), 0, size ))) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + break; + } + memset( &input, 0, sizeof(input) ); + + if (!DeviceIoControl( mgr, IOCTL_MOUNTMGR_QUERY_POINTS, &input, sizeof(input), + output, size, NULL, NULL )) + { + if (GetLastError() != ERROR_MORE_DATA) break; + size = output->Size; + HeapFree( GetProcessHeap(), 0, output ); + continue; + } + CloseHandle( mgr ); + /* abuse the Size field to store the current index */ + output->Size = 0; + if (!FindNextVolumeW( output, volume, len )) + { + HeapFree( GetProcessHeap(), 0, output ); + return INVALID_HANDLE_VALUE; + } + return (HANDLE)output; + } + CloseHandle( mgr ); + return INVALID_HANDLE_VALUE; } /* @@ -824,18 +884,40 @@ } /* - * @unimplemented + * @implemented */ BOOL STDCALL FindNextVolumeW( - HANDLE hFindVolume, - LPWSTR lpszVolumeName, - DWORD cchBufferLength - ) -{ - STUB; - return 0; + HANDLE handle, + LPWSTR volume, + DWORD len + ) +{ + MOUNTMGR_MOUNT_POINTS *data = handle; + + while (data->Size < data->NumberOfMountPoints) + { + static const WCHAR volumeW[] = {'\\','?','?','\\','V','o','l','u','m','e','{',}; + WCHAR *link = (WCHAR *)((char *)data + data->MountPoints[data->Size].SymbolicLinkNameOffset); + DWORD size = data->MountPoints[data->Size].SymbolicLinkNameLength; + data->Size++; + /* skip non-volumes */ + if (size < sizeof(volumeW) || memcmp( link, volumeW, sizeof(volumeW) )) continue; + if (size + sizeof(WCHAR) >= len * sizeof(WCHAR)) + { + SetLastError( ERROR_FILENAME_EXCED_RANGE ); + return FALSE; + } + memcpy( volume, link, size ); + volume[1] = '\\'; /* map \??\ to \\?\ */ + volume[size / sizeof(WCHAR)] = '\\'; /* Windows appends a backslash */ + volume[size / sizeof(WCHAR) + 1] = 0; + DPRINT( "returning entry %u %s\n", data->Size - 1, volume ); + return TRUE; + } + SetLastError( ERROR_NO_MORE_FILES ); + return FALSE; } /* @@ -977,17 +1059,28 @@ } /* - * @unimplemented + * @implemented */ HANDLE STDCALL FindFirstVolumeA( - LPSTR lpszVolumeName, - DWORD cchBufferLength - ) -{ - STUB; - return 0; + LPSTR volume, + DWORD len + ) +{ + WCHAR *buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + HANDLE handle = FindFirstVolumeW( buffer, len ); + + if (handle != INVALID_HANDLE_VALUE) + { + if (!WideCharToMultiByte( CP_ACP, 0, buffer, -1, volume, len, NULL, NULL )) + { + FindVolumeClose( handle ); + handle = INVALID_HANDLE_VALUE; + } + } + HeapFree( GetProcessHeap(), 0, buffer ); + return handle; } /* @@ -1011,13 +1104,20 @@ BOOL STDCALL FindNextVolumeA( - HANDLE hFindVolume, - LPSTR lpszVolumeName, - DWORD cchBufferLength - ) -{ - STUB; - return 0; + HANDLE handle, + LPSTR volume, + DWORD len + ) +{ + WCHAR *buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + BOOL ret; + + if ((ret = FindNextVolumeW( handle, buffer, len ))) + { + if (!WideCharToMultiByte( CP_ACP, 0, buffer, -1, volume, len, NULL, NULL )) ret = FALSE; + } + HeapFree( GetProcessHeap(), 0, buffer ); + return ret; } /*

1 0

[greatlrd] 32944: adding test for param puNumHeaps and puvmList in NtGdiDdQueryDirectDrawObject test only param puNumFourCC, puFourCC left to add test for.
by greatlrd＠svn.reactos.org 13 Apr '08

13 Apr '08

Author: greatlrd Date: Sun Apr 13 12:02:33 2008 New Revision: 32944 URL: http://svn.reactos.org/svn/reactos?rev=32944&view=rev Log: adding test for param puNumHeaps and puvmList in NtGdiDdQueryDirectDrawObject test only param puNumFourCC, puFourCC left to add test for. Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c [iso-8859-1] Sun Apr 13 12:02:33 2008 @@ -32,7 +32,7 @@ DD_D3DBUFCALLBACKS oldD3dBufferCallbacks; DDSURFACEDESC2 D3dTextureFormats[100]; - //DWORD NumHeaps = 0; + DWORD NumHeaps = 0; VIDEOMEMORY vmList; //DWORD NumFourCC = 0; //DWORD FourCC = 0; @@ -639,12 +639,142 @@ } + /* testing NtGdiDdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, puNumHeaps, NULL, */ + pHalInfo = &HalInfo; + pCallBackFlags = CallBackFlags; + puD3dCallbacks = &D3dCallbacks; + puD3dDriverData = &D3dDriverData; + puD3dBufferCallbacks = &D3dBufferCallbacks; + puNumHeaps = &NumHeaps; + + if (puD3dDriverData->dwNumTextureFormats != 0) + { + RtlZeroMemory(puD3dTextureFormats, puD3dDriverData->dwNumTextureFormats * sizeof(DDSURFACEDESC2)); + } + RtlZeroMemory(pHalInfo,sizeof(DD_HALINFO)); + RtlZeroMemory(pCallBackFlags,sizeof(DWORD)*3); + RtlZeroMemory(puD3dCallbacks,sizeof(D3DNTHAL_CALLBACKS)); + RtlZeroMemory(puD3dDriverData,sizeof(D3DNTHAL_GLOBALDRIVERDATA)); + RtlZeroMemory(&D3dBufferCallbacks,sizeof(DD_D3DBUFCALLBACKS)); + + RTEST(NtGdiDdQueryDirectDrawObject( hDirectDraw, pHalInfo, + pCallBackFlags, puD3dCallbacks, + puD3dDriverData, puD3dBufferCallbacks, + puD3dTextureFormats, puNumHeaps, + puvmList, puNumFourCC, + puFourCC)== FALSE); + + RTEST(pHalInfo != NULL); + ASSERT(pHalInfo != NULL); + + RTEST(pCallBackFlags != NULL); + ASSERT(pCallBackFlags != NULL); + + RTEST(puD3dCallbacks != NULL); + ASSERT(puD3dCallbacks != NULL); + + RTEST(puD3dDriverData != NULL); + ASSERT(puD3dDriverData != NULL); + + RTEST(puD3dBufferCallbacks != NULL); + ASSERT(puD3dDriverData != NULL); + + RTEST(puD3dTextureFormats != NULL); + ASSERT(puD3dTextureFormats != NULL); + + RTEST(puNumHeaps != NULL); + ASSERT(puNumHeaps != NULL); + RTEST(NumHeaps == 0); + + RTEST(puNumFourCC == NULL); + RTEST(puFourCC == NULL); + + RTEST(puvmList == NULL); + + /* We retesting the flags */ + RTEST(pCallBackFlags[0] != 0); + RTEST(pCallBackFlags[1] != 0); + RTEST(pCallBackFlags[2] == 0); + + /* We do not retesting instead we compare it */ + RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); + RTEST(memcmp(&oldD3dCallbacks, puD3dCallbacks, sizeof(D3DNTHAL_CALLBACKS)) == 0); + RTEST(memcmp(&oldD3dDriverData, puD3dDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA)) == 0); + RTEST(memcmp(&oldD3dBufferCallbacks, puD3dBufferCallbacks, sizeof(DD_D3DBUFCALLBACKS)) == 0); + /* we skip resting texture */ + + + /* testing NtGdiDdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, puNumHeaps, puvmList, NULL, */ + pHalInfo = &HalInfo; + pCallBackFlags = CallBackFlags; + puD3dCallbacks = &D3dCallbacks; + puD3dDriverData = &D3dDriverData; + puD3dBufferCallbacks = &D3dBufferCallbacks; + puNumHeaps = &NumHeaps; + puvmList = &vmList; + + if (puD3dDriverData->dwNumTextureFormats != 0) + { + RtlZeroMemory(puD3dTextureFormats, puD3dDriverData->dwNumTextureFormats * sizeof(DDSURFACEDESC2)); + } + RtlZeroMemory(pHalInfo,sizeof(DD_HALINFO)); + RtlZeroMemory(pCallBackFlags,sizeof(DWORD)*3); + RtlZeroMemory(puD3dCallbacks,sizeof(D3DNTHAL_CALLBACKS)); + RtlZeroMemory(puD3dDriverData,sizeof(D3DNTHAL_GLOBALDRIVERDATA)); + RtlZeroMemory(&D3dBufferCallbacks,sizeof(DD_D3DBUFCALLBACKS)); + + RTEST(NtGdiDdQueryDirectDrawObject( hDirectDraw, pHalInfo, + pCallBackFlags, puD3dCallbacks, + puD3dDriverData, puD3dBufferCallbacks, + puD3dTextureFormats, puNumHeaps, + puvmList, puNumFourCC, + puFourCC)== FALSE); + + RTEST(pHalInfo != NULL); + ASSERT(pHalInfo != NULL); + + RTEST(pCallBackFlags != NULL); + ASSERT(pCallBackFlags != NULL); + + RTEST(puD3dCallbacks != NULL); + ASSERT(puD3dCallbacks != NULL); + + RTEST(puD3dDriverData != NULL); + ASSERT(puD3dDriverData != NULL); + + RTEST(puD3dBufferCallbacks != NULL); + ASSERT(puD3dDriverData != NULL); + + RTEST(puD3dTextureFormats != NULL); + ASSERT(puD3dTextureFormats != NULL); + + RTEST(puNumHeaps != NULL); + ASSERT(puNumHeaps != NULL); + RTEST(NumHeaps == 0); + + RTEST(puvmList != NULL); + + RTEST(puNumFourCC == NULL); + RTEST(puFourCC == NULL); + + + + /* We retesting the flags */ + RTEST(pCallBackFlags[0] != 0); + RTEST(pCallBackFlags[1] != 0); + RTEST(pCallBackFlags[2] == 0); + + /* We do not retesting instead we compare it */ + RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); + RTEST(memcmp(&oldD3dCallbacks, puD3dCallbacks, sizeof(D3DNTHAL_CALLBACKS)) == 0); + RTEST(memcmp(&oldD3dDriverData, puD3dDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA)) == 0); + RTEST(memcmp(&oldD3dBufferCallbacks, puD3dBufferCallbacks, sizeof(DD_D3DBUFCALLBACKS)) == 0); + /* we skip resting texture */ + /* Todo * adding test for * puNumFourCC * puFourCC - * puNumHeaps - * puvmList */ /* Cleanup ReactX setup */

1 0

[greatlrd] 32943: adding test for param puD3dTextureFormats in NtGdiDdQueryDirectDrawObject test only param puNumHeaps, puvmList, puNumFourCC, puFourCC left to add test for.
by greatlrd＠svn.reactos.org 13 Apr '08

13 Apr '08

Author: greatlrd Date: Sun Apr 13 10:38:23 2008 New Revision: 32943 URL: http://svn.reactos.org/svn/reactos?rev=32943&view=rev Log: adding test for param puD3dTextureFormats in NtGdiDdQueryDirectDrawObject test only param puNumHeaps, puvmList, puNumFourCC, puFourCC left to add test for. Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c [iso-8859-1] Sun Apr 13 10:38:23 2008 @@ -38,6 +38,9 @@ //DWORD FourCC = 0; DEVMODE devmode; HDC hdc; + + DWORD dwTextureCounter = 0; + DDSURFACEDESC *myDesc = NULL; /* clear data */ memset(&vmList,0,sizeof(VIDEOMEMORY)); @@ -529,62 +532,11 @@ RTEST( puD3dBufferCallbacks->UnlockD3DBuffer == NULL); } - /* Backup D3DHAL_GLOBALDRIVERDATA so we do not need resting it */ + /* Backup DD_D3DBUFCALLBACKS so we do not need resting it */ RtlCopyMemory(&oldD3dBufferCallbacks, &D3dBufferCallbacks, sizeof(DD_D3DBUFCALLBACKS)); -/* Next Start 6 */ - pHalInfo = &HalInfo; - pCallBackFlags = CallBackFlags; - puD3dCallbacks = &D3dCallbacks; - puD3dDriverData = &D3dDriverData; - puD3dBufferCallbacks = &D3dBufferCallbacks; - - RtlZeroMemory(pHalInfo,sizeof(DD_HALINFO)); - RtlZeroMemory(pCallBackFlags,sizeof(DWORD)*3); - RtlZeroMemory(puD3dCallbacks,sizeof(D3DNTHAL_CALLBACKS)); - RtlZeroMemory(puD3dDriverData,sizeof(D3DNTHAL_GLOBALDRIVERDATA)); - RtlZeroMemory(&D3dBufferCallbacks,sizeof(DD_D3DBUFCALLBACKS)); - - RTEST(NtGdiDdQueryDirectDrawObject( hDirectDraw, pHalInfo, - pCallBackFlags, puD3dCallbacks, - puD3dDriverData, puD3dBufferCallbacks, - puD3dTextureFormats, puNumHeaps, - puvmList, puNumFourCC, - puFourCC)== FALSE); - RTEST(pHalInfo != NULL); - RTEST(pCallBackFlags != NULL); - - if (pHalInfo->ddCaps.ddsCaps.dwCaps & DDSCAPS_3DDEVICE ) - { - RTEST(puD3dCallbacks != NULL); - RTEST(puD3dDriverData != NULL); - RTEST(puD3dBufferCallbacks != NULL); - } - - RTEST(puD3dTextureFormats == NULL); - RTEST(puNumFourCC == NULL); - RTEST(puFourCC == NULL); - RTEST(puNumHeaps == NULL); - RTEST(puvmList == NULL); - ASSERT(pHalInfo != NULL); - - /* We do not retesting DD_HALINFO, instead we compare it */ - RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); - RTEST(pCallBackFlags[0] != 0); - RTEST(pCallBackFlags[1] != 0); - RTEST(pCallBackFlags[2] == 0); - - /* We do not retesting instead we compare it */ - RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); - RTEST(memcmp(&oldD3dCallbacks, puD3dCallbacks, sizeof(D3DNTHAL_CALLBACKS)) == 0); - RTEST(memcmp(&oldD3dDriverData, puD3dDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA)) == 0); - RTEST(memcmp(&oldD3dBufferCallbacks, puD3dBufferCallbacks, sizeof(DD_D3DBUFCALLBACKS)) == 0); - - - - -/* Next Start 7 */ +/* testing NtGdiDdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, */ pHalInfo = &HalInfo; pCallBackFlags = CallBackFlags; puD3dCallbacks = &D3dCallbacks; @@ -613,29 +565,31 @@ puD3dTextureFormats, puNumHeaps, puvmList, puNumFourCC, puFourCC)== FALSE); + RTEST(pHalInfo != NULL); + ASSERT(pHalInfo != NULL); + RTEST(pCallBackFlags != NULL); - - if (pHalInfo->ddCaps.ddsCaps.dwCaps & DDSCAPS_3DDEVICE ) - { - RTEST(puD3dCallbacks != NULL); - RTEST(puD3dDriverData != NULL); + ASSERT(pCallBackFlags != NULL); + + RTEST(puD3dCallbacks != NULL); + ASSERT(puD3dCallbacks != NULL); + + RTEST(puD3dDriverData != NULL); + ASSERT(puD3dDriverData != NULL); + RTEST(puD3dBufferCallbacks != NULL); - if (puD3dDriverData->dwNumTextureFormats != 0) - { - /* FIXME add a better test for texture */ - RTEST(puD3dTextureFormats != NULL); - } - } - + ASSERT(puD3dDriverData != NULL); + + RTEST(puD3dTextureFormats != NULL); + ASSERT(puD3dTextureFormats != NULL); + RTEST(puNumFourCC == NULL); RTEST(puFourCC == NULL); RTEST(puNumHeaps == NULL); RTEST(puvmList == NULL); - ASSERT(pHalInfo != NULL); - - /* We do not retesting DD_HALINFO, instead we compare it */ - RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); + + /* We retesting the flags */ RTEST(pCallBackFlags[0] != 0); RTEST(pCallBackFlags[1] != 0); RTEST(pCallBackFlags[2] == 0); @@ -646,13 +600,47 @@ RTEST(memcmp(&oldD3dDriverData, puD3dDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA)) == 0); RTEST(memcmp(&oldD3dBufferCallbacks, puD3dBufferCallbacks, sizeof(DD_D3DBUFCALLBACKS)) == 0); - + /* start test of dwNumTextureFormats */ + if (puD3dDriverData->dwNumTextureFormats != 0) + { + myDesc = puD3dTextureFormats; + for (dwTextureCounter=0;dwTextureCounter<puD3dDriverData->dwNumTextureFormats;dwTextureCounter++) + { + RTEST(myDesc->dwSize == sizeof(DDSURFACEDESC)) + ASSERT(myDesc->dwSize == sizeof(DDSURFACEDESC)); + + RTEST( (myDesc->dwFlags & (~(DDSD_CAPS|DDSD_PIXELFORMAT))) == 0); + RTEST(myDesc->dwHeight == 0); + RTEST(myDesc->dwWidth == 0); + RTEST(myDesc->dwLinearSize == 0); + RTEST(myDesc->dwBackBufferCount == 0); + RTEST(myDesc->dwZBufferBitDepth == 0); + RTEST(myDesc->dwAlphaBitDepth == 0); + RTEST(myDesc->dwReserved == 0); + RTEST(myDesc->lpSurface == 0); + RTEST(myDesc->ddckCKDestOverlay.dwColorSpaceLowValue == 0); + RTEST(myDesc->ddckCKDestOverlay.dwColorSpaceHighValue == 0); + RTEST(myDesc->ddckCKDestBlt.dwColorSpaceLowValue == 0); + RTEST(myDesc->ddckCKDestBlt.dwColorSpaceHighValue == 0); + RTEST(myDesc->ddckCKSrcOverlay.dwColorSpaceLowValue == 0); + RTEST(myDesc->ddckCKSrcOverlay.dwColorSpaceHighValue == 0); + RTEST(myDesc->ddckCKSrcBlt.dwColorSpaceLowValue == 0); + RTEST(myDesc->ddckCKSrcBlt.dwColorSpaceHighValue == 0); + RTEST(myDesc->ddpfPixelFormat.dwSize == sizeof(DDPIXELFORMAT)); + RTEST(myDesc->ddpfPixelFormat.dwFlags != 0); + if (myDesc->ddpfPixelFormat.dwFlags & DDPF_FOURCC) + { + RTEST(myDesc->ddpfPixelFormat.dwFourCC != 0); + } + RTEST(myDesc->ddsCaps.dwCaps == DDSCAPS_TEXTURE); + + myDesc = (DDSURFACEDESC *) (((DWORD) myDesc) + sizeof(DDSURFACEDESC)); + } + } + /* Todo - * adding test for - * puD3dCallbacks - * puD3dDriverData - * puD3dBufferCallbacks + * adding test for * puNumFourCC * puFourCC * puNumHeaps

1 0

[greatlrd] 32942: implement dump for all texture format our drv can create in windows nt and reactos
by greatlrd＠svn.reactos.org 13 Apr '08

13 Apr '08

Author: greatlrd Date: Sun Apr 13 09:50:23 2008 New Revision: 32942 URL: http://svn.reactos.org/svn/reactos?rev=32942&view=rev Log: implement dump for all texture format our drv can create in windows nt and reactos Modified: trunk/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c trunk/rostests/dxtest/win32kdxtest/dump.c trunk/rostests/dxtest/win32kdxtest/test.h Modified: trunk/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/NtGdi… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c [iso-8859-1] (original) +++ trunk/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c [iso-8859-1] Sun Apr 13 09:50:23 2008 @@ -405,12 +405,12 @@ if (dumping_on == TRUE) { - dump_halinfo(pHalInfo,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL, ...)"); - dump_CallBackFlags(pCallBackFlags,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL, ...)"); - dump_D3dCallbacks(puD3dCallbacks,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL, ...)"); - dump_D3dDriverData(puD3dDriverData, "NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL, ...)"); - dump_D3dBufferCallbacks(puD3dBufferCallbacks, "NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL, ...)"); - /* FIXME dump puD3dTextureFormats */ + dump_halinfo(pHalInfo,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...)"); + dump_CallBackFlags(pCallBackFlags,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...)"); + dump_D3dCallbacks(puD3dCallbacks,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...)"); + dump_D3dDriverData(puD3dDriverData, "NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...)"); + dump_D3dBufferCallbacks(puD3dBufferCallbacks, "NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...)"); + dump_D3dTextureFormats(puD3dTextureFormats, puD3dDriverData->dwNumTextureFormats, "NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...)"); } Modified: trunk/rostests/dxtest/win32kdxtest/dump.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/dump.… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/dump.c [iso-8859-1] (original) +++ trunk/rostests/dxtest/win32kdxtest/dump.c [iso-8859-1] Sun Apr 13 09:50:23 2008 @@ -1128,6 +1128,8 @@ int count = 0; DWORD flag = 0; + printf("dumping the DD_D3DBUFCALLBACKS from %s\n",text); + if (puD3dBufferCallbacks->dwSize == sizeof(DD_D3DBUFCALLBACKS)) { printf(" puD3dBufferCallbacks->dwSize : 0x%08lx\n",(long)puD3dBufferCallbacks->dwSize); @@ -1143,7 +1145,7 @@ checkflag(flag,DDHAL_D3DBUFCB32_LOCKD3DBUF,"DDHAL_D3DBUFCB32_LOCKD3DBUF"); checkflag(flag,DDHAL_D3DBUFCB32_UNLOCKD3DBUF,"DDHAL_D3DBUFCB32_UNLOCKD3DBUF"); - endcheckflag(flag,"ppuD3dBufferCallbacks->dwFlags"); + endcheckflag(flag,"puD3dBufferCallbacks->dwFlags"); printf(" puD3dBufferCallbacks->CanCreateD3DBuffer : 0x%08lx\n",(long)puD3dBufferCallbacks->CanCreateD3DBuffer); printf(" puD3dBufferCallbacks->CreateD3DBuffer : 0x%08lx\n",(long)puD3dBufferCallbacks->CreateD3DBuffer); @@ -1157,3 +1159,278 @@ } } + +void +dump_D3dTextureFormats(DDSURFACEDESC *puD3dTextureFormats, int dwNum, char *text) +{ + int t=0; + int count = 0; + DWORD flag = 0; + DDSURFACEDESC * myTextureFormats = puD3dTextureFormats; + + printf("dumping the DDSURFACEDESC/DDSURFACEDESC2 from %s\n",text); + + for (t=0;t<dwNum;t++) + { + printf("Show %d of %d DDSURFACEDESC\n",t+1,dwNum); + if (myTextureFormats->dwSize == sizeof(DDSURFACEDESC)) + { + printf(" puD3dTextureFormats->dwSize : 0x%08lx\n",(long)myTextureFormats->dwSize); + + printf(" puD3dTextureFormats->dwFlags : "); + count = 0; + flag = myTextureFormats->dwFlags; + checkflag(flag,DDSD_ALPHABITDEPTH,"DDSD_ALPHABITDEPTH"); + checkflag(flag,DDSD_BACKBUFFERCOUNT ,"DDSD_BACKBUFFERCOUNT"); + checkflag(flag,DDSD_CAPS,"DDSD_CAPS "); + checkflag(flag,DDSD_CKDESTBLT,"DDSD_CKDESTBLT"); + checkflag(flag,DDSD_CKDESTOVERLAY,"DDSD_CKDESTOVERLAY"); + checkflag(flag,DDSD_CKSRCBLT,"DDSD_CKSRCBLT"); + checkflag(flag,DDSD_CKSRCOVERLAY,"DDSD_CKSRCOVERLAY"); + checkflag(flag,DDSD_HEIGHT,"DDSD_HEIGHT"); + checkflag(flag,DDSD_LINEARSIZE,"DDSD_LINEARSIZE"); + checkflag(flag,DDSD_LPSURFACE,"DDSD_LPSURFACE"); + checkflag(flag,DDSD_MIPMAPCOUNT,"DDSD_MIPMAPCOUNT"); + checkflag(flag,DDSD_PITCH,"DDSD_PITCH"); + checkflag(flag,DDSD_PIXELFORMAT,"DDSD_PIXELFORMAT"); + checkflag(flag,DDSD_REFRESHRATE,"DDSD_REFRESHRATE"); + checkflag(flag,DDSD_WIDTH,"DDSD_WIDTH"); + checkflag(flag,DDSD_ZBUFFERBITDEPTH,"DDSD_ZBUFFERBITDEPTH"); + endcheckflag(flag,"puD3dTextureFormats->dwFlags"); + + printf(" puD3dTextureFormats->dwHeight : 0x%08lx\n",(long)myTextureFormats->dwHeight); + printf(" puD3dTextureFormats->dwWidth : 0x%08lx\n",(long)myTextureFormats->dwWidth); + printf(" puD3dTextureFormats->dwLinearSize : 0x%08lx\n",(long)myTextureFormats->dwLinearSize); + printf(" puD3dTextureFormats->dwBackBufferCount : 0x%08lx\n",(long)myTextureFormats->dwBackBufferCount); + printf(" puD3dTextureFormats->dwZBufferBitDepth : 0x%08lx\n",(long)myTextureFormats->dwZBufferBitDepth); + printf(" puD3dTextureFormats->dwAlphaBitDepth : 0x%08lx\n",(long)myTextureFormats->dwAlphaBitDepth); + printf(" puD3dTextureFormats->dwReserved : 0x%08lx\n",(long)myTextureFormats->dwReserved); + printf(" puD3dTextureFormats->lpSurface : 0x%08lx\n",(long)myTextureFormats->lpSurface); + printf(" puD3dTextureFormats->ddckCKDestOverlay.dwColorSpaceLowValue : 0x%08lx\n",(long)myTextureFormats->ddckCKDestOverlay.dwColorSpaceLowValue); + printf(" puD3dTextureFormats->ddckCKDestOverlay.dwColorSpaceHighValue : 0x%08lx\n",(long)myTextureFormats->ddckCKDestOverlay.dwColorSpaceHighValue); + printf(" puD3dTextureFormats->ddckCKDestBlt.dwColorSpaceLowValue : 0x%08lx\n",(long)myTextureFormats->ddckCKDestBlt.dwColorSpaceLowValue); + printf(" puD3dTextureFormats->ddckCKDestBlt : 0x%08lx\n",(long)myTextureFormats->ddckCKDestBlt.dwColorSpaceHighValue); + printf(" puD3dTextureFormats->ddckCKSrcOverlay.dwColorSpaceLowValue : 0x%08lx\n",(long)myTextureFormats->ddckCKSrcOverlay.dwColorSpaceLowValue); + printf(" puD3dTextureFormats->ddckCKSrcOverlay.dwColorSpaceHighValue : 0x%08lx\n",(long)myTextureFormats->ddckCKSrcOverlay.dwColorSpaceHighValue); + printf(" puD3dTextureFormats->ddckCKSrcBlt.dwColorSpaceLowValue : 0x%08lx\n",(long)myTextureFormats->ddckCKSrcBlt.dwColorSpaceLowValue); + printf(" puD3dTextureFormats->ddckCKSrcBlt.dwColorSpaceHighValue : 0x%08lx\n",(long)myTextureFormats->ddckCKSrcBlt.dwColorSpaceHighValue); + + // DDPIXELFORMAT + printf(" puD3dTextureFormats->ddpfPixelFormat.dwSize : 0x%08lx\n",(long)myTextureFormats->ddpfPixelFormat.dwSize); + if (puD3dTextureFormats->ddpfPixelFormat.dwSize == sizeof(DDPIXELFORMAT)) + { + printf(" puD3dTextureFormats->ddpfPixelFormat.dwFlags : "); + count = 0; + flag = myTextureFormats->ddpfPixelFormat.dwFlags; + checkflag(flag,DDPF_ALPHA,"DDPF_ALPHA"); + checkflag(flag,DDPF_ALPHAPIXELS ,"DDPF_ALPHAPIXELS"); + checkflag(flag,DDPF_ALPHAPREMULT,"DDPF_ALPHAPREMULT"); + checkflag(flag,DDPF_BUMPLUMINANCE ,"DDPF_BUMPLUMINANCE"); + checkflag(flag,DDPF_BUMPDUDV,"DDPF_BUMPDUDV"); + checkflag(flag,DDPF_COMPRESSED,"DDPF_COMPRESSED"); + checkflag(flag,DDPF_FOURCC,"DDPF_FOURCC"); + checkflag(flag,DDPF_LUMINANCE,"DDPF_LUMINANCE"); + checkflag(flag,DDPF_PALETTEINDEXED1,"DDPF_PALETTEINDEXED1"); + checkflag(flag,DDPF_PALETTEINDEXED2,"DDPF_PALETTEINDEXED2"); + checkflag(flag,DDPF_PALETTEINDEXED4,"DDPF_PALETTEINDEXED4"); + checkflag(flag,DDPF_PALETTEINDEXED8,"DDPF_PALETTEINDEXED8"); + checkflag(flag,DDPF_PALETTEINDEXEDTO8,"DDPF_PALETTEINDEXEDTO8"); + checkflag(flag,DDPF_RGB ,"DDPF_RGB"); + checkflag(flag,DDPF_RGBTOYUV,"DDPF_RGBTOYUV"); + checkflag(flag,DDPF_STENCILBUFFER,"DDPF_STENCILBUFFER"); + checkflag(flag,DDPF_YUV,"DDPF_YUV"); + checkflag(flag,DDPF_ZBUFFER,"DDPF_ZBUFFER"); + checkflag(flag,DDPF_ZPIXELS,"DDPF_ZPIXELS"); + endcheckflag(flag,"puD3dTextureFormats->ddpfPixelFormat.dwFlags"); + + + if (myTextureFormats->ddpfPixelFormat.dwFlags & DDPF_FOURCC) + { + printf(" puD3dTextureFormats->ddpfPixelFormat.dwFourCC : "); + switch(myTextureFormats->ddpfPixelFormat.dwFourCC) + { + case MAKEFOURCC('A','U','R','2'): + printf("AUR2\n"); + break; + + case MAKEFOURCC('A','U','R','A'): + printf("AURA\n"); + break; + + case MAKEFOURCC('C','H','A','M'): + printf("CHAM\n"); + break; + + case MAKEFOURCC('C','V','I','D'): + printf("CVID\n"); + break; + + case MAKEFOURCC('D','X','T','1'): + printf("DXT1\n"); + break; + + case MAKEFOURCC('D','X','T','2'): + printf("DXT2\n"); + break; + + case MAKEFOURCC('D','X','T','3'): + printf("DXT3\n"); + break; + + case MAKEFOURCC('D','X','T','4'): + printf("DXT4\n"); + break; + + case MAKEFOURCC('D','X','T','5'): + printf("DXT5\n"); + break; + + case MAKEFOURCC('F','V','F','1'): + printf("FVF1\n"); + break; + + case MAKEFOURCC('I','F','0','9'): + printf("IF09\n"); + break; + + case MAKEFOURCC('I','V','3','1'): + printf("IV31\n"); + break; + + case MAKEFOURCC('J','P','E','G'): + printf("JPEG\n"); + break; + + case MAKEFOURCC('M','J','P','G'): + printf("MJPG\n"); + break; + + case MAKEFOURCC('M','R','L','E'): + printf("MRLE\n"); + break; + + case MAKEFOURCC('M','S','V','C'): + printf("MSVC\n"); + break; + + case MAKEFOURCC('P','H','M','O'): + printf("PHMO\n"); + break; + + case MAKEFOURCC('R','T','2','1'): + printf("RT21\n"); + break; + + case MAKEFOURCC('U','L','T','I'): + printf("ULTI\n"); + break; + + case MAKEFOURCC('V','4','2','2'): + printf("V422\n"); + break; + + case MAKEFOURCC('V','6','5','5'): + printf("V655\n"); + break; + + case MAKEFOURCC('V','D','C','T'): + printf("VDCT\n"); + break; + + case MAKEFOURCC('V','I','D','S'): + printf("VIDS\n"); + break; + + case MAKEFOURCC('Y','U','9','2'): + printf("YU92\n"); + break; + + case MAKEFOURCC('Y','U','V','8'): + printf("YUV8\n"); + break; + + case MAKEFOURCC('Y','U','V','9'): + printf("YUV9\n"); + break; + + case MAKEFOURCC('Y','U','Y','V'): + printf("YUYV\n"); + break; + + case MAKEFOURCC('Z','P','E','G'): + printf("ZPEG\n"); + break; + + default: + printf("0x%08lx\n",(long)myTextureFormats->ddpfPixelFormat.dwFourCC); + break; + } + } + else + { + printf(" puD3dTextureFormats->ddpfPixelFormat.dwFourCC : 0x%08lx\n",(long)myTextureFormats->ddpfPixelFormat.dwFourCC); + } + printf(" puD3dTextureFormats->ddpfPixelFormat.dwRGBBitCount : 0x%08lx\n",(long)myTextureFormats->ddpfPixelFormat.dwRGBBitCount); + printf(" puD3dTextureFormats->ddpfPixelFormat.dwRBitMask : 0x%08lx\n",(long)myTextureFormats->ddpfPixelFormat.dwRBitMask); + printf(" puD3dTextureFormats->ddpfPixelFormat.dwGBitMask : 0x%08lx\n",(long)myTextureFormats->ddpfPixelFormat.dwGBitMask); + printf(" puD3dTextureFormats->ddpfPixelFormat.dwBBitMask : 0x%08lx\n",(long)myTextureFormats->ddpfPixelFormat.dwBBitMask); + printf(" puD3dTextureFormats->ddpfPixelFormat.dwRGBAlphaBitMask : 0x%08lx\n",(long)myTextureFormats->ddpfPixelFormat.dwRGBAlphaBitMask); + } + else + { + printf("none uD3dTextureFormats->ddpfPixelFormat from the driver 0x%08lx\n",myTextureFormats->ddpfPixelFormat.dwSize); + } + + printf(" puD3dTextureFormats->ddsCaps.dwCaps : "); + count = 0; + flag = myTextureFormats->ddsCaps.dwCaps; + // not in use longer acoing msdn checkflag(flag,DDSCAPS_3D,"DDSCAPS_3D"); + checkflag(flag,DDSCAPS_3DDEVICE ,"DDSCAPS_3DDEVICE"); + checkflag(flag,DDSCAPS_ALLOCONLOAD,"DDSCAPS_ALLOCONLOAD "); + checkflag(flag,DDSCAPS_ALPHA,"DDSCAPS_ALPHA"); + checkflag(flag,DDSCAPS_BACKBUFFER,"DDSCAPS_BACKBUFFER"); + checkflag(flag,DDSCAPS_FLIP,"DDSCAPS_FLIP"); + checkflag(flag,DDSCAPS_FRONTBUFFER,"DDSCAPS_FRONTBUFFER"); + checkflag(flag,DDSCAPS_HWCODEC,"DDSCAPS_HWCODEC"); + checkflag(flag,DDSCAPS_LIVEVIDEO ,"DDSCAPS_LIVEVIDEO"); + checkflag(flag,DDSCAPS_LOCALVIDMEM,"DDSCAPS_LOCALVIDMEM"); + checkflag(flag,DDSCAPS_MIPMAP,"DDSCAPS_MIPMAP"); + checkflag(flag,DDSCAPS_MODEX,"DDSCAPS_MODEX"); + checkflag(flag,DDSCAPS_NONLOCALVIDMEM,"DDSCAPS_NONLOCALVIDMEM"); + checkflag(flag,DDSCAPS_OFFSCREENPLAIN,"DDSCAPS_OFFSCREENPLAIN"); + checkflag(flag,DDSCAPS_OPTIMIZED,"DDSCAPS_OPTIMIZED"); + checkflag(flag,DDSCAPS_OVERLAY,"DDSCAPS_OVERLAY"); + checkflag(flag,DDSCAPS_OWNDC,"DDSCAPS_OWNDC"); + checkflag(flag,DDSCAPS_PALETTE,"DDSCAPS_PALETTE"); + checkflag(flag,DDSCAPS_PRIMARYSURFACE ,"DDSCAPS_PRIMARYSURFACE"); + checkflag(flag,DDSCAPS_STANDARDVGAMODE,"DDSCAPS_STANDARDVGAMODE"); + checkflag(flag,DDSCAPS_SYSTEMMEMORY,"DDSCAPS_SYSTEMMEMORY"); + checkflag(flag,DDSCAPS_TEXTURE,"DDSCAPS_TEXTURE"); + checkflag(flag,DDSCAPS_VIDEOMEMORY,"DDSCAPS_VIDEOMEMORY"); + checkflag(flag,DDSCAPS_VIDEOPORT,"DDSCAPS_VIDEOPORT"); + checkflag(flag,DDSCAPS_VISIBLE,"DDSCAPS_VISIBLE"); + checkflag(flag,DDSCAPS_WRITEONLY ,"DDSCAPS_WRITEONLY"); + checkflag(flag,DDSCAPS_ZBUFFER,"DDSCAPS_ZBUFFER"); + endcheckflag(flag,"puD3dTextureFormats->ddsCaps.dwCaps"); + + + myTextureFormats = (DDSURFACEDESC *) (((DWORD) myTextureFormats) + sizeof(DDSURFACEDESC)); + } + else + { + printf("error this should not happen : puD3dTextureFormats from the driver 0x%08lx\n",myTextureFormats->dwSize); + break; + } + } + + + + + + + + + + + +} Modified: trunk/rostests/dxtest/win32kdxtest/test.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/test.… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/test.h [iso-8859-1] (original) +++ trunk/rostests/dxtest/win32kdxtest/test.h [iso-8859-1] Sun Apr 13 09:50:23 2008 @@ -13,6 +13,7 @@ void dump_D3dCallbacks(D3DNTHAL_CALLBACKS *puD3dCallbacks, char *text); void dump_D3dDriverData(D3DNTHAL_GLOBALDRIVERDATA *puD3dDriverData, char *text); void dump_D3dBufferCallbacks(DD_D3DBUFCALLBACKS *puD3dCallbacks, char *text); +void dump_D3dTextureFormats(DDSURFACEDESC *puD3dTextureFormats, int dwNum, char *text);

1 0

[greatlrd] 32941: add more dump output for win3kdxtest fixed crash for texture.
by greatlrd＠svn.reactos.org 13 Apr '08

13 Apr '08

Author: greatlrd Date: Sun Apr 13 06:47:04 2008 New Revision: 32941 URL: http://svn.reactos.org/svn/reactos?rev=32941&view=rev Log: add more dump output for win3kdxtest fixed crash for texture. Modified: trunk/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c trunk/rostests/dxtest/win32kdxtest/dump.c trunk/rostests/dxtest/win32kdxtest/test.h Modified: trunk/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/NtGdi… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c [iso-8859-1] (original) +++ trunk/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c [iso-8859-1] Sun Apr 13 06:47:04 2008 @@ -339,53 +339,50 @@ dump_CallBackFlags(pCallBackFlags,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL, ...)"); dump_D3dCallbacks(puD3dCallbacks,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL, ...)"); dump_D3dDriverData(puD3dDriverData, "NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL, ...)"); - /* FIXME dump D3dBufferCallbacks */ - + dump_D3dBufferCallbacks(puD3dBufferCallbacks, "NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL, ...)"); } /* testing OsThunkDdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, D3dBufferCallbacks, puD3dTextureFormats, NULL, */ - //printf("testing DdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, D3dBufferCallbacks, puD3dTextureFormats, NULL, ....)\n"); - - //pHalInfo = &HalInfo; - //pCallBackFlags = CallBackFlags; - //puD3dCallbacks = &D3dCallbacks; - //puD3dDriverData = &D3dDriverData; - //puD3dBufferCallbacks = &D3dBufferCallbacks; - - //RtlZeroMemory(pHalInfo,sizeof(DD_HALINFO)); - //RtlZeroMemory(pCallBackFlags,sizeof(DWORD)*3); - //RtlZeroMemory(puD3dCallbacks,sizeof(D3DNTHAL_CALLBACKS)); - ////RtlZeroMemory(puD3dDriverData,sizeof(D3DNTHAL_CALLBACKS)); - //RtlZeroMemory(&D3dBufferCallbacks,sizeof(D3DNTHAL_CALLBACKS)); - - //if (puD3dDriverData) - //{ - // puD3dTextureFormats = malloc (puD3dDriverData->dwNumTextureFormats * sizeof(DDSURFACEDESC2)); - // if (!puD3dTextureFormats) - // printf("Waring Out of memory\n"); - - // RtlZeroMemory(puD3dTextureFormats, puD3dDriverData->dwNumTextureFormats * sizeof(DDSURFACEDESC2)); - //} - - //retValue = OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, - // pCallBackFlags, puD3dCallbacks, - // puD3dDriverData, puD3dBufferCallbacks, - // puD3dTextureFormats, puNumHeaps, - // puvmList, puNumFourCC, - // puFourCC); - -// testing_noteq(retValue,FALSE,fails,"69. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0"); -// testing_eq(pHalInfo,NULL,fails,"70. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0"); -// testing_eq(pCallBackFlags,NULL,fails,"71. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0"); -// -// /* does not work nice in xp */ -// // testing_noteq(puD3dCallbacks->dwSize,sizeof(D3DNTHAL_CALLBACKS),fails,"72. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0"); -// -// testing_noteq(puD3dDriverData->dwSize,sizeof(D3DNTHAL_GLOBALDRIVERDATA),fails,"73. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0"); -// -// testing_noteq(puNumFourCC,NULL,fails,"74. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0"); -// testing_noteq(puFourCC,NULL,fails,"75. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0"); -// + printf("testing DdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, D3dBufferCallbacks, puD3dTextureFormats, NULL, ....)\n"); + + pHalInfo = &HalInfo; + pCallBackFlags = CallBackFlags; + puD3dCallbacks = &D3dCallbacks; + puD3dDriverData = &D3dDriverData; + puD3dBufferCallbacks = &D3dBufferCallbacks; + + if (puD3dDriverData) + { + puD3dTextureFormats = malloc (puD3dDriverData->dwNumTextureFormats * sizeof(DDSURFACEDESC2)); + if (!puD3dTextureFormats) + printf("Waring Out of memory\n"); + + RtlZeroMemory(puD3dTextureFormats, puD3dDriverData->dwNumTextureFormats * sizeof(DDSURFACEDESC2)); + } + + retValue = OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, + pCallBackFlags, puD3dCallbacks, + puD3dDriverData, puD3dBufferCallbacks, + puD3dTextureFormats, puNumHeaps, + puvmList, puNumFourCC, + puFourCC); + + + + + + testing_noteq(retValue,FALSE,fails,"69. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0"); + testing_eq(pHalInfo,NULL,fails,"70. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0"); + testing_eq(pCallBackFlags,NULL,fails,"71. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0"); + + /* does not work nice in xp */ + // testing_noteq(puD3dCallbacks->dwSize,sizeof(D3DNTHAL_CALLBACKS),fails,"72. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0"); + + testing_noteq(puD3dDriverData->dwSize,sizeof(D3DNTHAL_GLOBALDRIVERDATA),fails,"73. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0"); + + testing_noteq(puNumFourCC,NULL,fails,"74. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0"); + testing_noteq(puFourCC,NULL,fails,"75. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0"); + // /* // if ((pHalInfo->dwSize != sizeof(DD_HALINFO)) && // (pHalInfo->dwSize != sizeof(DD_HALINFO_V4))) @@ -395,32 +392,32 @@ // } // */ // -// if (puD3dBufferCallbacks) -// { -// /* does not work nice in xp */ -// // testing_noteq(puD3dBufferCallbacks->dwSize,sizeof(DD_D3DBUFCALLBACKS),fails,"76. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL...);\0"); -// } -// -// if (puD3dTextureFormats) -// { -// /* fixme test case for it */ -// } -// -// if (dumping_on == TRUE) -// { -// dump_halinfo(pHalInfo,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...)"); -// dump_CallBackFlags(pCallBackFlags,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...)"); -// /* FIXME dump puD3dCallbacks */ -// /* FIXME dump puD3dDriverData */ -// /* FIXME dump D3dBufferCallbacks */ -// /* FIXME dump puD3dTextureFormats */ -// } -// -// -// -// -// -// if (puD3dTextureFormats) -// free (puD3dTextureFormats); + if (puD3dBufferCallbacks) + { + + testing_noteq(puD3dBufferCallbacks->dwSize,sizeof(DD_D3DBUFCALLBACKS),fails,"76. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL...);\0"); + } + + if (puD3dTextureFormats) + { + /* fixme test case for it */ + } + + if (dumping_on == TRUE) + { + dump_halinfo(pHalInfo,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL, ...)"); + dump_CallBackFlags(pCallBackFlags,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL, ...)"); + dump_D3dCallbacks(puD3dCallbacks,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL, ...)"); + dump_D3dDriverData(puD3dDriverData, "NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL, ...)"); + dump_D3dBufferCallbacks(puD3dBufferCallbacks, "NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL, ...)"); + /* FIXME dump puD3dTextureFormats */ + } + + + + + + if (puD3dTextureFormats) + free (puD3dTextureFormats); show_status(fails, "NtGdiDdQueryDirectDrawObject\0"); -} +} Modified: trunk/rostests/dxtest/win32kdxtest/dump.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/dump.… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/dump.c [iso-8859-1] (original) +++ trunk/rostests/dxtest/win32kdxtest/dump.c [iso-8859-1] Sun Apr 13 06:47:04 2008 @@ -1120,3 +1120,40 @@ printf("none puD3dDriverData from the driver 0x%08lx\n",puD3dDriverData->dwSize); } } + + +void +dump_D3dBufferCallbacks(DD_D3DBUFCALLBACKS *puD3dBufferCallbacks, char *text) +{ + int count = 0; + DWORD flag = 0; + + if (puD3dBufferCallbacks->dwSize == sizeof(DD_D3DBUFCALLBACKS)) + { + printf(" puD3dBufferCallbacks->dwSize : 0x%08lx\n",(long)puD3dBufferCallbacks->dwSize); + printf(" puD3dBufferCallbacks->dwFlags : "); + + /* rember this flags are not in msdn only in ms ddk */ + count = 0; + flag = puD3dBufferCallbacks->dwFlags; + checkflag(flag,DDHAL_D3DBUFCB32_CANCREATED3DBUF,"DDHAL_D3DBUFCB32_CANCREATED3DBUF"); + checkflag(flag,DDHAL_D3DBUFCB32_CREATED3DBUF,"DDHAL_D3DBUFCB32_CREATED3DBUF"); + + checkflag(flag,DDHAL_D3DBUFCB32_DESTROYD3DBUF,"DDHAL_D3DBUFCB32_DESTROYD3DBUF"); + + checkflag(flag,DDHAL_D3DBUFCB32_LOCKD3DBUF,"DDHAL_D3DBUFCB32_LOCKD3DBUF"); + checkflag(flag,DDHAL_D3DBUFCB32_UNLOCKD3DBUF,"DDHAL_D3DBUFCB32_UNLOCKD3DBUF"); + endcheckflag(flag,"ppuD3dBufferCallbacks->dwFlags"); + + printf(" puD3dBufferCallbacks->CanCreateD3DBuffer : 0x%08lx\n",(long)puD3dBufferCallbacks->CanCreateD3DBuffer); + printf(" puD3dBufferCallbacks->CreateD3DBuffer : 0x%08lx\n",(long)puD3dBufferCallbacks->CreateD3DBuffer); + printf(" puD3dBufferCallbacks->DestroyD3DBuffer : 0x%08lx\n",(long)puD3dBufferCallbacks->DestroyD3DBuffer); + printf(" puD3dBufferCallbacks->LockD3DBuffer : 0x%08lx\n",(long)puD3dBufferCallbacks->LockD3DBuffer); + printf(" puD3dBufferCallbacks->UnlockD3DBuffer : 0x%08lx\n",(long)puD3dBufferCallbacks->UnlockD3DBuffer); + } + else + { + printf("none puD3dBufferCallbacks from the driver 0x%08lx\n",puD3dBufferCallbacks->dwSize); + } + +} Modified: trunk/rostests/dxtest/win32kdxtest/test.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/test.… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/test.h [iso-8859-1] (original) +++ trunk/rostests/dxtest/win32kdxtest/test.h [iso-8859-1] Sun Apr 13 06:47:04 2008 @@ -12,6 +12,11 @@ void dump_CallBackFlags(DWORD *pCallBackFlags, char *text); void dump_D3dCallbacks(D3DNTHAL_CALLBACKS *puD3dCallbacks, char *text); void dump_D3dDriverData(D3DNTHAL_GLOBALDRIVERDATA *puD3dDriverData, char *text); +void dump_D3dBufferCallbacks(DD_D3DBUFCALLBACKS *puD3dCallbacks, char *text); + + + +

1 0

[greatlrd] 32940: adding test for param puD3dBufferCallbacks in NtGdiDdQueryDirectDrawObject test
by greatlrd＠svn.reactos.org 13 Apr '08

13 Apr '08

Author: greatlrd Date: Sun Apr 13 06:00:52 2008 New Revision: 32940 URL: http://svn.reactos.org/svn/reactos?rev=32940&view=rev Log: adding test for param puD3dBufferCallbacks in NtGdiDdQueryDirectDrawObject test Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c [iso-8859-1] Sun Apr 13 06:00:52 2008 @@ -29,6 +29,8 @@ D3DNTHAL_GLOBALDRIVERDATA oldD3dDriverData; DD_D3DBUFCALLBACKS D3dBufferCallbacks; + DD_D3DBUFCALLBACKS oldD3dBufferCallbacks; + DDSURFACEDESC2 D3dTextureFormats[100]; //DWORD NumHeaps = 0; VIDEOMEMORY vmList; @@ -475,7 +477,61 @@ RTEST(memcmp(&oldD3dCallbacks, puD3dCallbacks, sizeof(D3DNTHAL_CALLBACKS)) == 0); RTEST(memcmp(&oldD3dDriverData, puD3dDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA)) == 0); - /* start test of puD3dBufferCallbacks */ + /* start test of puD3dBufferCallbacks */ + RTEST(puD3dBufferCallbacks->dwSize == sizeof(DD_D3DBUFCALLBACKS)); + if (puD3dBufferCallbacks->dwFlags & DDHAL_D3DBUFCB32_CANCREATED3DBUF) + { + /* point to kmode direcly to the graphic drv, the drv is kmode and it is kmode address we getting back*/ + RTEST( ( (DWORD)puD3dBufferCallbacks->CanCreateD3DBuffer & (~0x80000000)) != 0 ); + } + else + { + RTEST( puD3dBufferCallbacks->CanCreateD3DBuffer == NULL); + } + + if (puD3dBufferCallbacks->dwFlags & DDHAL_D3DBUFCB32_CREATED3DBUF) + { + /* point to kmode direcly to the graphic drv, the drv is kmode and it is kmode address we getting back*/ + RTEST( ( (DWORD)puD3dBufferCallbacks->CreateD3DBuffer & (~0x80000000)) != 0 ); + } + else + { + RTEST( puD3dBufferCallbacks->CreateD3DBuffer == NULL); + } + + if (puD3dBufferCallbacks->dwFlags & DDHAL_D3DBUFCB32_DESTROYD3DBUF) + { + /* point to kmode direcly to the graphic drv, the drv is kmode and it is kmode address we getting back*/ + RTEST( ( (DWORD)puD3dBufferCallbacks->DestroyD3DBuffer & (~0x80000000)) != 0 ); + } + else + { + RTEST( puD3dBufferCallbacks->DestroyD3DBuffer == NULL); + } + + if (puD3dBufferCallbacks->dwFlags & DDHAL_D3DBUFCB32_LOCKD3DBUF) + { + /* point to kmode direcly to the graphic drv, the drv is kmode and it is kmode address we getting back*/ + RTEST( ( (DWORD)puD3dBufferCallbacks->LockD3DBuffer & (~0x80000000)) != 0 ); + } + else + { + RTEST( puD3dBufferCallbacks->LockD3DBuffer == NULL); + } + + if (puD3dBufferCallbacks->dwFlags & DDHAL_D3DBUFCB32_UNLOCKD3DBUF) + { + /* point to kmode direcly to the graphic drv, the drv is kmode and it is kmode address we getting back*/ + RTEST( ( (DWORD)puD3dBufferCallbacks->UnlockD3DBuffer & (~0x80000000)) != 0 ); + } + else + { + RTEST( puD3dBufferCallbacks->UnlockD3DBuffer == NULL); + } + + /* Backup D3DHAL_GLOBALDRIVERDATA so we do not need resting it */ + RtlCopyMemory(&oldD3dBufferCallbacks, &D3dBufferCallbacks, sizeof(DD_D3DBUFCALLBACKS)); + /* Next Start 6 */ pHalInfo = &HalInfo; @@ -519,8 +575,13 @@ RTEST(pCallBackFlags[1] != 0); RTEST(pCallBackFlags[2] == 0); - /* We do not retesting D3DNTHAL_CALLBACKS, instead we compare it */ + /* We do not retesting instead we compare it */ + RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); RTEST(memcmp(&oldD3dCallbacks, puD3dCallbacks, sizeof(D3DNTHAL_CALLBACKS)) == 0); + RTEST(memcmp(&oldD3dDriverData, puD3dDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA)) == 0); + RTEST(memcmp(&oldD3dBufferCallbacks, puD3dBufferCallbacks, sizeof(DD_D3DBUFCALLBACKS)) == 0); + + /* Next Start 7 */ @@ -579,8 +640,11 @@ RTEST(pCallBackFlags[1] != 0); RTEST(pCallBackFlags[2] == 0); - /* We do not retesting D3DNTHAL_CALLBACKS, instead we compare it */ + /* We do not retesting instead we compare it */ + RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); RTEST(memcmp(&oldD3dCallbacks, puD3dCallbacks, sizeof(D3DNTHAL_CALLBACKS)) == 0); + RTEST(memcmp(&oldD3dDriverData, puD3dDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA)) == 0); + RTEST(memcmp(&oldD3dBufferCallbacks, puD3dBufferCallbacks, sizeof(DD_D3DBUFCALLBACKS)) == 0);

1 0

[greatlrd] 32939: adding test for param puD3dDriverData in NtGdiDdQueryDirectDrawObject test
by greatlrd＠svn.reactos.org 13 Apr '08

13 Apr '08

Author: greatlrd Date: Sun Apr 13 04:53:25 2008 New Revision: 32939 URL: http://svn.reactos.org/svn/reactos?rev=32939&view=rev Log: adding test for param puD3dDriverData in NtGdiDdQueryDirectDrawObject test Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c [iso-8859-1] Sun Apr 13 04:53:25 2008 @@ -26,6 +26,8 @@ D3DNTHAL_CALLBACKS oldD3dCallbacks; D3DNTHAL_GLOBALDRIVERDATA D3dDriverData; + D3DNTHAL_GLOBALDRIVERDATA oldD3dDriverData; + DD_D3DBUFCALLBACKS D3dBufferCallbacks; DDSURFACEDESC2 D3dTextureFormats[100]; //DWORD NumHeaps = 0; @@ -198,6 +200,10 @@ */ RTEST( pHalInfo->ddCaps.dwCaps != 0); RTEST( pHalInfo->ddCaps.ddsCaps.dwCaps != 0); + + /* This flags is obsolete and should not be used by the driver */ + RTEST( pHalInfo->ddCaps.dwFXAlphaCaps == 0); + /* if this fail we do not have a dx driver install acodring ms, some version of windows it * is okay this fail and drv does then only support basic dx @@ -387,18 +393,30 @@ RTEST(puNumHeaps == NULL); RTEST(puvmList == NULL); - /* We do not retesting DD_HALINFO, instead we compare it */ - RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); + /* We retesting pCallBackFlags */ RTEST(pCallBackFlags[0] != 0); RTEST(pCallBackFlags[1] != 0); RTEST(pCallBackFlags[2] == 0); - /* We do not retesting D3DNTHAL_CALLBACKS, instead we compare it */ + /* We do not retesting instead we compare it */ + RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); RTEST(memcmp(&oldD3dCallbacks, puD3dCallbacks, sizeof(D3DNTHAL_CALLBACKS)) == 0); /* start test of puD3dDriverData */ - -/* Next Start 5 */ + + RTEST(puD3dDriverData->dwSize == sizeof(D3DNTHAL_GLOBALDRIVERDATA)); + RTEST(puD3dDriverData->hwCaps.dwSize == sizeof(D3DNTHALDEVICEDESC_V1)); + RTEST(puD3dDriverData->hwCaps.dtcTransformCaps.dwSize == sizeof(D3DTRANSFORMCAPS)); + RTEST(puD3dDriverData->hwCaps.dlcLightingCaps.dwSize == sizeof(D3DLIGHTINGCAPS)); + RTEST(puD3dDriverData->hwCaps.dpcLineCaps.dwSize == sizeof(D3DPRIMCAPS)); + RTEST(puD3dDriverData->hwCaps.dpcTriCaps.dwSize == sizeof(D3DPRIMCAPS)); + RTEST(puD3dDriverData->hwCaps.dwMaxBufferSize == 0); + RTEST(puD3dDriverData->hwCaps.dwMaxVertexCount == 0); + + /* Backup D3DHAL_GLOBALDRIVERDATA so we do not need resting it */ + RtlCopyMemory(&oldD3dDriverData, &D3dDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA)); + +/* testing NtGdiDdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL, */ pHalInfo = &HalInfo; pCallBackFlags = CallBackFlags; puD3dCallbacks = &D3dCallbacks; @@ -426,22 +444,38 @@ RTEST(puD3dBufferCallbacks != NULL); } - - RTEST(puD3dTextureFormats == NULL); - RTEST(puNumFourCC == NULL); - RTEST(puFourCC == NULL); - RTEST(puNumHeaps == NULL); - RTEST(puvmList == NULL); + RTEST(pHalInfo != NULL); ASSERT(pHalInfo != NULL); - /* We do not retesting DD_HALINFO, instead we compare it */ - RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); + RTEST(pCallBackFlags != NULL); + ASSERT(pCallBackFlags != NULL); + + RTEST(puD3dCallbacks != NULL); + ASSERT(puD3dCallbacks != NULL); + + RTEST(puD3dDriverData != NULL); + ASSERT(puD3dDriverData != NULL); + + RTEST(puD3dBufferCallbacks != NULL); + ASSERT(puD3dDriverData != NULL); + + RTEST(puD3dTextureFormats == NULL); + RTEST(puNumFourCC == NULL); + RTEST(puFourCC == NULL); + RTEST(puNumHeaps == NULL); + RTEST(puvmList == NULL); + + /* We retesting the flags */ RTEST(pCallBackFlags[0] != 0); RTEST(pCallBackFlags[1] != 0); RTEST(pCallBackFlags[2] == 0); - /* We do not retesting D3DNTHAL_CALLBACKS, instead we compare it */ + /* We do not retesting instead we compare it */ + RTEST(memcmp(&oldHalInfo, pHalInfo, sizeof(DD_HALINFO)) == 0); RTEST(memcmp(&oldD3dCallbacks, puD3dCallbacks, sizeof(D3DNTHAL_CALLBACKS)) == 0); + RTEST(memcmp(&oldD3dDriverData, puD3dDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA)) == 0); + + /* start test of puD3dBufferCallbacks */ /* Next Start 6 */ pHalInfo = &HalInfo;

1 0

[greatlrd] 32938: update the dump output, so it list more flags with names. it also let me found undocumented flags more easy.
by greatlrd＠svn.reactos.org 13 Apr '08

13 Apr '08

Author: greatlrd Date: Sun Apr 13 03:50:20 2008 New Revision: 32938 URL: http://svn.reactos.org/svn/reactos?rev=32938&view=rev Log: update the dump output, so it list more flags with names. it also let me found undocumented flags more easy. Modified: trunk/rostests/dxtest/win32kdxtest/dump.c Modified: trunk/rostests/dxtest/win32kdxtest/dump.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/dump.… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/dump.c [iso-8859-1] (original) +++ trunk/rostests/dxtest/win32kdxtest/dump.c [iso-8859-1] Sun Apr 13 03:50:20 2008 @@ -349,7 +349,16 @@ printf(" pHalInfo->ddCaps.dwFXAlphaCaps : 0x%08lx\n",pHalInfo->ddCaps.dwFXAlphaCaps); printf(" pHalInfo->ddCaps.dwPalCaps : 0x%08lx\n",pHalInfo->ddCaps.dwPalCaps); - printf(" pHalInfo->ddCaps.dwSVCaps : 0x%08lx\n",pHalInfo->ddCaps.dwSVCaps); + + printf(" pHalInfo->ddCaps.dwSVCaps : "); + flag = pHalInfo->ddCaps.dwSVCaps; + count = 0; + checkflag(flag,DDSVCAPS_ENIGMA,"DDSVCAPS_ENIGMA"); + checkflag(flag,DDSVCAPS_FLICKER,"DDSVCAPS_FLICKER"); + checkflag(flag,DDSVCAPS_REDBLUE,"DDSVCAPS_REDBLUE"); + checkflag(flag,DDSVCAPS_SPLIT,"DDSVCAPS_SPLIT"); + endcheckflag(flag,"pHalInfo->ddCaps.dwSVCaps"); + printf(" pHalInfo->ddCaps.dwAlphaBltConstBitDepths : 0x%08lx\n",pHalInfo->ddCaps.dwAlphaBltConstBitDepths); printf(" pHalInfo->ddCaps.dwAlphaBltPixelBitDepths : 0x%08lx\n",pHalInfo->ddCaps.dwAlphaBltPixelBitDepths); printf(" pHalInfo->ddCaps.dwAlphaBltSurfaceBitDepths : 0x%08lx\n",pHalInfo->ddCaps.dwAlphaBltSurfaceBitDepths); @@ -405,7 +414,6 @@ checkflag(flag,DDSCAPS_ZBUFFER,"DDSCAPS_ZBUFFER"); endcheckflag(flag,"pHalInfo->ddCaps.ddsCaps.dwCaps"); - printf(" pHalInfo->ddCaps.dwMinOverlayStretch : 0x%08lx\n",pHalInfo->ddCaps.dwMinOverlayStretch); printf(" pHalInfo->ddCaps.dwMaxOverlayStretch : 0x%08lx\n",pHalInfo->ddCaps.dwMaxOverlayStretch); printf(" pHalInfo->ddCaps.dwMinLiveVideoStretch : 0x%08lx\n",pHalInfo->ddCaps.dwMinLiveVideoStretch); @@ -415,14 +423,88 @@ printf(" pHalInfo->ddCaps.dwReserved1 : 0x%08lx\n",pHalInfo->ddCaps.dwReserved1); printf(" pHalInfo->ddCaps.dwReserved2 : 0x%08lx\n",pHalInfo->ddCaps.dwReserved2); printf(" pHalInfo->ddCaps.dwReserved3 : 0x%08lx\n",pHalInfo->ddCaps.dwReserved3); - printf(" pHalInfo->ddCaps.dwSVBCaps : 0x%08lx\n",pHalInfo->ddCaps.dwSVBCaps); + + printf(" pHalInfo->ddCaps.dwSVBCaps : "); + flag = pHalInfo->ddCaps.dwSVBCaps; + count = 0; + checkflag(flag,DDCAPS_3D,"DDCAPS_3D"); + checkflag(flag,DDCAPS_ALIGNBOUNDARYDEST,"DDCAPS_ALIGNBOUNDARYDEST"); + checkflag(flag,DDCAPS_ALIGNBOUNDARYSRC,"DDCAPS_ALIGNBOUNDARYSRC"); + checkflag(flag,DDCAPS_ALIGNSIZEDEST,"DDCAPS_ALIGNSIZEDEST"); + checkflag(flag,DDCAPS_ALIGNSIZESRC,"DDCAPS_ALIGNSIZESRC"); + checkflag(flag,DDCAPS_ALIGNSTRIDE,"DDCAPS_ALIGNSTRIDE"); + checkflag(flag,DDCAPS_ALPHA,"DDCAPS_ALPHA"); + checkflag(flag,DDCAPS_BANKSWITCHED,"DDCAPS_BANKSWITCHED"); + checkflag(flag,DDCAPS_BLT,"DDCAPS_BLT"); + checkflag(flag,DDCAPS_BLTCOLORFILL,"DDCAPS_BLTCOLORFILL"); + checkflag(flag,DDCAPS_BLTDEPTHFILL,"DDCAPS_BLTDEPTHFILL"); + checkflag(flag,DDCAPS_BLTFOURCC,"DDCAPS_BLTFOURCC"); + checkflag(flag,DDCAPS_BLTQUEUE,"DDCAPS_BLTQUEUE"); + checkflag(flag,DDCAPS_BLTSTRETCH,"DDCAPS_BLTSTRETCH"); + checkflag(flag,DDCAPS_CANBLTSYSMEM,"DDCAPS_CANBLTSYSMEM"); + checkflag(flag,DDCAPS_CANCLIP,"DDCAPS_CANCLIP"); + checkflag(flag,DDCAPS_CANCLIPSTRETCHED,"DDCAPS_CANCLIPSTRETCHED"); + checkflag(flag,DDCAPS_COLORKEY,"DDCAPS_COLORKEY"); + checkflag(flag,DDCAPS_COLORKEYHWASSIST,"DDCAPS_COLORKEYHWASSIST"); + checkflag(flag,DDCAPS_GDI,"DDCAPS_GDI"); + checkflag(flag,DDCAPS_NOHARDWARE,"DDCAPS_NOHARDWARE"); + checkflag(flag,DDCAPS_OVERLAY,"DDCAPS_OVERLAY"); + checkflag(flag,DDCAPS_OVERLAYCANTCLIP,"DDCAPS_OVERLAYCANTCLIP"); + checkflag(flag,DDCAPS_OVERLAYFOURCC,"DDCAPS_OVERLAYFOURCC"); + checkflag(flag,DDCAPS_OVERLAYSTRETCH,"DDCAPS_OVERLAYSTRETCH"); + checkflag(flag,DDCAPS_PALETTE,"DDCAPS_PALETTE"); + checkflag(flag,DDCAPS_PALETTEVSYNC,"DDCAPS_PALETTEVSYNC"); + checkflag(flag,DDCAPS_READSCANLINE,"DDCAPS_READSCANLINE"); + checkflag(flag,DDCAPS_STEREOVIEW,"DDCAPS_STEREOVIEW"); + checkflag(flag,DDCAPS_VBI,"DDCAPS_VBI"); + checkflag(flag,DDCAPS_ZBLTS,"DDCAPS_ZBLTS"); + checkflag(flag,DDCAPS_ZOVERLAYS,"DDCAPS_ZOVERLAYS"); + endcheckflag(flag,"pHalInfo->ddCaps.dwSVBCaps"); + printf(" pHalInfo->ddCaps.dwSVBCKeyCaps : 0x%08lx\n",pHalInfo->ddCaps.dwSVBCKeyCaps); printf(" pHalInfo->ddCaps.dwSVBFXCaps : 0x%08lx\n",pHalInfo->ddCaps.dwSVBFXCaps); for (t=0;t<DD_ROP_SPACE;t++) { printf(" pHalInfo->ddCaps.dwSVBRops[0x%04x] : 0x%08lx\n",t,pHalInfo->ddCaps.dwSVBRops[t]); } - printf(" pHalInfo->ddCaps.dwVSBCaps : 0x%08lx\n",pHalInfo->ddCaps.dwVSBCaps); + + printf(" pHalInfo->ddCaps.dwVSBCaps : "); + flag = pHalInfo->ddCaps.dwVSBCaps; + count = 0; + checkflag(flag,DDCAPS_3D,"DDCAPS_3D"); + checkflag(flag,DDCAPS_ALIGNBOUNDARYDEST,"DDCAPS_ALIGNBOUNDARYDEST"); + checkflag(flag,DDCAPS_ALIGNBOUNDARYSRC,"DDCAPS_ALIGNBOUNDARYSRC"); + checkflag(flag,DDCAPS_ALIGNSIZEDEST,"DDCAPS_ALIGNSIZEDEST"); + checkflag(flag,DDCAPS_ALIGNSIZESRC,"DDCAPS_ALIGNSIZESRC"); + checkflag(flag,DDCAPS_ALIGNSTRIDE,"DDCAPS_ALIGNSTRIDE"); + checkflag(flag,DDCAPS_ALPHA,"DDCAPS_ALPHA"); + checkflag(flag,DDCAPS_BANKSWITCHED,"DDCAPS_BANKSWITCHED"); + checkflag(flag,DDCAPS_BLT,"DDCAPS_BLT"); + checkflag(flag,DDCAPS_BLTCOLORFILL,"DDCAPS_BLTCOLORFILL"); + checkflag(flag,DDCAPS_BLTDEPTHFILL,"DDCAPS_BLTDEPTHFILL"); + checkflag(flag,DDCAPS_BLTFOURCC,"DDCAPS_BLTFOURCC"); + checkflag(flag,DDCAPS_BLTQUEUE,"DDCAPS_BLTQUEUE"); + checkflag(flag,DDCAPS_BLTSTRETCH,"DDCAPS_BLTSTRETCH"); + checkflag(flag,DDCAPS_CANBLTSYSMEM,"DDCAPS_CANBLTSYSMEM"); + checkflag(flag,DDCAPS_CANCLIP,"DDCAPS_CANCLIP"); + checkflag(flag,DDCAPS_CANCLIPSTRETCHED,"DDCAPS_CANCLIPSTRETCHED"); + checkflag(flag,DDCAPS_COLORKEY,"DDCAPS_COLORKEY"); + checkflag(flag,DDCAPS_COLORKEYHWASSIST,"DDCAPS_COLORKEYHWASSIST"); + checkflag(flag,DDCAPS_GDI,"DDCAPS_GDI"); + checkflag(flag,DDCAPS_NOHARDWARE,"DDCAPS_NOHARDWARE"); + checkflag(flag,DDCAPS_OVERLAY,"DDCAPS_OVERLAY"); + checkflag(flag,DDCAPS_OVERLAYCANTCLIP,"DDCAPS_OVERLAYCANTCLIP"); + checkflag(flag,DDCAPS_OVERLAYFOURCC,"DDCAPS_OVERLAYFOURCC"); + checkflag(flag,DDCAPS_OVERLAYSTRETCH,"DDCAPS_OVERLAYSTRETCH"); + checkflag(flag,DDCAPS_PALETTE,"DDCAPS_PALETTE"); + checkflag(flag,DDCAPS_PALETTEVSYNC,"DDCAPS_PALETTEVSYNC"); + checkflag(flag,DDCAPS_READSCANLINE,"DDCAPS_READSCANLINE"); + checkflag(flag,DDCAPS_STEREOVIEW,"DDCAPS_STEREOVIEW"); + checkflag(flag,DDCAPS_VBI,"DDCAPS_VBI"); + checkflag(flag,DDCAPS_ZBLTS,"DDCAPS_ZBLTS"); + checkflag(flag,DDCAPS_ZOVERLAYS,"DDCAPS_ZOVERLAYS"); + endcheckflag(flag,"pHalInfo->ddCaps.dwVSBCaps"); + printf(" pHalInfo->ddCaps.dwVSBCKeyCaps : 0x%08lx\n",pHalInfo->ddCaps.dwVSBCKeyCaps); printf(" pHalInfo->ddCaps.dwVSBFXCaps : 0x%08lx\n",pHalInfo->ddCaps.dwVSBFXCaps); for (t=0;t<DD_ROP_SPACE;t++) @@ -659,15 +741,156 @@ checkflag(flag,D3DPRASTERCAPS_ZTEST,"D3DPRASTERCAPS_ZTEST"); endcheckflag(flag,"puD3dDriverData->hwCaps.dpcLineCaps.dwRasterCaps"); - printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwZCmpCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcLineCaps.dwZCmpCaps); - printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwSrcBlendCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcLineCaps.dwSrcBlendCaps); - printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwDestBlendCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcLineCaps.dwDestBlendCaps); - printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwAlphaCmpCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcLineCaps.dwAlphaCmpCaps); - printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwShadeCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcLineCaps.dwShadeCaps); - printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwTextureCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcLineCaps.dwTextureCaps); - printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwTextureFilterCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcLineCaps.dwTextureFilterCaps); - printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwTextureBlendCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcLineCaps.dwTextureBlendCaps); - printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwTextureAddressCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcLineCaps.dwTextureAddressCaps); + printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwZCmpCaps : "); + count = 0; + flag = puD3dDriverData->hwCaps.dpcLineCaps.dwZCmpCaps; + checkflag(flag,D3DPCMPCAPS_ALWAYS,"D3DPCMPCAPS_ALWAYS"); + checkflag(flag,D3DPCMPCAPS_EQUAL,"D3DPCMPCAPS_EQUAL"); + checkflag(flag,D3DPCMPCAPS_GREATER,"D3DPCMPCAPS_GREATER"); + checkflag(flag,D3DPCMPCAPS_GREATEREQUAL,"D3DPCMPCAPS_GREATEREQUAL"); + checkflag(flag,D3DPCMPCAPS_LESS,"D3DPCMPCAPS_LESS"); + checkflag(flag,D3DPCMPCAPS_LESSEQUAL,"D3DPCMPCAPS_LESSEQUAL"); + checkflag(flag,D3DPCMPCAPS_NEVER,"D3DPCMPCAPS_NEVER"); + checkflag(flag,D3DPCMPCAPS_NOTEQUAL,"D3DPCMPCAPS_NOTEQUAL"); + endcheckflag(flag,"puD3dDriverData->hwCaps.dpcLineCaps.dwZCmpCaps "); + + printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwSrcBlendCaps : "); + count = 0; + flag = puD3dDriverData->hwCaps.dpcLineCaps.dwSrcBlendCaps; + checkflag(flag,D3DPBLENDCAPS_BOTHINVSRCALPHA,"D3DPBLENDCAPS_BOTHINVSRCALPHA"); + checkflag(flag,D3DPBLENDCAPS_BOTHSRCALPHA,"D3DPBLENDCAPS_BOTHSRCALPHA"); + checkflag(flag,D3DPBLENDCAPS_DESTALPHA,"D3DPBLENDCAPS_DESTALPHA"); + checkflag(flag,D3DPBLENDCAPS_DESTCOLOR,"D3DPBLENDCAPS_DESTCOLOR"); + checkflag(flag,D3DPBLENDCAPS_INVDESTALPHA,"D3DPBLENDCAPS_INVDESTALPHA"); + checkflag(flag,D3DPBLENDCAPS_INVDESTCOLOR,"D3DPBLENDCAPS_INVDESTCOLOR"); + checkflag(flag,D3DPBLENDCAPS_INVSRCALPHA,"D3DPBLENDCAPS_INVSRCALPHA"); + checkflag(flag,D3DPBLENDCAPS_INVSRCCOLOR,"D3DPBLENDCAPS_INVSRCCOLOR"); + checkflag(flag,D3DPBLENDCAPS_ONE,"D3DPBLENDCAPS_ONE"); + checkflag(flag,D3DPBLENDCAPS_SRCALPHA,"D3DPBLENDCAPS_SRCALPHA"); + checkflag(flag,D3DPBLENDCAPS_SRCALPHASAT,"D3DPBLENDCAPS_SRCALPHASAT"); + checkflag(flag,D3DPBLENDCAPS_SRCCOLOR,"D3DPBLENDCAPS_SRCCOLOR"); + checkflag(flag,D3DPBLENDCAPS_ZERO,"D3DPBLENDCAPS_ZERO"); + endcheckflag(flag,"puD3dDriverData->hwCaps.dpcLineCaps.dwSrcBlendCaps "); + + printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwDestBlendCaps : "); + count = 0; + flag = puD3dDriverData->hwCaps.dpcLineCaps.dwDestBlendCaps; + checkflag(flag,D3DPBLENDCAPS_BOTHINVSRCALPHA,"D3DPBLENDCAPS_BOTHINVSRCALPHA"); + checkflag(flag,D3DPBLENDCAPS_BOTHSRCALPHA,"D3DPBLENDCAPS_BOTHSRCALPHA"); + checkflag(flag,D3DPBLENDCAPS_DESTALPHA,"D3DPBLENDCAPS_DESTALPHA"); + checkflag(flag,D3DPBLENDCAPS_DESTCOLOR,"D3DPBLENDCAPS_DESTCOLOR"); + checkflag(flag,D3DPBLENDCAPS_INVDESTALPHA,"D3DPBLENDCAPS_INVDESTALPHA"); + checkflag(flag,D3DPBLENDCAPS_INVDESTCOLOR,"D3DPBLENDCAPS_INVDESTCOLOR"); + checkflag(flag,D3DPBLENDCAPS_INVSRCALPHA,"D3DPBLENDCAPS_INVSRCALPHA"); + checkflag(flag,D3DPBLENDCAPS_INVSRCCOLOR,"D3DPBLENDCAPS_INVSRCCOLOR"); + checkflag(flag,D3DPBLENDCAPS_ONE,"D3DPBLENDCAPS_ONE"); + checkflag(flag,D3DPBLENDCAPS_SRCALPHA,"D3DPBLENDCAPS_SRCALPHA"); + checkflag(flag,D3DPBLENDCAPS_SRCALPHASAT,"D3DPBLENDCAPS_SRCALPHASAT"); + checkflag(flag,D3DPBLENDCAPS_SRCCOLOR,"D3DPBLENDCAPS_SRCCOLOR"); + checkflag(flag,D3DPBLENDCAPS_ZERO,"D3DPBLENDCAPS_ZERO"); + endcheckflag(flag,"puD3dDriverData->hwCaps.dpcLineCaps.dwDestBlendCaps "); + + printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwAlphaCmpCaps : "); + count = 0; + flag = puD3dDriverData->hwCaps.dpcLineCaps.dwAlphaCmpCaps; + checkflag(flag,D3DPCMPCAPS_ALWAYS,"D3DPCMPCAPS_ALWAYS"); + checkflag(flag,D3DPCMPCAPS_EQUAL,"D3DPCMPCAPS_EQUAL"); + checkflag(flag,D3DPCMPCAPS_GREATER,"D3DPCMPCAPS_GREATER"); + checkflag(flag,D3DPCMPCAPS_GREATEREQUAL,"D3DPCMPCAPS_GREATEREQUAL"); + checkflag(flag,D3DPCMPCAPS_LESS,"D3DPCMPCAPS_LESS"); + checkflag(flag,D3DPCMPCAPS_LESSEQUAL,"D3DPCMPCAPS_LESSEQUAL"); + checkflag(flag,D3DPCMPCAPS_NEVER,"D3DPCMPCAPS_NEVER"); + checkflag(flag,D3DPCMPCAPS_NOTEQUAL,"D3DPCMPCAPS_NOTEQUAL"); + endcheckflag(flag,"puD3dDriverData->hwCaps.dpcLineCaps.dwAlphaCmpCaps "); + + printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwShadeCaps : "); + count = 0; + flag = puD3dDriverData->hwCaps.dpcLineCaps.dwShadeCaps; + checkflag(flag,D3DPSHADECAPS_ALPHAFLATBLEND,"D3DPSHADECAPS_ALPHAFLATBLEND"); + checkflag(flag,D3DPSHADECAPS_ALPHAFLATSTIPPLED,"D3DPSHADECAPS_ALPHAFLATSTIPPLED"); + checkflag(flag,D3DPSHADECAPS_ALPHAGOURAUDBLEND,"D3DPSHADECAPS_ALPHAGOURAUDBLEND"); + checkflag(flag,D3DPSHADECAPS_ALPHAGOURAUDSTIPPLED,"D3DPSHADECAPS_ALPHAGOURAUDSTIPPLED"); + checkflag(flag,D3DPSHADECAPS_ALPHAPHONGBLEND,"D3DPSHADECAPS_ALPHAPHONGBLEND"); + checkflag(flag,D3DPSHADECAPS_ALPHAPHONGSTIPPLED,"D3DPSHADECAPS_ALPHAPHONGSTIPPLED"); + checkflag(flag,D3DPSHADECAPS_COLORFLATMONO,"D3DPSHADECAPS_COLORFLATMONO"); + checkflag(flag,D3DPSHADECAPS_COLORFLATRGB,"D3DPSHADECAPS_COLORFLATRGB"); + checkflag(flag,D3DPSHADECAPS_COLORGOURAUDMONO,"D3DPSHADECAPS_COLORGOURAUDMONO"); + checkflag(flag,D3DPSHADECAPS_COLORGOURAUDRGB,"D3DPSHADECAPS_COLORGOURAUDRGB"); + checkflag(flag,D3DPSHADECAPS_COLORPHONGMONO,"D3DPSHADECAPS_COLORPHONGMONO"); + checkflag(flag,D3DPSHADECAPS_COLORPHONGRGB,"D3DPSHADECAPS_COLORPHONGRGB"); + checkflag(flag,D3DPSHADECAPS_FOGFLAT,"D3DPSHADECAPS_FOGFLAT"); + checkflag(flag,D3DPSHADECAPS_FOGGOURAUD,"D3DPSHADECAPS_FOGGOURAUD"); + checkflag(flag,D3DPSHADECAPS_FOGPHONG,"D3DPSHADECAPS_FOGPHONG"); + checkflag(flag,D3DPSHADECAPS_SPECULARFLATMONO,"D3DPSHADECAPS_SPECULARFLATMONO"); + checkflag(flag,D3DPSHADECAPS_SPECULARFLATRGB,"D3DPSHADECAPS_SPECULARFLATRGB"); + checkflag(flag,D3DPSHADECAPS_SPECULARGOURAUDMONO,"D3DPSHADECAPS_SPECULARGOURAUDMONO"); + checkflag(flag,D3DPSHADECAPS_SPECULARGOURAUDRGB,"D3DPSHADECAPS_SPECULARGOURAUDRGB"); + checkflag(flag,D3DPSHADECAPS_SPECULARPHONGMONO,"D3DPSHADECAPS_SPECULARPHONGMONO"); + checkflag(flag,D3DPSHADECAPS_SPECULARPHONGRGB,"D3DPSHADECAPS_SPECULARPHONGRGB"); + endcheckflag(flag,"puD3dDriverData->hwCaps.dpcLineCaps.dwShadeCaps "); + + printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwTextureCaps : "); + count = 0; + flag = puD3dDriverData->hwCaps.dpcLineCaps.dwTextureCaps; + checkflag(flag,D3DPTEXTURECAPS_ALPHA,"D3DPTEXTURECAPS_ALPHA"); + checkflag(flag,D3DPTEXTURECAPS_ALPHAPALETTE,"D3DPTEXTURECAPS_ALPHAPALETTE"); + checkflag(flag,D3DPTEXTURECAPS_BORDER,"D3DPTEXTURECAPS_BORDER"); + checkflag(flag,D3DPTEXTURECAPS_COLORKEYBLEND,"D3DPTEXTURECAPS_COLORKEYBLEND"); + checkflag(flag,D3DPTEXTURECAPS_CUBEMAP,"D3DPTEXTURECAPS_CUBEMAP"); + checkflag(flag,D3DPTEXTURECAPS_PERSPECTIVE,"D3DPTEXTURECAPS_PERSPECTIVE"); + checkflag(flag,D3DPTEXTURECAPS_POW2,"D3DPTEXTURECAPS_POW2"); + checkflag(flag,D3DPTEXTURECAPS_PROJECTED,"D3DPTEXTURECAPS_PROJECTED"); + checkflag(flag,D3DPTEXTURECAPS_NONPOW2CONDITIONAL,"D3DPTEXTURECAPS_NONPOW2CONDITIONAL"); + checkflag(flag,D3DPTEXTURECAPS_SQUAREONLY,"D3DPTEXTURECAPS_SQUAREONLY"); + // not in ddk or dxsdk but it is in msdn checkflag(flag,D3DPTEXTURECAPS_TEXREPEATNOTSCALESBYSIZE,"D3DPTEXTURECAPS_TEXREPEATNOTSCALESBYSIZE"); + // not in ddk or dxsdk but it is in msdn checkflag(flag,D3DPTEXTURECAPS_TEXTURETRANSFORM,"D3DPTEXTURECAPS_TEXTURETRANSFORM"); + checkflag(flag,D3DPTEXTURECAPS_TRANSPARENCY,"D3DPTEXTURECAPS_TRANSPARENCY"); + endcheckflag(flag,"puD3dDriverData->hwCaps.dpcLineCaps.dwTextureCaps "); + + printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwTextureFilterCaps : "); + count = 0; + flag = puD3dDriverData->hwCaps.dpcLineCaps.dwTextureFilterCaps; + checkflag(flag,D3DPTFILTERCAPS_LINEAR,"D3DPTFILTERCAPS_LINEAR"); + checkflag(flag,D3DPTFILTERCAPS_LINEARMIPLINEAR,"D3DPTFILTERCAPS_LINEARMIPLINEAR"); + checkflag(flag,D3DPTFILTERCAPS_LINEARMIPNEAREST,"D3DPTFILTERCAPS_LINEARMIPNEAREST"); + checkflag(flag,D3DPTFILTERCAPS_MAGFAFLATCUBIC,"D3DPTFILTERCAPS_MAGFAFLATCUBIC"); + checkflag(flag,D3DPTFILTERCAPS_MAGFANISOTROPIC,"D3DPTFILTERCAPS_MAGFANISOTROPIC"); + checkflag(flag,D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC,"D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC"); + checkflag(flag,D3DPTFILTERCAPS_MAGFLINEAR,"D3DPTFILTERCAPS_MAGFLINEAR"); + checkflag(flag,D3DPTFILTERCAPS_MAGFPOINT,"D3DPTFILTERCAPS_MAGFPOINT"); + checkflag(flag,D3DPTFILTERCAPS_MINFANISOTROPIC,"D3DPTFILTERCAPS_MINFANISOTROPIC"); + checkflag(flag,D3DPTFILTERCAPS_MINFLINEAR,"D3DPTFILTERCAPS_MINFLINEAR"); + checkflag(flag,D3DPTFILTERCAPS_MINFPOINT,"D3DPTFILTERCAPS_MINFPOINT"); + checkflag(flag,D3DPTFILTERCAPS_MIPFLINEAR,"D3DPTFILTERCAPS_MIPFLINEAR"); + checkflag(flag,D3DPTFILTERCAPS_MIPFPOINT,"D3DPTFILTERCAPS_MIPFPOINT"); + checkflag(flag,D3DPTFILTERCAPS_MIPLINEAR,"D3DPTFILTERCAPS_MIPLINEAR"); + checkflag(flag,D3DPTFILTERCAPS_MIPNEAREST,"D3DPTFILTERCAPS_MIPNEAREST"); + checkflag(flag,D3DPTFILTERCAPS_NEAREST,"D3DPTFILTERCAPS_NEAREST"); + endcheckflag(flag,"puD3dDriverData->hwCaps.dpcLineCaps.dwTextureFilterCaps "); + + printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwTextureBlendCaps : "); + count = 0; + flag = puD3dDriverData->hwCaps.dpcLineCaps.dwTextureBlendCaps; + checkflag(flag,D3DPTBLENDCAPS_ADD,"D3DPTBLENDCAPS_ADD"); + checkflag(flag,D3DPTBLENDCAPS_COPY,"D3DPTBLENDCAPS_COPY"); + checkflag(flag,D3DPTBLENDCAPS_DECAL,"D3DPTBLENDCAPS_DECAL"); + checkflag(flag,D3DPTBLENDCAPS_DECALALPHA,"D3DPTBLENDCAPS_DECALALPHA"); + checkflag(flag,D3DPTBLENDCAPS_DECALMASK,"D3DPTBLENDCAPS_DECALMASK"); + checkflag(flag,D3DPTBLENDCAPS_MODULATE,"D3DPTBLENDCAPS_MODULATE"); + checkflag(flag,D3DPTBLENDCAPS_MODULATEALPHA,"D3DPTBLENDCAPS_MODULATEALPHA"); + checkflag(flag,D3DPTBLENDCAPS_MODULATEMASK,"D3DPTBLENDCAPS_MODULATEMASK"); + endcheckflag(flag,"puD3dDriverData->hwCaps.dpcLineCaps.dwTextureBlendCaps "); + + printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwTextureAddressCaps : "); + count = 0; + flag = puD3dDriverData->hwCaps.dpcLineCaps.dwTextureAddressCaps; + checkflag(flag,D3DPTADDRESSCAPS_BORDER,"D3DPTADDRESSCAPS_BORDER"); + checkflag(flag,D3DPTADDRESSCAPS_CLAMP,"D3DPTADDRESSCAPS_CLAMP"); + checkflag(flag,D3DPTADDRESSCAPS_INDEPENDENTUV,"D3DPTADDRESSCAPS_INDEPENDENTUV"); + checkflag(flag,D3DPTADDRESSCAPS_MIRROR,"D3DPTADDRESSCAPS_MIRROR"); + checkflag(flag,D3DPTADDRESSCAPS_WRAP,"D3DPTADDRESSCAPS_WRAP"); + endcheckflag(flag,"puD3dDriverData->hwCaps.dpcLineCaps.dwTextureAddressCaps "); + printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwStippleWidth : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcLineCaps.dwStippleWidth); printf(" puD3dDriverData->hwCaps.dpcLineCaps.dwStippleHeight : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcLineCaps.dwStippleHeight); } @@ -679,17 +902,195 @@ if (puD3dDriverData->hwCaps.dpcTriCaps.dwSize == sizeof(D3DPRIMCAPS)) { printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwSize : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcTriCaps.dwSize); - printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwMiscCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcTriCaps.dwMiscCaps); - printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwRasterCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcTriCaps.dwRasterCaps); - printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwZCmpCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcTriCaps.dwZCmpCaps); - printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwSrcBlendCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcTriCaps.dwSrcBlendCaps); - printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwDestBlendCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcTriCaps.dwDestBlendCaps); - printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwAlphaCmpCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcTriCaps.dwAlphaCmpCaps); - printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwShadeCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcTriCaps.dwShadeCaps); - printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwTextureCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcTriCaps.dwTextureCaps); - printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwTextureFilterCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcTriCaps.dwTextureFilterCaps); - printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwTextureBlendCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcTriCaps.dwTextureBlendCaps); - printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwTextureAddressCaps : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcTriCaps.dwTextureAddressCaps); + + printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwMiscCaps : "); + count = 0; + flag = puD3dDriverData->hwCaps.dpcTriCaps.dwMiscCaps; + checkflag(flag,D3DPMISCCAPS_CONFORMANT,"D3DPMISCCAPS_CONFORMANT"); + checkflag(flag,D3DPMISCCAPS_CULLCCW,"D3DPMISCCAPS_CULLCCW"); + checkflag(flag,D3DPMISCCAPS_CULLCW,"D3DPMISCCAPS_CULLCW"); + checkflag(flag,D3DPMISCCAPS_CULLNONE,"D3DPMISCCAPS_CULLNONE"); + checkflag(flag,D3DPMISCCAPS_LINEPATTERNREP,"D3DPMISCCAPS_LINEPATTERNREP"); + checkflag(flag,D3DPMISCCAPS_MASKPLANES,"D3DPMISCCAPS_MASKPLANES"); + checkflag(flag,D3DPMISCCAPS_MASKZ,"D3DPMISCCAPS_MASKZ"); + endcheckflag(flag,"puD3dDriverData->hwCaps.dpcTriCaps.dwMiscCaps"); + + printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwRasterCaps : "); + count = 0; + flag = puD3dDriverData->hwCaps.dpcTriCaps.dwRasterCaps; + checkflag(flag,D3DPRASTERCAPS_ANISOTROPY,"D3DPRASTERCAPS_ANISOTROPY"); + checkflag(flag,D3DPRASTERCAPS_ANTIALIASEDGES,"D3DPRASTERCAPS_ANTIALIASEDGES"); + checkflag(flag,D3DPRASTERCAPS_ANTIALIASSORTDEPENDENT,"D3DPRASTERCAPS_ANTIALIASSORTDEPENDENT"); + checkflag(flag,D3DPRASTERCAPS_ANTIALIASSORTINDEPENDENT,"D3DPRASTERCAPS_ANTIALIASSORTINDEPENDENT"); + checkflag(flag,D3DPRASTERCAPS_DITHER,"D3DPRASTERCAPS_DITHER"); + checkflag(flag,D3DPRASTERCAPS_FOGRANGE,"D3DPRASTERCAPS_FOGRANGE"); + checkflag(flag,D3DPRASTERCAPS_FOGTABLE,"D3DPRASTERCAPS_FOGTABLE"); + checkflag(flag,D3DPRASTERCAPS_FOGVERTEX,"D3DPRASTERCAPS_FOGVERTEX"); + checkflag(flag,D3DPRASTERCAPS_PAT,"D3DPRASTERCAPS_PAT"); + checkflag(flag,D3DPRASTERCAPS_ROP2,"D3DPRASTERCAPS_ROP2"); + checkflag(flag,D3DPRASTERCAPS_STIPPLE,"D3DPRASTERCAPS_STIPPLE"); + checkflag(flag,D3DPRASTERCAPS_SUBPIXEL,"D3DPRASTERCAPS_SUBPIXEL"); + checkflag(flag,D3DPRASTERCAPS_SUBPIXELX,"D3DPRASTERCAPS_SUBPIXELX"); + checkflag(flag,D3DPRASTERCAPS_TRANSLUCENTSORTINDEPENDENT,"D3DPRASTERCAPS_TRANSLUCENTSORTINDEPENDENT"); + checkflag(flag,D3DPRASTERCAPS_WBUFFER,"D3DPRASTERCAPS_WBUFFER"); + checkflag(flag,D3DPRASTERCAPS_WFOG,"D3DPRASTERCAPS_WFOG"); + checkflag(flag,D3DPRASTERCAPS_XOR,"D3DPRASTERCAPS_XOR"); + checkflag(flag,D3DPRASTERCAPS_ZBIAS,"D3DPRASTERCAPS_ZBIAS"); + checkflag(flag,D3DPRASTERCAPS_ZBUFFERLESSHSR,"D3DPRASTERCAPS_ZBUFFERLESSHSR"); + checkflag(flag,D3DPRASTERCAPS_ZFOG,"D3DPRASTERCAPS_ZFOG"); + checkflag(flag,D3DPRASTERCAPS_ZTEST,"D3DPRASTERCAPS_ZTEST"); + endcheckflag(flag,"puD3dDriverData->hwCaps.dpcTriCaps.dwRasterCaps"); + + printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwZCmpCaps : "); + count = 0; + flag = puD3dDriverData->hwCaps.dpcTriCaps.dwZCmpCaps; + checkflag(flag,D3DPCMPCAPS_ALWAYS,"D3DPCMPCAPS_ALWAYS"); + checkflag(flag,D3DPCMPCAPS_EQUAL,"D3DPCMPCAPS_EQUAL"); + checkflag(flag,D3DPCMPCAPS_GREATER,"D3DPCMPCAPS_GREATER"); + checkflag(flag,D3DPCMPCAPS_GREATEREQUAL,"D3DPCMPCAPS_GREATEREQUAL"); + checkflag(flag,D3DPCMPCAPS_LESS,"D3DPCMPCAPS_LESS"); + checkflag(flag,D3DPCMPCAPS_LESSEQUAL,"D3DPCMPCAPS_LESSEQUAL"); + checkflag(flag,D3DPCMPCAPS_NEVER,"D3DPCMPCAPS_NEVER"); + checkflag(flag,D3DPCMPCAPS_NOTEQUAL,"D3DPCMPCAPS_NOTEQUAL"); + endcheckflag(flag,"puD3dDriverData->hwCaps.dpcTriCaps.dwZCmpCaps "); + + printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwSrcBlendCaps : "); + count = 0; + flag = puD3dDriverData->hwCaps.dpcTriCaps.dwSrcBlendCaps; + checkflag(flag,D3DPBLENDCAPS_BOTHINVSRCALPHA,"D3DPBLENDCAPS_BOTHINVSRCALPHA"); + checkflag(flag,D3DPBLENDCAPS_BOTHSRCALPHA,"D3DPBLENDCAPS_BOTHSRCALPHA"); + checkflag(flag,D3DPBLENDCAPS_DESTALPHA,"D3DPBLENDCAPS_DESTALPHA"); + checkflag(flag,D3DPBLENDCAPS_DESTCOLOR,"D3DPBLENDCAPS_DESTCOLOR"); + checkflag(flag,D3DPBLENDCAPS_INVDESTALPHA,"D3DPBLENDCAPS_INVDESTALPHA"); + checkflag(flag,D3DPBLENDCAPS_INVDESTCOLOR,"D3DPBLENDCAPS_INVDESTCOLOR"); + checkflag(flag,D3DPBLENDCAPS_INVSRCALPHA,"D3DPBLENDCAPS_INVSRCALPHA"); + checkflag(flag,D3DPBLENDCAPS_INVSRCCOLOR,"D3DPBLENDCAPS_INVSRCCOLOR"); + checkflag(flag,D3DPBLENDCAPS_ONE,"D3DPBLENDCAPS_ONE"); + checkflag(flag,D3DPBLENDCAPS_SRCALPHA,"D3DPBLENDCAPS_SRCALPHA"); + checkflag(flag,D3DPBLENDCAPS_SRCALPHASAT,"D3DPBLENDCAPS_SRCALPHASAT"); + checkflag(flag,D3DPBLENDCAPS_SRCCOLOR,"D3DPBLENDCAPS_SRCCOLOR"); + checkflag(flag,D3DPBLENDCAPS_ZERO,"D3DPBLENDCAPS_ZERO"); + endcheckflag(flag,"puD3dDriverData->hwCaps.dpcTriCaps.dwSrcBlendCaps "); + + printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwDestBlendCaps : "); + count = 0; + flag = puD3dDriverData->hwCaps.dpcTriCaps.dwDestBlendCaps; + checkflag(flag,D3DPBLENDCAPS_BOTHINVSRCALPHA,"D3DPBLENDCAPS_BOTHINVSRCALPHA"); + checkflag(flag,D3DPBLENDCAPS_BOTHSRCALPHA,"D3DPBLENDCAPS_BOTHSRCALPHA"); + checkflag(flag,D3DPBLENDCAPS_DESTALPHA,"D3DPBLENDCAPS_DESTALPHA"); + checkflag(flag,D3DPBLENDCAPS_DESTCOLOR,"D3DPBLENDCAPS_DESTCOLOR"); + checkflag(flag,D3DPBLENDCAPS_INVDESTALPHA,"D3DPBLENDCAPS_INVDESTALPHA"); + checkflag(flag,D3DPBLENDCAPS_INVDESTCOLOR,"D3DPBLENDCAPS_INVDESTCOLOR"); + checkflag(flag,D3DPBLENDCAPS_INVSRCALPHA,"D3DPBLENDCAPS_INVSRCALPHA"); + checkflag(flag,D3DPBLENDCAPS_INVSRCCOLOR,"D3DPBLENDCAPS_INVSRCCOLOR"); + checkflag(flag,D3DPBLENDCAPS_ONE,"D3DPBLENDCAPS_ONE"); + checkflag(flag,D3DPBLENDCAPS_SRCALPHA,"D3DPBLENDCAPS_SRCALPHA"); + checkflag(flag,D3DPBLENDCAPS_SRCALPHASAT,"D3DPBLENDCAPS_SRCALPHASAT"); + checkflag(flag,D3DPBLENDCAPS_SRCCOLOR,"D3DPBLENDCAPS_SRCCOLOR"); + checkflag(flag,D3DPBLENDCAPS_ZERO,"D3DPBLENDCAPS_ZERO"); + endcheckflag(flag,"puD3dDriverData->hwCaps.dpcTriCaps.dwDestBlendCaps "); + + printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwAlphaCmpCaps : "); + count = 0; + flag = puD3dDriverData->hwCaps.dpcTriCaps.dwAlphaCmpCaps; + checkflag(flag,D3DPCMPCAPS_ALWAYS,"D3DPCMPCAPS_ALWAYS"); + checkflag(flag,D3DPCMPCAPS_EQUAL,"D3DPCMPCAPS_EQUAL"); + checkflag(flag,D3DPCMPCAPS_GREATER,"D3DPCMPCAPS_GREATER"); + checkflag(flag,D3DPCMPCAPS_GREATEREQUAL,"D3DPCMPCAPS_GREATEREQUAL"); + checkflag(flag,D3DPCMPCAPS_LESS,"D3DPCMPCAPS_LESS"); + checkflag(flag,D3DPCMPCAPS_LESSEQUAL,"D3DPCMPCAPS_LESSEQUAL"); + checkflag(flag,D3DPCMPCAPS_NEVER,"D3DPCMPCAPS_NEVER"); + checkflag(flag,D3DPCMPCAPS_NOTEQUAL,"D3DPCMPCAPS_NOTEQUAL"); + endcheckflag(flag,"puD3dDriverData->hwCaps.dpcTriCaps.dwAlphaCmpCaps "); + + printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwShadeCaps : "); + count = 0; + flag = puD3dDriverData->hwCaps.dpcTriCaps.dwShadeCaps; + checkflag(flag,D3DPSHADECAPS_ALPHAFLATBLEND,"D3DPSHADECAPS_ALPHAFLATBLEND"); + checkflag(flag,D3DPSHADECAPS_ALPHAFLATSTIPPLED,"D3DPSHADECAPS_ALPHAFLATSTIPPLED"); + checkflag(flag,D3DPSHADECAPS_ALPHAGOURAUDBLEND,"D3DPSHADECAPS_ALPHAGOURAUDBLEND"); + checkflag(flag,D3DPSHADECAPS_ALPHAGOURAUDSTIPPLED,"D3DPSHADECAPS_ALPHAGOURAUDSTIPPLED"); + checkflag(flag,D3DPSHADECAPS_ALPHAPHONGBLEND,"D3DPSHADECAPS_ALPHAPHONGBLEND"); + checkflag(flag,D3DPSHADECAPS_ALPHAPHONGSTIPPLED,"D3DPSHADECAPS_ALPHAPHONGSTIPPLED"); + checkflag(flag,D3DPSHADECAPS_COLORFLATMONO,"D3DPSHADECAPS_COLORFLATMONO"); + checkflag(flag,D3DPSHADECAPS_COLORFLATRGB,"D3DPSHADECAPS_COLORFLATRGB"); + checkflag(flag,D3DPSHADECAPS_COLORGOURAUDMONO,"D3DPSHADECAPS_COLORGOURAUDMONO"); + checkflag(flag,D3DPSHADECAPS_COLORGOURAUDRGB,"D3DPSHADECAPS_COLORGOURAUDRGB"); + checkflag(flag,D3DPSHADECAPS_COLORPHONGMONO,"D3DPSHADECAPS_COLORPHONGMONO"); + checkflag(flag,D3DPSHADECAPS_COLORPHONGRGB,"D3DPSHADECAPS_COLORPHONGRGB"); + checkflag(flag,D3DPSHADECAPS_FOGFLAT,"D3DPSHADECAPS_FOGFLAT"); + checkflag(flag,D3DPSHADECAPS_FOGGOURAUD,"D3DPSHADECAPS_FOGGOURAUD"); + checkflag(flag,D3DPSHADECAPS_FOGPHONG,"D3DPSHADECAPS_FOGPHONG"); + checkflag(flag,D3DPSHADECAPS_SPECULARFLATMONO,"D3DPSHADECAPS_SPECULARFLATMONO"); + checkflag(flag,D3DPSHADECAPS_SPECULARFLATRGB,"D3DPSHADECAPS_SPECULARFLATRGB"); + checkflag(flag,D3DPSHADECAPS_SPECULARGOURAUDMONO,"D3DPSHADECAPS_SPECULARGOURAUDMONO"); + checkflag(flag,D3DPSHADECAPS_SPECULARGOURAUDRGB,"D3DPSHADECAPS_SPECULARGOURAUDRGB"); + checkflag(flag,D3DPSHADECAPS_SPECULARPHONGMONO,"D3DPSHADECAPS_SPECULARPHONGMONO"); + checkflag(flag,D3DPSHADECAPS_SPECULARPHONGRGB,"D3DPSHADECAPS_SPECULARPHONGRGB"); + endcheckflag(flag,"puD3dDriverData->hwCaps.dpcTriCaps.dwShadeCaps "); + + printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwTextureCaps : "); + count = 0; + flag = puD3dDriverData->hwCaps.dpcTriCaps.dwTextureCaps; + checkflag(flag,D3DPTEXTURECAPS_ALPHA,"D3DPTEXTURECAPS_ALPHA"); + checkflag(flag,D3DPTEXTURECAPS_ALPHAPALETTE,"D3DPTEXTURECAPS_ALPHAPALETTE"); + checkflag(flag,D3DPTEXTURECAPS_BORDER,"D3DPTEXTURECAPS_BORDER"); + checkflag(flag,D3DPTEXTURECAPS_COLORKEYBLEND,"D3DPTEXTURECAPS_COLORKEYBLEND"); + checkflag(flag,D3DPTEXTURECAPS_CUBEMAP,"D3DPTEXTURECAPS_CUBEMAP"); + checkflag(flag,D3DPTEXTURECAPS_PERSPECTIVE,"D3DPTEXTURECAPS_PERSPECTIVE"); + checkflag(flag,D3DPTEXTURECAPS_POW2,"D3DPTEXTURECAPS_POW2"); + checkflag(flag,D3DPTEXTURECAPS_PROJECTED,"D3DPTEXTURECAPS_PROJECTED"); + checkflag(flag,D3DPTEXTURECAPS_NONPOW2CONDITIONAL,"D3DPTEXTURECAPS_NONPOW2CONDITIONAL"); + checkflag(flag,D3DPTEXTURECAPS_SQUAREONLY,"D3DPTEXTURECAPS_SQUAREONLY"); + //not in ddk or dxsdk but it is in msdn checkflag(flag,D3DPTEXTURECAPS_TEXREPEATNOTSCALESBYSIZE,"D3DPTEXTURECAPS_TEXREPEATNOTSCALESBYSIZE"); + //not in ddk or dxsdk but it is in msdn checkflag(flag,D3DPTEXTURECAPS_TEXTURETRANSFORM,"D3DPTEXTURECAPS_TEXTURETRANSFORM"); + checkflag(flag,D3DPTEXTURECAPS_TRANSPARENCY,"D3DPTEXTURECAPS_TRANSPARENCY"); + endcheckflag(flag,"puD3dDriverData->hwCaps.dpcTriCaps.dwTextureCaps "); + + printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwTextureFilterCaps : "); + count = 0; + flag = puD3dDriverData->hwCaps.dpcTriCaps.dwTextureFilterCaps; + checkflag(flag,D3DPTFILTERCAPS_LINEAR,"D3DPTFILTERCAPS_LINEAR"); + checkflag(flag,D3DPTFILTERCAPS_LINEARMIPLINEAR,"D3DPTFILTERCAPS_LINEARMIPLINEAR"); + checkflag(flag,D3DPTFILTERCAPS_LINEARMIPNEAREST,"D3DPTFILTERCAPS_LINEARMIPNEAREST"); + checkflag(flag,D3DPTFILTERCAPS_MAGFAFLATCUBIC,"D3DPTFILTERCAPS_MAGFAFLATCUBIC"); + checkflag(flag,D3DPTFILTERCAPS_MAGFANISOTROPIC,"D3DPTFILTERCAPS_MAGFANISOTROPIC"); + checkflag(flag,D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC,"D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC"); + checkflag(flag,D3DPTFILTERCAPS_MAGFLINEAR,"D3DPTFILTERCAPS_MAGFLINEAR"); + checkflag(flag,D3DPTFILTERCAPS_MAGFPOINT,"D3DPTFILTERCAPS_MAGFPOINT"); + checkflag(flag,D3DPTFILTERCAPS_MINFANISOTROPIC,"D3DPTFILTERCAPS_MINFANISOTROPIC"); + checkflag(flag,D3DPTFILTERCAPS_MINFLINEAR,"D3DPTFILTERCAPS_MINFLINEAR"); + checkflag(flag,D3DPTFILTERCAPS_MINFPOINT,"D3DPTFILTERCAPS_MINFPOINT"); + checkflag(flag,D3DPTFILTERCAPS_MIPFLINEAR,"D3DPTFILTERCAPS_MIPFLINEAR"); + checkflag(flag,D3DPTFILTERCAPS_MIPFPOINT,"D3DPTFILTERCAPS_MIPFPOINT"); + checkflag(flag,D3DPTFILTERCAPS_MIPLINEAR,"D3DPTFILTERCAPS_MIPLINEAR"); + checkflag(flag,D3DPTFILTERCAPS_MIPNEAREST,"D3DPTFILTERCAPS_MIPNEAREST"); + checkflag(flag,D3DPTFILTERCAPS_NEAREST,"D3DPTFILTERCAPS_NEAREST"); + endcheckflag(flag,"puD3dDriverData->hwCaps.dpcTriCaps.dwTextureFilterCaps "); + + printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwTextureBlendCaps : "); + count = 0; + flag = puD3dDriverData->hwCaps.dpcTriCaps.dwTextureBlendCaps; + checkflag(flag,D3DPTBLENDCAPS_ADD,"D3DPTBLENDCAPS_ADD"); + checkflag(flag,D3DPTBLENDCAPS_COPY,"D3DPTBLENDCAPS_COPY"); + checkflag(flag,D3DPTBLENDCAPS_DECAL,"D3DPTBLENDCAPS_DECAL"); + checkflag(flag,D3DPTBLENDCAPS_DECALALPHA,"D3DPTBLENDCAPS_DECALALPHA"); + checkflag(flag,D3DPTBLENDCAPS_DECALMASK,"D3DPTBLENDCAPS_DECALMASK"); + checkflag(flag,D3DPTBLENDCAPS_MODULATE,"D3DPTBLENDCAPS_MODULATE"); + checkflag(flag,D3DPTBLENDCAPS_MODULATEALPHA,"D3DPTBLENDCAPS_MODULATEALPHA"); + checkflag(flag,D3DPTBLENDCAPS_MODULATEMASK,"D3DPTBLENDCAPS_MODULATEMASK"); + endcheckflag(flag,"puD3dDriverData->hwCaps.dpcTriCaps.dwTextureBlendCaps "); + + printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwTextureAddressCaps : "); + count = 0; + flag = puD3dDriverData->hwCaps.dpcTriCaps.dwTextureAddressCaps; + checkflag(flag,D3DPTADDRESSCAPS_BORDER,"D3DPTADDRESSCAPS_BORDER"); + checkflag(flag,D3DPTADDRESSCAPS_CLAMP,"D3DPTADDRESSCAPS_CLAMP"); + checkflag(flag,D3DPTADDRESSCAPS_INDEPENDENTUV,"D3DPTADDRESSCAPS_INDEPENDENTUV"); + checkflag(flag,D3DPTADDRESSCAPS_MIRROR,"D3DPTADDRESSCAPS_MIRROR"); + checkflag(flag,D3DPTADDRESSCAPS_WRAP,"D3DPTADDRESSCAPS_WRAP"); + endcheckflag(flag,"puD3dDriverData->hwCaps.dpcTriCaps.dwTextureAddressCaps "); + printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwStippleWidth : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcTriCaps.dwStippleWidth); printf(" puD3dDriverData->hwCaps.dpcTriCaps.dwStippleHeight : 0x%08lx\n",(long)puD3dDriverData->hwCaps.dpcTriCaps.dwStippleHeight); }

1 0

[greatlrd] 32937: fixed so old name can be use also like DDSVCAPS_ENIGMA ...
by greatlrd＠svn.reactos.org 13 Apr '08

13 Apr '08

Author: greatlrd Date: Sun Apr 13 03:48:05 2008 New Revision: 32937 URL: http://svn.reactos.org/svn/reactos?rev=32937&view=rev Log: fixed so old name can be use also like DDSVCAPS_ENIGMA ... Modified: trunk/reactos/include/dxsdk/ddraw.h Modified: trunk/reactos/include/dxsdk/ddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/ddraw.h?rev=… ============================================================================== --- trunk/reactos/include/dxsdk/ddraw.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/ddraw.h [iso-8859-1] Sun Apr 13 03:48:05 2008 @@ -422,17 +422,20 @@ #define DDFXCAPS_BLTFILTER DDFXCAPS_BLTARITHSTRETCHY #define DDFXCAPS_OVERLAYFILTER DDFXCAPS_OVERLAYARITHSTRETCHY -#if DIRECTDRAW_VERSION >= 0x700 + #define DDSVCAPS_RESERVED1 0x00000001 #define DDSVCAPS_RESERVED2 0x00000002 #define DDSVCAPS_RESERVED3 0x00000004 #define DDSVCAPS_RESERVED4 0x00000008 -#else +/* rember that DDSVCAPS_ENIGMA is same as DDSVCAPS_RESERVED1 */ #define DDSVCAPS_ENIGMA 0x00000001 +/* rember that DDSVCAPS_FLICKER is same as DDSVCAPS_RESERVED2 */ #define DDSVCAPS_FLICKER 0x00000002 +/* rember that DDSVCAPS_REDBLUE is same as DDSVCAPS_RESERVED3 */ #define DDSVCAPS_REDBLUE 0x00000004 +/* rember that DDSVCAPS_SPLIT is same as DDSVCAPS_RESERVED4 */ #define DDSVCAPS_SPLIT 0x00000008 -#endif + #define DDSVCAPS_STEREOSEQUENTIAL 0x00000010 #define DDPCAPS_INITIALIZE 0x00000000

1 0

[dreimer] 32936: Polish Translation Update by Olaf Siejka
by dreimer＠svn.reactos.org 13 Apr '08

13 Apr '08

Author: dreimer Date: Sun Apr 13 03:47:00 2008 New Revision: 32936 URL: http://svn.reactos.org/svn/reactos?rev=32936&view=rev Log: Polish Translation Update by Olaf Siejka Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Sun Apr 13 03:47:00 2008 @@ -98,12 +98,12 @@ SHNEWBRSFORFOLDER_MSGBOX DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 15, 40, 218, 196 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Wybierz folder" +CAPTION "Wybierz katalog" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDD_TITLE, 10, 8, 198, 24 LTEXT "", IDD_STATUS, 10, 25, 198, 12 - LTEXT "Folder:", IDD_FOLDER, 10, 152, 40, 12 + LTEXT "Katalog:", IDD_FOLDER, 10, 152, 40, 12 CONTROL "", IDD_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "&Utwórz katalog", IDD_MAKENEWFOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP @@ -393,7 +393,7 @@ PUSHBUTTON "Z&resetuj ustawienia", 14002, 150, 50, 80, 14, WS_TABSTOP LTEXT "Zaawansowane:", -1, 7, 80, 100, 10 CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120 -PUSHBUTTON "Odtwórz &Domylne", 14004, 180, 210, 80, 14, WS_TABSTOP +PUSHBUTTON "Odtwórz &domylne", 14004, 180, 210, 80, 14, WS_TABSTOP END FOLDER_OPTIONS_FILETYPES_DLG DIALOGEX 0, 0, 264, 256 @@ -635,7 +635,7 @@ IDS_PRINTHOOD "Drukarki" IDS_LOCAL_APPDATA "Ustawienia lokalne\\Dane aplikacji" IDS_INTERNET_CACHE "Ustawienia lokalne\\Temporary Internet Files" - IDS_COOKIES "Cookies" + IDS_COOKIES "Ciasteczka" IDS_HISTORY "Ustawienia Lokalne\\Historia" IDS_PROGRAM_FILES "Program Files" IDS_MYPICTURES "Moje obrazy" @@ -646,26 +646,26 @@ IDS_COMMON_PICTURES "Documenty\\Moje obrazy" IDS_COMMON_VIDEO "Documenty\\Moje wideo" IDS_CDBURN_AREA "Ustawienia lokalne\\Dane aplikacji\\Microsoft\\Nagrywanie dysków CD" - IDS_NETWORKPLACE "My Network Place" - - IDS_NEWFOLDER "Nowy Katalog" - - IDS_DRIVE_FIXED "Dysk Lokalny" + IDS_NETWORKPLACE "Moja sieæ" + + IDS_NEWFOLDER "Nowy katalog" + + IDS_DRIVE_FIXED "Dysk lokalny" IDS_DRIVE_CDROM "CDROM" - IDS_DRIVE_NETWORK "Dysk Sieciowy" + IDS_DRIVE_NETWORK "Dysk sieciowy" IDS_OPEN_WITH "Otwórz z" - IDS_OPEN_WITH_CHOOSE "Wybierz Program..." + IDS_OPEN_WITH_CHOOSE "Wybierz program..." IDS_SHELL_ABOUT_AUTHORS "&Autorzy" IDS_SHELL_ABOUT_BACK "< &Wstecz" FCIDM_SHVIEW_NEW "&Nowy" FCIDM_SHVIEW_NEWFOLDER "&Folder" FCIDM_SHVIEW_NEWLINK "&Skrót" - IDS_FOLDER_OPTIONS "Opcje Katalogów" - IDS_RECYCLEBIN_LOCATION "Lokalizacja Kosza" + IDS_FOLDER_OPTIONS "Opcje katalogów" + IDS_RECYCLEBIN_LOCATION "Lokalizacja kosza" IDS_RECYCLEBIN_DISKSPACE "Pozosta³o wolnego miejsca" - IDS_PICK_ICON_TITLE "Choose Icon" - IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" - IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0" -END + IDS_PICK_ICON_TITLE "Wybierz ikonê" + IDS_PICK_ICON_FILTER "Pliki ikon(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" + IDS_OPEN_WITH_FILTER "Programy\0*.exe\0" +END

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs