Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[gschneider] 37382: - DIB_1BPP_BitBlt: Increment source coordinates properly, see bug #2372 - Remove old code - Enable dprint for DIB_1BPP_StretchBlt
by gschneider＠svn.reactos.org 15 Nov '08

15 Nov '08

Author: gschneider Date: Sat Nov 15 16:35:44 2008 New Revision: 37382 URL: http://svn.reactos.org/svn/reactos?rev=37382&view=rev Log: - DIB_1BPP_BitBlt: Increment source coordinates properly, see bug #2372 - Remove old code - Enable dprint for DIB_1BPP_StretchBlt Modified: trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c [iso-8859-1] Sat Nov 15 16:35:44 2008 @@ -351,7 +351,6 @@ BOOLEAN UsesPattern; PULONG DestBits; ULONG RoundedRight; -/* BYTE NoBits;*/ UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4); UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4); @@ -417,7 +416,7 @@ #endif } - for (; DestX < RoundedRight; DestX += 32, DestBits++, SourceX++) + for (; DestX < RoundedRight; DestX += 32, DestBits++, SourceX += 32) { Dest = *DestBits; @@ -450,10 +449,8 @@ if (DestX < BltInfo->DestRect.right) { -// Dest = *DestBits; for (; DestX < BltInfo->DestRect.right; DestX++, SourceX++) { -// Dest = *DestBits; Dest = DIB_1BPP_GetPixel(BltInfo->DestSurface, DestX, DestY); if (UsesSource) @@ -467,7 +464,6 @@ } DIB_1BPP_PutPixel(BltInfo->DestSurface, DestX, DestY, DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xF); -// Dest >>= 1; } } @@ -627,7 +623,7 @@ break; default: - //DPRINT1("DIB_1BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); + DPRINT1("DIB_1BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); return FALSE; }

1 0

[ekohl] 37381: Sync to wine-1.1.0: - Simon Richter <Simon.Richter@hogyros.de> Tue, 17 Jun 2008 widl: Write string lengths in host endianness. Type libraries are currently parsed in host endianness, so byte arrays that are going to be interpreted as integers need to be written in the appropriate byte order. - Rob Shearman <robertshearman@gmail.com> Fri, 20 Jun 2008 widl: Fix generation of the type format string for conformant-varying structures. The conformance needs to be added on to the offset
by ekohl＠svn.reactos.org 15 Nov '08

15 Nov '08

Author: ekohl Date: Sat Nov 15 15:17:09 2008 New Revision: 37381 URL: http://svn.reactos.org/svn/reactos?rev=37381&view=rev Log: Sync to wine-1.1.0: - Simon Richter <Simon.Richter(a)hogyros.de> Tue, 17 Jun 2008 widl: Write string lengths in host endianness. Type libraries are currently parsed in host endianness, so byte arrays that are going to be interpreted as integers need to be written in the appropriate byte order. - Rob Shearman <robertshearman(a)gmail.com> Fri, 20 Jun 2008 widl: Fix generation of the type format string for conformant-varying structures. The conformance needs to be added on to the offset in the buffer so set this before calling each the writer of each class of pointer description in write_pointer_description. Pass the passed in offsets to buffer and memory to write_pointer_description_offsets in write_varying_array_pointer_descriptions. - Rob Shearman <robertshearman(a)gmail.com> Mon, 23 Jun 2008 widl: Replace code to round up values and calculate padding with macros to improve readability. - Rob Shearman <robertshearman(a)gmail.com> Mon, 23 Jun 2008 widl: Fix the embedded pointer offsets in generated code when the containing structure has padding. Do so by calculating the alignment of members when iterating through the structures and adding it onto the buffer and memory offsets. Only call type_memsize once elsewhere in the embedded pointer processing functions since the return value will be the same from the second call. - Rob Shearman <robertshearman(a)gmail.com> Mon, 23 Jun 2008 widl: Factor out the finding of a registered type to reduce code duplication. - Rob Shearman <robertshearman(a)gmail.com> Mon, 23 Jun 2008 widl: Set the type of the type_t node constructured for dispinterfaces to RPC_FC_IP, like we do for interfaces. - Rob Shearman <robertshearman(a)gmail.com> Mon, 23 Jun 2008 widl: Fix crash in find_array_or_string_in_struct if the structure or union has no fields or cases. (Aleksey already applied this patch in rev37378) - Rob Shearman <robertshearman(a)gmail.com> Mon, 23 Jun 2008 widl: Fix the types of enums with the v1_enum attribute applied. - Rob Shearman <robertshearman(a)gmail.com> Mon, 23 Jun 2008 widl: Fix type_memsize to follow aliases so that the correct size is calculated. - Rob Shearman <robertshearman(a)gmail.com> Mon, 23 Jun 2008 widl: Fix check_remoting_fields to enumerate the correct list of fields. Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.y trunk/reactos/tools/widl/typegen.c trunk/reactos/tools/widl/write_msft.c Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Nov 15 15:17:09 2008 @@ -26,7 +26,7 @@ reactos/tools/winebuild # Synced to Wine-20081105 (~Wine-1.1.7) reactos/tools/wmc # Synced to Wine-20081105 (~Wine-1.1.7) reactos/tools/wrc # Synced to Wine-20081105 (~Wine-1.1.7) -reactos/tools/widl # Synced to Wine-1_0-rc1 +reactos/tools/widl # Synced to Wine-1_1_0 The following libraries are shared with Wine. Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… ============================================================================== --- trunk/reactos/tools/widl/parser.tab.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/parser.tab.c [iso-8859-1] Sat Nov 15 15:17:09 2008 @@ -3744,12 +3744,12 @@ case 242: #line 877 "parser.y" - { (yyval.type) = get_type(0, (yyvsp[0].str), 0); (yyval.type)->kind = TKIND_DISPATCH; ;} + { (yyval.type) = get_type(RPC_FC_IP, (yyvsp[0].str), 0); (yyval.type)->kind = TKIND_DISPATCH; ;} break; case 243: #line 878 "parser.y" - { (yyval.type) = get_type(0, (yyvsp[0].str), 0); (yyval.type)->kind = TKIND_DISPATCH; ;} + { (yyval.type) = get_type(RPC_FC_IP, (yyvsp[0].str), 0); (yyval.type)->kind = TKIND_DISPATCH; ;} break; case 244: @@ -4792,6 +4792,14 @@ error_loc("'%s': [string] attribute applied to non-pointer, non-array type\n", v->name); + if (is_attr(v->attrs, ATTR_V1ENUM)) + { + if (v->type->type == RPC_FC_ENUM16) + v->type->type = RPC_FC_ENUM32; + else + error_loc("'%s': [v1_enum] attribute applied to non-enum type\n", v->name); + } + sizeless = FALSE; if (arr) LIST_FOR_EACH_ENTRY_REV(dim, arr, expr_t, entry) { @@ -5213,16 +5221,22 @@ return type; } -type_t *find_type(const char *name, int t) +static type_t *find_type_helper(const char *name, int t) { struct rtype *cur = type_hash[hash_ident(name)]; while (cur && (cur->t != t || strcmp(cur->name, name))) cur = cur->next; - if (!cur) { + return cur ? cur->type : NULL; +} + +type_t *find_type(const char *name, int t) +{ + type_t *type = find_type_helper(name, t); + if (!type) { error_loc("type '%s' not found\n", name); return NULL; } - return cur->type; + return type; } static type_t *find_type2(char *name, int t) @@ -5234,25 +5248,18 @@ int is_type(const char *name) { - struct rtype *cur = type_hash[hash_ident(name)]; - while (cur && (cur->t || strcmp(cur->name, name))) - cur = cur->next; - if (cur) return TRUE; - return FALSE; + return find_type_helper(name, 0) != NULL; } static type_t *get_type(unsigned char type, char *name, int t) { - struct rtype *cur = NULL; type_t *tp; if (name) { - cur = type_hash[hash_ident(name)]; - while (cur && (cur->t != t || strcmp(cur->name, name))) - cur = cur->next; - } - if (cur) { - free(name); - return cur->type; + tp = find_type_helper(name, t); + if (tp) { + free(name); + return tp; + } } tp = make_type(type, NULL); tp->name = name; @@ -5929,7 +5936,7 @@ fields = type->fields_or_args; } - if (fields) LIST_FOR_EACH_ENTRY( field, type->fields_or_args, const var_t, entry ) + if (fields) LIST_FOR_EACH_ENTRY( field, fields, const var_t, entry ) if (field->type) check_field_common(type, type->name, field); } Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=37… ============================================================================== --- trunk/reactos/tools/widl/parser.y [iso-8859-1] (original) +++ trunk/reactos/tools/widl/parser.y [iso-8859-1] Sat Nov 15 15:17:09 2008 @@ -874,8 +874,8 @@ m_attributes interfacedec { $$ = make_ifref($2); $$->attrs = $1; } ; -dispinterface: tDISPINTERFACE aIDENTIFIER { $$ = get_type(0, $2, 0); $$->kind = TKIND_DISPATCH; } - | tDISPINTERFACE aKNOWNTYPE { $$ = get_type(0, $2, 0); $$->kind = TKIND_DISPATCH; } +dispinterface: tDISPINTERFACE aIDENTIFIER { $$ = get_type(RPC_FC_IP, $2, 0); $$->kind = TKIND_DISPATCH; } + | tDISPINTERFACE aKNOWNTYPE { $$ = get_type(RPC_FC_IP, $2, 0); $$->kind = TKIND_DISPATCH; } ; dispinterfacehdr: attributes dispinterface { attr_t *attrs; @@ -1479,6 +1479,14 @@ error_loc("'%s': [string] attribute applied to non-pointer, non-array type\n", v->name); + if (is_attr(v->attrs, ATTR_V1ENUM)) + { + if (v->type->type == RPC_FC_ENUM16) + v->type->type = RPC_FC_ENUM32; + else + error_loc("'%s': [v1_enum] attribute applied to non-enum type\n", v->name); + } + sizeless = FALSE; if (arr) LIST_FOR_EACH_ENTRY_REV(dim, arr, expr_t, entry) { @@ -1900,16 +1908,22 @@ return type; } -type_t *find_type(const char *name, int t) +static type_t *find_type_helper(const char *name, int t) { struct rtype *cur = type_hash[hash_ident(name)]; while (cur && (cur->t != t || strcmp(cur->name, name))) cur = cur->next; - if (!cur) { + return cur ? cur->type : NULL; +} + +type_t *find_type(const char *name, int t) +{ + type_t *type = find_type_helper(name, t); + if (!type) { error_loc("type '%s' not found\n", name); return NULL; } - return cur->type; + return type; } static type_t *find_type2(char *name, int t) @@ -1921,25 +1935,18 @@ int is_type(const char *name) { - struct rtype *cur = type_hash[hash_ident(name)]; - while (cur && (cur->t || strcmp(cur->name, name))) - cur = cur->next; - if (cur) return TRUE; - return FALSE; + return find_type_helper(name, 0) != NULL; } static type_t *get_type(unsigned char type, char *name, int t) { - struct rtype *cur = NULL; type_t *tp; if (name) { - cur = type_hash[hash_ident(name)]; - while (cur && (cur->t != t || strcmp(cur->name, name))) - cur = cur->next; - } - if (cur) { - free(name); - return cur->type; + tp = find_type_helper(name, t); + if (tp) { + free(name); + return tp; + } } tp = make_type(type, NULL); tp->name = name; @@ -2616,7 +2623,7 @@ fields = type->fields_or_args; } - if (fields) LIST_FOR_EACH_ENTRY( field, type->fields_or_args, const var_t, entry ) + if (fields) LIST_FOR_EACH_ENTRY( field, fields, const var_t, entry ) if (field->type) check_field_common(type, type->name, field); } Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=3… ============================================================================== --- trunk/reactos/tools/widl/typegen.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typegen.c [iso-8859-1] Sat Nov 15 15:17:09 2008 @@ -40,6 +40,11 @@ #include "typegen.h" #include "expr.h" + +/* round size up to multiple of alignment */ +#define ROUND_SIZE(size, alignment) (((size) + ((alignment) - 1)) & ~((alignment) - 1)) +/* value to add on to round size up to a multiple of alignment */ +#define ROUNDING(size, alignment) (((alignment) - 1) - (((size) + ((alignment) - 1)) & ((alignment) - 1))) static const func_t *current_func; static const type_t *current_structure; @@ -754,11 +759,11 @@ *align = falign; have_align = TRUE; } - size = (size + (falign - 1)) & ~(falign - 1); + size = ROUND_SIZE(size, falign); size += fsize; } - size = (size + (*align - 1)) & ~(*align - 1); + size = ROUND_SIZE(size, *align); return size; } @@ -798,18 +803,20 @@ size_t size = type_memsize(ft, &align); if (salign == -1) salign = align; - offset = (offset + (align - 1)) & ~(align - 1); + offset = ROUND_SIZE(offset, align); offset += size; } - return ((offset + (salign - 1)) & ~(salign - 1)) - offset; + return ROUNDING(offset, salign); } size_t type_memsize(const type_t *t, unsigned int *align) { size_t size = 0; - if (t->declarray && is_conformant_array(t)) + if (t->kind == TKIND_ALIAS) + size = type_memsize(t->orig, align); + else if (t->declarray && is_conformant_array(t)) { type_memsize(t->ref, align); size = 0; @@ -1112,6 +1119,8 @@ if (is_ptr(type) || (!type->declarray && is_conformant_array(type))) { + size_t memsize; + print_file(file, 2, "0x%02x, /* FC_NO_REPEAT */\n", RPC_FC_NO_REPEAT); print_file(file, 2, "0x%02x, /* FC_PAD */\n", RPC_FC_PAD); @@ -1139,10 +1148,11 @@ } align = 0; - *offset_in_memory += type_memsize(type, &align); - /* FIXME: is there a case where these two are different? */ - align = 0; - *offset_in_buffer += type_memsize(type, &align); + memsize = type_memsize(type, &align); + *offset_in_memory += memsize; + /* increment these separately as in the case of conformant (varying) + * structures these start at different values */ + *offset_in_buffer += memsize; return 1; } @@ -1151,17 +1161,30 @@ { const var_t *v; LIST_FOR_EACH_ENTRY( v, type->fields_or_args, const var_t, entry ) + { + if (offset_in_memory && offset_in_buffer) + { + size_t padding; + align = 0; + type_memsize(v->type, &align); + padding = ROUNDING(*offset_in_memory, align); + *offset_in_memory += padding; + *offset_in_buffer += padding; + } written += write_no_repeat_pointer_descriptions( file, v->type, offset_in_memory, offset_in_buffer, typestring_offset); + } } else { + size_t memsize; align = 0; - *offset_in_memory += type_memsize(type, &align); - /* FIXME: is there a case where these two are different? */ - align = 0; - *offset_in_buffer += type_memsize(type, &align); + memsize = type_memsize(type, &align); + *offset_in_memory += memsize; + /* increment these separately as in the case of conformant (varying) + * structures these start at different values */ + *offset_in_buffer += memsize; } return written; @@ -1179,16 +1202,19 @@ { if (offset_in_memory && offset_in_buffer) { + size_t memsize; + /* pointer instance */ /* FIXME: sometimes from end of structure, sometimes from beginning */ print_file(file, 2, "NdrFcShort(0x%x), /* Memory offset = %d */\n", *offset_in_memory, *offset_in_memory); print_file(file, 2, "NdrFcShort(0x%x), /* Buffer offset = %d */\n", *offset_in_buffer, *offset_in_buffer); align = 0; - *offset_in_memory += type_memsize(type, &align); - /* FIXME: is there a case where these two are different? */ - align = 0; - *offset_in_buffer += type_memsize(type, &align); + memsize = type_memsize(type, &align); + *offset_in_memory += memsize; + /* increment these separately as in the case of conformant (varying) + * structures these start at different values */ + *offset_in_buffer += memsize; } *typestring_offset += 4; @@ -1206,7 +1232,7 @@ { return write_pointer_description_offsets( file, attrs, type->ref, offset_in_memory, offset_in_buffer, - typestring_offset); + typestring_offset); } else if (is_non_complex_struct(type)) { @@ -1214,6 +1240,15 @@ const var_t *v; LIST_FOR_EACH_ENTRY( v, type->fields_or_args, const var_t, entry ) { + if (offset_in_memory && offset_in_buffer) + { + size_t padding; + align = 0; + type_memsize(v->type, &align); + padding = ROUNDING(*offset_in_memory, align); + *offset_in_memory += padding; + *offset_in_buffer += padding; + } written += write_pointer_description_offsets( file, v->attrs, v->type, offset_in_memory, offset_in_buffer, typestring_offset); @@ -1221,13 +1256,16 @@ } else { - align = 0; - if (offset_in_memory) - *offset_in_memory += type_memsize(type, &align); - /* FIXME: is there a case where these two are different? */ - align = 0; - if (offset_in_buffer) - *offset_in_buffer += type_memsize(type, &align); + if (offset_in_memory && offset_in_buffer) + { + size_t memsize; + align = 0; + memsize = type_memsize(type, &align); + *offset_in_memory += memsize; + /* increment these separately as in the case of conformant (varying) + * structures these start at different values */ + *offset_in_buffer += memsize; + } } return written; @@ -1277,6 +1315,15 @@ const var_t *v; LIST_FOR_EACH_ENTRY( v, type->fields_or_args, const var_t, entry ) { + if (offset_in_memory && offset_in_buffer) + { + size_t padding; + align = 0; + type_memsize(v->type, &align); + padding = ROUNDING(*offset_in_memory, align); + *offset_in_memory += padding; + *offset_in_buffer += padding; + } pointer_count += write_fixed_array_pointer_descriptions( file, v->attrs, v->type, offset_in_memory, offset_in_buffer, typestring_offset); @@ -1284,13 +1331,16 @@ } else { - align = 0; - if (offset_in_memory) - *offset_in_memory += type_memsize(type, &align); - /* FIXME: is there a case where these two are different? */ - align = 0; - if (offset_in_buffer) - *offset_in_buffer += type_memsize(type, &align); + if (offset_in_memory && offset_in_buffer) + { + size_t memsize; + align = 0; + memsize = type_memsize(type, &align); + *offset_in_memory += memsize; + /* increment these separately as in the case of conformant (varying) + * structures these start at different values */ + *offset_in_buffer += memsize; + } } return pointer_count; @@ -1350,8 +1400,6 @@ unsigned int align; int pointer_count = 0; - /* FIXME: do varying array searching here, but pointer searching in write_pointer_description_offsets */ - if (is_array(type) && type->length_is) { unsigned int temp = 0; @@ -1362,8 +1410,6 @@ if (pointer_count > 0) { unsigned int increment_size; - size_t offset_of_array_pointer_mem = 0; - size_t offset_of_array_pointer_buf = 0; align = 0; increment_size = type_memsize(type->ref, &align); @@ -1379,8 +1425,8 @@ *typestring_offset += 8; pointer_count = write_pointer_description_offsets( - file, attrs, type, &offset_of_array_pointer_mem, - &offset_of_array_pointer_buf, typestring_offset); + file, attrs, type, offset_in_memory, + offset_in_buffer, typestring_offset); } } else if (is_struct(type->type)) @@ -1388,6 +1434,15 @@ const var_t *v; LIST_FOR_EACH_ENTRY( v, type->fields_or_args, const var_t, entry ) { + if (offset_in_memory && offset_in_buffer) + { + size_t padding; + align = 0; + type_memsize(v->type, &align); + padding = ROUNDING(*offset_in_memory, align); + *offset_in_memory += padding; + *offset_in_buffer += padding; + } pointer_count += write_varying_array_pointer_descriptions( file, v->attrs, v->type, offset_in_memory, offset_in_buffer, typestring_offset); @@ -1395,13 +1450,16 @@ } else { - align = 0; - if (offset_in_memory) - *offset_in_memory += type_memsize(type, &align); - /* FIXME: is there a case where these two are different? */ - align = 0; - if (offset_in_buffer) - *offset_in_buffer += type_memsize(type, &align); + if (offset_in_memory && offset_in_buffer) + { + size_t memsize; + align = 0; + memsize = type_memsize(type, &align); + *offset_in_memory += memsize; + /* increment these separately as in the case of conformant (varying) + * structures these start at different values */ + *offset_in_buffer += memsize; + } } return pointer_count; @@ -1412,13 +1470,19 @@ { size_t offset_in_buffer; size_t offset_in_memory; + size_t conformance = 0; + + if (type->type == RPC_FC_CVSTRUCT) + conformance = 8; + else if (type->type == RPC_FC_CSTRUCT || type->type == RPC_FC_CPSTRUCT) + conformance = 4; /* pass 1: search for single instance of a pointer (i.e. don't descend * into arrays) */ if (!is_array(type)) { offset_in_memory = 0; - offset_in_buffer = 0; + offset_in_buffer = conformance; write_no_repeat_pointer_descriptions( file, type, &offset_in_memory, &offset_in_buffer, typestring_offset); @@ -1426,7 +1490,7 @@ /* pass 2: search for pointers in fixed arrays */ offset_in_memory = 0; - offset_in_buffer = 0; + offset_in_buffer = conformance; write_fixed_array_pointer_descriptions( file, NULL, type, &offset_in_memory, &offset_in_buffer, typestring_offset); @@ -1446,9 +1510,9 @@ typestring_offset); } - /* pass 4: search for pointers in varying arrays */ + /* pass 4: search for pointers in varying arrays */ offset_in_memory = 0; - offset_in_buffer = 0; + offset_in_buffer = conformance; write_varying_array_pointer_descriptions( file, NULL, type, &offset_in_memory, &offset_in_buffer, typestring_offset); @@ -1709,7 +1773,7 @@ error("write_struct_members: cannot align type %d\n", ft->type); } print_file(file, 2, "0x%x,\t/* %s */\n", fc, string_of_type(fc)); - offset = (offset + (align - 1)) & ~(align - 1); + offset = ROUND_SIZE(offset, align); *typestring_offset += 1; } write_member_type(file, type, field->attrs, field->type, corroff, @@ -1718,7 +1782,7 @@ } } - padding = ((offset + (salign - 1)) & ~(salign - 1)) - offset; + padding = ROUNDING(offset, salign); if (padding) { print_file(file, 2, "0x%x,\t/* FC_STRUCTPAD%d */\n", Modified: trunk/reactos/tools/widl/write_msft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/write_msft.c?re… ============================================================================== --- trunk/reactos/tools/widl/write_msft.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/write_msft.c [iso-8859-1] Sat Nov 15 15:17:09 2008 @@ -294,16 +294,23 @@ length = strlen(name); memcpy(converted_name + 4, name, length); + + converted_name[length + 4] = 0; + + + value = lhash_val_of_name_sys(typelib->typelib_header.varflags & 0x0f, typelib->typelib_header.lcid, converted_name + 4); + +#ifdef WORDS_BIGENDIAN + converted_name[3] = length & 0xff; + converted_name[2] = 0x00; + converted_name[1] = value; + converted_name[0] = value >> 8; +#else converted_name[0] = length & 0xff; - - converted_name[length + 4] = 0; - converted_name[1] = 0x00; - - value = lhash_val_of_name_sys(typelib->typelib_header.varflags & 0x0f, typelib->typelib_header.lcid, converted_name + 4); - converted_name[2] = value; converted_name[3] = value >> 8; +#endif for (offset = (4 - length) & 3; offset; offset--) converted_name[length + offset + 3] = 0x57; @@ -337,8 +344,14 @@ length = strlen(string); memcpy(converted_string + 2, string, length); + +#ifdef WORDS_BIGENDIAN + converted_string[1] = length & 0xff; + converted_string[0] = (length >> 8) & 0xff; +#else converted_string[0] = length & 0xff; converted_string[1] = (length >> 8) & 0xff; +#endif if(length < 3) { /* strings of this length are padded with up to 8 bytes incl the 2 byte length */ for(offset = 0; offset < 4; offset++)

1 0

[ekohl] 37380: Sync to wine-1.0-rc11: - Francois Gouget <fgouget@free.fr> Tue, 6 May 2008 Add a comment warning when a table must be kept sorted for later use with bsearch(). - Francois Gouget <fgouget@free.fr> Tue, 6 May 2008 Assorted spelling fixes. - Marcus Meissner <marcus@jet.franken.de> Tue, 6 May 2008 widl: Mark non-returning functions as noreturn.
by ekohl＠svn.reactos.org 15 Nov '08

15 Nov '08

Author: ekohl Date: Sat Nov 15 14:18:16 2008 New Revision: 37380 URL: http://svn.reactos.org/svn/reactos?rev=37380&view=rev Log: Sync to wine-1.0-rc11: - Francois Gouget <fgouget(a)free.fr> Tue, 6 May 2008 Add a comment warning when a table must be kept sorted for later use with bsearch(). - Francois Gouget <fgouget(a)free.fr> Tue, 6 May 2008 Assorted spelling fixes. - Marcus Meissner <marcus(a)jet.franken.de> Tue, 6 May 2008 widl: Mark non-returning functions as noreturn. Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/tools/widl/parser.l trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.y trunk/reactos/tools/widl/parser.yy.c trunk/reactos/tools/widl/typelib.c trunk/reactos/tools/widl/utils.c trunk/reactos/tools/widl/utils.h Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Nov 15 14:18:16 2008 @@ -26,7 +26,7 @@ reactos/tools/winebuild # Synced to Wine-20081105 (~Wine-1.1.7) reactos/tools/wmc # Synced to Wine-20081105 (~Wine-1.1.7) reactos/tools/wrc # Synced to Wine-20081105 (~Wine-1.1.7) -reactos/tools/widl # Synced to Wine-0_9_61 +reactos/tools/widl # Synced to Wine-1_0-rc1 The following libraries are shared with Wine. Modified: trunk/reactos/tools/widl/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.l?rev=37… ============================================================================== --- trunk/reactos/tools/widl/parser.l [iso-8859-1] (original) +++ trunk/reactos/tools/widl/parser.l [iso-8859-1] Sat Nov 15 14:18:16 2008 @@ -198,6 +198,7 @@ int token; }; +/* This table MUST be alphabetically sorted on the kw field */ static const struct keyword keywords[] = { {"FALSE", tFALSE}, {"NULL", tNULL}, @@ -256,7 +257,9 @@ }; #define NKEYWORDS (sizeof(keywords)/sizeof(keywords[0])) -/* keywords only recognized in attribute lists */ +/* keywords only recognized in attribute lists + * This table MUST be alphabetically sorted on the kw field + */ static const struct keyword attr_keywords[] = { {"aggregatable", tAGGREGATABLE}, Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… ============================================================================== --- trunk/reactos/tools/widl/parser.tab.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/parser.tab.c [iso-8859-1] Sat Nov 15 14:18:16 2008 @@ -4905,7 +4905,7 @@ } } - /* v->type is currently pointing the the type on the left-side of the + /* v->type is currently pointing to the type on the left-side of the * declaration, so we need to fix this up so that it is the return type of the * function and make v->type point to the function side of the declaration */ if (func_type) Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=37… ============================================================================== --- trunk/reactos/tools/widl/parser.y [iso-8859-1] (original) +++ trunk/reactos/tools/widl/parser.y [iso-8859-1] Sat Nov 15 14:18:16 2008 @@ -1592,7 +1592,7 @@ } } - /* v->type is currently pointing the the type on the left-side of the + /* v->type is currently pointing to the type on the left-side of the * declaration, so we need to fix this up so that it is the return type of the * function and make v->type point to the function side of the declaration */ if (func_type) Modified: trunk/reactos/tools/widl/parser.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.yy.c?rev… ============================================================================== --- trunk/reactos/tools/widl/parser.yy.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/parser.yy.c [iso-8859-1] Sat Nov 15 14:18:16 2008 @@ -1996,6 +1996,7 @@ int token; }; +/* This table MUST be alphabetically sorted on the kw field */ static const struct keyword keywords[] = { {"FALSE", tFALSE}, {"NULL", tNULL}, @@ -2054,7 +2055,9 @@ }; #define NKEYWORDS (sizeof(keywords)/sizeof(keywords[0])) -/* keywords only recognized in attribute lists */ +/* keywords only recognized in attribute lists + * This table MUST be alphabetically sorted on the kw field + */ static const struct keyword attr_keywords[] = { {"aggregatable", tAGGREGATABLE}, Modified: trunk/reactos/tools/widl/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.c?rev=3… ============================================================================== --- trunk/reactos/tools/widl/typelib.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typelib.c [iso-8859-1] Sat Nov 15 14:18:16 2008 @@ -100,8 +100,9 @@ } /* List of oleauto types that should be recognized by name. - * (most of) these seem to be intrinsic types in mktyplib. */ - + * (most of) these seem to be intrinsic types in mktyplib. + * This table MUST be alphabetically sorted on the kw field. + */ static const struct oatype { const char *kw; unsigned short vt; Modified: trunk/reactos/tools/widl/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/utils.c?rev=373… ============================================================================== --- trunk/reactos/tools/widl/utils.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/utils.c [iso-8859-1] Sat Nov 15 14:18:16 2008 @@ -67,7 +67,7 @@ /* yyerror: yacc assumes this is not newline terminated. */ -int parser_error(const char *s, ...) +void parser_error(const char *s, ...) { loc_info_t cur_location = CURRENT_LOCATION; va_list ap; @@ -76,7 +76,6 @@ fprintf(stderr, "\n"); va_end(ap); exit(1); - return 1; } void error_loc(const char *s, ...) Modified: trunk/reactos/tools/widl/utils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/utils.h?rev=373… ============================================================================== --- trunk/reactos/tools/widl/utils.h [iso-8859-1] (original) +++ trunk/reactos/tools/widl/utils.h [iso-8859-1] Sat Nov 15 14:18:16 2008 @@ -33,11 +33,11 @@ #define __attribute__(X) #endif -int parser_error(const char *s, ...) __attribute__((format (printf, 1, 2))); +void parser_error(const char *s, ...) __attribute__((format (printf, 1, 2))) __attribute__((noreturn)); int parser_warning(const char *s, ...) __attribute__((format (printf, 1, 2))); -void error_loc(const char *s, ...) __attribute__((format (printf, 1, 2))); -void error(const char *s, ...) __attribute__((format (printf, 1, 2))); -void error_loc_info(const loc_info_t *, const char *s, ...) __attribute__((format (printf, 2, 3))); +void error_loc(const char *s, ...) __attribute__((format (printf, 1, 2))) __attribute__((noreturn)); +void error(const char *s, ...) __attribute__((format (printf, 1, 2))) __attribute__((noreturn)); +void error_loc_info(const loc_info_t *, const char *s, ...) __attribute__((format (printf, 2, 3))) __attribute__((noreturn)); void warning(const char *s, ...) __attribute__((format (printf, 1, 2))); void warning_loc_info(const loc_info_t *, const char *s, ...) __attribute__((format (printf, 2, 3))); void chat(const char *s, ...) __attribute__((format (printf, 1, 2)));

1 0

[fireball] 37379: - Remove duplicate, often conflicting, type definitions from IDL (spotted by new widl).
by fireball＠svn.reactos.org 15 Nov '08

15 Nov '08

Author: fireball Date: Sat Nov 15 13:32:13 2008 New Revision: 37379 URL: http://svn.reactos.org/svn/reactos?rev=37379&view=rev Log: - Remove duplicate, often conflicting, type definitions from IDL (spotted by new widl). Modified: trunk/reactos/include/reactos/idl/lsa.idl trunk/reactos/include/reactos/idl/ms-dtyp.idl trunk/reactos/include/reactos/idl/svcctl.idl Modified: trunk/reactos/include/reactos/idl/lsa.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/lsa.id… ============================================================================== --- trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] Sat Nov 15 13:32:13 2008 @@ -10,13 +10,11 @@ typedef LSAPR_HANDLE *PLSAPR_HANDLE; cpp_quote("#ifndef _WINNT_H") -typedef LARGE_INTEGER LUID; +typedef LARGE_INTEGER LUID, *PLUID; cpp_quote("#endif") cpp_quote("#ifndef _NTDEF_") - typedef long NTSTATUS; - typedef struct _STRING { WORD Length; WORD MaximumLength; @@ -74,8 +72,6 @@ PLSAPR_SECURITY_DESCRIPTOR SecurityDescriptor; PSECURITY_QUALITY_OF_SERVICE SecurityQualityOfService; } LSAPR_OBJECT_ATTRIBUTES, *PLSAPR_OBJECT_ATTRIBUTES; - -typedef unsigned long SECURITY_INFORMATION; typedef struct _LSAPR_POLICY_PRIVILEGE_DEF { RPC_UNICODE_STRING Name; @@ -518,13 +514,6 @@ [case(TrustedDomainSupportedEncryptionTypes)] TRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES TrustedDomainSETs; } LSAPR_TRUSTED_DOMAIN_INFO, *PLSAPR_TRUSTED_DOMAIN_INFO; -cpp_quote("#ifndef _WINNT_H") -typedef struct _LUID { - ULONG LowPart; - LONG HightPart; -} LUID, *PLUID; -cpp_quote("#endif") - typedef struct _LSAPR_LUID_AND_ATTRIBUTES { LUID Luid; DWORD Attributes; Modified: trunk/reactos/include/reactos/idl/ms-dtyp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/ms-dty… ============================================================================== --- trunk/reactos/include/reactos/idl/ms-dtyp.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/ms-dtyp.idl [iso-8859-1] Sat Nov 15 13:32:13 2008 @@ -17,9 +17,6 @@ typedef signed __int64 INT64; typedef signed int LONG32; typedef signed __int64 LONG64; -cpp_quote("#if 0") -typedef long NTSTATUS; -cpp_quote("#endif") typedef unsigned __int64 QWORD; typedef short SHORT; typedef __int64 TIME; @@ -50,9 +47,6 @@ typedef ULONG ULONG_PTR; #endif typedef ULONG_PTR SIZE_T; -cpp_quote("#if 0") -typedef UCHAR *STRING; -cpp_quote("#endif") typedef DWORD NET_API_STATUS; typedef ULONG_PTR DWORD_PTR; typedef ULONGLONG DWORDLONG, *PDWORDLONG; Modified: trunk/reactos/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/svcctl… ============================================================================== --- trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] Sat Nov 15 13:32:13 2008 @@ -296,10 +296,7 @@ [ uuid(367abb81-9844-35f1-ad32-98f038001003), version(2.0), - pointer_default(unique), - #ifndef __midl - ,explicit_handle - #endif + pointer_default(unique) ] interface svcctl {

1 0

[fireball] 37378: Rob Shearman <robertshearman@gmail.com> Mon, 23 Jun 2008 21:28:56 +0000 (22:28 +0100) widl: Fix crash in find_array_or_string_in_struct if the structure or union has no fields or cases. http://source.winehq.org/git/wine.git/?a=commit; h=b3dde47ed760880e323222af9ec7ad30702dec7c
by fireball＠svn.reactos.org 15 Nov '08

15 Nov '08

Author: fireball Date: Sat Nov 15 12:37:15 2008 New Revision: 37378 URL: http://svn.reactos.org/svn/reactos?rev=37378&view=rev Log: Rob Shearman <robertshearman(a)gmail.com> Mon, 23 Jun 2008 21:28:56 +0000 (22:28 +0100) widl: Fix crash in find_array_or_string_in_struct if the structure or union has no fields or cases. http://source.winehq.org/git/wine.git/?a=commit;h=b3dde47ed760880e323222af9… Modified: trunk/reactos/tools/widl/typegen.c Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=3… ============================================================================== --- trunk/reactos/tools/widl/typegen.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typegen.c [iso-8859-1] Sat Nov 15 12:37:15 2008 @@ -1659,14 +1659,20 @@ static const var_t *find_array_or_string_in_struct(const type_t *type) { - const var_t *last_field = LIST_ENTRY( list_tail(type->fields_or_args), const var_t, entry ); - const type_t *ft = last_field->type; + const var_t *last_field; + const type_t *ft; + + if (!type->fields_or_args || list_empty(type->fields_or_args)) + return NULL; + + last_field = LIST_ENTRY( list_tail(type->fields_or_args), const var_t, entry ); + ft = last_field->type; if (ft->declarray && is_conformant_array(ft)) return last_field; if (ft->type == RPC_FC_CSTRUCT || ft->type == RPC_FC_CPSTRUCT || ft->type == RPC_FC_CVSTRUCT) - return find_array_or_string_in_struct(last_field->type); + return find_array_or_string_in_struct(ft); else return NULL; }

1 0

[greatlrd] 37377: Comment out old test that does not work right yet.
by greatlrd＠svn.reactos.org 15 Nov '08

15 Nov '08

Author: greatlrd Date: Sat Nov 15 11:26:03 2008 New Revision: 37377 URL: http://svn.reactos.org/svn/reactos?rev=37377&view=rev Log: Comment out old test that does not work right yet. Modified: branches/reactx/rostests/apitests/ddrawapi/tests/Test_DirectDrawCreateEx.c Modified: branches/reactx/rostests/apitests/ddrawapi/tests/Test_DirectDrawCreateEx.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/rostests/apitests/ddrawa… ============================================================================== --- branches/reactx/rostests/apitests/ddrawapi/tests/Test_DirectDrawCreateEx.c [iso-8859-1] (original) +++ branches/reactx/rostests/apitests/ddrawapi/tests/Test_DirectDrawCreateEx.c [iso-8859-1] Sat Nov 15 11:26:03 2008 @@ -324,12 +324,12 @@ /* both caps pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps. and pIntDirectDraw7->lpLcl->lpGbl->ddCaps. */ RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSize == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSize, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSize)); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwCaps)); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwCaps2 == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwCaps2, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwCaps2)); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwCKeyCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwCKeyCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwCKeyCaps)); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwFXCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwFXCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwFXCaps)); + // RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwCaps)); + // RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwCaps2 == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwCaps2, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwCaps2)); + // RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwCKeyCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwCKeyCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwCKeyCaps)); + // RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwFXCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwFXCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwFXCaps)); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwFXAlphaCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwFXAlphaCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwFXAlphaCaps)); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwPalCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwPalCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwPalCaps)); + // RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwPalCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwPalCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwPalCaps)); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVCaps)); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwAlphaBltConstBitDepths == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwAlphaBltConstBitDepths, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwAlphaBltConstBitDepths)); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwAlphaBltPixelBitDepths == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwAlphaBltPixelBitDepths, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwAlphaBltPixelBitDepths)); @@ -337,7 +337,7 @@ RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwAlphaOverlayConstBitDepths == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwAlphaOverlayConstBitDepths, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwAlphaOverlayConstBitDepths)); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwAlphaOverlayPixelBitDepths == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwAlphaOverlayPixelBitDepths, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwAlphaOverlayPixelBitDepths)); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwAlphaOverlaySurfaceBitDepths == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwAlphaOverlaySurfaceBitDepths, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwAlphaOverlaySurfaceBitDepths)); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwZBufferBitDepths == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwZBufferBitDepths, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwZBufferBitDepths)); + // RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwZBufferBitDepths == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwZBufferBitDepths, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwZBufferBitDepths)); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVidMemTotal == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVidMemTotal, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVidMemTotal)); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVidMemFree == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVidMemFree, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVidMemFree)); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwMaxVisibleOverlays == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwMaxVisibleOverlays, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwMaxVisibleOverlays)); @@ -346,15 +346,15 @@ RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwAlignBoundarySrc == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwAlignBoundarySrc, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwAlignBoundarySrc)); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwAlignSizeSrc == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwAlignSizeSrc, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwAlignSizeSrc)); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwAlignBoundaryDest == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwAlignBoundaryDest, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwAlignBoundaryDest)); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwRops[0x00] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwRops[0x00], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwRops[0x00])); + // RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwRops[0x00] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwRops[0x00], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwRops[0x00])); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwRops[0x01] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwRops[0x01], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwRops[0x01])); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwRops[0x02] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwRops[0x02], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwRops[0x02])); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwRops[0x02] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwRops[0x03], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwRops[0x03])); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwRops[0x04] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwRops[0x04], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwRops[0x04])); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwRops[0x05] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwRops[0x05], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwRops[0x05])); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwRops[0x06] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwRops[0x06], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwRops[0x06])); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwRops[0x07] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwRops[0x07], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwRops[0x07])); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.ddsCaps.dwCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.ddsCaps.dwCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.ddsCaps.dwCaps)); + // RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwRops[0x07] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwRops[0x07], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwRops[0x07])); + // RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.ddsCaps.dwCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.ddsCaps.dwCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.ddsCaps.dwCaps)); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwMinOverlayStretch == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwMinOverlayStretch, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwMinOverlayStretch)); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwMaxOverlayStretch == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwMaxOverlayStretch, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwMaxOverlayStretch)); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwMinLiveVideoStretch == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwMinLiveVideoStretch, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwMinLiveVideoStretch)); @@ -364,39 +364,39 @@ RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwReserved1 == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwReserved1, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwReserved1)); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwReserved2 == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwReserved2, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwReserved2)); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwReserved3 == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwReserved3, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwReserved3)); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBCaps)); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBCKeyCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBCKeyCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBCKeyCaps)); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBFXCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBFXCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBFXCaps)); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBRops[0x00] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBRops[0x00], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBRops[0x00])); + // RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBCaps)); + // RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBCKeyCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBCKeyCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBCKeyCaps)); + // RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBFXCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBFXCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBFXCaps)); + // RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBRops[0x00] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBRops[0x00], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBRops[0x00])); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBRops[0x01] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBRops[0x01], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBRops[0x01])); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBRops[0x02] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBRops[0x02], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBRops[0x02])); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBRops[0x03] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBRops[0x03], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBRops[0x03])); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBRops[0x04] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBRops[0x04], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBRops[0x04])); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBRops[0x05] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBRops[0x05], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBRops[0x05])); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBRops[0x06] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBRops[0x06], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBRops[0x06])); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBRops[0x07] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBRops[0x07], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBRops[0x07])); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVSBCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBCaps)); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVSBCKeyCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBCKeyCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBCKeyCaps)); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVSBFXCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBFXCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBFXCaps)); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVSBRops[0x00] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBRops[0x00], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBRops[0x00])); + // RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBRops[0x06] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBRops[0x06], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBRops[0x06])); + // RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBRops[0x07] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBRops[0x07], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBRops[0x07])); + // RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVSBCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBCaps)); + // RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVSBCKeyCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBCKeyCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBCKeyCaps)); + // RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVSBFXCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBFXCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBFXCaps)); + // RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVSBRops[0x00] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBRops[0x00], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBRops[0x00])); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVSBRops[0x01] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBRops[0x01], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBRops[0x01])); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVSBRops[0x02] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBRops[0x02], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBRops[0x02])); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVSBRops[0x03] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBRops[0x03], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBRops[0x03])); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVSBRops[0x04] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBRops[0x04], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBRops[0x04])); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVSBRops[0x05] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBRops[0x05], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBRops[0x05])); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVSBRops[0x06] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBRops[0x06], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBRops[0x06])); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVSBRops[0x07] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBRops[0x07], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBRops[0x07])); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSSBCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBCaps)); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSSBCKeyCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBCKeyCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBCKeyCaps)); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSSBFXCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBFXCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBFXCaps)); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSSBRops[0x00] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBRops[0x00], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBRops[0x00])); + // RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVSBRops[0x06] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBRops[0x06], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBRops[0x06])); + // RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVSBRops[0x07] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBRops[0x07], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBRops[0x07])); + // RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSSBCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBCaps)); + // RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSSBCKeyCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBCKeyCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBCKeyCaps)); + // RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSSBFXCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBFXCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBFXCaps)); + // RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSSBRops[0x00] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBRops[0x00], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBRops[0x00])); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSSBRops[0x01] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBRops[0x01], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBRops[0x01])); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSSBRops[0x02] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBRops[0x02], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBRops[0x02])); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSSBRops[0x03] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBRops[0x03], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBRops[0x03])); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSSBRops[0x04] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBRops[0x04], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBRops[0x04])); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSSBRops[0x05] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBRops[0x05], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBRops[0x05])); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSSBRops[0x06] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBRops[0x06], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBRops[0x06])); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSSBRops[0x07] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBRops[0x07], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBRops[0x07])); + // RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSSBRops[0x06] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBRops[0x06], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBRops[0x06])); + // RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSSBRops[0x07] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBRops[0x07], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBRops[0x07])); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwMaxVideoPorts == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwMaxVideoPorts, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwMaxVideoPorts)); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwCurrVideoPorts == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwCurrVideoPorts, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwCurrVideoPorts)); RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBCaps2 == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBCaps2, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBCaps2)); @@ -407,16 +407,16 @@ /* The res height */ RTEST(pIntDirectDraw7->lpLcl->lpGbl->rectDevice.bottom != 0); RTEST(pIntDirectDraw7->lpLcl->lpGbl->rectDevice.left == 0); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->rectDevice.right == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->rectDevice.right != 0); RTEST(pIntDirectDraw7->lpLcl->lpGbl->rectDevice.top == 0); /* how many Monitors */ RTEST(pIntDirectDraw7->lpLcl->lpGbl->cMonitors != 0); RTEST(pIntDirectDraw7->lpLcl->lpGbl->gpbmiSrc != 0); RTEST(pIntDirectDraw7->lpLcl->lpGbl->gpbmiDest != 0); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->phaiHeapAliases != 0); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->hKernelHandle != 0); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->pfnNotifyProc != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->phaiHeapAliases == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->hKernelHandle == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->pfnNotifyProc == 0); RTEST(pIntDirectDraw7->lpLcl->lpGbl->lpDDKernelCaps != 0); RTEST(pIntDirectDraw7->lpLcl->lpGbl->lpddNLVCaps != 0); RTEST(pIntDirectDraw7->lpLcl->lpGbl->lpddNLVHELCaps != 0); @@ -426,7 +426,7 @@ /* The res height */ RTEST(pIntDirectDraw7->lpLcl->lpGbl->rectDesktop.bottom != 0); RTEST(pIntDirectDraw7->lpLcl->lpGbl->rectDesktop.left == 0); - RTEST(pIntDirectDraw7->lpLcl->lpGbl->rectDesktop.right == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->rectDesktop.right != 0); RTEST(pIntDirectDraw7->lpLcl->lpGbl->rectDesktop.top == 0); /* ms ddraw send in the string "display" when it create the hDC */

1 0

[greatlrd] 37376: port a really old test I have for ddraw.dll, this test testing see if the internal value are right when u create the com interface
by greatlrd＠svn.reactos.org 15 Nov '08

15 Nov '08

Author: greatlrd Date: Sat Nov 15 11:00:58 2008 New Revision: 37376 URL: http://svn.reactos.org/svn/reactos?rev=37376&view=rev Log: port a really old test I have for ddraw.dll, this test testing see if the internal value are right when u create the com interface Modified: branches/reactx/rostests/apitests/ddrawapi/testlist.c branches/reactx/rostests/apitests/ddrawapi/tests/Test_DirectDrawCreateEx.c Modified: branches/reactx/rostests/apitests/ddrawapi/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/rostests/apitests/ddrawa… ============================================================================== --- branches/reactx/rostests/apitests/ddrawapi/testlist.c [iso-8859-1] (original) +++ branches/reactx/rostests/apitests/ddrawapi/testlist.c [iso-8859-1] Sat Nov 15 11:00:58 2008 @@ -2,8 +2,16 @@ #define _DDRAWTESTLIST_H #include "ddrawapi.h" -void dump_ddrawi_directdraw_int(LPDDRAWI_DIRECTDRAW_INT lpDraw_int); -void dump_ddrawi_directdraw_lcl(LPDDRAWI_DIRECTDRAW_LCL lpDraw_lcl); + +#define MIX_BOTH_CAPS(a,b) ( (a + b - (a & b)) ) + +void dump_DDRAWI_DIRECTDRAW_INT(char *str, LPDDRAWI_DIRECTDRAW_INT lpDraw_int, DWORD offset); +void dump_DDRAWI_DIRECTDRAW_LCL(char *str, LPDDRAWI_DIRECTDRAW_LCL lpDraw_lcl, DWORD offset); +void dump_DDRAWI_DIRECTDRAW_GBL(char *str, LPDDRAWI_DIRECTDRAW_GBL lpDraw_gbl, DWORD offset); + +void dump_DDCORECAPS(char *str, LPDDCORECAPS lpDdcorecaps, DWORD offset); +void dump_VIDMEMINFO(char *str, LPVIDMEMINFO lpVidmeminfo, DWORD offset); +void dump_DBLNODE(char *str, LPDBLNODE lpDblnode, DWORD offset); /* dump all data struct when this is trun onm usefull when u debug ddraw.dll */ #define DUMP_ON 1 @@ -33,44 +41,349 @@ /* old debug macro and dump data */ -void dump_ddrawi_directdraw_int(LPDDRAWI_DIRECTDRAW_INT lpDraw_int) -{ - printf("%08lx LPVOID pDirectDraw->lpVtbl : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, lpVtbl), lpDraw_int->lpVtbl); - printf("%08lx LPDDRAWI_DIRECTDRAW_LCL pDirectDraw->lpLcl : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, lpLcl), lpDraw_int->lpLcl ); - printf("%08lx LPDDRAWI_DIRECTDRAW_INT pDirectDraw->lpLink : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, lpLink), lpDraw_int->lpLink ); - printf("%08lx DWORD pDirectDraw->dwIntRefCnt : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, dwIntRefCnt), lpDraw_int->dwIntRefCnt ); -} - - -void dump_ddrawi_directdraw_lcl(LPDDRAWI_DIRECTDRAW_LCL lpDraw_lcl) -{ - printf("%08lx DWORD lpLcl->lpDDMore : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpDDMore), lpDraw_lcl->lpDDMore); - printf("%08lx LPDDRAWI_DIRECTDRAW_GBL lpLcl->lpGbl : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpGbl), lpDraw_lcl->lpGbl); - printf("%08lx DWORD lpLcl->dwUnused0 : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwUnused0), lpDraw_lcl->dwUnused0); - printf("%08lx DWORD lpLcl->dwLocalFlags : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwLocalFlags), lpDraw_lcl->dwLocalFlags); - printf("%08lx DWORD lpLcl->dwLocalRefCnt : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwLocalRefCnt), lpDraw_lcl->dwLocalRefCnt); - printf("%08lx DWORD lpLcl->dwProcessId : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwProcessId), lpDraw_lcl->dwProcessId); - printf("%08lx PVOID lpLcl->pUnkOuter : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, pUnkOuter), lpDraw_lcl->pUnkOuter); - printf("%08lx DWORD lpLcl->dwObsolete1 : 0x%08lx\n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwObsolete1), lpDraw_lcl->dwObsolete1); - printf("%08lx ULONG_PTR lpLcl->hWnd : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hWnd), (PVOID)lpDraw_lcl->hWnd); - printf("%08lx ULONG_PTR lpLcl->hDC : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hDC), (PVOID) lpDraw_lcl->hDC); - printf("%08lx DWORD lpLcl->dwErrorMode : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwErrorMode), lpDraw_lcl->dwErrorMode); - printf("%08lx LPDDRAWI_DDRAWSURFACE_INT lpLcl->lpPrimary : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpPrimary), lpDraw_lcl->lpPrimary); - printf("%08lx LPDDRAWI_DDRAWSURFACE_INT lpLcl->lpCB : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpCB), lpDraw_lcl->lpCB); - printf("%08lx DWORD lpLcl->dwPreferredMode : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwPreferredMode), lpDraw_lcl->dwPreferredMode); - printf("%08lx HINSTANCE lpLcl->hD3DInstance : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hD3DInstance), lpDraw_lcl->hD3DInstance); - printf("%08lx PVOID lpLcl->pD3DIUnknown : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, pD3DIUnknown), (PVOID) lpDraw_lcl->pD3DIUnknown); - printf("%08lx LPDDHAL_CALLBACKS lpLcl->lpDDCB : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpDDCB), lpDraw_lcl->lpDDCB); - printf("%08lx ULONG_PTR lpLcl->hDDVxd : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hDDVxd), (PVOID) lpDraw_lcl->hDDVxd); - printf("%08lx DWORD lpLcl->dwAppHackFlags : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwAppHackFlags), lpDraw_lcl->dwAppHackFlags); - printf("%08lx ULONG_PTR lpLcl->hFocusWnd : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hFocusWnd), (PVOID) lpDraw_lcl->hFocusWnd); - printf("%08lx DWORD lpLcl->dwHotTracking : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwHotTracking), lpDraw_lcl->dwHotTracking); - printf("%08lx DWORD lpLcl->dwIMEState : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwIMEState), lpDraw_lcl->dwIMEState); - printf("%08lx ULONG_PTR lpLcl->hWndPopup : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hWndPopup), (PVOID) lpDraw_lcl->hWndPopup); - printf("%08lx ULONG_PTR lpLcl->hDD : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hDD), (PVOID) lpDraw_lcl->hDD); - printf("%08lx ULONG_PTR lpLcl->hGammaCalibrator : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hGammaCalibrator), (PVOID) lpDraw_lcl->hGammaCalibrator); - printf("%08lx LPDDGAMMACALIBRATORPROC lpLcl->lpGammaCalibrator : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpGammaCalibrator), lpDraw_lcl->lpGammaCalibrator); -} + void dump_DDRAWI_DIRECTDRAW_INT(char *str, LPDDRAWI_DIRECTDRAW_INT lpDraw_int, DWORD offset) +{ + char buffer[2048]; + if (lpDraw_int == NULL) + return ; + + printf("%08lx LPVOID %slpVtbl : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, lpVtbl)+offset, str, lpDraw_int->lpVtbl); + printf("%08lx DWORD %s->lpLcl : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, lpLcl) + offset, str, lpDraw_int->lpLcl ); + printf("%08lx DWORD %s->lpLink : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, lpLink) + offset, str, lpDraw_int->lpLink ); + printf("%08lx DWORD %s->dwIntRefCnt : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, dwIntRefCnt) + offset, str, lpDraw_int->dwIntRefCnt ); + + printf("\n"); + sprintf(buffer,"%slpLcl->",str); + dump_DDRAWI_DIRECTDRAW_LCL(buffer, lpDraw_int->lpLcl, FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, lpLcl)); + + printf("\n"); + sprintf(buffer,"%slpLink->",str); + dump_DDRAWI_DIRECTDRAW_INT(buffer, lpDraw_int->lpLink, FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, lpLink)); +} + +void dump_DDRAWI_DIRECTDRAW_LCL(char *str, LPDDRAWI_DIRECTDRAW_LCL lpDraw_lcl, DWORD offset) +{ + char buffer[2048]; + if (lpDraw_lcl == NULL) + return ; + + printf("%08lx DWORD %slpDDMore : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpDDMore)+offset, str, lpDraw_lcl->lpDDMore); + printf("%08lx LPDDRAWI_DIRECTDRAW_GBL %slpGbl : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpGbl)+offset, str, lpDraw_lcl->lpGbl); + printf("%08lx DWORD %sdwUnused0 : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwUnused0)+offset, str, lpDraw_lcl->dwUnused0); + printf("%08lx DWORD %sdwLocalFlags : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwLocalFlags)+offset, str, lpDraw_lcl->dwLocalFlags); + printf("%08lx DWORD %sdwLocalRefCnt : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwLocalRefCnt)+offset, str, lpDraw_lcl->dwLocalRefCnt); + printf("%08lx DWORD %sdwProcessId : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwProcessId)+offset, str, lpDraw_lcl->dwProcessId); + printf("%08lx PVOID %spUnkOuter : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, pUnkOuter)+offset, str, lpDraw_lcl->pUnkOuter); + printf("%08lx DWORD %sdwObsolete1 : 0x%08lx\n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwObsolete1)+offset, str, lpDraw_lcl->dwObsolete1); + printf("%08lx ULONG_PTR %shWnd : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hWnd)+offset, str, (PVOID)lpDraw_lcl->hWnd); + printf("%08lx ULONG_PTR %shDC : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hDC)+offset, str, (PVOID) lpDraw_lcl->hDC); + printf("%08lx DWORD %sdwErrorMode : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwErrorMode)+offset, str, lpDraw_lcl->dwErrorMode); + printf("%08lx LPDDRAWI_DDRAWSURFACE_INT %slpPrimary : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpPrimary)+offset, str, lpDraw_lcl->lpPrimary); + printf("%08lx LPDDRAWI_DDRAWSURFACE_INT %slpCB : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpCB)+offset, str, lpDraw_lcl->lpCB); + printf("%08lx DWORD %sdwPreferredMode : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwPreferredMode)+offset, str, lpDraw_lcl->dwPreferredMode); + printf("%08lx HINSTANCE %shD3DInstance : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hD3DInstance)+offset, str, lpDraw_lcl->hD3DInstance); + printf("%08lx PVOID %spD3DIUnknown : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, pD3DIUnknown)+offset, str, (PVOID) lpDraw_lcl->pD3DIUnknown); + printf("%08lx LPDDHAL_CALLBACKS %slpDDCB : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpDDCB)+offset, str, lpDraw_lcl->lpDDCB); + printf("%08lx ULONG_PTR %shDDVxd : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hDDVxd)+offset, str, (PVOID) lpDraw_lcl->hDDVxd); + printf("%08lx DWORD %sdwAppHackFlags : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwAppHackFlags)+offset, str, lpDraw_lcl->dwAppHackFlags); + printf("%08lx ULONG_PTR %shFocusWnd : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hFocusWnd)+offset, str, (PVOID) lpDraw_lcl->hFocusWnd); + printf("%08lx DWORD %sdwHotTracking : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwHotTracking)+offset, str, lpDraw_lcl->dwHotTracking); + printf("%08lx DWORD %sdwIMEState : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwIMEState)+offset, str, lpDraw_lcl->dwIMEState); + printf("%08lx ULONG_PTR %shWndPopup : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hWndPopup)+offset, str, (PVOID) lpDraw_lcl->hWndPopup); + printf("%08lx ULONG_PTR %shDD : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hDD)+offset, str, (PVOID) lpDraw_lcl->hDD); + printf("%08lx ULONG_PTR %shGammaCalibrator : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hGammaCalibrator)+offset, str, (PVOID) lpDraw_lcl->hGammaCalibrator); + printf("%08lx LPDDGAMMACALIBRATORPROC %slpGammaCalibrator : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpGammaCalibrator)+offset, str, lpDraw_lcl->lpGammaCalibrator); + + printf("\n"); + sprintf(buffer,"%slpGbl->",str); + dump_DDRAWI_DIRECTDRAW_GBL(buffer, lpDraw_lcl->lpGbl, 0); +} + +void dump_DDRAWI_DIRECTDRAW_GBL(char * str, LPDDRAWI_DIRECTDRAW_GBL lpDraw_gbl, DWORD offset) +{ + char buffer[2048]; + if (lpDraw_gbl == NULL) + return ; + + printf("%08lx DWORD %sdwRefCnt : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwRefCnt) + offset, str, lpDraw_gbl->dwRefCnt); + printf("%08lx DWORD %sdwFlags : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwFlags) + offset, str, lpDraw_gbl->dwFlags); + printf("%08lx FLATPTR %sfpPrimaryOrig : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, fpPrimaryOrig) + offset, str, (LPVOID)lpDraw_gbl->fpPrimaryOrig); + + sprintf(buffer,"%sddCaps.",str); + dump_DDCORECAPS(buffer, &lpDraw_gbl->ddCaps, FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, ddCaps) + offset ); + + printf("%08lx DWORD %sdwInternal1 : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwInternal1) + offset, str, lpDraw_gbl->dwInternal1); + printf("%08lx DWORD %sdwUnused1[0] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[0]) + offset, str, lpDraw_gbl->dwUnused1[0]); + printf("%08lx DWORD %sdwUnused1[1] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[1]) + offset, str, lpDraw_gbl->dwUnused1[1]); + printf("%08lx DWORD %sdwUnused1[2] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[2]) + offset, str, lpDraw_gbl->dwUnused1[2]); + printf("%08lx DWORD %sdwUnused1[3] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[3]) + offset, str, lpDraw_gbl->dwUnused1[3]); + printf("%08lx DWORD %sdwUnused1[4] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[4]) + offset, str, lpDraw_gbl->dwUnused1[4]); + printf("%08lx DWORD %sdwUnused1[5] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[5]) + offset, str, lpDraw_gbl->dwUnused1[5]); + printf("%08lx DWORD %sdwUnused1[6] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[6]) + offset, str, lpDraw_gbl->dwUnused1[6]); + printf("%08lx DWORD %sdwUnused1[7] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[7]) + offset, str, lpDraw_gbl->dwUnused1[7]); + printf("%08lx DWORD %sdwUnused1[8] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[8]) + offset, str, lpDraw_gbl->dwUnused1[8]); + printf("%08lx LPDDHAL_CALLBACKS %slpDDCBtmp : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpDDCBtmp) + offset, str, lpDraw_gbl->lpDDCBtmp); + printf("%08lx LPDDRAWI_DDRAWSURFACE_INT %sdsList : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dsList) + offset, str, lpDraw_gbl->dsList); + printf("%08lx LPDDRAWI_DDRAWPALETTE_INT %spalList : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, palList) + offset, str, lpDraw_gbl->palList); + printf("%08lx LPDDRAWI_DDRAWCLIPPER_INT %sclipperList : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, clipperList) + offset, str, lpDraw_gbl->clipperList); + printf("%08lx LPDDRAWI_DIRECTDRAW_GBL %slp16DD : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lp16DD) + offset, str, lpDraw_gbl->lp16DD); + printf("%08lx DWORD %sdwMaxOverlays : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwMaxOverlays) + offset, str, lpDraw_gbl->dwMaxOverlays); + printf("%08lx DWORD %sdwCurrOverlays : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwCurrOverlays) + offset, str, lpDraw_gbl->dwCurrOverlays); + printf("%08lx DWORD %sdwMonitorFrequency : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwMonitorFrequency) + offset, str, lpDraw_gbl->dwMonitorFrequency); + + sprintf(buffer,"%sddHELCaps.",str); + dump_DDCORECAPS(buffer, &lpDraw_gbl->ddHELCaps, FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, ddHELCaps) + offset ); + + printf("%08lx DWORD %sdwUnused2[0] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[0]) + offset, str, lpDraw_gbl->dwUnused2[0]); + printf("%08lx DWORD %sdwUnused2[1] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[1]) + offset, str, lpDraw_gbl->dwUnused2[1]); + printf("%08lx DWORD %sdwUnused2[2] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[2]) + offset, str, lpDraw_gbl->dwUnused2[2]); + printf("%08lx DWORD %sdwUnused2[3] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[3]) + offset, str, lpDraw_gbl->dwUnused2[3]); + printf("%08lx DWORD %sdwUnused2[4] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[4]) + offset, str, lpDraw_gbl->dwUnused2[4]); + printf("%08lx DWORD %sdwUnused2[5] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[5]) + offset, str, lpDraw_gbl->dwUnused2[5]); + printf("%08lx DWORD %sdwUnused2[6] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[6]) + offset, str, lpDraw_gbl->dwUnused2[6]); + printf("%08lx DWORD %sdwUnused2[7] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[7]) + offset, str, lpDraw_gbl->dwUnused2[7]); + printf("%08lx DWORD %sdwUnused2[8] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[8]) + offset, str, lpDraw_gbl->dwUnused2[8]); + printf("%08lx DWORD %sdwUnused2[9] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[9]) + offset, str, lpDraw_gbl->dwUnused2[9]); + printf("%08lx DWORD %sdwUnused2[10] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[10]) + offset, str, lpDraw_gbl->dwUnused2[10]); + printf("%08lx DWORD %sdwUnused2[11] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[11]) + offset, str, lpDraw_gbl->dwUnused2[11]); + printf("%08lx DWORD %sdwUnused2[12] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[12]) + offset, str, lpDraw_gbl->dwUnused2[12]); + printf("%08lx DWORD %sdwUnused2[13] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[13]) + offset, str, lpDraw_gbl->dwUnused2[13]); + printf("%08lx DWORD %sdwUnused2[14] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[14]) + offset, str, lpDraw_gbl->dwUnused2[14]); + printf("%08lx DWORD %sdwUnused2[15] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[15]) + offset, str, lpDraw_gbl->dwUnused2[15]); + printf("%08lx DWORD %sdwUnused2[16] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[16]) + offset, str, lpDraw_gbl->dwUnused2[16]); + printf("%08lx DWORD %sdwUnused2[17] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[17]) + offset, str, lpDraw_gbl->dwUnused2[17]); + printf("%08lx DWORD %sdwUnused2[18] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[18]) + offset, str, lpDraw_gbl->dwUnused2[18]); + printf("%08lx DWORD %sdwUnused2[19] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[19]) + offset, str, lpDraw_gbl->dwUnused2[19]); + printf("%08lx DWORD %sdwUnused2[20] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[20]) + offset, str, lpDraw_gbl->dwUnused2[20]); + printf("%08lx DWORD %sdwUnused2[21] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[21]) + offset, str, lpDraw_gbl->dwUnused2[21]); + printf("%08lx DWORD %sdwUnused2[22] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[22]) + offset, str, lpDraw_gbl->dwUnused2[22]); + printf("%08lx DWORD %sdwUnused2[23] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[23]) + offset, str, lpDraw_gbl->dwUnused2[23]); + printf("%08lx DWORD %sdwUnused2[24] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[24]) + offset, str, lpDraw_gbl->dwUnused2[24]); + printf("%08lx DWORD %sdwUnused2[25] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[25]) + offset, str, lpDraw_gbl->dwUnused2[25]); + printf("%08lx DWORD %sdwUnused2[26] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[26]) + offset, str, lpDraw_gbl->dwUnused2[26]); + printf("%08lx DWORD %sdwUnused2[27] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[27]) + offset, str, lpDraw_gbl->dwUnused2[27]); + printf("%08lx DWORD %sdwUnused2[28] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[28]) + offset, str, lpDraw_gbl->dwUnused2[28]); + printf("%08lx DWORD %sdwUnused2[29] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[29]) + offset, str, lpDraw_gbl->dwUnused2[29]); + printf("%08lx DWORD %sdwUnused2[30] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[30]) + offset, str, lpDraw_gbl->dwUnused2[30]); + printf("%08lx DWORD %sdwUnused2[31] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[31]) + offset, str, lpDraw_gbl->dwUnused2[31]); + printf("%08lx DWORD %sdwUnused2[32] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[32]) + offset, str, lpDraw_gbl->dwUnused2[32]); + printf("%08lx DWORD %sdwUnused2[33] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[33]) + offset, str, lpDraw_gbl->dwUnused2[33]); + printf("%08lx DWORD %sdwUnused2[34] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[34]) + offset, str, lpDraw_gbl->dwUnused2[34]); + printf("%08lx DWORD %sdwUnused2[35] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[35]) + offset, str, lpDraw_gbl->dwUnused2[35]); + printf("%08lx DWORD %sdwUnused2[36] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[36]) + offset, str, lpDraw_gbl->dwUnused2[36]); + printf("%08lx DWORD %sdwUnused2[37] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[37]) + offset, str, lpDraw_gbl->dwUnused2[37]); + printf("%08lx DWORD %sdwUnused2[38] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[38]) + offset, str, lpDraw_gbl->dwUnused2[38]); + printf("%08lx DWORD %sdwUnused2[39] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[39]) + offset, str, lpDraw_gbl->dwUnused2[39]); + printf("%08lx DWORD %sdwUnused2[40] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[40]) + offset, str, lpDraw_gbl->dwUnused2[40]); + printf("%08lx DWORD %sdwUnused2[41] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[41]) + offset, str, lpDraw_gbl->dwUnused2[41]); + printf("%08lx DWORD %sdwUnused2[42] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[42]) + offset, str, lpDraw_gbl->dwUnused2[42]); + printf("%08lx DWORD %sdwUnused2[43] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[43]) + offset, str, lpDraw_gbl->dwUnused2[43]); + printf("%08lx DWORD %sdwUnused2[44] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[44]) + offset, str, lpDraw_gbl->dwUnused2[44]); + printf("%08lx DWORD %sdwUnused2[45] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[45]) + offset, str, lpDraw_gbl->dwUnused2[45]); + printf("%08lx DWORD %sdwUnused2[46] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[46]) + offset, str, lpDraw_gbl->dwUnused2[46]); + printf("%08lx DWORD %sdwUnused2[47] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[47]) + offset, str, lpDraw_gbl->dwUnused2[47]); + printf("%08lx DWORD %sdwUnused2[48] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[48]) + offset, str, lpDraw_gbl->dwUnused2[48]); + printf("%08lx DWORD %sdwUnused2[49] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[49]) + offset, str, lpDraw_gbl->dwUnused2[49]); + //printf("%08lx DDCOLORKEY lpGbl->ddckCKDestOverlay : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, ddckCKDestOverlay) + offset, str, lpDraw_gbl->ddckCKDestOverlay); + //printf("%08lx DDCOLORKEY lpGbl->ddckCKSrcOverlay : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, ddckCKSrcOverlay) + offset, str, lpDraw_gbl->ddckCKSrcOverlay); + + sprintf(buffer,"%svmiData.",str); + dump_VIDMEMINFO(buffer, &lpDraw_gbl->vmiData, FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, vmiData) + offset); + + printf("%08lx LPVOID %slpDriverHandle : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpDriverHandle) + offset, str, lpDraw_gbl->lpDriverHandle); + printf("%08lx LPDDRAWI_DIRECTDRAW_LCL %slpExclusiveOwner : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpExclusiveOwner) + offset, str, lpDraw_gbl->lpExclusiveOwner); + printf("%08lx DWORD %sdwModeIndex : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwModeIndex) + offset, str, lpDraw_gbl->dwModeIndex); + printf("%08lx DWORD %sdwModeIndexOrig : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwModeIndexOrig) + offset, str, lpDraw_gbl->dwModeIndexOrig); + printf("%08lx DWORD %sdwNumFourCC : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwNumFourCC) + offset, str, lpDraw_gbl->dwNumFourCC); + printf("%08lx LPDWORD %slpdwFourCC : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpdwFourCC) + offset, str, lpDraw_gbl->lpdwFourCC); + printf("%08lx DWORD %sdwNumModes : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwNumModes) + offset, str, lpDraw_gbl->dwNumModes); + printf("%08lx LPDDHALMODEI %slpModeInfo : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpModeInfo) + offset, str, lpDraw_gbl->lpModeInfo); + //printf("%08lx PROCESS_LIST lpGbl->plProcessList : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, plProcessList) + offset, str, lpDraw_gbl->plProcessList); + + printf("%08lx DWORD %sdwSurfaceLockCount : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwSurfaceLockCount) + offset, str, lpDraw_gbl->dwSurfaceLockCount); + printf("%08lx DWORD %sdwAliasedLockCnt : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwAliasedLockCnt) + offset, str, lpDraw_gbl->dwAliasedLockCnt); + printf("%08lx DWORD %sdwReserved3 : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwReserved3) + offset, str, lpDraw_gbl->dwReserved3); + printf("%08lx ULONG_PTR %shDD : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, hDD) + offset, str, lpDraw_gbl->hDD); + printf("%08lx char %scObsolete : %s \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, cObsolete[0]) + offset, str, lpDraw_gbl->cObsolete); + printf("%08lx DWORD %sdwReserved1 : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwReserved1)+ offset, str, lpDraw_gbl->dwReserved1); + printf("%08lx DWORD %sdwReserved2 : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwReserved2)+ offset, str, lpDraw_gbl->dwReserved2); + + sprintf(buffer,"%sdbnOverlayRoot.",str); + dump_DBLNODE(buffer, &lpDraw_gbl->dbnOverlayRoot, FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dbnOverlayRoot)+ offset); + + printf("%08lx volatile LPWORD %slpwPDeviceFlags : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpwPDeviceFlags)+ offset, str, lpDraw_gbl->lpwPDeviceFlags); + printf("%08lx DWORD %sdwPDevice : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwPDevice)+ offset, str, lpDraw_gbl->dwPDevice); + printf("%08lx DWORD %sdwWin16LockCnt : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwWin16LockCnt)+ offset, str, lpDraw_gbl->dwWin16LockCnt); + printf("%08lx DWORD %sdwUnused3 : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused3)+ offset, str, lpDraw_gbl->dwUnused3); + printf("%08lx DWORD %shInstance : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, hInstance)+ offset, str, lpDraw_gbl->hInstance); + printf("%08lx DWORD %sdwEvent16 : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwEvent16)+ offset, str, lpDraw_gbl->dwEvent16); + printf("%08lx DWORD %sdwSaveNumModes : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwSaveNumModes)+ offset, str, lpDraw_gbl->dwSaveNumModes); + printf("%08lx ULONG_PTR %slpD3DGlobalDriverData : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpD3DGlobalDriverData)+ offset, str, (LPVOID) lpDraw_gbl->lpD3DGlobalDriverData); + printf("%08lx ULONG_PTR %slpD3DHALCallbacks : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpD3DHALCallbacks)+ offset, str, (LPVOID) lpDraw_gbl->lpD3DHALCallbacks); + + sprintf(buffer,"%sddBothCaps.",str); + dump_DDCORECAPS(buffer, &lpDraw_gbl->ddBothCaps, FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, ddBothCaps)+ offset ); + + printf("%08lx LPDDVIDEOPORTCAPS %slpDDVideoPortCaps : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpDDVideoPortCaps)+ offset, str, lpDraw_gbl->lpDDVideoPortCaps); + printf("%08lx LPDDRAWI_DDVIDEOPORT_INT %sdvpList : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dvpList)+ offset, str, lpDraw_gbl->dvpList); + + printf("%08lx RECT %srectDevice.bottom : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, rectDevice.bottom)+ offset, str, lpDraw_gbl->rectDevice.bottom); + printf("%08lx RECT %srectDevice.left : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, rectDevice.left)+ offset, str, lpDraw_gbl->rectDevice.left); + printf("%08lx RECT %srectDevice.right : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, rectDevice.right)+ offset, str, lpDraw_gbl->rectDevice.right); + printf("%08lx RECT %srectDevice.top : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, rectDevice.top)+ offset, str, lpDraw_gbl->rectDevice.top); + + printf("%08lx DWORD %scMonitors : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, cMonitors)+ offset, str, lpDraw_gbl->cMonitors); + printf("%08lx LPVOID %sgpbmiSrc : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, gpbmiSrc)+ offset, str, lpDraw_gbl->gpbmiSrc); + printf("%08lx LPVOID %sgpbmiDest : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, gpbmiDest)+ offset, str, lpDraw_gbl->gpbmiDest); + printf("%08lx LPHEAPALIASINFO %sphaiHeapAliases : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, phaiHeapAliases)+ offset, str, lpDraw_gbl->phaiHeapAliases); + printf("%08lx ULONG_PTR %shKernelHandle : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, hKernelHandle)+ offset, str, lpDraw_gbl->hKernelHandle); + printf("%08lx ULONG_PTR %spfnNotifyProc : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, pfnNotifyProc)+ offset, str, (LPVOID)lpDraw_gbl->pfnNotifyProc); + printf("%08lx LPDDKERNELCAPS %slpDDKernelCaps : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpDDKernelCaps)+ offset, str, lpDraw_gbl->lpDDKernelCaps); + printf("%08lx LPDDNONLOCALVIDMEMCAPS %slpddNLVCaps : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpddNLVCaps)+ offset, str, lpDraw_gbl->lpddNLVCaps); + printf("%08lx LPDDNONLOCALVIDMEMCAPS %slpddNLVHELCaps : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpddNLVHELCaps)+ offset, str, lpDraw_gbl->lpddNLVHELCaps); + printf("%08lx LPDDNONLOCALVIDMEMCAPS %slpddNLVBothCaps : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpddNLVBothCaps)+ offset, str, lpDraw_gbl->lpddNLVBothCaps); + printf("%08lx ULONG_PTR %slpD3DExtendedCaps : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpD3DExtendedCaps)+ offset, str, (LPVOID) lpDraw_gbl->lpD3DExtendedCaps); + printf("%08lx DWORD %sdwDOSBoxEvent : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwDOSBoxEvent)+ offset, str, lpDraw_gbl->dwDOSBoxEvent); + + printf("%08lx RECT %srectDesktop.bottom : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, rectDesktop.bottom)+ offset, str, lpDraw_gbl->rectDesktop.bottom); + printf("%08lx RECT %srectDesktop.left : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, rectDesktop.left)+ offset, str, lpDraw_gbl->rectDesktop.left); + printf("%08lx RECT %srectDesktop.right : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, rectDesktop.right)+ offset, str, lpDraw_gbl->rectDesktop.right); + printf("%08lx RECT %srectDesktop.top : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, rectDesktop.top)+ offset, str, lpDraw_gbl->rectDesktop.top); + + printf("%08lx char %scDriverName[MAX_DRIVER_NAME] : %s \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, cDriverName)+ offset, str, lpDraw_gbl->cDriverName); + printf("%08lx ULONG_PTR %slpD3DHALCallbacks3 : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpD3DHALCallbacks3)+ offset, str, (LPVOID) lpDraw_gbl->lpD3DHALCallbacks3); + printf("%08lx DWORD %sdwNumZPixelFormats : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwNumZPixelFormats)+ offset, str, lpDraw_gbl->dwNumZPixelFormats); + printf("%08lx LPDDPIXELFORMAT %slpZPixelFormats : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpZPixelFormats)+ offset, str, lpDraw_gbl->lpZPixelFormats); + printf("%08lx LPDDRAWI_DDMOTIONCOMP_INT %smcList : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, mcList)+ offset, str, lpDraw_gbl->mcList); + printf("%08lx DWORD %shDDVxd : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, hDDVxd)+ offset, str, lpDraw_gbl->hDDVxd); + printf("%08lx DWORD %sddsCapsMore.dwCaps2 : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, ddsCapsMore)+ FIELD_OFFSET(DDSCAPSEX, dwCaps2)+offset, str, lpDraw_gbl->ddsCapsMore.dwCaps2); + printf("%08lx DWORD %sddsCapsMore.dwCaps3 : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, ddsCapsMore)+ FIELD_OFFSET(DDSCAPSEX, dwCaps3)+ offset, str, lpDraw_gbl->ddsCapsMore.dwCaps3); + printf("%08lx DWORD %sddsCapsMore.dwCaps4 : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, ddsCapsMore)+ FIELD_OFFSET(DDSCAPSEX, dwCaps4)+ offset, str, lpDraw_gbl->ddsCapsMore.dwCaps4); + printf("%08lx DWORD %sddsCapsMore.dwVolumeDepth : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, ddsCapsMore)+ FIELD_OFFSET(DDSCAPSEX, dwVolumeDepth)+ offset, str, lpDraw_gbl->ddsCapsMore.dwVolumeDepth); + + +} + +void dump_DBLNODE(char *str, LPDBLNODE lpDblnode, DWORD offset) +{ + + if (lpDblnode == NULL) + return ; + + printf("%08lx struct _DBLNODE * %snext : 0x%p\n", FIELD_OFFSET(DBLNODE, next)+offset, str, lpDblnode->next); + printf("%08lx struct _DBLNODE * %sprev : 0x%p\n", FIELD_OFFSET(DBLNODE, prev)+offset, str, lpDblnode->prev); + printf("%08lx struct LPDDRAWI_DDRAWSURFACE_LCL %sobject : 0x%p\n", FIELD_OFFSET(DBLNODE, object)+offset, str, lpDblnode->object); + printf("%08lx struct LPDDRAWI_DDRAWSURFACE_INT %sobject_int : 0x%p\n", FIELD_OFFSET(DBLNODE, object_int)+offset, str, lpDblnode->object_int); +} + +void dump_DDCORECAPS(char *str, LPDDCORECAPS lpDdcorecaps, DWORD offset) +{ + + if (lpDdcorecaps == NULL) + return ; + + int c; + printf("%08lx DWORD %sdwSize : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSize)+offset, str, lpDdcorecaps->dwSize); + printf("%08lx DWORD %sdwCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwCaps)+offset, str, lpDdcorecaps->dwCaps); + printf("%08lx DWORD %sdwCaps2 : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwCaps2)+offset, str, lpDdcorecaps->dwCaps2); + printf("%08lx DWORD %sdwCKeyCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwCKeyCaps)+offset, str, lpDdcorecaps->dwCKeyCaps); + printf("%08lx DWORD %sdwFXCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwFXCaps)+offset, str, lpDdcorecaps->dwFXCaps); + printf("%08lx DWORD %sdwFXAlphaCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwFXAlphaCaps)+offset, str, lpDdcorecaps->dwFXAlphaCaps); + printf("%08lx DWORD %sdwPalCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwPalCaps)+offset, str, lpDdcorecaps->dwPalCaps); + printf("%08lx DWORD %sdwSVCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSVCaps)+offset, str, lpDdcorecaps->dwSVCaps); + printf("%08lx DWORD %sdwAlphaBltConstBitDepths : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlphaBltConstBitDepths)+offset, str, lpDdcorecaps->dwAlphaBltConstBitDepths); + printf("%08lx DWORD %sdwAlphaBltPixelBitDepths : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlphaBltPixelBitDepths)+offset, str, lpDdcorecaps->dwAlphaBltPixelBitDepths); + printf("%08lx DWORD %sdwAlphaBltSurfaceBitDepths : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlphaBltSurfaceBitDepths)+offset, str, lpDdcorecaps->dwAlphaBltSurfaceBitDepths); + printf("%08lx DWORD %sdwAlphaOverlayConstBitDepths : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlphaOverlayConstBitDepths)+offset, str, lpDdcorecaps->dwAlphaOverlayConstBitDepths); + printf("%08lx DWORD %sdwAlphaOverlayPixelBitDepths : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlphaOverlayPixelBitDepths)+offset, str, lpDdcorecaps->dwAlphaOverlayPixelBitDepths); + printf("%08lx DWORD %sdwAlphaOverlaySurfaceBitDepths : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlphaOverlaySurfaceBitDepths)+offset, str, lpDdcorecaps->dwAlphaOverlaySurfaceBitDepths); + printf("%08lx DWORD %sdwZBufferBitDepths : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwZBufferBitDepths)+offset, str, lpDdcorecaps->dwZBufferBitDepths); + printf("%08lx DWORD %sdwVidMemTotal : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwVidMemTotal)+offset, str, lpDdcorecaps->dwVidMemTotal); + printf("%08lx DWORD %sdwVidMemFree : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwVidMemFree)+offset, str, lpDdcorecaps->dwVidMemFree); + printf("%08lx DWORD %sdwMaxVisibleOverlays : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMaxVisibleOverlays)+offset, str, lpDdcorecaps->dwMaxVisibleOverlays); + printf("%08lx DWORD %sdwCurrVisibleOverlays : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwCurrVisibleOverlays)+offset, str, lpDdcorecaps->dwCurrVisibleOverlays); + printf("%08lx DWORD %sdwNumFourCCCodes : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwNumFourCCCodes)+offset, str, lpDdcorecaps->dwNumFourCCCodes); + printf("%08lx DWORD %sdwAlignBoundarySrc : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlignBoundarySrc)+offset, str, lpDdcorecaps->dwAlignBoundarySrc); + printf("%08lx DWORD %sdwAlignSizeSrc : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlignSizeSrc)+offset, str, lpDdcorecaps->dwAlignSizeSrc); + printf("%08lx DWORD %sdwAlignBoundaryDest : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlignBoundaryDest)+offset, str, lpDdcorecaps->dwAlignBoundaryDest); + printf("%08lx DWORD %sdwAlignSizeDest : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlignSizeDest)+offset, str, lpDdcorecaps->dwAlignSizeDest); + printf("%08lx DWORD %sdwAlignStrideAlign : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlignStrideAlign)+offset, str, lpDdcorecaps->dwAlignStrideAlign); + + for (c=0;c<DD_ROP_SPACE;c++) + { + printf("%08lx DWORD %sdwRops[0x%02x] : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwRops[c])+offset, str, c, lpDdcorecaps->dwRops[c]); + } + + printf("%08lx DWORD %sddsCaps.dwCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, ddsCaps)+offset, str, lpDdcorecaps->ddsCaps.dwCaps); + printf("%08lx DWORD %sdwMinOverlayStretch : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMinOverlayStretch)+offset, str, lpDdcorecaps->dwMinOverlayStretch); + printf("%08lx DWORD %sdwMaxOverlayStretch : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMaxOverlayStretch)+offset, str, lpDdcorecaps->dwMaxOverlayStretch); + printf("%08lx DWORD %sdwMinLiveVideoStretch : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMinLiveVideoStretch)+offset, str, lpDdcorecaps->dwMinLiveVideoStretch); + printf("%08lx DWORD %sdwMaxLiveVideoStretch : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMaxLiveVideoStretch)+offset, str, lpDdcorecaps->dwMaxLiveVideoStretch); + printf("%08lx DWORD %sdwMinHwCodecStretch : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMinHwCodecStretch)+offset, str, lpDdcorecaps->dwMinHwCodecStretch); + printf("%08lx DWORD %sdwMaxHwCodecStretch : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMaxHwCodecStretch)+offset, str, lpDdcorecaps->dwMaxHwCodecStretch); + printf("%08lx DWORD %sdwReserved1 : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwReserved1)+offset, str, lpDdcorecaps->dwReserved1); + printf("%08lx DWORD %sdwReserved2 : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwReserved2)+offset, str, lpDdcorecaps->dwReserved2); + printf("%08lx DWORD %sdwReserved3 : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwReserved3)+offset, str, lpDdcorecaps->dwReserved3); + printf("%08lx DWORD %sdwSVBCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSVBCaps)+offset, str, lpDdcorecaps->dwSVBCaps); + printf("%08lx DWORD %sdwSVBCKeyCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSVBCKeyCaps)+offset, str, lpDdcorecaps->dwSVBCKeyCaps); + printf("%08lx DWORD %sdwSVBFXCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSVBFXCaps)+offset, str, lpDdcorecaps->dwSVBFXCaps); + + for (c=0;c<DD_ROP_SPACE;c++) + { + printf("%08lx DWORD %sdwSVBRops[0x%02x] : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSVBRops[c])+offset, str, c, lpDdcorecaps->dwSVBRops[c]); + } + + printf("%08lx DWORD %sdwVSBCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwVSBCaps)+offset, str, lpDdcorecaps->dwVSBCaps); + printf("%08lx DWORD %sdwVSBCKeyCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwVSBCKeyCaps)+offset, str, lpDdcorecaps->dwVSBCKeyCaps); + printf("%08lx DWORD %sdwVSBFXCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwVSBFXCaps)+offset, str, lpDdcorecaps->dwVSBFXCaps); + + for (c=0;c<DD_ROP_SPACE;c++) + { + printf("%08lx DWORD %sdwVSBRops[0x%02x] : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwVSBRops[c])+offset, str, c, lpDdcorecaps->dwVSBRops[c]); + } + + printf("%08lx DWORD %sdwSSBCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSSBCaps)+offset, str, lpDdcorecaps->dwSSBCaps); + printf("%08lx DWORD %sdwSSBCKeyCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSSBCKeyCaps)+offset, str, lpDdcorecaps->dwSSBCKeyCaps); + printf("%08lx DWORD %sdwSSBFXCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSSBFXCaps)+offset, str, lpDdcorecaps->dwSSBFXCaps); + + for (c=0;c<DD_ROP_SPACE;c++) + { + printf("%08lx DWORD %sdwSSBRops[0x%02x] : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSSBRops[c])+offset, str, c, lpDdcorecaps->dwSSBRops[c]); + } + + printf("%08lx DWORD %sdwMaxVideoPorts : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMaxVideoPorts)+offset, str, lpDdcorecaps->dwMaxVideoPorts); + printf("%08lx DWORD %sdwCurrVideoPorts : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwCurrVideoPorts)+offset, str, lpDdcorecaps->dwCurrVideoPorts); + printf("%08lx DWORD %sdwSVBCaps2 : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwZBufferBitDepths)+offset, str, lpDdcorecaps->dwSVBCaps2); +} + +void dump_VIDMEMINFO(char *str, LPVIDMEMINFO lpVidmeminfo, DWORD offset) +{ + + if (lpVidmeminfo == NULL) + return ; + + printf("%08lx FLATPTR %sfpPrimary : 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, fpPrimary)+offset, str, lpVidmeminfo->fpPrimary); + printf("%08lx DWORD %sdwFlags : 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwFlags)+offset, str, lpVidmeminfo->dwFlags); + printf("%08lx DWORD %sdwDisplayWidth : 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, fpPrimary)+offset, str, lpVidmeminfo->dwDisplayWidth); + printf("%08lx DWORD %sdwDisplayHeight : 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwDisplayHeight)+offset, str, lpVidmeminfo->dwDisplayHeight); + printf("%08lx LONG %slDisplayPitch : 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, lDisplayPitch)+offset, str, lpVidmeminfo->lDisplayPitch); + //printf("%08lx DDPIXELFORMAT %sddpfDisplay : 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, ddpfDisplay)+offset, str, lpVidmeminfo->ddpfDisplay); + printf("%08lx DWORD %sdwOffscreenAlign : 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwOffscreenAlign)+offset, str, lpVidmeminfo->dwOffscreenAlign); + printf("%08lx DWORD %sdwOverlayAlign : 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwOverlayAlign)+offset, str, lpVidmeminfo->dwOverlayAlign); + printf("%08lx DWORD %sdwTextureAlign : 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwTextureAlign)+offset, str, lpVidmeminfo->dwTextureAlign); + printf("%08lx DWORD %sdwZBufferAlign : 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwZBufferAlign)+offset, str, lpVidmeminfo->dwZBufferAlign); + printf("%08lx DWORD %sdwAlphaAlign : 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwDisplayWidth)+offset, str, lpVidmeminfo->dwAlphaAlign); + printf("%08lx DWORD %sdwNumHeaps : 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwNumHeaps)+offset, str, lpVidmeminfo->dwNumHeaps); + printf("%08lx LPVIDMEM %spvmList : 0x%p\n", FIELD_OFFSET(VIDMEMINFO, pvmList)+offset, str, lpVidmeminfo->pvmList); +} + + + + + + + + Modified: branches/reactx/rostests/apitests/ddrawapi/tests/Test_DirectDrawCreateEx.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/rostests/apitests/ddrawa… ============================================================================== --- branches/reactx/rostests/apitests/ddrawapi/tests/Test_DirectDrawCreateEx.c [iso-8859-1] (original) +++ branches/reactx/rostests/apitests/ddrawapi/tests/Test_DirectDrawCreateEx.c [iso-8859-1] Sat Nov 15 11:00:58 2008 @@ -4,6 +4,7 @@ { LPDIRECTDRAW7 DirectDraw7; + LPDIRECTDRAW DirectDraw; LPDDRAWI_DIRECTDRAW_INT pIntDirectDraw7; HRESULT ret; @@ -19,47 +20,438 @@ RTEST(pIntDirectDraw7->lpLcl != NULL); RTEST(pIntDirectDraw7->lpLink == NULL); RTEST(pIntDirectDraw7->dwIntRefCnt == 1); - + RTEST(pIntDirectDraw7->lpLcl->lpDDMore == 0); RTEST(pIntDirectDraw7->lpLcl->lpGbl != NULL); RTEST(pIntDirectDraw7->lpLcl->dwUnused0 == 0); RTEST(pIntDirectDraw7->lpLcl->dwLocalFlags == DDRAWILCL_DIRECTDRAW7); RTEST(pIntDirectDraw7->lpLcl->dwLocalRefCnt == 1); - - /* pIntDirectDraw7->lpLcl->dwProcessId call see if we have same ProcessId */ - RTEST(pIntDirectDraw7->lpLcl->dwProcessId != 0); - + RTEST(pIntDirectDraw7->lpLcl->dwProcessId == GetCurrentProcessId()); RTEST(pIntDirectDraw7->lpLcl->pUnkOuter == NULL); - RTEST(pIntDirectDraw7->lpLcl->dwObsolete1 == 0); + RTEST(pIntDirectDraw7->lpLcl->dwObsolete1 == 0); RTEST(pIntDirectDraw7->lpLcl->hWnd == 0); - - /* FIXME vaildate pIntDirectDraw7->lpLcl->hDC */ - RTEST(pIntDirectDraw7->lpLcl->hDC != 0); - - RTEST(pIntDirectDraw7->lpLcl->dwErrorMode == 0); + RTEST(pIntDirectDraw7->lpLcl->hDC != 0); + RTEST(pIntDirectDraw7->lpLcl->dwErrorMode == 0); RTEST(pIntDirectDraw7->lpLcl->lpPrimary == NULL); RTEST(pIntDirectDraw7->lpLcl->lpCB == NULL); - RTEST(pIntDirectDraw7->lpLcl->dwPreferredMode == 0); - RTEST(pIntDirectDraw7->lpLcl->hD3DInstance == NULL); - RTEST(pIntDirectDraw7->lpLcl->pD3DIUnknown == NULL); - - RTEST(pIntDirectDraw7->lpLcl->lpDDCB != NULL); - //RTEST(pIntDirectDraw7->lpLcl->hDDVxd != -1); fixme - RTEST(pIntDirectDraw7->lpLcl->hFocusWnd == 0); - RTEST(pIntDirectDraw7->lpLcl->dwHotTracking == 0); - RTEST(pIntDirectDraw7->lpLcl->dwIMEState == 0); - - RTEST(pIntDirectDraw7->lpLcl->hWndPopup == 0); - RTEST(pIntDirectDraw7->lpLcl->hDD != 0); - RTEST(pIntDirectDraw7->lpLcl->hGammaCalibrator != 0); + RTEST(pIntDirectDraw7->lpLcl->dwPreferredMode == 0); + RTEST(pIntDirectDraw7->lpLcl->hD3DInstance == NULL); + RTEST(pIntDirectDraw7->lpLcl->pD3DIUnknown == NULL); + RTEST(pIntDirectDraw7->lpLcl->lpDDCB != NULL); + //RTEST(pIntDirectDraw7->lpLcl->hDDVxd != 0xFFFFFFFF); + RTEST(pIntDirectDraw7->lpLcl->dwAppHackFlags == 0); + RTEST(pIntDirectDraw7->lpLcl->hFocusWnd == 0); + RTEST(pIntDirectDraw7->lpLcl->dwHotTracking == 0); + RTEST(pIntDirectDraw7->lpLcl->dwIMEState == 0); + RTEST(pIntDirectDraw7->lpLcl->hWndPopup == 0); + RTEST(pIntDirectDraw7->lpLcl->hDD != 0); + RTEST(pIntDirectDraw7->lpLcl->hGammaCalibrator != 0); RTEST(pIntDirectDraw7->lpLcl->lpGammaCalibrator != NULL); + + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwRefCnt == 1); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwFlags == 0x21804020); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->fpPrimaryOrig == 0x00000000); + + /* ddCaps is Hal caps from the drv */ + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSize == 0x0000013c); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwCaps != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwCaps2 != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwCKeyCaps != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwFXCaps != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwFXAlphaCaps == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwPalCaps == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVCaps == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwAlphaBltConstBitDepths == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwAlphaBltPixelBitDepths == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwAlphaBltSurfaceBitDepths == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwAlphaOverlayConstBitDepths == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwAlphaOverlayPixelBitDepths == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwAlphaOverlaySurfaceBitDepths == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwZBufferBitDepths == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVidMemTotal == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVidMemFree == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwMaxVisibleOverlays != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwNumFourCCCodes != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwAlignBoundarySrc == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwAlignSizeSrc == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwAlignBoundaryDest == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwAlignSizeDest == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwAlignStrideAlign == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwRops[0x00] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwRops[0x01] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwRops[0x02] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwRops[0x03] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwRops[0x04] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwRops[0x05] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwRops[0x06] != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwRops[0x07] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.ddsCaps.dwCaps != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwMinOverlayStretch != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwMaxOverlayStretch != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwMinLiveVideoStretch != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwMaxLiveVideoStretch != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwMinHwCodecStretch != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwMaxHwCodecStretch != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwReserved1 == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwReserved2 == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwReserved3 == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBCaps != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBCKeyCaps == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBFXCaps == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBRops[0x00] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBRops[0x01] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBRops[0x02] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBRops[0x03] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBRops[0x04] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBRops[0x05] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBRops[0x06] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBRops[0x07] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBCaps != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBCKeyCaps == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBFXCaps == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBRops[0x00] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBRops[0x01] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBRops[0x02] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBRops[0x03] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBRops[0x04] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBRops[0x05] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBRops[0x06] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBRops[0x07] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBCaps == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBCKeyCaps == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBFXCaps == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBRops[0x00] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBRops[0x01] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBRops[0x02] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBRops[0x03] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBRops[0x04] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBRops[0x05] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBRops[0x06] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBRops[0x07] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwMaxVideoPorts == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwCurrVideoPorts == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBCaps2 != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwInternal1 == 0x00000902 ); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused1[0] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused1[1] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused1[2] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused1[3] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused1[4] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused1[5] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused1[6] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused1[7] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused1[8] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->lpDDCBtmp != NULL); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dsList == NULL); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->palList == NULL); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->clipperList == NULL); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->lp16DD == NULL); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwMaxOverlays == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwCurrOverlays == 0); + + /* fixme check with current res freq */ + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwMonitorFrequency != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSize == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwCaps == 0xf4c08241); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwCaps2 == 0x00000001); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwCKeyCaps == 0x00000200); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwFXCaps == 0x0003fce3); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwFXAlphaCaps == 0x00000000); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwPalCaps == 0x00000347); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVCaps == 0x00000000); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwAlphaBltConstBitDepths == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwAlphaBltPixelBitDepths == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwAlphaBltSurfaceBitDepths == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwAlphaOverlayConstBitDepths == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwAlphaOverlayPixelBitDepths == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwAlphaOverlaySurfaceBitDepths == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwZBufferBitDepths != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVidMemTotal == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVidMemFree == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwMaxVisibleOverlays == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwCurrVisibleOverlays == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwNumFourCCCodes == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwAlignBoundarySrc == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwAlignSizeSrc == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwAlignBoundaryDest == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwAlignSizeDest == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwAlignStrideAlign == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwRops[0x00] == 1); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwRops[0x01] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwRops[0x02] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwRops[0x03] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwRops[0x04] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwRops[0x05] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwRops[0x06] == 0x00001000); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwRops[0x07] == 0x80000000); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.ddsCaps.dwCaps == 0x00c21350); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwMinOverlayStretch == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwMaxOverlayStretch == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwMinLiveVideoStretch == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwMaxLiveVideoStretch == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwMinHwCodecStretch == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwMaxHwCodecStretch == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwReserved1 == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwReserved2 == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwReserved3 == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBCaps == 0xf4c08241); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBCKeyCaps == 0x00000200); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBFXCaps == 0x0003fce3); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBRops[0x00] == 1); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBRops[0x01] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBRops[0x02] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBRops[0x03] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBRops[0x04] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBRops[0x05] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBRops[0x06] == 0x00001000); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBRops[0x07] == 0x80000000); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBCaps == 0xf4c08241); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBCKeyCaps == 0x00000200); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBFXCaps == 0x0003fce3); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBRops[0x00] == 1); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBRops[0x01] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBRops[0x02] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBRops[0x03] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBRops[0x04] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBRops[0x05] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBRops[0x06] == 0x00001000); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBRops[0x07] == 0x80000000); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBCaps == 0xf4c08241); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBCKeyCaps == 0x00000200); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBFXCaps == 0x0003fce3); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBRops[0x00] == 0x00000001); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBRops[0x01] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBRops[0x02] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBRops[0x03] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBRops[0x04] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBRops[0x05] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBRops[0x06] == 0x00001000); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBRops[0x07] == 0x80000000); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwMaxVideoPorts == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwCurrVideoPorts == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBCaps2 == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[0] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[1] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[2] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[3] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[4] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[5] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[6] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[7] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[8] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[9] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[10] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[11] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[12] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[13] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[14] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[15] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[16] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[17] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[18] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[19] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[20] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[21] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[22] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[23] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[24] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[25] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[26] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[27] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[28] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[29] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[30] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[31] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[32] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[33] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[34] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[35] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[36] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[37] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[38] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[39] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[40] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[41] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[42] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[43] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[44] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[45] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[46] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[47] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[48] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused2[49] == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->vmiData.fpPrimary == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->vmiData.dwFlags == 0x00000000); + /* get current res and compare it with dwDisplayWidth, lDisplayPitch, currenr res fixme */ + RTEST(pIntDirectDraw7->lpLcl->lpGbl->vmiData.dwDisplayWidth != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->vmiData.dwDisplayHeight != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->vmiData.lDisplayPitch != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->vmiData.dwOffscreenAlign != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->vmiData.dwOverlayAlign != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->vmiData.dwTextureAlign != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->vmiData.dwZBufferAlign != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->vmiData.dwAlphaAlign == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->vmiData.dwNumHeaps == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->vmiData.pvmList == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->lpDriverHandle != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->lpExclusiveOwner == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwModeIndex == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwModeIndexOrig == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwNumFourCC != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->lpdwFourCC != NULL); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwNumModes != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->lpModeInfo != NULL); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwSurfaceLockCount == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwAliasedLockCnt == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwReserved3 == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->hDD != 0); + /* ms ddraw send in the string "display" when it create the hDC */ + RTEST(strcmp(pIntDirectDraw7->lpLcl->lpGbl->cObsolete,"display") == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwReserved1 == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwReserved2 == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dbnOverlayRoot.next != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dbnOverlayRoot.object == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dbnOverlayRoot.object_int == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->lpwPDeviceFlags == (LPVOID)0x737A07F0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwPDevice == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwWin16LockCnt == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwUnused3 == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->hInstance == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwEvent16 == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwSaveNumModes == 1); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->lpD3DGlobalDriverData != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->lpD3DHALCallbacks != 0); + + /* both caps pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps. and pIntDirectDraw7->lpLcl->lpGbl->ddCaps. */ + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSize == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSize, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSize)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwCaps)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwCaps2 == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwCaps2, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwCaps2)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwCKeyCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwCKeyCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwCKeyCaps)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwFXCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwFXCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwFXCaps)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwFXAlphaCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwFXAlphaCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwFXAlphaCaps)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwPalCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwPalCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwPalCaps)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVCaps)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwAlphaBltConstBitDepths == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwAlphaBltConstBitDepths, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwAlphaBltConstBitDepths)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwAlphaBltPixelBitDepths == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwAlphaBltPixelBitDepths, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwAlphaBltPixelBitDepths)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwAlphaBltSurfaceBitDepths == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwAlphaBltSurfaceBitDepths, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwAlphaBltSurfaceBitDepths)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwAlphaOverlayConstBitDepths == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwAlphaOverlayConstBitDepths, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwAlphaOverlayConstBitDepths)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwAlphaOverlayPixelBitDepths == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwAlphaOverlayPixelBitDepths, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwAlphaOverlayPixelBitDepths)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwAlphaOverlaySurfaceBitDepths == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwAlphaOverlaySurfaceBitDepths, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwAlphaOverlaySurfaceBitDepths)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwZBufferBitDepths == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwZBufferBitDepths, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwZBufferBitDepths)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVidMemTotal == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVidMemTotal, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVidMemTotal)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVidMemFree == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVidMemFree, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVidMemFree)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwMaxVisibleOverlays == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwMaxVisibleOverlays, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwMaxVisibleOverlays)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwCurrVisibleOverlays == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwCurrVisibleOverlays, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwCurrVisibleOverlays)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwNumFourCCCodes == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwNumFourCCCodes, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwNumFourCCCodes)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwAlignBoundarySrc == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwAlignBoundarySrc, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwAlignBoundarySrc)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwAlignSizeSrc == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwAlignSizeSrc, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwAlignSizeSrc)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwAlignBoundaryDest == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwAlignBoundaryDest, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwAlignBoundaryDest)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwRops[0x00] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwRops[0x00], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwRops[0x00])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwRops[0x01] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwRops[0x01], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwRops[0x01])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwRops[0x02] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwRops[0x02], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwRops[0x02])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwRops[0x02] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwRops[0x03], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwRops[0x03])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwRops[0x04] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwRops[0x04], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwRops[0x04])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwRops[0x05] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwRops[0x05], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwRops[0x05])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwRops[0x06] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwRops[0x06], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwRops[0x06])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwRops[0x07] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwRops[0x07], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwRops[0x07])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.ddsCaps.dwCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.ddsCaps.dwCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.ddsCaps.dwCaps)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwMinOverlayStretch == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwMinOverlayStretch, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwMinOverlayStretch)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwMaxOverlayStretch == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwMaxOverlayStretch, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwMaxOverlayStretch)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwMinLiveVideoStretch == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwMinLiveVideoStretch, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwMinLiveVideoStretch)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwMaxLiveVideoStretch == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwMaxLiveVideoStretch, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwMaxLiveVideoStretch)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwMinHwCodecStretch == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwMinHwCodecStretch, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwMinHwCodecStretch)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwMaxHwCodecStretch == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwMaxHwCodecStretch, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwMaxHwCodecStretch)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwReserved1 == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwReserved1, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwReserved1)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwReserved2 == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwReserved2, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwReserved2)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwReserved3 == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwReserved3, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwReserved3)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBCaps)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBCKeyCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBCKeyCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBCKeyCaps)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBFXCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBFXCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBFXCaps)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBRops[0x00] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBRops[0x00], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBRops[0x00])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBRops[0x01] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBRops[0x01], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBRops[0x01])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBRops[0x02] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBRops[0x02], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBRops[0x02])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBRops[0x03] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBRops[0x03], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBRops[0x03])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBRops[0x04] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBRops[0x04], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBRops[0x04])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBRops[0x05] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBRops[0x05], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBRops[0x05])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBRops[0x06] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBRops[0x06], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBRops[0x06])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBRops[0x07] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBRops[0x07], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBRops[0x07])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVSBCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBCaps)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVSBCKeyCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBCKeyCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBCKeyCaps)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVSBFXCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBFXCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBFXCaps)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVSBRops[0x00] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBRops[0x00], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBRops[0x00])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVSBRops[0x01] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBRops[0x01], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBRops[0x01])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVSBRops[0x02] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBRops[0x02], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBRops[0x02])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVSBRops[0x03] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBRops[0x03], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBRops[0x03])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVSBRops[0x04] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBRops[0x04], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBRops[0x04])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVSBRops[0x05] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBRops[0x05], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBRops[0x05])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVSBRops[0x06] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBRops[0x06], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBRops[0x06])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwVSBRops[0x07] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwVSBRops[0x07], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwVSBRops[0x07])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSSBCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBCaps)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSSBCKeyCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBCKeyCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBCKeyCaps)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSSBFXCaps == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBFXCaps, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBFXCaps)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSSBRops[0x00] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBRops[0x00], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBRops[0x00])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSSBRops[0x01] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBRops[0x01], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBRops[0x01])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSSBRops[0x02] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBRops[0x02], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBRops[0x02])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSSBRops[0x03] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBRops[0x03], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBRops[0x03])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSSBRops[0x04] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBRops[0x04], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBRops[0x04])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSSBRops[0x05] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBRops[0x05], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBRops[0x05])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSSBRops[0x06] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBRops[0x06], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBRops[0x06])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSSBRops[0x07] == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSSBRops[0x07], pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSSBRops[0x07])); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwMaxVideoPorts == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwMaxVideoPorts, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwMaxVideoPorts)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwCurrVideoPorts == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwCurrVideoPorts, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwCurrVideoPorts)); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddBothCaps.dwSVBCaps2 == MIX_BOTH_CAPS(pIntDirectDraw7->lpLcl->lpGbl->ddHELCaps.dwSVBCaps2, pIntDirectDraw7->lpLcl->lpGbl->ddCaps.dwSVBCaps2)); + + RTEST(pIntDirectDraw7->lpLcl->lpGbl->lpDDVideoPortCaps == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dvpList == 0); + + /* The res height */ + RTEST(pIntDirectDraw7->lpLcl->lpGbl->rectDevice.bottom != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->rectDevice.left == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->rectDevice.right == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->rectDevice.top == 0); + + /* how many Monitors */ + RTEST(pIntDirectDraw7->lpLcl->lpGbl->cMonitors != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->gpbmiSrc != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->gpbmiDest != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->phaiHeapAliases != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->hKernelHandle != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->pfnNotifyProc != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->lpDDKernelCaps != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->lpddNLVCaps != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->lpddNLVHELCaps != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->lpD3DExtendedCaps != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwDOSBoxEvent == 0); + + /* The res height */ + RTEST(pIntDirectDraw7->lpLcl->lpGbl->rectDesktop.bottom != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->rectDesktop.left == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->rectDesktop.right == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->rectDesktop.top == 0); + + /* ms ddraw send in the string "display" when it create the hDC */ + RTEST(strcmp(pIntDirectDraw7->lpLcl->lpGbl->cDriverName,"display") == 0); + + RTEST(pIntDirectDraw7->lpLcl->lpGbl->lpD3DHALCallbacks3 != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->dwNumZPixelFormats != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->lpZPixelFormats != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->mcList == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->hDDVxd == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddsCapsMore.dwCaps2 == 0x00000200); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddsCapsMore.dwCaps3 == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddsCapsMore.dwCaps4 == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl->ddsCapsMore.dwVolumeDepth == 0); + + } + + + ret = DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, &IID_IDirectDraw, NULL); #if DUMP_ON if (pIntDirectDraw7 != NULL) { - dump_ddrawi_directdraw_int(pIntDirectDraw7); - dump_ddrawi_directdraw_lcl(pIntDirectDraw7->lpLcl); + dump_DDRAWI_DIRECTDRAW_INT("PDraw->", pIntDirectDraw7, 0); } #endif

1 0

[jimtabor] 37375: - Fix newest Wine bitmap gdi32 crosstest.
by jimtabor＠svn.reactos.org 15 Nov '08

15 Nov '08

Author: jimtabor Date: Sat Nov 15 09:20:14 2008 New Revision: 37375 URL: http://svn.reactos.org/svn/reactos?rev=37375&view=rev Log: - Fix newest Wine bitmap gdi32 crosstest. Modified: trunk/reactos/dll/win32/gdi32/objects/utils.c Modified: trunk/reactos/dll/win32/gdi32/objects/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/ut… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/utils.c [iso-8859-1] Sat Nov 15 09:20:14 2008 @@ -188,9 +188,10 @@ * description). */ - if (BitmapInfo->bmiHeader.biSize != sizeof(BITMAPCOREHEADER) && + if ( !BitmapInfo || + (BitmapInfo->bmiHeader.biSize != sizeof(BITMAPCOREHEADER) && (BitmapInfo->bmiHeader.biSize < sizeof(BITMAPINFOHEADER) || - BitmapInfo->bmiHeader.biSize > sizeof(BITMAPV5HEADER))) + BitmapInfo->bmiHeader.biSize > sizeof(BITMAPV5HEADER)))) { return NULL; }

1 0

[fireball] 37374: - Remove duplicate type definitions.
by fireball＠svn.reactos.org 15 Nov '08

15 Nov '08

Author: fireball Date: Sat Nov 15 08:04:18 2008 New Revision: 37374 URL: http://svn.reactos.org/svn/reactos?rev=37374&view=rev Log: - Remove duplicate type definitions. Modified: trunk/reactos/include/dxsdk/vmrender.idl Modified: trunk/reactos/include/dxsdk/vmrender.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/vmrender.idl… ============================================================================== --- trunk/reactos/include/dxsdk/vmrender.idl [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/vmrender.idl [iso-8859-1] Sat Nov 15 08:04:18 2008 @@ -2,10 +2,6 @@ cpp_quote("#if 0") import "unknwn.idl"; - typedef int DWORD; - typedef int REFERENCE_TIME; - typedef int HMONITOR; - typedef int AM_MEDIA_TYPE; typedef DWORD* LPDIRECTDRAW7; typedef DWORD* LPDIRECTDRAWSURFACE7;

1 0

[khornicek] 37373: use the dmSize we got from caller and fall back to SIZEOF_DEVMODEA_300 in case we got some unexpected value as it's done in Windows
by khornicek＠svn.reactos.org 15 Nov '08

15 Nov '08

Author: khornicek Date: Sat Nov 15 07:54:17 2008 New Revision: 37373 URL: http://svn.reactos.org/svn/reactos?rev=37373&view=rev Log: use the dmSize we got from caller and fall back to SIZEOF_DEVMODEA_300 in case we got some unexpected value as it's done in Windows Modified: trunk/reactos/dll/win32/user32/misc/display.c Modified: trunk/reactos/dll/win32/user32/misc/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/disp… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/display.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/display.c [iso-8859-1] Sat Nov 15 07:54:17 2008 @@ -242,17 +242,14 @@ COPYS(dmDeviceName, CCHDEVICENAME ); COPYN(dmSpecVersion); COPYN(dmDriverVersion); - switch (DevModeW.dmSize) - { - case SIZEOF_DEVMODEW_300: + switch (lpDevMode->dmSize) + { + case SIZEOF_DEVMODEA_300: + case SIZEOF_DEVMODEA_400: + case SIZEOF_DEVMODEA_500: + break; + default: lpDevMode->dmSize = SIZEOF_DEVMODEA_300; - break; - case SIZEOF_DEVMODEW_400: - lpDevMode->dmSize = SIZEOF_DEVMODEA_400; - break; - case SIZEOF_DEVMODEW_500: - default: /* FIXME what to do??? */ - lpDevMode->dmSize = SIZEOF_DEVMODEA_500; break; } COPYN(dmDriverExtra); @@ -276,7 +273,7 @@ COPYN(dmDisplayFlags); // aka dmNup COPYN(dmDisplayFrequency); - if (DevModeW.dmSize <= SIZEOF_DEVMODEW_300) + if (lpDevMode->dmSize <= SIZEOF_DEVMODEW_300) return TRUE; // we're done with 0x300 fields COPYN(dmICMMethod); @@ -286,7 +283,7 @@ COPYN(dmReserved1); COPYN(dmReserved2); - if (DevModeW.dmSize <= SIZEOF_DEVMODEW_400) + if (lpDevMode->dmSize <= SIZEOF_DEVMODEW_400) return TRUE; // we're done with 0x400 fields COPYN(dmPanningWidth);

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
66
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2008