September 2007 - Wine-commits

Dan Hipschman : widl: Fix alignment comments.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: b16de39417aad0393257370f52d05e07e362a9e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b16de39417aad0393257370f5… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Sep 18 15:28:17 2007 -0700 widl: Fix alignment comments. --- tools/widl/typegen.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 7851b77..71885c7 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -98,8 +98,8 @@ const char *string_of_type(unsigned char type) case RPC_FC_CARRAY: return "FC_CARRAY"; case RPC_FC_CVARRAY: return "FC_CVARRAY"; case RPC_FC_BOGUS_ARRAY: return "FC_BOGUS_ARRAY"; - case RPC_FC_ALIGNM4: return "RPC_FC_ALIGNM4"; - case RPC_FC_ALIGNM8: return "RPC_FC_ALIGNM8"; + case RPC_FC_ALIGNM4: return "FC_ALIGNM4"; + case RPC_FC_ALIGNM8: return "FC_ALIGNM8"; default: error("string_of_type: unknown type 0x%02x\n", type); return NULL;

1 0

Dan Hipschman : widl: Implement pointer descriptions for complex structures .
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: 8df79f0c999c4736326f381b59de8b31cf894beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8df79f0c999c4736326f381b5… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Sep 18 15:28:49 2007 -0700 widl: Implement pointer descriptions for complex structures. --- dlls/rpcrt4/tests/server.c | 16 ++++++++++++++++ dlls/rpcrt4/tests/server.idl | 15 +++++++++++++++ tools/widl/parser.y | 1 + tools/widl/typegen.c | 38 +++++++++++++++++++++++++++++++------- tools/widl/widltypes.h | 1 + 5 files changed, 64 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 879e0d1..2ed6de7 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -350,6 +350,12 @@ s_sum_padded(padded_t *p) return p->i + p->c; } +int +s_sum_bogus(bogus_t *b) +{ + return *b->h.p1 + *b->p2 + *b->p3 + b->c; +} + void s_stop(void) { @@ -399,6 +405,7 @@ basic_tests(void) pints_t pints; ptypes_t ptypes; padded_t padded; + bogus_t bogus; int i1, i2, i3, *pi2, *pi3, **ppi3; double u, v; float s, t; @@ -476,6 +483,15 @@ basic_tests(void) padded.i = -3; padded.c = 8; ok(sum_padded(&padded) == 5, "RPC sum_padded\n"); + + i1 = 14; + i2 = -7; + i3 = -4; + bogus.h.p1 = &i1; + bogus.p2 = &i2; + bogus.p3 = &i3; + bogus.c = 9; + ok(sum_bogus(&bogus) == 12, "RPC sum_bogus\n"); } static void diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index d84637c..44bb945 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -208,5 +208,20 @@ interface IServer int sum_padded(padded_t *p); + typedef struct + { + int *p1; + } bogus_helper_t; + + typedef struct + { + bogus_helper_t h; + int *p2; + int *p3; + char c; + } bogus_t; + + int sum_bogus(bogus_t *b); + void stop(void); } diff --git a/tools/widl/parser.y b/tools/widl/parser.y index ac24038..fbaf9a7 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1249,6 +1249,7 @@ static type_t *make_type(unsigned char type, type_t *ref) t->size_is = NULL; t->length_is = NULL; t->typestring_offset = 0; + t->ptrdesc = 0; t->declarray = FALSE; t->ignore = (parse_only != 0); t->is_const = FALSE; diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 71885c7..573d88b 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -100,6 +100,7 @@ const char *string_of_type(unsigned char type) case RPC_FC_BOGUS_ARRAY: return "FC_BOGUS_ARRAY"; case RPC_FC_ALIGNM4: return "FC_ALIGNM4"; case RPC_FC_ALIGNM8: return "FC_ALIGNM8"; + case RPC_FC_POINTER: return "FC_POINTER"; default: error("string_of_type: unknown type 0x%02x\n", type); return NULL; @@ -918,7 +919,8 @@ static void write_user_tfs(FILE *file, type_t *type, unsigned int *tfsoff) *tfsoff += 2; } -static void write_member_type(FILE *file, type_t *type, const var_t *field, +static void write_member_type(FILE *file, const type_t *cont, + const attr_list_t *attrs, const type_t *type, unsigned int *corroff, unsigned int *tfsoff) { if (is_embedded_complex(type)) @@ -926,7 +928,7 @@ static void write_member_type(FILE *file, type_t *type, const var_t *field, size_t absoff; short reloff; - if (is_union(type->type) && is_attr(field->attrs, ATTR_SWITCHIS)) + if (is_union(type->type) && is_attr(attrs, ATTR_SWITCHIS)) { absoff = *corroff; *corroff += 8; @@ -946,7 +948,10 @@ static void write_member_type(FILE *file, type_t *type, const var_t *field, } else if (is_ptr(type)) { - print_file(file, 2, "0x8,\t/* FC_LONG */\n"); + unsigned char fc = (cont->type == RPC_FC_BOGUS_STRUCT + ? RPC_FC_POINTER + : RPC_FC_LONG); + print_file(file, 2, "0x%x,\t/* %s */\n", fc, string_of_type(fc)); *tfsoff += 1; } else if (!write_base_type(file, type, tfsoff)) @@ -1521,7 +1526,7 @@ static size_t write_array_tfs(FILE *file, const attr_list_t *attrs, type_t *type *typestring_offset += 1; } - write_member_type(file, type->ref, NULL, NULL, typestring_offset); + write_member_type(file, type, NULL, type->ref, NULL, typestring_offset); write_end(file, typestring_offset); } else @@ -1579,7 +1584,8 @@ static void write_struct_members(FILE *file, const type_t *type, offset = (offset + (align - 1)) & ~(align - 1); *typestring_offset += 1; } - write_member_type(file, ft, field, corroff, typestring_offset); + write_member_type(file, type, field->attrs, field->type, corroff, + typestring_offset); offset += size; } } @@ -1655,8 +1661,12 @@ static size_t write_struct_tfs(FILE *file, type_t *type, if (type->type == RPC_FC_BOGUS_STRUCT) { - - print_file(file, 2, "NdrFcShort(0x0),\t/* FIXME: pointer stuff */\n"); + /* On the sizing pass, type->ptrdesc may be zero, but it's ok as + nothing is written to file yet. On the actual writing pass, + this will have been updated. */ + short reloff = type->ptrdesc - *tfsoff; + print_file(file, 2, "NdrFcShort(0x%hx),\t/* Offset= %hd (%u) */\n", + reloff, reloff, type->ptrdesc); *tfsoff += 2; } else if ((type->type == RPC_FC_PSTRUCT) || @@ -1673,6 +1683,20 @@ static size_t write_struct_tfs(FILE *file, type_t *type, write_struct_members(file, type, &corroff, tfsoff); + if (type->type == RPC_FC_BOGUS_STRUCT) + { + const var_list_t *fs = type->fields; + const var_t *f; + + type->ptrdesc = *tfsoff; + if (fs) LIST_FOR_EACH_ENTRY(f, fs, const var_t, entry) + { + type_t *ft = f->type; + if (is_ptr(ft)) + write_pointer_tfs(file, ft, tfsoff); + } + } + current_structure = save_current_structure; return start_offset; } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index d514d54..2b1aaa9 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -214,6 +214,7 @@ struct _type_t { expr_t *size_is, *length_is; type_t *orig; /* dup'd types */ unsigned int typestring_offset; + unsigned int ptrdesc; /* used for complex structs */ int typelib_idx; unsigned int declarray : 1; /* if declared as an array */ unsigned int ignore : 1;

1 0

Dan Hipschman : widl: Handle all buffer sizes.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: 6eb07cb100086ce52fe83d3134899a197b7b71e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eb07cb100086ce52fe83d313… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Sep 18 15:29:26 2007 -0700 widl: Handle all buffer sizes. --- tools/widl/typegen.c | 41 +++++++++++++---------------------------- 1 files changed, 13 insertions(+), 28 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 573d88b..d821065 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2176,16 +2176,14 @@ void write_typeformatstring(FILE *file, const ifref_list_t *ifaces, int for_obje static unsigned int get_required_buffer_size_type( const type_t *type, const char *name, unsigned int *alignment) { - size_t size = 0; - *alignment = 0; if (is_user_type(type)) { const char *uname; const type_t *utype = get_user_type(type, &uname); - size = get_required_buffer_size_type(utype, uname, alignment); + return get_required_buffer_size_type(utype, uname, alignment); } - else if (!is_ptr(type)) + else { switch (type->type) { @@ -2194,16 +2192,14 @@ static unsigned int get_required_buffer_size_type( case RPC_FC_USMALL: case RPC_FC_SMALL: *alignment = 4; - size = 1; - break; + return 1; case RPC_FC_WCHAR: case RPC_FC_USHORT: case RPC_FC_SHORT: case RPC_FC_ENUM16: *alignment = 4; - size = 2; - break; + return 2; case RPC_FC_ULONG: case RPC_FC_LONG: @@ -2211,14 +2207,12 @@ static unsigned int get_required_buffer_size_type( case RPC_FC_FLOAT: case RPC_FC_ERROR_STATUS_T: *alignment = 4; - size = 4; - break; + return 4; case RPC_FC_HYPER: case RPC_FC_DOUBLE: *alignment = 8; - size = 8; - break; + return 8; case RPC_FC_IGNORE: case RPC_FC_BIND_PRIMITIVE: @@ -2227,6 +2221,7 @@ static unsigned int get_required_buffer_size_type( case RPC_FC_STRUCT: case RPC_FC_PSTRUCT: { + size_t size = 0; const var_t *field; if (!type->fields) return 0; LIST_FOR_EACH_ENTRY( field, type->fields, const var_t, entry ) @@ -2235,33 +2230,23 @@ static unsigned int get_required_buffer_size_type( size += get_required_buffer_size_type(field->type, field->name, &alignment); } - break; + return size; } case RPC_FC_RP: - if (is_base_type( type->ref->type ) || type->ref->type == RPC_FC_STRUCT) - size = get_required_buffer_size_type( type->ref, name, alignment ); - break; + return + is_base_type( type->ref->type ) || type->ref->type == RPC_FC_STRUCT + ? get_required_buffer_size_type( type->ref, name, alignment ) + : 0; case RPC_FC_SMFARRAY: case RPC_FC_LGFARRAY: - size = type->dim * get_required_buffer_size_type(type->ref, name, alignment); - break; - - case RPC_FC_SMVARRAY: - case RPC_FC_LGVARRAY: - case RPC_FC_CARRAY: - case RPC_FC_CVARRAY: - case RPC_FC_BOGUS_ARRAY: - size = 0; - break; + return type->dim * get_required_buffer_size_type(type->ref, name, alignment); default: - error("get_required_buffer_size: Unknown/unsupported type: %s (0x%02x)\n", name, type->type); return 0; } } - return size; } static unsigned int get_required_buffer_size(const var_t *var, unsigned int *alignment, enum pass pass)

1 0

Dan Hipschman : widl: Implement complex arrays.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: 132f06cd48c7ebd176649a5e00795e7a7fc67adb URL: http://source.winehq.org/git/wine.git/?a=commit;h=132f06cd48c7ebd176649a5e0… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Sep 18 15:29:59 2007 -0700 widl: Implement complex arrays. --- dlls/rpcrt4/tests/server.c | 12 ++++++++++++ dlls/rpcrt4/tests/server.idl | 1 + tools/widl/parser.y | 25 ++++++++++++++++++++++--- tools/widl/typegen.c | 25 +++++++++++++++++++------ tools/widl/typegen.h | 1 + 5 files changed, 55 insertions(+), 9 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 2ed6de7..40f9a81 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -351,6 +351,12 @@ s_sum_padded(padded_t *p) } int +s_sum_padded2(padded_t ps[2]) +{ + return s_sum_padded(&ps[0]) + s_sum_padded(&ps[1]); +} + +int s_sum_bogus(bogus_t *b) { return *b->h.p1 + *b->p2 + *b->p3 + b->c; @@ -405,6 +411,7 @@ basic_tests(void) pints_t pints; ptypes_t ptypes; padded_t padded; + padded_t padded2[2]; bogus_t bogus; int i1, i2, i3, *pi2, *pi3, **ppi3; double u, v; @@ -483,6 +490,11 @@ basic_tests(void) padded.i = -3; padded.c = 8; ok(sum_padded(&padded) == 5, "RPC sum_padded\n"); + padded2[0].i = -5; + padded2[0].c = 1; + padded2[1].i = 3; + padded2[1].c = 7; + ok(sum_padded2(padded2) == 6, "RPC sum_padded2\n"); i1 = 14; i2 = -7; diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 44bb945..23ca779 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -207,6 +207,7 @@ interface IServer } padded_t; int sum_padded(padded_t *p); + int sum_padded2(padded_t ps[2]); typedef struct { diff --git a/tools/widl/parser.y b/tools/widl/parser.y index fbaf9a7..46fb439 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1365,9 +1365,28 @@ static void set_type(var_t *v, type_t *type, int ptr_level, array_dims_t *arr) } } - /* if the structure is complex, then so must be the encompassing array */ - if (is_array(v->type) && (v->type->ref->type == RPC_FC_BOGUS_STRUCT)) - v->type->type = RPC_FC_BOGUS_ARRAY; + if (is_array(v->type)) + { + const type_t *rt = v->type->ref; + switch (rt->type) + { + case RPC_FC_BOGUS_STRUCT: + case RPC_FC_NON_ENCAPSULATED_UNION: + case RPC_FC_ENCAPSULATED_UNION: + case RPC_FC_ENUM16: + v->type->type = RPC_FC_BOGUS_ARRAY; + break; + /* FC_RP should be above, but widl overuses these, and will break things. */ + case RPC_FC_UP: + case RPC_FC_RP: + if (rt->ref->type == RPC_FC_IP) + v->type->type = RPC_FC_BOGUS_ARRAY; + break; + default: + if (is_user_type(rt)) + v->type->type = RPC_FC_BOGUS_ARRAY; + } + } } static ifref_list_t *append_ifref(ifref_list_t *list, ifref_t *iface) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index d821065..6625bda 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -200,7 +200,7 @@ static type_t *get_user_type(const type_t *t, const char **pname) } } -static int is_user_type(const type_t *t) +int is_user_type(const type_t *t) { return get_user_type(t, NULL) != NULL; } @@ -1448,6 +1448,11 @@ static size_t write_array_tfs(FILE *file, const attr_list_t *attrs, type_t *type size_t start_offset; int has_pointer; int pointer_type = get_attrv(attrs, ATTR_POINTERTYPE); + unsigned int baseoff + = type->declarray && current_structure + ? type_memsize(current_structure, &align) + : 0; + if (!pointer_type) pointer_type = RPC_FC_RP; @@ -1470,10 +1475,6 @@ static size_t write_array_tfs(FILE *file, const attr_list_t *attrs, type_t *type if (type->type != RPC_FC_BOGUS_ARRAY) { unsigned char tc = type->type; - unsigned int baseoff - = type->declarray && current_structure - ? type_memsize(current_structure, &align) - : 0; if (tc == RPC_FC_LGFARRAY || tc == RPC_FC_LGVARRAY) { @@ -1530,7 +1531,19 @@ static size_t write_array_tfs(FILE *file, const attr_list_t *attrs, type_t *type write_end(file, typestring_offset); } else - error("%s: complex arrays unimplemented\n", name); + { + unsigned int dim = size_is ? 0 : type->dim; + print_file(file, 2, "NdrFcShort(0x%x),\t/* %u */\n", dim, dim); + *typestring_offset += 2; + *typestring_offset + += write_conf_or_var_desc(file, current_structure, baseoff, + size_is); + *typestring_offset + += write_conf_or_var_desc(file, current_structure, baseoff, + length_is); + write_member_type(file, type, NULL, type->ref, NULL, typestring_offset); + write_end(file, typestring_offset); + } return start_offset; } diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index 448e503..fc17c19 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -56,3 +56,4 @@ int decl_indirect(const type_t *t); void write_parameters_init(FILE *file, int indent, const func_t *func); void print(FILE *file, int indent, const char *format, va_list ap); int get_padding(const var_list_t *fields); +int is_user_type(const type_t *t);

1 0

Stefan Dösinger : wined3d: Untie culling and offscreen rendering.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: 5a63b79a66434e8f56de27cd1616036e9f29fd8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a63b79a66434e8f56de27cd1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 18 11:43:09 2007 +0200 wined3d: Untie culling and offscreen rendering. --- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/state.c | 37 +++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 4 +++- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c7622cb..403acdf 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -706,11 +706,11 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf IWineD3DSwapChain_Release(swapchain); if(oldRenderOffscreen) { - Context_MarkStateDirty(context, WINED3DRS_CULLMODE); Context_MarkStateDirty(context, WINED3DTS_PROJECTION); Context_MarkStateDirty(context, STATE_VDECL); Context_MarkStateDirty(context, STATE_VIEWPORT); Context_MarkStateDirty(context, STATE_SCISSORRECT); + Context_MarkStateDirty(context, STATE_FRONTFACE); } } else { @@ -794,11 +794,11 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf } if(!oldRenderOffscreen) { - Context_MarkStateDirty(context, WINED3DRS_CULLMODE); Context_MarkStateDirty(context, WINED3DTS_PROJECTION); Context_MarkStateDirty(context, STATE_VDECL); Context_MarkStateDirty(context, STATE_VIEWPORT); Context_MarkStateDirty(context, STATE_SCISSORRECT); + Context_MarkStateDirty(context, STATE_FRONTFACE); } } if (readTexture) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index da2fb3c..b248d00 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -132,11 +132,9 @@ static void state_zenable(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD } static void state_cullmode(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { - /* TODO: Put this into the offscreen / onscreen rendering block due to device->render_offscreen */ - - /* If we are culling "back faces with clockwise vertices" then - set front faces to be counter clockwise and enable culling - of back faces */ + /* glFrontFace() is set in context.c at context init and on an offscreen / onscreen rendering + * switch + */ switch ((WINED3DCULL) stateblock->renderState[WINED3DRS_CULLMODE]) { case WINED3DCULL_NONE: glDisable(GL_CULL_FACE); @@ -145,26 +143,14 @@ static void state_cullmode(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine case WINED3DCULL_CW: glEnable(GL_CULL_FACE); checkGLcall("glEnable GL_CULL_FACE"); - if (stateblock->wineD3DDevice->render_offscreen) { - glFrontFace(GL_CW); - checkGLcall("glFrontFace GL_CW"); - } else { - glFrontFace(GL_CCW); - checkGLcall("glFrontFace GL_CCW"); - } - glCullFace(GL_BACK); + glCullFace(GL_FRONT); + checkGLcall("glCullFace(GL_FRONT)"); break; case WINED3DCULL_CCW: glEnable(GL_CULL_FACE); checkGLcall("glEnable GL_CULL_FACE"); - if (stateblock->wineD3DDevice->render_offscreen) { - glFrontFace(GL_CCW); - checkGLcall("glFrontFace GL_CCW"); - } else { - glFrontFace(GL_CW); - checkGLcall("glFrontFace GL_CW"); - } glCullFace(GL_BACK); + checkGLcall("glCullFace(GL_BACK)"); break; default: FIXME("Unrecognized/Unhandled WINED3DCULL value %d\n", stateblock->renderState[WINED3DRS_CULLMODE]); @@ -3605,6 +3591,16 @@ static void indexbuffer(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D } } +static void frontface(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + if(stateblock->wineD3DDevice->render_offscreen) { + glFrontFace(GL_CCW); + checkGLcall("glFrontFace(GL_CCW)"); + } else { + glFrontFace(GL_CW); + checkGLcall("glFrontFace(GL_CW)"); + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -4676,4 +4672,5 @@ const struct StateEntry StateTable[] = { /* STATE_CLIPPLANE(31) */ STATE_CLIPPLANE(31), clipplane }, { /* STATE_MATERIAL */ STATE_RENDER(WINED3DRS_SPECULARENABLE), state_specularenable}, + { /* STATE_FRONTFACE */ STATE_FRONTFACE, frontface }, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8b71e03..b7e08fc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -481,7 +481,9 @@ typedef void (*APPLYSTATEFUNC)(DWORD state, IWineD3DStateBlockImpl *stateblock, #define STATE_MATERIAL (STATE_CLIPPLANE(MAX_CLIPPLANES)) -#define STATE_HIGHEST (STATE_MATERIAL) +#define STATE_FRONTFACE (STATE_MATERIAL + 1) + +#define STATE_HIGHEST (STATE_FRONTFACE) struct StateEntry {

1 0

Rob Shearman : rpcrt4: Fix a copy-and-paste error in RpcAuthInfo_Release that caused a double free of memory .
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: 5191498564d3949f1a2eb1922c72e116db19c0f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5191498564d3949f1a2eb1922… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Sep 18 16:31:55 2007 +0100 rpcrt4: Fix a copy-and-paste error in RpcAuthInfo_Release that caused a double free of memory. --- dlls/rpcrt4/rpc_binding.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index f69d290..2df1206 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -1001,7 +1001,7 @@ ULONG RpcAuthInfo_Release(RpcAuthInfo *AuthInfo) { HeapFree(GetProcessHeap(), 0, AuthInfo->nt_identity->User); HeapFree(GetProcessHeap(), 0, AuthInfo->nt_identity->Domain); - HeapFree(GetProcessHeap(), 0, AuthInfo->nt_identity->User); + HeapFree(GetProcessHeap(), 0, AuthInfo->nt_identity->Password); HeapFree(GetProcessHeap(), 0, AuthInfo->nt_identity); } HeapFree(GetProcessHeap(), 0, AuthInfo);

1 0

Alexandre Julliard : winetest.exe: We can now store binary files in the repository.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: ba465823b5f71d3ba719bf51d304119b14bedbc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba465823b5f71d3ba719bf51d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 18 13:25:01 2007 +0200 winetest.exe: We can now store binary files in the repository. --- .gitignore | 1 - programs/winetest/Makefile.in | 5 +-- programs/winetest/dist.rc | 5 +++ programs/winetest/wine.ico | Bin 0 -> 1078 bytes programs/winetest/winetest.rc | 72 +---------------------------------------- 5 files changed, 7 insertions(+), 76 deletions(-) diff --git a/.gitignore b/.gitignore index bc2c41c..60303cf 100644 --- a/.gitignore +++ b/.gitignore @@ -731,7 +731,6 @@ programs/winetest/user32_test.exe programs/winetest/usp10_test.exe programs/winetest/uxtheme_test.exe programs/winetest/version_test.exe -programs/winetest/wine.ico programs/winetest/winetest programs/winetest/winetest.res programs/winetest/wininet_test.exe diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 30d29ff..a2a7f98 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -15,9 +15,6 @@ C_SRCS = \ RC_SRCS = \ winetest.rc -RC_BINSRC = winetest.rc -RC_BINARIES = wine.ico - @MAKE_PROG_RULES@ # List of test executables (auto-generated by make_makefiles) @@ -251,6 +248,6 @@ winetest-dist.exe: $(OBJS) dist.res.o Makefile.in tests.rc: maketest Makefile.in $(SRCDIR)/maketest $(TOPSRCDIR) > $@ || ($(RM) $@ && exit 1) -dist.res: winetest.rc tests.rc build.id build.nfo tests.url $(TESTBINS) $(RC_BINARIES) +dist.res: winetest.rc tests.rc build.id build.nfo tests.url wine.ico $(TESTBINS) @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/programs/winetest/dist.rc b/programs/winetest/dist.rc index 7bd6362..111bf9c 100644 --- a/programs/winetest/dist.rc +++ b/programs/winetest/dist.rc @@ -21,6 +21,11 @@ #include "winetest.rc" #include "tests.rc" +/* @makedep: build.id */ WINE_BUILD STRINGRES "build.id" + +/* @makedep: build.nfo */ BUILD_INFO STRINGRES "build.nfo" + +/* @makedep: tests.url */ TESTS_URL STRINGRES "tests.url" diff --git a/programs/winetest/wine.ico b/programs/winetest/wine.ico new file mode 100644 index 0000000..fc394c9 Binary files /dev/null and b/programs/winetest/wine.ico differ diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index ff6e2c2..566135f 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -73,78 +73,8 @@ BEGIN DEFPUSHBUTTON "Close", IDCANCEL, 55, 40, 40, 14 END -/* BINRES wine.ico */ +/* @makedep: wine.ico */ IDI_WINE ICON "wine.ico" -/* { - '00 00 01 00 02 00 20 20 10 00 00 00 00 00 E8 02' - '00 00 26 00 00 00 10 10 10 00 00 00 00 00 28 01' - '00 00 0E 03 00 00 28 00 00 00 20 00 00 00 40 00' - '00 00 01 00 04 00 00 00 00 00 00 02 00 00 00 00' - '00 00 00 00 00 00 10 00 00 00 00 00 00 00 39 02' - 'B1 00 23 02 6C 00 0F 03 29 00 1B 02 51 00 FF FF' - 'FF 00 1B 1A 1B 00 1E 02 63 00 33 02 A1 00 08 08' - '08 00 14 03 3C 00 0C 04 1E 00 2E 02 8E 00 10 0F' - '10 00 2A 02 82 00 29 02 7D 00 03 02 04 00 44 44' - '44 44 44 44 44 44 55 44 44 44 44 44 44 44 44 44' - '44 44 44 44 8F FF 84 44 44 44 44 44 44 44 44 44' - '44 44 44 8F F8 F8 44 44 44 44 44 44 44 44 44 44' - '44 44 8F FF F5 44 44 44 44 44 44 44 44 44 44 44' - '44 5C F8 C8 F5 44 44 44 44 44 44 44 44 44 44 44' - '44 44 44 44 85 44 44 44 44 44 44 44 44 44 44 44' - '44 44 44 44 4C 44 44 44 44 44 44 44 44 44 44 44' - '44 44 44 44 4C 44 44 44 44 44 44 44 44 44 44 44' - '44 44 44 44 45 54 44 44 44 44 44 44 44 44 44 44' - '44 44 44 44 45 F4 44 44 44 44 44 44 44 44 44 44' - '44 44 44 44 45 FF 44 44 44 44 44 44 44 44 44 44' - '44 44 44 44 48 FF F4 44 44 44 44 44 44 44 44 44' - '44 44 44 44 48 23 9A 84 44 44 44 44 44 44 44 44' - '44 44 44 44 42 B7 7E AF 44 44 44 44 44 44 44 44' - '44 44 44 44 49 00 00 EA C4 44 44 44 44 44 44 44' - '44 44 44 44 46 00 00 01 F4 44 44 44 44 44 44 44' - '44 44 44 44 46 00 00 00 9F 44 44 44 44 44 44 44' - '44 44 44 44 46 00 70 00 EF 44 44 44 44 44 44 44' - '44 44 44 44 43 00 00 00 79 F4 44 44 44 44 44 44' - '44 44 44 44 49 00 00 00 0E F4 44 44 44 44 44 44' - '44 44 44 44 42 00 00 00 07 24 44 44 44 44 44 44' - '44 44 44 44 43 B0 00 00 00 34 44 44 44 44 44 44' - '44 44 44 44 4C 30 00 00 00 1F 44 44 44 44 44 44' - '44 44 44 44 48 27 E1 1D B1 2C 44 44 44 44 44 44' - '44 44 44 44 44 A9 CC CF F8 48 C4 44 44 44 44 44' - '44 44 44 44 44 58 44 44 44 45 C4 44 44 44 44 44' - '44 44 44 44 44 4C 44 44 44 44 84 44 44 44 44 44' - '44 44 44 44 44 48 44 44 44 44 C4 44 44 44 44 44' - '44 44 44 44 44 48 C4 44 44 44 C4 44 44 44 44 44' - '44 44 44 44 44 44 F4 44 44 4C C4 44 44 44 44 44' - '44 44 44 44 44 44 84 44 F8 84 44 44 44 44 44 44' - '44 44 44 44 44 44 48 F8 44 44 44 44 44 44 FF FF' - '3F FF FF F0 7F FF FF C0 FF FF FF 03 FF FF FC 03' - 'FF FF FF F3 FF FF FF FB FF FF FF FB FF FF FF F9' - 'FF FF FF F9 FF FF FF F8 FF FF FF F8 7F FF FF F8' - '1F FF FF F8 0F FF FF F8 07 FF FF F8 07 FF FF F8' - '03 FF FF F8 03 FF FF F8 01 FF FF F8 01 FF FF F8' - '01 FF FF F8 01 FF FF F8 00 FF FF F8 00 FF FF FC' - '02 7F FF FC FE 7F FF FE FF 7F FF FE FF 7F FF FE' - '7F 7F FF FF 7E 7F FF FF 71 FF FF FF 8F FF 28 00' - '00 00 10 00 00 00 20 00 00 00 01 00 04 00 00 00' - '00 00 80 00 00 00 00 00 00 00 00 00 00 00 10 00' - '00 00 00 00 00 00 3A 02 B1 00 0A 06 14 00 12 03' - '33 00 FF FF FF 00 12 12 12 00 0B 0B 0B 00 1B 1B' - '1B 00 25 02 6F 00 2E 02 92 00 1A 02 52 00 36 02' - 'A6 00 15 03 3E 00 04 04 05 00 13 11 19 00 1E 02' - '62 00 2A 02 82 00 33 33 33 CC 43 33 33 33 33 33' - 'CC 5C 33 33 33 33 33 36 C5 53 33 33 33 33 33 33' - '33 43 33 33 33 33 33 33 33 65 33 33 33 33 33 33' - '33 DC 33 33 33 33 33 33 33 17 EC 33 33 33 33 33' - '33 B0 07 53 33 33 33 33 33 90 00 B3 33 33 33 33' - '33 B0 00 FC 33 33 33 33 33 BA 00 A2 33 33 33 33' - '33 C7 88 82 33 33 33 33 33 3D D5 14 43 33 33 33' - '33 35 33 33 53 33 33 33 33 33 53 33 53 33 33 33' - '33 33 C5 5C 33 33 FC 7F 00 00 F0 FF 00 00 E1 FF' - '00 00 FD FF 00 00 FC FF 00 00 FC FF 00 00 FC 3F' - '00 00 FC 1F 00 00 FC 1F 00 00 FC 0F 00 00 FC 0F' - '00 00 FC 0F 00 00 FE 07 00 00 FE F7 00 00 FF 77' - '00 00 FF 0F 00 00' -} */ /* list of tests (automatically generated by make_makefiles) */

1 0

Alexandre Julliard : wordpad.exe: We can now store binary files in the repository.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: eb030986818b594ec0b89b04a13287814b365084 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb030986818b594ec0b89b04a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 18 13:25:50 2007 +0200 wordpad.exe: We can now store binary files in the repository. --- .gitignore | 6 - programs/wordpad/Makefile.in | 8 - programs/wordpad/formatbar.bmp | Bin 0 -> 1014 bytes programs/wordpad/rsrc.rc | 664 +--------------------------------------- programs/wordpad/rtf.ico | Bin 0 -> 2238 bytes programs/wordpad/toolbar.bmp | Bin 0 -> 246 bytes programs/wordpad/txt.ico | Bin 0 -> 2238 bytes programs/wordpad/wordpad.ico | Bin 0 -> 2238 bytes programs/wordpad/wri.ico | Bin 0 -> 2238 bytes 9 files changed, 6 insertions(+), 672 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb030986818b594ec0b89…

1 0

Alexandre Julliard : tools: Remove the no longer needed bin2res tool.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: b64ceefde35f64e04946317d6804c2293749e1ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=b64ceefde35f64e04946317d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 18 13:29:07 2007 +0200 tools: Remove the no longer needed bin2res tool. --- .gitignore | 1 - Make.rules.in | 8 +- tools/Makefile.in | 5 - tools/bin2res.c | 283 ----------------------------------------------------- 4 files changed, 2 insertions(+), 295 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b64ceefde35f64e049463…

1 0

Alexandre Julliard : uninstaller.exe: We can now store binary files in the repository.
by Alexandre Julliard 19 Sep '07

19 Sep '07

Module: wine Branch: master Commit: 0bed768ec6b158db17b25e325c24045b6be11f31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bed768ec6b158db17b25e325… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 18 13:19:44 2007 +0200 uninstaller.exe: We can now store binary files in the repository. --- .gitignore | 1 - programs/uninstaller/Makefile.in | 2 - programs/uninstaller/rsrc.rc | 52 +--------------------------------- programs/uninstaller/uninstaller.ico | Bin 0 -> 766 bytes 4 files changed, 1 insertions(+), 54 deletions(-) diff --git a/.gitignore b/.gitignore index 3b17d9a..26108bb 100644 --- a/.gitignore +++ b/.gitignore @@ -647,7 +647,6 @@ programs/taskmgr/taskmgr programs/taskmgr/taskmgr.res programs/uninstaller/rsrc.res programs/uninstaller/uninstaller -programs/uninstaller/uninstaller.ico programs/view/view programs/view/viewrc.res programs/wineapploader diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in index 7855811..7694c6a 100644 --- a/programs/uninstaller/Makefile.in +++ b/programs/uninstaller/Makefile.in @@ -10,8 +10,6 @@ C_SRCS = \ main.c RC_SRCS = rsrc.rc -RC_BINSRC = rsrc.rc -RC_BINARIES = uninstaller.ico @MAKE_PROG_RULES@ diff --git a/programs/uninstaller/rsrc.rc b/programs/uninstaller/rsrc.rc index 701e031..5c1c946 100644 --- a/programs/uninstaller/rsrc.rc +++ b/programs/uninstaller/rsrc.rc @@ -46,55 +46,5 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -/* BINRES uninstaller.ico */ +/* @makedep: uninstaller.ico */ UNINSTALLER ICON MOVEABLE uninstaller.ico -/* { - '00 00 01 00 01 00 20 20 10 00 00 00 00 00 E8 02' - '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' - '00 00 01 00 04 00 00 00 00 00 00 02 00 00 00 00' - '00 00 00 00 00 00 10 00 00 00 00 00 00 00 FF 19' - '00 00 00 00 00 00 7F 7F 7F 00 FF FF FF 00 00 00' - 'FF 00 D6 D6 D6 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 44 11' - '11 11 11 11 11 11 11 11 11 11 11 11 11 44 44 41' - '11 11 11 11 11 11 11 11 11 11 11 11 14 44 44 44' - '00 00 00 00 00 00 00 00 00 00 00 00 44 41 14 44' - '40 00 00 00 00 00 00 00 00 00 00 04 44 11 11 14' - '44 00 00 00 00 00 00 00 00 00 00 44 41 11 11 10' - '44 43 33 33 33 33 33 33 33 33 34 44 01 11 11 10' - '04 44 33 33 33 33 33 33 33 33 44 40 01 11 11 10' - '00 44 42 22 22 33 32 22 22 24 44 00 01 11 11 10' - '00 34 44 33 33 33 33 33 33 44 43 00 01 11 11 10' - '00 32 44 42 22 22 22 22 24 44 33 00 01 11 11 10' - '00 33 34 44 33 33 33 33 44 43 33 00 01 11 11 10' - '00 32 22 44 42 23 32 24 44 23 33 00 01 11 11 10' - '00 33 33 34 44 33 33 44 43 33 33 00 01 11 11 10' - '00 32 22 22 44 43 24 44 22 23 33 00 01 11 11 10' - '00 33 33 33 34 44 44 43 33 33 33 00 01 11 11 10' - '00 32 22 22 22 44 44 33 33 33 33 00 01 11 11 10' - '00 33 33 33 33 44 44 33 33 33 33 00 01 11 11 10' - '00 00 00 00 04 44 44 40 00 00 00 00 01 11 11 10' - '00 00 00 00 44 40 04 44 00 00 00 00 01 11 11 10' - '00 00 00 04 44 00 00 44 40 00 00 00 01 11 11 10' - '00 00 05 44 45 55 55 54 44 00 00 00 01 11 11 10' - '00 00 04 44 55 55 55 00 44 40 00 00 01 11 11 10' - '00 00 44 45 55 55 55 00 04 44 00 00 01 11 11 10' - '00 04 44 55 55 55 55 00 05 44 40 00 01 11 11 10' - '00 44 45 55 55 55 55 00 05 54 44 00 01 11 11 10' - '04 44 05 55 55 55 55 00 05 50 44 40 11 11 11 10' - '44 40 05 55 55 55 55 00 05 50 04 44 41 11 11 14' - '44 00 05 55 55 55 55 00 05 50 00 44 44 41 14 44' - '40 00 05 55 55 55 55 55 55 50 01 14 44 44 14 44' - '11 11 11 11 11 11 11 11 11 11 11 11 44 44 44 41' - '11 11 11 11 11 11 11 11 11 11 11 11 14 44 44 11' - '11 11 11 11 11 11 11 11 11 11 11 11 11 44 3F FF' - 'FF FC 00 00 00 00 80 00 00 01 C0 00 00 03 C0 00' - '00 03 C0 00 00 03 C0 00 00 03 C0 00 00 03 C0 00' - '00 03 C0 00 00 03 C0 00 00 03 C0 00 00 03 C0 00' - '00 03 C0 00 00 03 C0 00 00 03 C0 00 00 03 C0 00' - '00 03 C0 00 00 03 C0 00 00 03 C0 00 00 03 C0 00' - '00 03 C0 00 00 03 C0 00 00 03 C0 00 00 03 C0 00' - '00 03 C0 00 00 03 C0 00 00 0F C0 00 00 07 C0 00' - '00 03 80 00 00 31 1F FF FF F8 3F FF FF FC' -} */ diff --git a/programs/uninstaller/uninstaller.ico b/programs/uninstaller/uninstaller.ico new file mode 100644 index 0000000..fcc5894 Binary files /dev/null and b/programs/uninstaller/uninstaller.ico differ

1 0