March 2010 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Add a separate function to set the pixel format in context_create().
by Alexandre Julliard March 16, 2010

March 16, 2010

Module: wine Branch: master Commit: b281f23efef0b2de3aaee90497814d59777facf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b281f23efef0b2de3aaee9049… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 15 21:07:24 2010 +0100 wined3d: Add a separate function to set the pixel format in context_create(). --- dlls/wined3d/context.c | 81 ++++++++++++++++++++++++++---------------------- 1 files changed, 44 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index bb7be47..e972721 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -647,6 +647,47 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource } } +static BOOL context_set_pixel_format(const struct wined3d_gl_info *gl_info, HDC dc, int format) +{ + int current = GetPixelFormat(dc); + + if (current == format) return TRUE; + + if (!current) + { + if (!SetPixelFormat(dc, format, NULL)) + { + ERR("Failed to set pixel format %d on device context %p, last error %#x.\n", + format, dc, GetLastError()); + return FALSE; + } + return TRUE; + } + + /* By default WGL doesn't allow pixel format adjustments but we need it + * here. For this reason there's a Wine specific wglSetPixelFormat() + * which allows us to set the pixel format multiple times. Only use it + * when really needed. */ + if (gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH]) + { + if (!GL_EXTCALL(wglSetPixelFormatWINE(dc, format, NULL))) + { + ERR("wglSetPixelFormatWINE failed to set pixel format %d on device context %p.\n", + format, dc); + return FALSE; + } + return TRUE; + } + + /* OpenGL doesn't allow pixel format adjustments. Print an error and + * continue using the old format. There's a big chance that the old + * format works although with a performance hit and perhaps rendering + * errors. */ + ERR("Unable to set pixel format %d on device context %p. Already using format %d.\n", + format, dc, current); + return TRUE; +} + static void context_validate(struct wined3d_context *context) { HWND wnd = WindowFromDC(context->hdc); @@ -1121,7 +1162,6 @@ struct wined3d_context *context_create(IWineD3DDeviceImpl *This, IWineD3DSurface DWORD state; HGLRC ctx; HDC hdc; - int res; TRACE("device %p, target %p, window %p, present parameters %p.\n", This, target, win_handle, pPresentParms); @@ -1205,43 +1245,10 @@ struct wined3d_context *context_create(IWineD3DDeviceImpl *This, IWineD3DSurface } DescribePixelFormat(hdc, pixel_format, sizeof(pfd), &pfd); - res = SetPixelFormat(hdc, pixel_format, NULL); - if (!res) + if (!context_set_pixel_format(gl_info, hdc, pixel_format)) { - int oldPixelFormat = GetPixelFormat(hdc); - - /* By default WGL doesn't allow pixel format adjustments but we need - * it here. For this reason there is a WINE-specific wglSetPixelFormat - * which allows you to set the pixel format multiple times. Only use - * it when it is really needed. */ - - if (oldPixelFormat == pixel_format) - { - /* We don't have to do anything as the formats are the same :) */ - } - else if (oldPixelFormat && gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH]) - { - res = GL_EXTCALL(wglSetPixelFormatWINE(hdc, pixel_format, NULL)); - - if (!res) - { - ERR("wglSetPixelFormatWINE failed on HDC %p for pixel_format %d.\n", hdc, pixel_format); - goto out; - } - } - else if (oldPixelFormat) - { - /* OpenGL doesn't allow pixel format adjustments. Print an error - * and continue using the old format. There's a big chance that - * the old format works although with a performance hit and perhaps - * rendering errors. */ - ERR("HDC %p is already set to pixel_format %d and OpenGL doesn't allow changes.\n", hdc, oldPixelFormat); - } - else - { - ERR("SetPixelFormat failed on HDC %p for pixel format %d.\n", hdc, pixel_format); - goto out; - } + ERR("Failed to set pixel format %d on device context %p.\n", pixel_format, hdc); + goto out; } ctx = pwglCreateContext(hdc);

1 0

Rob Shearman : rpcrt4: Add support for marshalling/ unmarshalling complex arrays of pointers.
by Alexandre Julliard March 16, 2010

March 16, 2010

Module: wine Branch: master Commit: 088c0857c9639b33a6b705c3b6382a4477dd3b7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=088c0857c9639b33a6b705c3b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Mar 15 21:18:46 2010 +0000 rpcrt4: Add support for marshalling/unmarshalling complex arrays of pointers. --- dlls/rpcrt4/ndr_marshall.c | 61 ++++++++++++++++++++++++++++++++++--- dlls/rpcrt4/tests/ndr_marshall.c | 7 ---- 2 files changed, 56 insertions(+), 12 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index e594c95..9946bd1 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2711,12 +2711,18 @@ static unsigned char * ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg, safe_copy_to_buffer(pStubMsg, pMemory, sizeof(double)); pMemory += sizeof(double); break; + case RPC_FC_RP: + case RPC_FC_UP: + case RPC_FC_OP: + case RPC_FC_FP: case RPC_FC_POINTER: { unsigned char *saved_buffer; int pointer_buffer_mark_set = 0; TRACE("pointer=%p <= %p\n", *(unsigned char**)pMemory, pMemory); TRACE("pStubMsg->Buffer before %p\n", pStubMsg->Buffer); + if (*pFormat != RPC_FC_POINTER) + pPointer = pFormat; if (*pPointer != RPC_FC_RP) ALIGN_POINTER_CLEAR(pStubMsg->Buffer, 4); saved_buffer = pStubMsg->Buffer; @@ -2738,7 +2744,10 @@ static unsigned char * ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg, safe_buffer_increment(pStubMsg, 4); /* for pointer ID */ } TRACE("pStubMsg->Buffer after %p\n", pStubMsg->Buffer); - pPointer += 4; + if (*pFormat == RPC_FC_POINTER) + pPointer += 4; + else + pFormat += 4; pMemory += sizeof(void *); break; } @@ -2850,11 +2859,17 @@ static unsigned char * ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, TRACE("double=%f => %p\n", *(double*)pMemory, pMemory); pMemory += sizeof(double); break; + case RPC_FC_RP: + case RPC_FC_UP: + case RPC_FC_OP: + case RPC_FC_FP: case RPC_FC_POINTER: { unsigned char *saved_buffer; int pointer_buffer_mark_set = 0; TRACE("pointer => %p\n", pMemory); + if (*pFormat != RPC_FC_POINTER) + pPointer = pFormat; if (*pPointer != RPC_FC_RP) ALIGN_POINTER(pStubMsg->Buffer, 4); saved_buffer = pStubMsg->Buffer; @@ -2876,7 +2891,10 @@ static unsigned char * ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, if (*pPointer != RPC_FC_RP) safe_buffer_increment(pStubMsg, 4); /* for pointer ID */ } - pPointer += 4; + if (*pFormat == RPC_FC_POINTER) + pPointer += 4; + else + pFormat += 4; pMemory += sizeof(void *); break; } @@ -2979,7 +2997,13 @@ static unsigned char * ComplexBufferSize(PMIDL_STUB_MESSAGE pStubMsg, safe_buffer_length_increment(pStubMsg, 8); pMemory += 8; break; + case RPC_FC_RP: + case RPC_FC_UP: + case RPC_FC_OP: + case RPC_FC_FP: case RPC_FC_POINTER: + if (*pFormat != RPC_FC_POINTER) + pPointer = pFormat; if (!pStubMsg->IgnoreEmbeddedPointers) { int saved_buffer_length = pStubMsg->BufferLength; @@ -2996,7 +3020,10 @@ static unsigned char * ComplexBufferSize(PMIDL_STUB_MESSAGE pStubMsg, ALIGN_LENGTH(pStubMsg->BufferLength, 4); safe_buffer_length_increment(pStubMsg, 4); } - pPointer += 4; + if (*pFormat == RPC_FC_POINTER) + pPointer += 4; + else + pFormat += 4; pMemory += sizeof(void*); break; case RPC_FC_ALIGNM2: @@ -3082,9 +3109,18 @@ static unsigned char * ComplexFree(PMIDL_STUB_MESSAGE pStubMsg, case RPC_FC_DOUBLE: pMemory += 8; break; + case RPC_FC_RP: + case RPC_FC_UP: + case RPC_FC_OP: + case RPC_FC_FP: case RPC_FC_POINTER: + if (*pFormat != RPC_FC_POINTER) + pPointer = pFormat; NdrPointerFree(pStubMsg, *(unsigned char**)pMemory, pPointer); - pPointer += 4; + if (*pFormat == RPC_FC_POINTER) + pPointer += 4; + else + pFormat += 4; pMemory += sizeof(void *); break; case RPC_FC_ALIGNM2: @@ -3174,10 +3210,16 @@ static ULONG ComplexStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, size += 8; safe_buffer_increment(pStubMsg, 8); break; + case RPC_FC_RP: + case RPC_FC_UP: + case RPC_FC_OP: + case RPC_FC_FP: case RPC_FC_POINTER: { unsigned char *saved_buffer; int pointer_buffer_mark_set = 0; + if (*pFormat != RPC_FC_POINTER) + pPointer = pFormat; if (*pPointer != RPC_FC_RP) ALIGN_POINTER(pStubMsg->Buffer, 4); saved_buffer = pStubMsg->Buffer; @@ -3200,7 +3242,10 @@ static ULONG ComplexStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, if (*pPointer != RPC_FC_RP) safe_buffer_increment(pStubMsg, 4); /* for pointer ID */ } - pPointer += 4; + if (*pFormat == RPC_FC_POINTER) + pPointer += 4; + else + pFormat += 4; size += sizeof(void *); break; } @@ -3269,8 +3314,14 @@ ULONG ComplexStructSize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) case RPC_FC_DOUBLE: size += 8; break; + case RPC_FC_RP: + case RPC_FC_UP: + case RPC_FC_OP: + case RPC_FC_FP: case RPC_FC_POINTER: size += sizeof(void *); + if (*pFormat != RPC_FC_POINTER) + pFormat += 4; break; case RPC_FC_ALIGNM2: ALIGN_LENGTH(size, 2); diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 2c18bc5..b5987dc 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1997,7 +1997,6 @@ static void test_conf_complex_array(void) win_skip("Tests crash on Win9x, WinMe and NT4\n"); goto cleanup; } -todo_wine ok(StubMsg.BufferLength >= expected_length, "length %d\n", StubMsg.BufferLength); /*NdrGetBuffer(&_StubMsg, _StubMsg.BufferLength, NULL);*/ @@ -2013,13 +2012,8 @@ todo_wine #endif ok(ptr == NULL, "ret %p\n", ptr); -todo_wine ok((char*)StubMsg.Buffer == (char*)StubMsg.BufferStart + expected_length, "not at expected length\n"); - /* Skip tests on Wine until the todo_wine is removed */ - if((char*)StubMsg.Buffer == (char*)StubMsg.BufferStart + expected_length) - { - buf = (DWORD *)StubMsg.BufferStart; ok(*buf == memsrc.dim1, "dim1 should have been %d instead of %08x\n", memsrc.dim1, *buf); @@ -2069,7 +2063,6 @@ todo_wine #else NdrSimpleStructFree( &StubMsg, (unsigned char*)mem, &fmtstr_complex_array[32]); #endif - } HeapFree(GetProcessHeap(), 0, StubMsg.RpcMsg->Buffer);

1 0

Rob Shearman : widl: Remove some FIXME comments and replace them with comments explaining why the current behaviour is correct .
by Alexandre Julliard March 16, 2010

March 16, 2010

Module: wine Branch: master Commit: 0e6ad1fa8566f07fc82c392a80ad4b1b7e86a84c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e6ad1fa8566f07fc82c392a8… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Mar 15 19:30:50 2010 +0000 widl: Remove some FIXME comments and replace them with comments explaining why the current behaviour is correct. --- tools/widl/typegen.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index b7982b0..a241e69 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1555,8 +1555,10 @@ static void write_member_type(FILE *file, const type_t *cont, reloff = absoff - (*tfsoff + 2); print_file(file, 2, "0x4c,\t/* FC_EMBEDDED_COMPLEX */\n"); - /* FIXME: actually compute necessary padding */ - print_file(file, 2, "0x0,\t/* FIXME: padding */\n"); + /* padding is represented using FC_STRUCTPAD* types, so presumably + * this is left over in the format for historical purposes in MIDL + * or rpcrt4. */ + print_file(file, 2, "0x0,\n"); print_file(file, 2, "NdrFcShort(0x%hx),\t/* Offset= %hd (%u) */\n", reloff, reloff, absoff); *tfsoff += 4; @@ -1651,8 +1653,11 @@ static int write_pointer_description_offsets( { unsigned int memsize; - /* pointer instance */ - /* FIXME: sometimes from end of structure, sometimes from beginning */ + /* pointer instance + * + * note that MSDN states that for pointer layouts in structures, + * this is a negative offset from the end of the structure, but + * this statement is incorrect. all offsets are positive */ print_file(file, 2, "NdrFcShort(0x%hx),\t/* Memory offset = %d */\n", *offset_in_memory, *offset_in_memory); print_file(file, 2, "NdrFcShort(0x%hx),\t/* Buffer offset = %d */\n", *offset_in_buffer, *offset_in_buffer);

1 0

Rob Shearman : widl: Fix the writing of expressions in un-typedef' d structures by using write_type_left to write out the type, which adds the "struct ..." if necessary.
by Alexandre Julliard March 16, 2010

March 16, 2010

Module: wine Branch: master Commit: 9aad1447552173d2bbe07021c859907e344e54a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aad1447552173d2bbe07021c… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Mar 15 19:30:37 2010 +0000 widl: Fix the writing of expressions in un-typedef'd structures by using write_type_left to write out the type, which adds the "struct ..." if necessary. Also improve the type comparison code to not crash on unnamed structures (although further changes need to be made to fix the output in this case) and make it more efficient by first doing a comparison on the values of the type pointers. --- tools/widl/typegen.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 7e7a851..b7982b0 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1118,8 +1118,10 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure, LIST_FOR_EACH_ENTRY(eval, &expr_eval_routines, struct expr_eval_routine, entry) { - if (!strcmp (eval->structure->name, structure->name) - && !compare_expr (eval->expr, expr)) + if (eval->structure == structure || + (eval->structure->name && structure->name && + !strcmp(eval->structure->name, structure->name) && + !compare_expr(eval->expr, expr))) { found = 1; break; @@ -3957,8 +3959,11 @@ int write_expr_eval_routines(FILE *file, const char *iface) print_file(file, 0, "static void __RPC_USER %s_%sExprEval_%04u(PMIDL_STUB_MESSAGE pStubMsg)\n", iface, name, callback_offset); print_file(file, 0, "{\n"); - print_file (file, 1, "%s *%s = (%s *)(pStubMsg->StackTop - %u);\n", - name, var_name, name, eval->baseoff); + print_file(file, 1, "%s", ""); + write_type_left(file, (type_t *)eval->structure, TRUE); + fprintf(file, " *%s = (", var_name); + write_type_left(file, (type_t *)eval->structure, TRUE); + fprintf(file, " *)(pStubMsg->StackTop - %u);\n", eval->baseoff); print_file(file, 1, "pStubMsg->Offset = 0;\n"); /* FIXME */ print_file(file, 1, "pStubMsg->MaxCount = (ULONG_PTR)"); write_expr(file, eval->expr, 1, 1, var_name_expr, eval->structure, "");

1 0

Rob Shearman : widl: error_status_t isn't an allowed conformance type.
by Alexandre Julliard March 16, 2010

March 16, 2010

Module: wine Branch: master Commit: df853f8ed2ce37587585055cf0926e3ced745041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df853f8ed2ce37587585055cf… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Mar 15 19:30:28 2010 +0000 widl: error_status_t isn't an allowed conformance type. The FC code requires more than 4 bits to represent it and the correlation descriptor and union formats only allow 4 bits to represent the type referred to. --- tools/widl/parser.y | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 71b7ed6..8a23a82 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2261,7 +2261,6 @@ static int is_allowed_conf_type(const type_t *type) case TYPE_BASIC_HYPER: case TYPE_BASIC_BYTE: case TYPE_BASIC_WCHAR: - case TYPE_BASIC_ERROR_STATUS_T: return TRUE; default: return FALSE;

1 0

Rob Shearman : widl: Merge write_typeformatstring_var and write_embedded_types into one function , write_type_tfs.
by Alexandre Julliard March 16, 2010

March 16, 2010

Module: wine Branch: master Commit: 06e7eb5c98d473cf1edc828c67f6a6586a94e2f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06e7eb5c98d473cf1edc828c6… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Mar 15 19:29:57 2010 +0000 widl: Merge write_typeformatstring_var and write_embedded_types into one function, write_type_tfs. --- tools/widl/typegen.c | 191 ++++++++++++++++++++++---------------------------- 1 files changed, 84 insertions(+), 107 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06e7eb5c98d473cf1edc8…

1 0

Rob Shearman : widl: Write pointers in write_typeformatstring_var using write_pointer_tfs.
by Alexandre Julliard March 16, 2010

March 16, 2010

Module: wine Branch: master Commit: 484fe1cff30fafcf21c0f8b5b2d41caefbc57909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=484fe1cff30fafcf21c0f8b5b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Mar 15 19:29:48 2010 +0000 widl: Write pointers in write_typeformatstring_var using write_pointer_tfs. Avoid duplicating the pointer writing code. --- tools/widl/typegen.c | 71 +++++++++++++++---------------------------------- 1 files changed, 22 insertions(+), 49 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index b0c2c20..0316531 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1366,6 +1366,9 @@ static unsigned int write_simple_pointer(FILE *file, const attr_list_t *attrs, c unsigned char fc; unsigned char pointer_fc; const type_t *ref; + int in_attr = is_attr(attrs, ATTR_IN); + int out_attr = is_attr(attrs, ATTR_OUT); + unsigned char flags = RPC_FC_P_SIMPLEPOINTER; /* for historical reasons, write_simple_pointer also handled string types, * but no longer does. catch bad uses of the function with this check */ @@ -1380,8 +1383,12 @@ static unsigned int write_simple_pointer(FILE *file, const attr_list_t *attrs, c else fc = get_basic_fc(ref); - print_file(file, 2, "0x%02x, 0x%x,\t/* %s [simple_pointer] */\n", - pointer_fc, RPC_FC_P_SIMPLEPOINTER, string_of_type(pointer_fc)); + if (out_attr && !in_attr) + flags |= RPC_FC_P_ONSTACK; + + print_file(file, 2, "0x%02x, 0x%x,\t/* %s %s[simple_pointer] */\n", + pointer_fc, flags, string_of_type(pointer_fc), + flags & RPC_FC_P_ONSTACK ? "[allocated_on_stack] " : ""); print_file(file, 2, "0x%02x,\t/* %s */\n", fc, string_of_type(fc)); print_file(file, 2, "0x5c,\t/* FC_PAD */\n"); return 4; @@ -1395,7 +1402,8 @@ static void print_start_tfs_comment(FILE *file, type_t *t, unsigned int tfsoff) } static unsigned int write_pointer_tfs(FILE *file, const attr_list_t *attrs, - type_t *type, int toplevel_param, + type_t *type, unsigned int ref_offset, + int toplevel_param, unsigned int *typestring_offset) { unsigned int offset = *typestring_offset; @@ -1412,10 +1420,10 @@ static unsigned int write_pointer_tfs(FILE *file, const attr_list_t *attrs, toplevel_param); break; default: - if (ref->typestring_offset) + if (ref_offset) write_nonsimple_pointer(file, attrs, type, toplevel_param, - type_pointer_get_ref(type)->typestring_offset, + ref_offset, typestring_offset); break; } @@ -2412,7 +2420,9 @@ static unsigned int write_struct_tfs(FILE *file, type_t *type, if (is_string_type(f->attrs, ft)) write_string_tfs(file, f->attrs, ft, FALSE, f->name, tfsoff); else - write_pointer_tfs(file, f->attrs, ft, FALSE, tfsoff); + write_pointer_tfs(file, f->attrs, ft, + type_pointer_get_ref(ft)->typestring_offset, + FALSE, tfsoff); } else if (type_get_type(ft) == TYPE_ARRAY && type_array_is_decl_as_ptr(ft)) { @@ -2794,48 +2804,11 @@ static unsigned int write_typeformatstring_var(FILE *file, int indent, const var case TGT_IFACE_POINTER: return write_ip_tfs(file, var->attrs, type, typeformat_offset); case TGT_POINTER: - { - type_t *ref = type_pointer_get_ref(type); - - switch (typegen_detect_type(ref, NULL, TDT_ALL_TYPES)) - { - /* special case for pointers to base types */ - case TGT_BASIC: - case TGT_ENUM: - { - unsigned char fc; - size_t start_offset = *typeformat_offset; - int in_attr = is_attr(var->attrs, ATTR_IN); - int out_attr = is_attr(var->attrs, ATTR_OUT); - - if (type_get_type(ref) == TYPE_ENUM) - fc = get_enum_fc(ref); - else - fc = get_basic_fc(ref); - - print_file(file, indent, "0x%x, 0x%x, /* %s %s[simple_pointer] */\n", - get_pointer_fc(type, var->attrs, toplevel_param), - (!in_attr && out_attr) ? 0x0C : 0x08, - string_of_type(get_pointer_fc(type, var->attrs, toplevel_param)), - (!in_attr && out_attr) ? "[allocated_on_stack] " : ""); - print_file(file, indent, "0x%02x, /* %s */\n", - fc, string_of_type(fc)); - print_file(file, indent, "0x5c, /* FC_PAD */\n"); - *typeformat_offset += 4; - return start_offset; - } - default: - break; - } - - offset = write_typeformatstring_var(file, indent, func, ref, var, - FALSE, typeformat_offset); - if (file) - fprintf(file, "/* %2u */\n", *typeformat_offset); - return write_nonsimple_pointer(file, var->attrs, type, - toplevel_param, - offset, typeformat_offset); - } + offset = write_typeformatstring_var(file, indent, func, + type_pointer_get_ref(type), var, + FALSE, typeformat_offset); + return write_pointer_tfs(file, var->attrs, type, offset, + toplevel_param, typeformat_offset); case TGT_INVALID: break; } @@ -2867,7 +2840,7 @@ static int write_embedded_types(FILE *file, const attr_list_t *attrs, type_t *ty retmask |= write_embedded_types(file, NULL, ref, name, TRUE, tfsoff); if (write_ptr) - write_pointer_tfs(file, attrs, type, FALSE, tfsoff); + write_pointer_tfs(file, attrs, type, type_pointer_get_ref(type)->typestring_offset, FALSE, tfsoff); retmask |= 1; break;

1 0

Rob Shearman : widl: Don' t use the return value of write_embedded_types to determine whether a type contains pointers or not .
by Alexandre Julliard March 16, 2010

March 16, 2010

Module: wine Branch: master Commit: 2fd6be54bee3c639bdeb0754eddd085ec0a6191f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fd6be54bee3c639bdeb0754e… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Mar 15 19:29:53 2010 +0000 widl: Don't use the return value of write_embedded_types to determine whether a type contains pointers or not. It isn't correct in all situations, so type_has_pointer has to be used anyway so using the return value of write_embedded_types just clutters the code. --- tools/widl/typegen.c | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 0316531..78fe60c 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2137,7 +2137,6 @@ static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t unsigned int size; unsigned int start_offset; unsigned char fc; - int has_pointer; int pointer_type = get_attrv(attrs, ATTR_POINTERTYPE); unsigned int baseoff = !type_array_is_decl_as_ptr(type) && current_structure @@ -2147,10 +2146,7 @@ static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t if (!pointer_type) pointer_type = RPC_FC_RP; - if (write_embedded_types(file, attrs, type_array_get_element(type), name, FALSE, typestring_offset)) - has_pointer = TRUE; - else - has_pointer = type_has_pointers(type_array_get_element(type)); + write_embedded_types(file, attrs, type_array_get_element(type), name, FALSE, typestring_offset); align = 0; size = type_memsize((is_conformant_array(type) ? type_array_get_element(type) : type), &align); @@ -2208,7 +2204,8 @@ static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t += write_conf_or_var_desc(file, current_structure, baseoff, type, length_is); - if (has_pointer && (type_array_is_decl_as_ptr(type) || !current_structure)) + if (type_has_pointers(type_array_get_element(type)) && + (type_array_is_decl_as_ptr(type) || !current_structure)) { print_file(file, 2, "0x%x, /* FC_PP */\n", RPC_FC_PP); print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD); @@ -2328,7 +2325,6 @@ static unsigned int write_struct_tfs(FILE *file, type_t *type, const var_t *array; unsigned int start_offset; unsigned int array_offset; - int has_pointers = 0; unsigned int align = 0; unsigned int corroff; var_t *f; @@ -2344,9 +2340,7 @@ static unsigned int write_struct_tfs(FILE *file, type_t *type, name, USHRT_MAX, total_size - USHRT_MAX); if (fields) LIST_FOR_EACH_ENTRY(f, fields, var_t, entry) - has_pointers |= write_embedded_types(file, f->attrs, f->type, f->name, - FALSE, tfsoff); - if (!has_pointers) has_pointers = type_has_pointers(type); + write_embedded_types(file, f->attrs, f->type, f->name, FALSE, tfsoff); array = find_array_or_string_in_struct(type); if (array && !processed(array->type)) @@ -2394,7 +2388,7 @@ static unsigned int write_struct_tfs(FILE *file, type_t *type, } else if ((fc == RPC_FC_PSTRUCT) || (fc == RPC_FC_CPSTRUCT) || - (fc == RPC_FC_CVSTRUCT && has_pointers)) + (fc == RPC_FC_CVSTRUCT && type_has_pointers(type))) { print_file(file, 2, "0x%x, /* FC_PP */\n", RPC_FC_PP); print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD);

1 0

Rob Shearman : widl: Remove some unused functions, definitions and types.
by Alexandre Julliard March 16, 2010

March 16, 2010

Module: wine Branch: master Commit: 5d985a80282fba5b1cc36ad2c5bc2d0330fcbae7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d985a80282fba5b1cc36ad2c… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Mar 15 19:29:33 2010 +0000 widl: Remove some unused functions, definitions and types. --- tools/widl/typegen.c | 110 ++++++++++++++++++++--------------------------- tools/widl/typegen.h | 2 - tools/widl/widltypes.h | 7 --- 3 files changed, 47 insertions(+), 72 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index c35020c..60668dd 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -202,6 +202,30 @@ static unsigned char get_enum_fc(const type_t *type) return RPC_FC_ENUM16; } +static type_t *get_user_type(const type_t *t, const char **pname) +{ + for (;;) + { + type_t *ut = get_attrp(t->attrs, ATTR_WIREMARSHAL); + if (ut) + { + if (pname) + *pname = t->name; + return ut; + } + + if (type_is_alias(t)) + t = type_alias_get_aliasee(t); + else + return NULL; + } +} + +static int is_user_type(const type_t *t) +{ + return get_user_type(t, NULL) != NULL; +} + enum typegen_type typegen_detect_type(const type_t *type, const attr_list_t *attrs, unsigned int flags) { if (is_user_type(type)) @@ -252,6 +276,29 @@ enum typegen_type typegen_detect_type(const type_t *type, const attr_list_t *att return TGT_INVALID; } +static int get_padding(const var_list_t *fields) +{ + unsigned short offset = 0; + unsigned int salign = 1; + const var_t *f; + + if (!fields) + return 0; + + LIST_FOR_EACH_ENTRY(f, fields, const var_t, entry) + { + type_t *ft = f->type; + unsigned int align = 0; + unsigned int size = type_memsize(ft, &align); + align = clamp_align(align); + if (align > salign) salign = align; + offset = ROUND_SIZE(offset, align); + offset += size; + } + + return ROUNDING(offset, salign); +} + unsigned char get_struct_fc(const type_t *type) { int has_pointer = 0; @@ -472,22 +519,6 @@ static unsigned char get_array_fc(const type_t *type) return fc; } -int is_struct(unsigned char type) -{ - switch (type) - { - 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 1; - default: - return 0; - } -} - static int is_non_complex_struct(const type_t *type) { return (type_get_type(type) == TYPE_STRUCT && @@ -626,30 +657,6 @@ static void guard_rec(type_t *type) type->typestring_offset = 1; } -static type_t *get_user_type(const type_t *t, const char **pname) -{ - for (;;) - { - type_t *ut = get_attrp(t->attrs, ATTR_WIREMARSHAL); - if (ut) - { - if (pname) - *pname = t->name; - return ut; - } - - if (type_is_alias(t)) - t = type_alias_get_aliasee(t); - else - return NULL; - } -} - -int is_user_type(const type_t *t) -{ - return get_user_type(t, NULL) != NULL; -} - static int is_embedded_complex(const type_t *type) { switch (typegen_detect_type(type, NULL, TDT_ALL_TYPES)) @@ -1177,29 +1184,6 @@ static unsigned int union_memsize(const var_list_t *fields, unsigned int *pmaxa) return maxs; } -int get_padding(const var_list_t *fields) -{ - unsigned short offset = 0; - unsigned int salign = 1; - const var_t *f; - - if (!fields) - return 0; - - LIST_FOR_EACH_ENTRY(f, fields, const var_t, entry) - { - type_t *ft = f->type; - unsigned int align = 0; - unsigned int size = type_memsize(ft, &align); - align = clamp_align(align); - if (align > salign) salign = align; - offset = ROUND_SIZE(offset, align); - offset += size; - } - - return ROUNDING(offset, salign); -} - unsigned int type_memsize(const type_t *t, unsigned int *align) { unsigned int size = 0; diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index 2b2e65d..242b40d 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -84,8 +84,6 @@ unsigned int type_memsize(const type_t *t, unsigned int *align); int decl_indirect(const type_t *t); void write_parameters_init(FILE *file, int indent, const var_t *func, const char *local_var_prefix); 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); expr_t *get_size_is_expr(const type_t *t, const char *name); int is_full_pointer_function(const var_t *func); void write_full_pointer_init(FILE *file, int indent, const var_t *func, int is_server); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index a44e02a..18f601c 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -35,15 +35,10 @@ typedef GUID UUID; #define TRUE 1 #define FALSE 0 -#define RPC_FC_MODULE 0xfc -#define RPC_FC_COCLASS 0xfd -#define RPC_FC_FUNCTION 0xfe - typedef struct _loc_info_t loc_info_t; typedef struct _attr_t attr_t; typedef struct _expr_t expr_t; typedef struct _type_t type_t; -typedef struct _typeref_t typeref_t; typedef struct _var_t var_t; typedef struct _declarator_t declarator_t; typedef struct _func_t func_t; @@ -520,8 +515,6 @@ int is_ptr(const type_t *t); int is_array(const type_t *t); int is_var_ptr(const var_t *v); int cant_be_null(const var_t *v); -int is_struct(unsigned char tc); -int is_union(unsigned char tc); #define tsENUM 1 #define tsSTRUCT 2

1 0

Rob Shearman : widl: Make write_pointer_tfs more readable.
by Alexandre Julliard March 16, 2010

March 16, 2010

Module: wine Branch: master Commit: 08126d7483bf798e692edec9b8320ad10bbf433c URL: http://source.winehq.org/git/wine.git/?a=commit;h=08126d7483bf798e692edec9b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Mar 15 19:29:38 2010 +0000 widl: Make write_pointer_tfs more readable. Change write_pointer_tfs to rely on the detected type of the type to determine when to write a simple pointer rather than relying on typestring_offset not being set anywhere else. --- tools/widl/typegen.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 60668dd..19f66c0 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1404,15 +1404,21 @@ static unsigned int write_pointer_tfs(FILE *file, const attr_list_t *attrs, print_start_tfs_comment(file, type, offset); update_tfsoff(type, offset, file); - if (ref->typestring_offset) - write_nonsimple_pointer(file, attrs, type, - toplevel_param, - type_pointer_get_ref(type)->typestring_offset, - typestring_offset); - else if (type_get_type(ref) == TYPE_BASIC || - type_get_type(ref) == TYPE_ENUM) + switch (typegen_detect_type(ref, attrs, TDT_ALL_TYPES)) + { + case TGT_BASIC: + case TGT_ENUM: *typestring_offset += write_simple_pointer(file, attrs, type, toplevel_param); + break; + default: + if (ref->typestring_offset) + write_nonsimple_pointer(file, attrs, type, + toplevel_param, + type_pointer_get_ref(type)->typestring_offset, + typestring_offset); + break; + } return offset; }

1 0