Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

by sserapion＠svn.reactos.org

Author: sserapion Date: Wed Jan 28 06:08:33 2009 New Revision: 39173 URL: http://svn.reactos.org/svn/reactos?rev=39173&view=rev Log: Fix typo. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/sysinfo.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Wed Jan 28 06:08:33 2009 @@ -1962,7 +1962,7 @@ for (;;); #elif defined(_M_ARM) __asm__ __volatile__("mov r1, #0; mcr p15, 0, r1, c7, c5, 0"); -s#else +#else #error Unknown architecture #endif return STATUS_SUCCESS;

15 years, 9 months

[cwittich] 39172: update bi->biBitCount before using it - fixes 5 gdi32 bitmap winetests

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Jan 28 05:55:56 2009 New Revision: 39172 URL: http://svn.reactos.org/svn/reactos?rev=39172&view=rev Log: update bi->biBitCount before using it - fixes 5 gdi32 bitmap winetests Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Wed Jan 28 05:55:56 2009 @@ -1476,6 +1476,17 @@ NtGdiDeleteObject(bmp); return NULL; } + + /* WINE NOTE: WINE makes use of a colormap, which is a color translation + table between the DIB and the X physical device. Obviously, + this is left out of the ReactOS implementation. Instead, + we call NtGdiSetDIBColorTable. */ + bi->biClrUsed = 0; + /* set number of entries in bmi.bmiColors table */ + if(bi->biBitCount == 1) { bi->biClrUsed = 2; } else + if(bi->biBitCount == 4) { bi->biClrUsed = 16; } else + if(bi->biBitCount == 8) { bi->biClrUsed = 256; } + bmp->hDIBSection = section; bmp->hSecure = hSecure; bmp->dwOffset = offset; @@ -1485,16 +1496,6 @@ bmp->dsBitfields[2] = dsBitfields[2]; bmp->biClrUsed = bi->biClrUsed; bmp->biClrImportant = bi->biClrImportant; - - /* WINE NOTE: WINE makes use of a colormap, which is a color translation - table between the DIB and the X physical device. Obviously, - this is left out of the ReactOS implementation. Instead, - we call NtGdiSetDIBColorTable. */ - bi->biClrUsed = 0; - /* set number of entries in bmi.bmiColors table */ - if(bi->biBitCount == 1) { bi->biClrUsed = 2; } else - if(bi->biBitCount == 4) { bi->biClrUsed = 16; } else - if(bi->biBitCount == 8) { bi->biClrUsed = 256; } if (bi->biClrUsed != 0) bmp->hDIBPalette = PALETTE_AllocPaletteIndexedRGB(bi->biClrUsed, lpRGB);

15 years, 9 months

[dreimer] 39171: Fix typoes. Update plans.txt

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Jan 28 05:27:22 2009 New Revision: 39171 URL: http://svn.reactos.org/svn/reactos?rev=39171&view=rev Log: Fix typoes. Update plans.txt Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc trunk/tools/RosBE/RosBE-Windows/plans.txt Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc [iso-8859-1] Wed Jan 28 05:27:22 2009 @@ -49,7 +49,7 @@ CLR13, "Magenta" CLR14, "Gelb" CLR15, "Weiß" - MSG_NOGCCFOUND, "Kein MinGW/GCC Compiler gefunden! Bitte überprüfen sie ihren Pfad." + MSG_NOGCCFOUND, "Kein MinGW/GCC Compiler gefunden! Bitte überprüfen Sie Ihren Pfad." MSG_CMDFFAILED, "rosbe-options.cmd konnte nicht erstellt werden!" MSG_PS1FFAILED, "rosbe-options.ps1 konnte nicht erstellt werden!" MSG_DIREFAILED, "Ordner konnte nicht erstellt werden!" Modified: trunk/tools/RosBE/RosBE-Windows/plans.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/plans.tx… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/plans.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/plans.txt [iso-8859-1] Wed Jan 28 05:27:22 2009 @@ -1,2 +1,4 @@ - New icons for every arch we support -- More Error catching +- More Error catching +- support y/n and yes/no +- Make it possible to set different obj and out folders for different arches

15 years, 9 months

[fireball] 39170: Rob Shearman <robertshearman@gmail.com> widl: Add a new function, type_alias_get_aliasee to wrap the retrieval of the type that the alias aliases. Rob Shearman <robertshearman@gmail.com> widl: Add new type_get_type and type_get_real_type_type functions. Use these to implement a few helper functions. Change the type verification in type accessor functions to use these new functions. Austin English <austinenglish@gmail.com> widl: Fix a compiler warning. Alexandre Julliard <jullia

by fireball＠svn.reactos.org

Author: fireball Date: Wed Jan 28 04:41:01 2009 New Revision: 39170 URL: http://svn.reactos.org/svn/reactos?rev=39170&view=rev Log: Rob Shearman <robertshearman(a)gmail.com> widl: Add a new function, type_alias_get_aliasee to wrap the retrieval of the type that the alias aliases. Rob Shearman <robertshearman(a)gmail.com> widl: Add new type_get_type and type_get_real_type_type functions. Use these to implement a few helper functions. Change the type verification in type accessor functions to use these new functions. Austin English <austinenglish(a)gmail.com> widl: Fix a compiler warning. Alexandre Julliard <julliard(a)winehq.org> widl: We need an offset after the correlation descriptor for unencapsulated unions. Modified: trunk/reactos/tools/widl/header.c trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.y trunk/reactos/tools/widl/typegen.c trunk/reactos/tools/widl/typelib.c trunk/reactos/tools/widl/typetree.h trunk/reactos/tools/widl/widltypes.h trunk/reactos/tools/widl/write_msft.c Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=39… ============================================================================== --- trunk/reactos/tools/widl/header.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/header.c [iso-8859-1] Wed Jan 28 04:41:01 2009 @@ -63,7 +63,7 @@ if (is_attr(type->attrs, t)) return 1; else if (type_is_alias(type)) - type = type->orig; + type = type_alias_get_aliasee(type); else if (is_ptr(type)) type = type_pointer_get_ref(type); else return 0; @@ -79,7 +79,7 @@ if (is_attr(t->attrs, attr)) return 1; else if (type_is_alias(t)) - t = t->orig; + t = type_alias_get_aliasee(t); else return 0; } } @@ -110,8 +110,7 @@ int is_void(const type_t *t) { - if (!t->type && !t->ref) return 1; - return 0; + return type_get_type(t) == TYPE_VOID; } int is_conformant_array(const type_t *t) @@ -424,7 +423,7 @@ } if (type_is_alias(type)) - type = type->orig; + type = type_alias_get_aliasee(type); else if (is_ptr(type)) type = type_pointer_get_ref(type); else if (is_array(type)) @@ -472,7 +471,7 @@ static void write_typedef(FILE *header, type_t *type) { fprintf(header, "typedef "); - write_type_def_or_decl(header, type->orig, FALSE, "%s", type->name); + write_type_def_or_decl(header, type_alias_get_aliasee(type), FALSE, "%s", type->name); fprintf(header, ";\n"); } 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] Wed Jan 28 04:41:01 2009 @@ -4764,7 +4764,7 @@ { ptr_attr = get_attrv(ptr->attrs, ATTR_POINTERTYPE); if (!ptr_attr && type_is_alias(ptr)) - ptr = ptr->orig; + ptr = type_alias_get_aliasee(ptr); else break; } @@ -5098,7 +5098,7 @@ static void fix_type(type_t *t) { if (type_is_alias(t) && is_incomplete(t)) { - type_t *ot = t->orig; + type_t *ot = type_alias_get_aliasee(t); fix_type(ot); if (is_struct(ot->type) || is_union(ot->type)) t->details.structure = ot->details.structure; @@ -5701,9 +5701,9 @@ break; } if (type_is_alias(type)) - type = type->orig; + type = type_alias_get_aliasee(type); else if (is_ptr(type)) - type = type->ref; + type = type_pointer_get_ref(type); else if (is_array(type)) type = type_array_get_element(type); else @@ -5763,7 +5763,7 @@ if (is_attr(type->attrs, ATTR_CONTEXTHANDLE)) break; if (type_is_alias(type)) - type = type->orig; + type = type_alias_get_aliasee(type); else if (is_ptr(type)) { ptr_level++; Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=39… ============================================================================== --- trunk/reactos/tools/widl/parser.y [iso-8859-1] (original) +++ trunk/reactos/tools/widl/parser.y [iso-8859-1] Wed Jan 28 04:41:01 2009 @@ -1443,7 +1443,7 @@ { ptr_attr = get_attrv(ptr->attrs, ATTR_POINTERTYPE); if (!ptr_attr && type_is_alias(ptr)) - ptr = ptr->orig; + ptr = type_alias_get_aliasee(ptr); else break; } @@ -1777,7 +1777,7 @@ static void fix_type(type_t *t) { if (type_is_alias(t) && is_incomplete(t)) { - type_t *ot = t->orig; + type_t *ot = type_alias_get_aliasee(t); fix_type(ot); if (is_struct(ot->type) || is_union(ot->type)) t->details.structure = ot->details.structure; @@ -2380,9 +2380,9 @@ break; } if (type_is_alias(type)) - type = type->orig; + type = type_alias_get_aliasee(type); else if (is_ptr(type)) - type = type->ref; + type = type_pointer_get_ref(type); else if (is_array(type)) type = type_array_get_element(type); else @@ -2442,7 +2442,7 @@ if (is_attr(type->attrs, ATTR_CONTEXTHANDLE)) break; if (type_is_alias(type)) - type = type->orig; + type = type_alias_get_aliasee(type); else if (is_ptr(type)) { ptr_level++; 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] Wed Jan 28 04:41:01 2009 @@ -515,7 +515,7 @@ } if (type_is_alias(t)) - t = t->orig; + t = type_alias_get_aliasee(t); else return 0; } @@ -1053,7 +1053,7 @@ size_t size = 0; if (type_is_alias(t)) - size = type_memsize(t->orig, align); + size = type_memsize(type_alias_get_aliasee(t), align); else if (t->declarray && is_conformant_array(t)) { type_memsize(type_array_get_element(t), align); @@ -2325,6 +2325,8 @@ } *tfsoff += write_conf_or_var_desc(file, NULL, *tfsoff, st, &dummy_expr ); + print_file(file, 2, "NdrFcShort(0x2),\t/* Offset= 2 (%u) */\n", *tfsoff + 2); + *tfsoff += 2; } print_file(file, 2, "NdrFcShort(0x%x),\t/* %d */\n", size, size); 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] Wed Jan 28 04:41:01 2009 @@ -50,28 +50,12 @@ int is_ptr(const type_t *t) { - unsigned char c = t->type; - return c == RPC_FC_RP - || c == RPC_FC_UP - || c == RPC_FC_FP - || c == RPC_FC_OP; + return type_get_type(t) == TYPE_POINTER; } int is_array(const type_t *t) { - switch (t->type) - { - case RPC_FC_SMFARRAY: - case RPC_FC_LGFARRAY: - case RPC_FC_SMVARRAY: - case RPC_FC_LGVARRAY: - case RPC_FC_CARRAY: - case RPC_FC_CVARRAY: - case RPC_FC_BOGUS_ARRAY: - return TRUE; - default: - return FALSE; - } + return type_get_type(t) == TYPE_ARRAY; } /* List of oleauto types that should be recognized by name. Modified: trunk/reactos/tools/widl/typetree.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typetree.h?rev=… ============================================================================== --- trunk/reactos/tools/widl/typetree.h [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typetree.h [iso-8859-1] Wed Jan 28 04:41:01 2009 @@ -39,47 +39,78 @@ /* FIXME: shouldn't need to export this */ type_t *duptype(type_t *t, int dupname); +/* un-alias the type until finding the non-alias type */ +static inline type_t *type_get_real_type(const type_t *type) +{ + if (type->is_alias) + return type_get_real_type(type->orig); + else + return (type_t *)type; +} + +static inline enum type_type type_get_type(const type_t *type) +{ + return type_get_type_detect_alias(type_get_real_type(type)); +} + +static inline unsigned char type_basic_get_fc(const type_t *type) +{ + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_BASIC); + return type->type; +} + static inline var_list_t *type_struct_get_fields(const type_t *type) { - assert(is_struct(type->type)); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_STRUCT); return type->details.structure->fields; } static inline var_list_t *type_function_get_args(const type_t *type) { - assert(type->type == RPC_FC_FUNCTION); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_FUNCTION); return type->details.function->args; } static inline type_t *type_function_get_rettype(const type_t *type) { - assert(type->type == RPC_FC_FUNCTION); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_FUNCTION); return type->ref; } static inline var_list_t *type_enum_get_values(const type_t *type) { - assert(type->type == RPC_FC_ENUM16 || type->type == RPC_FC_ENUM32); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_ENUM); return type->details.enumeration->enums; } static inline var_t *type_union_get_switch_value(const type_t *type) { - assert(type->type == RPC_FC_ENCAPSULATED_UNION); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_ENCAPSULATED_UNION); return LIST_ENTRY(list_head(type->details.structure->fields), var_t, entry); } static inline var_list_t *type_encapsulated_union_get_fields(const type_t *type) { - assert(type->type == RPC_FC_ENCAPSULATED_UNION); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_ENCAPSULATED_UNION); return type->details.structure->fields; } static inline var_list_t *type_union_get_cases(const type_t *type) { - assert(type->type == RPC_FC_ENCAPSULATED_UNION || - type->type == RPC_FC_NON_ENCAPSULATED_UNION); - if (type->type == RPC_FC_ENCAPSULATED_UNION) + enum type_type type_type; + + type = type_get_real_type(type); + type_type = type_get_type(type); + + assert(type_type == TYPE_UNION || type_type == TYPE_ENCAPSULATED_UNION); + if (type_type == TYPE_ENCAPSULATED_UNION) { const var_t *uv = LIST_ENTRY(list_tail(type->details.structure->fields), const var_t, entry); return uv->type->details.structure->fields; @@ -90,25 +121,29 @@ static inline statement_list_t *type_iface_get_stmts(const type_t *type) { - assert(type->type == RPC_FC_IP); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_INTERFACE); return type->details.iface->stmts; } static inline type_t *type_iface_get_inherit(const type_t *type) { - assert(type->type == RPC_FC_IP); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_INTERFACE); return type->ref; } static inline var_list_t *type_dispiface_get_props(const type_t *type) { - assert(type->type == RPC_FC_IP); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_INTERFACE); return type->details.iface->disp_props; } static inline var_list_t *type_dispiface_get_methods(const type_t *type) { - assert(type->type == RPC_FC_IP); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_INTERFACE); return type->details.iface->disp_methods; } @@ -119,60 +154,70 @@ static inline int type_is_complete(const type_t *type) { - if (type->type == RPC_FC_FUNCTION) + switch (type_get_type_detect_alias(type)) + { + case TYPE_FUNCTION: return (type->details.function != NULL); - else if (type->type == RPC_FC_IP) + case TYPE_INTERFACE: return (type->details.iface != NULL); - else if (type->type == RPC_FC_ENUM16 || type->type == RPC_FC_ENUM32) + case TYPE_ENUM: return (type->details.enumeration != NULL); - else if (is_struct(type->type) || is_union(type->type)) + case TYPE_UNION: + case TYPE_ENCAPSULATED_UNION: + case TYPE_STRUCT: return (type->details.structure != NULL); - else + case TYPE_VOID: + case TYPE_BASIC: + case TYPE_ALIAS: + case TYPE_MODULE: + case TYPE_COCLASS: + case TYPE_POINTER: + case TYPE_ARRAY: return TRUE; + } + return FALSE; } static inline int type_array_has_conformance(const type_t *type) { - assert(is_array(type)); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_ARRAY); return (type->details.array.size_is != NULL); } static inline int type_array_has_variance(const type_t *type) { - assert(is_array(type)); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_ARRAY); return (type->details.array.length_is != NULL); } static inline unsigned long type_array_get_dim(const type_t *type) { - assert(is_array(type)); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_ARRAY); return type->details.array.dim; } static inline expr_t *type_array_get_conformance(const type_t *type) { - assert(is_array(type)); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_ARRAY); return type->details.array.size_is; } static inline expr_t *type_array_get_variance(const type_t *type) { - assert(is_array(type)); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_ARRAY); return type->details.array.length_is; } static inline type_t *type_array_get_element(const type_t *type) { - assert(is_array(type)); - return type->ref; -} - -static inline type_t *type_get_real_type(const type_t *type) -{ - if (type->is_alias) - return type_get_real_type(type->orig); - else - return (type_t *)type; + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_ARRAY); + return type->ref; } static inline int type_is_alias(const type_t *type) @@ -180,15 +225,23 @@ return type->is_alias; } +static inline type_t *type_alias_get_aliasee(const type_t *type) +{ + assert(type_is_alias(type)); + return type->orig; +} + static inline ifref_list_t *type_coclass_get_ifaces(const type_t *type) { - assert(type->type == RPC_FC_COCLASS); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_COCLASS); return type->details.coclass.ifaces; } static inline type_t *type_pointer_get_ref(const type_t *type) { - assert(is_ptr(type)); + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_POINTER); return type->ref; } Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev… ============================================================================== --- trunk/reactos/tools/widl/widltypes.h [iso-8859-1] (original) +++ trunk/reactos/tools/widl/widltypes.h [iso-8859-1] Wed Jan 28 04:41:01 2009 @@ -310,6 +310,23 @@ ifref_list_t *ifaces; }; +enum type_type +{ + TYPE_VOID, + TYPE_BASIC, /* ints, floats and handles */ + TYPE_ENUM, + TYPE_STRUCT, + TYPE_ENCAPSULATED_UNION, + TYPE_UNION, + TYPE_ALIAS, + TYPE_MODULE, + TYPE_COCLASS, + TYPE_FUNCTION, + TYPE_INTERFACE, + TYPE_POINTER, + TYPE_ARRAY, +}; + struct _type_t { const char *name; unsigned char type; @@ -469,10 +486,75 @@ return func_type->details.function->args; } +static inline enum type_type type_get_type_detect_alias(const type_t *type) +{ + if (type->is_alias) + return TYPE_ALIAS; + switch (type->type) + { + case 0: + return TYPE_VOID; + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_USMALL: + case RPC_FC_SMALL: + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_HYPER: + case RPC_FC_IGNORE: + case RPC_FC_FLOAT: + case RPC_FC_DOUBLE: + case RPC_FC_ERROR_STATUS_T: + case RPC_FC_BIND_PRIMITIVE: + return TYPE_BASIC; + case RPC_FC_ENUM16: + case RPC_FC_ENUM32: + return TYPE_ENUM; + case RPC_FC_RP: + case RPC_FC_UP: + case RPC_FC_FP: + case RPC_FC_OP: + return TYPE_POINTER; + case RPC_FC_STRUCT: + case RPC_FC_PSTRUCT: + case RPC_FC_CSTRUCT: + case RPC_FC_CPSTRUCT: + case RPC_FC_CVSTRUCT: + case RPC_FC_BOGUS_STRUCT: + return TYPE_STRUCT; + case RPC_FC_ENCAPSULATED_UNION: + return TYPE_ENCAPSULATED_UNION; + case RPC_FC_NON_ENCAPSULATED_UNION: + return TYPE_UNION; + case RPC_FC_SMFARRAY: + case RPC_FC_LGFARRAY: + case RPC_FC_SMVARRAY: + case RPC_FC_LGVARRAY: + case RPC_FC_CARRAY: + case RPC_FC_CVARRAY: + case RPC_FC_BOGUS_ARRAY: + return TYPE_ARRAY; + case RPC_FC_FUNCTION: + return TYPE_FUNCTION; + case RPC_FC_COCLASS: + return TYPE_COCLASS; + case RPC_FC_IP: + return TYPE_INTERFACE; + case RPC_FC_MODULE: + return TYPE_MODULE; + default: + assert(0); + return 0; + } +} + #define STATEMENTS_FOR_EACH_FUNC(stmt, stmts) \ if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, statement_t, entry ) \ if (stmt->type == STMT_DECLARATION && stmt->u.var->stgclass == STG_NONE && \ - stmt->u.var->type->type == RPC_FC_FUNCTION) + type_get_type_detect_alias(stmt->u.var->type) == TYPE_FUNCTION) static inline int statements_has_func(const statement_list_t *stmts) { 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] Wed Jan 28 04:41:01 2009 @@ -979,7 +979,7 @@ /* typedef'd types without public attribute aren't included in the typelib */ while (type->typelib_idx < 0 && type_is_alias(type) && !is_attr(type->attrs, ATTR_PUBLIC)) - type = type->orig; + type = type_alias_get_aliasee(type); chat("encode_type: VT_USERDEFINED - type %p name = %s type->type %d idx %d\n", type, type->name, type->type, type->typelib_idx); @@ -2093,8 +2093,11 @@ tdef->typelib_idx = typelib->typelib_header.nrtypeinfos; msft_typeinfo = create_msft_typeinfo(typelib, TKIND_ALIAS, tdef->name, tdef->attrs); - encode_type(typelib, get_type_vt(tdef->orig), tdef->orig, &msft_typeinfo->typeinfo->datatype1, &msft_typeinfo->typeinfo->size, - &alignment, &msft_typeinfo->typeinfo->datatype2); + encode_type(typelib, get_type_vt(type_alias_get_aliasee(tdef)), + type_alias_get_aliasee(tdef), + &msft_typeinfo->typeinfo->datatype1, + &msft_typeinfo->typeinfo->size, + &alignment, &msft_typeinfo->typeinfo->datatype2); msft_typeinfo->typeinfo->typekind |= (alignment << 11 | alignment << 6); } @@ -2267,7 +2270,7 @@ if (is_attr(type_entry->type->attrs, ATTR_PUBLIC)) add_typedef_typeinfo(typelib, type_entry->type); else - add_type_typeinfo(typelib, type_entry->type->orig); + add_type_typeinfo(typelib, type_alias_get_aliasee(type_entry->type)); } break; }

15 years, 9 months

[hyperion] 39169: modified ntoskrnl/include/internal/ob.h modified ntoskrnl/ob/obhandle.c New helper routine ObGetProcessHandleCount to safely read the count of handles in a process without messing with Ob internals Goodbye ObpGetHandleCountByHandleTable modified ntoskrnl/ex/sysinfo.c modified ntoskrnl/ps/query.c Read handle counts with ObGetProcessHandleCount instead of ObpGetHandleCountByHandleTable Fixes at least one crash Thanks to Stefan Ginsberg for reporting the issue and testing Thanks t

by hyperion＠svn.reactos.org

Author: hyperion Date: Wed Jan 28 04:32:43 2009 New Revision: 39169 URL: http://svn.reactos.org/svn/reactos?rev=39169&view=rev Log: modified ntoskrnl/include/internal/ob.h modified ntoskrnl/ob/obhandle.c New helper routine ObGetProcessHandleCount to safely read the count of handles in a process without messing with Ob internals Goodbye ObpGetHandleCountByHandleTable modified ntoskrnl/ex/sysinfo.c modified ntoskrnl/ps/query.c Read handle counts with ObGetProcessHandleCount instead of ObpGetHandleCountByHandleTable Fixes at least one crash Thanks to Stefan Ginsberg for reporting the issue and testing Thanks to Alex Ionescu for code review and suggestions See issue #4050 for more details. Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Wed Jan 28 04:32:43 2009 @@ -778,7 +778,7 @@ SpiCurrent->BasePriority = Process->Pcb.BasePriority; SpiCurrent->UniqueProcessId = Process->UniqueProcessId; SpiCurrent->InheritedFromUniqueProcessId = Process->InheritedFromUniqueProcessId; - SpiCurrent->HandleCount = (Process->ObjectTable ? ObpGetHandleCountByHandleTable(Process->ObjectTable) : 0); + SpiCurrent->HandleCount = ObGetProcessHandleCount(Process); SpiCurrent->PeakVirtualSize = Process->PeakVirtualSize; SpiCurrent->VirtualSize = Process->VirtualSize; SpiCurrent->PageFaultCount = Process->Vm.PageFaultCount; @@ -1023,7 +1023,7 @@ do { - hCount = hCount + (pr->ObjectTable ? ObpGetHandleCountByHandleTable(pr->ObjectTable) : 0); + hCount = hCount + ObGetProcessHandleCount(pr); pr = PsGetNextProcess(pr); if ((pr == syspr) || (pr == NULL)) break; @@ -1059,7 +1059,7 @@ { int Count = 0, HandleCount; - HandleCount = (pr->ObjectTable ? ObpGetHandleCountByHandleTable(pr->ObjectTable) : 0); + HandleCount = ObGetProcessHandleCount(pr); for (Count = 0; HandleCount > 0 ; HandleCount--) { Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h [iso-8859-1] Wed Jan 28 04:32:43 2009 @@ -71,12 +71,6 @@ (HANDLE)((ULONG_PTR)(Handle) | KERNEL_HANDLE_FLAG) // -// Returns the number of handles in a handle table -// -#define ObpGetHandleCountByHandleTable(HandleTable) \ - ((PHANDLE_TABLE)HandleTable)->HandleCount - -// // Converts from an EXHANDLE object to a POBJECT_HEADER // #define ObpGetHandleObject(x) \ @@ -124,7 +118,7 @@ LIST_ENTRY Link; ULONG RefCount; ULONG FullHash; - QUAD SecurityDescriptor; + QUAD SecurityDescriptor; } SECURITY_DESCRIPTOR_HEADER, *PSECURITY_DESCRIPTOR_HEADER; // @@ -568,6 +562,15 @@ IN BOOLEAN AllocateFromLookaside, IN POBJECT_CREATE_INFORMATION ObjectCreateInfo, OUT PUNICODE_STRING ObjectName +); + +// +// Miscellanea +// +ULONG +NTAPI +ObGetProcessHandleCount( + IN PEPROCESS Process ); // Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] Wed Jan 28 04:32:43 2009 @@ -52,6 +52,35 @@ { /* Release the process lock */ ExReleaseRundownProtection(&Process->RundownProtect); +} + +ULONG +NTAPI +ObGetProcessHandleCount(IN PEPROCESS Process) +{ + ULONG HandleCount; + PHANDLE_TABLE HandleTable; + + ASSERT(Process); + + /* Ensure the handle table doesn't go away while we use it */ + HandleTable = ObReferenceProcessHandleTable(Process); + + if (HandleTable != NULL) + { + /* Count the number of handles the process has */ + HandleCount = HandleTable->HandleCount; + + /* Let the handle table go */ + ObDereferenceProcessHandleTable(Process); + } + else + { + /* No handle table, no handles */ + HandleCount = 0; + } + + return HandleCount; } NTSTATUS Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=39… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Wed Jan 28 04:32:43 2009 @@ -237,7 +237,7 @@ } /* Count the number of handles this process has */ - HandleCount = ObpGetHandleCountByHandleTable(Process->ObjectTable); + HandleCount = ObGetProcessHandleCount(Process); /* Protect write in SEH */ _SEH2_TRY

15 years, 9 months

[hyperion] 39168: Corrected prototype of SystemFunction036 (RtlGenRandom): BOOL -> BOOLEAN Fixes a build regression introduced in r39167

by hyperion＠svn.reactos.org

Author: hyperion Date: Wed Jan 28 03:58:46 2009 New Revision: 39168 URL: http://svn.reactos.org/svn/reactos?rev=39168&view=rev Log: Corrected prototype of SystemFunction036 (RtlGenRandom): BOOL -> BOOLEAN Fixes a build regression introduced in r39167 Modified: trunk/reactos/dll/win32/advapi32/misc/sysfunc.c Modified: trunk/reactos/dll/win32/advapi32/misc/sysfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/sy… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/sysfunc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/sysfunc.c [iso-8859-1] Wed Jan 28 03:58:46 2009 @@ -564,7 +564,7 @@ * RETURNS * Always TRUE in my tests */ -BOOL +BOOLEAN WINAPI SystemFunction036(PVOID pbBuffer, ULONG dwLen) {

15 years, 9 months

[fireball] 39167: - Add RtlGenRandom.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Jan 28 03:38:49 2009 New Revision: 39167 URL: http://svn.reactos.org/svn/reactos?rev=39167&view=rev Log: - Add RtlGenRandom. Modified: trunk/reactos/include/psdk/ntsecapi.h Modified: trunk/reactos/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] Wed Jan 28 03:38:49 2009 @@ -665,6 +665,11 @@ TRUSTED_POSIX_OFFSET_INFO PosixOffset; TRUSTED_DOMAIN_AUTH_INFORMATION AuthInformation; } TRUSTED_DOMAIN_FULL_INFORMATION, *PTRUSTED_DOMAIN_FULL_INFORMATION; + +#define RtlGenRandom SystemFunction036 + +BOOLEAN WINAPI RtlGenRandom(PVOID,ULONG); + NTSTATUS NTAPI LsaAddAccountRights(LSA_HANDLE,PSID,PLSA_UNICODE_STRING,ULONG); NTSTATUS NTAPI LsaCallAuthenticationPackage(HANDLE,ULONG,PVOID,ULONG,PVOID*, PULONG,PNTSTATUS);

15 years, 9 months

[cwittich] 39166: draw a rect around the (not yet drawn) image

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Jan 28 03:09:30 2009 New Revision: 39166 URL: http://svn.reactos.org/svn/reactos?rev=39166&view=rev Log: draw a rect around the (not yet drawn) image Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] Wed Jan 28 03:09:30 2009 @@ -152,6 +152,7 @@ } DPRINT("x = %d\ny = %d\nWidth = %d\nHeight = %d\n\nrect.right = %d\nrect.bottom = %d\n\nuImgWidth = %d\nuImgHeight = %d\n", x, y, width, height, rect.right, rect.bottom, uImgWidth, uImgHeight); + Rectangle(hdc, x - 1, y - 1, x + width + 1, y + height + 1); GdipDrawImageRect(graphics, image, x, y, width, height); } GdipDeleteGraphics(graphics); @@ -380,7 +381,7 @@ } } } - break; + return TRUE; } case WM_SIZING: { @@ -432,8 +433,8 @@ // Initialize GDI+ gdiplusStartupInput.GdiplusVersion = 1; gdiplusStartupInput.DebugEventCallback = NULL; - gdiplusStartupInput.SuppressBackgroundThread = 0; - gdiplusStartupInput.SuppressExternalCodecs = 0; + gdiplusStartupInput.SuppressBackgroundThread = FALSE; + gdiplusStartupInput.SuppressExternalCodecs = FALSE; GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); pLoadImage(szFileName);

15 years, 9 months

[cwittich] 39165: remove redundant code

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Jan 28 02:56:55 2009 New Revision: 39165 URL: http://svn.reactos.org/svn/reactos?rev=39165&view=rev Log: remove redundant code Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Wed Jan 28 02:56:55 2009 @@ -654,8 +654,6 @@ if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info; - - coreheader = (BITMAPCOREHEADER*) Info; coreheader->bcWidth = psurf->SurfObj.sizlBitmap.cx; coreheader->bcPlanes = 1; coreheader->bcBitCount = BitsPerFormat(psurf->SurfObj.iBitmapFormat);

15 years, 9 months

[dchapyshev] 39164: - Add more TODO to .def

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Jan 28 02:22:39 2009 New Revision: 39164 URL: http://svn.reactos.org/svn/reactos?rev=39164&view=rev Log: - Add more TODO to .def Modified: trunk/reactos/dll/win32/user32/user32.def Modified: trunk/reactos/dll/win32/user32/user32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.de… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.def [iso-8859-1] Wed Jan 28 02:22:39 2009 @@ -62,7 +62,7 @@ CheckMenuRadioItem@20 CheckRadioButton@16 ChildWindowFromPoint@12 -ChildWindowFromPointEx@16 +ChildWindowFromPointEx@16 ; TODO: Direct call NtUserChildWindowFromPointEx ;CliImmSetHotKey ClientThreadSetup@0 ClientToScreen@8 @@ -121,7 +121,7 @@ DdeFreeStringHandle@8 DdeGetData@16 DdeGetLastError@4 -DdeGetQualityOfService@12 +DdeGetQualityOfService@12 ; TODO: Direct call NtUserDdeGetQualityOfService DdeImpersonateClient@4 DdeInitializeA@16 DdeInitializeW@16 @@ -133,7 +133,7 @@ DdeQueryStringA@20 DdeQueryStringW@20 DdeReconnect@4 -DdeSetQualityOfService@12 +DdeSetQualityOfService@12 ; TODO: Direct call NtUserDdeSetQualityOfService DdeSetUserHandle@12 DdeUnaccessData@4 DdeUninitialize@4 @@ -146,7 +146,7 @@ DefRawInputProc@12 DefWindowProcA@16 DefWindowProcW@16 -DeferWindowPos@32 +DeferWindowPos@32 ; TODO: Direct call NtUserDeferWindowPos DeleteMenu@12=NtUserDeleteMenu@12 DeregisterShellHookWindow@4 DestroyAcceleratorTable@4 @@ -174,7 +174,7 @@ DlgDirSelectComboBoxExW@16 DlgDirSelectExA@16 DlgDirSelectExW@16 -DragDetect@12 +DragDetect@12 ; TODO: Direct call NtUserDragDetect DragObject@20=NtUserDragObject@20 DrawAnimatedRects@16=NtUserDrawAnimatedRects@16 DrawCaption@16 @@ -212,7 +212,7 @@ EnumDesktopsW@12 EnumDisplayDevicesA@16 EnumDisplayDevicesW@16 -EnumDisplayMonitors@16 +EnumDisplayMonitors@16 ; TODO: Direct call NtUserEnumDisplayMonitors EnumDisplaySettingsA@12 EnumDisplaySettingsExA@16 EnumDisplaySettingsExW@16 @@ -243,7 +243,7 @@ GetAltTabInfo=GetAltTabInfoA@20 GetAltTabInfoA@20 GetAltTabInfoW@20 -GetAncestor@8 +GetAncestor@8 ; TODO: Direct call NtUserGetAncestor GetAppCompatFlags@4 GetAppCompatFlags2@4 GetAsyncKeyState@4 @@ -267,7 +267,7 @@ GetClipboardOwner@0=NtUserGetClipboardOwner@0 GetClipboardSequenceNumber@0=NtUserGetClipboardSequenceNumber@0 GetClipboardViewer@0=NtUserGetClipboardViewer@0 -GetComboBoxInfo@8 +GetComboBoxInfo@8 ; TODO: Direct call NtUserGetComboBoxInfo GetCursor@0 ;GetCursorFrameInfo GetCursorInfo@4=NtUserGetCursorInfo@4 @@ -325,7 +325,7 @@ GetMessageW@16 GetMonitorInfoA@8 GetMonitorInfoW@8 -GetMouseMovePointsEx@20 +GetMouseMovePointsEx@20 ; TODO: Direct call NtUserGetMouseMovePointsEx GetNextDlgGroupItem@12 GetNextDlgTabItem@12 GetOpenClipboardWindow@0=NtUserGetOpenClipboardWindow@0 @@ -352,7 +352,7 @@ GetSubMenu@8 GetSysColor@4 GetSysColorBrush@4 -GetSystemMenu@8 +GetSystemMenu@8 ; TODO: Direct call NtUserGetSystemMenu GetSystemMetrics@4 GetTabbedTextExtentA@20 GetTabbedTextExtentW@20 @@ -395,7 +395,7 @@ IMPQueryIMEW@4 IMPSetIMEA@8 IMPSetIMEW@8 -ImpersonateDdeClientWindow@8 +ImpersonateDdeClientWindow@8 ; TODO: Direct call NtUserImpersonateDdeClientWindow InSendMessage@0 InSendMessageEx@4 InflateRect@12 @@ -476,7 +476,7 @@ MapVirtualKeyW@8 MapWindowPoints@16 MB_GetString@4 -MenuItemFromPoint@16 +MenuItemFromPoint@16 ; TODO: Direct call NtUserMenuItemFromPoint MenuWindowProcA@16 MenuWindowProcW@16 MessageBeep@4 @@ -532,8 +532,8 @@ ;PrivateSetRipFlags PtInRect@12 ;QuerySendMessage -;QueryUserCounters -RealChildWindowFromPoint@12 +;QueryUserCounters ; TODO: Direct call NtUserQueryUserCounters +RealChildWindowFromPoint@12 ; TODO: Direct call NtUserRealChildWindowFromPoint RealGetWindowClass=RealGetWindowClassA@12 RealGetWindowClassA@12 RealGetWindowClassW@12 @@ -592,7 +592,7 @@ SetCaretPos@8 SetClassLongA@12 SetClassLongW@12 -SetClassWord@12 +SetClassWord@12 ; TODO: Direct call NtUserSetClassWord SetClipboardData@8 SetClipboardViewer@4=NtUserSetClipboardViewer@4 ;SetConsoleReserveKeys @@ -611,7 +611,7 @@ SetKeyboardState@4=NtUserSetKeyboardState@4 SetLastErrorEx@8 SetLayeredWindowAttributes@16=NtUserSetLayeredWindowAttributes@16 -SetLogonNotifyWindow@8 +SetLogonNotifyWindow@8 ; TODO: Direct call NtUserSetLogonNotifyWindow SetMenu@8 SetMenuContextHelpId@8=NtUserSetMenuContextHelpId@8 SetMenuDefaultItem@12=NtUserSetMenuDefaultItem@12 @@ -629,7 +629,7 @@ SetPropW@12 SetRect@20 SetRectEmpty@4 -SetScrollInfo@16 +SetScrollInfo@16 ; TODO: Direct call NtUserSetScrollInfo SetScrollPos@16 SetScrollRange@20 SetShellWindow@4 @@ -637,7 +637,7 @@ SetSysColors@12 SetSysColorsTemp@12 SetSystemCursor@8 -SetSystemMenu@8 +SetSystemMenu@8 ; TODO: Direct call NtUserSetSystemMenu SetSystemTimer@16=NtUserSetSystemTimer@16 SetTaskmanWindow@4 SetThreadDesktop@4=NtUserSetThreadDesktop@4 @@ -655,7 +655,7 @@ SetWindowStationUser@16 SetWindowTextA@8 SetWindowTextW@8 -SetWindowWord@12 +SetWindowWord@12 ; TODO: Direct call NtUserSetWindowWord SetWindowsHookA@8 SetWindowsHookExA@16 SetWindowsHookExW@16 @@ -682,9 +682,9 @@ ToAsciiEx@24 ToUnicode@24 ToUnicodeEx@28 -TrackMouseEvent@4 +TrackMouseEvent@4 ; TODO: Direct call NtUserTrackMouseEvent TrackPopupMenu@28 -TrackPopupMenuEx@24 +TrackPopupMenuEx@24 ; TODO: Direct call NtUserTrackPopupMenuEx TranslateAccelerator=TranslateAcceleratorA@12 TranslateAcceleratorA@12 TranslateAcceleratorW@12 @@ -717,7 +717,7 @@ ;UserRegisterWowHandlers ;VRipOutput ;VTagOutput -ValidateRect@8 +ValidateRect@8 ; TODO: Direct call NtUserValidateRect ValidateRgn@8 VkKeyScanA@4 VkKeyScanExA@8

15 years, 9 months

← Newer
1
...
6
7
8
9
10
11
12
...
76
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2009