June 2009 - Wine-commits - list.winehq.org

Eric Pouech : winedbg: Print array size when looking at its type.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: bfb6c80148de62b4d26983691e8c01d7a2c3723b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfb6c80148de62b4d26983691… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jun 28 21:00:11 2009 +0200 winedbg: Print array size when looking at its type. --- programs/winedbg/types.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index cc981a9..a13f77f 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -671,7 +671,10 @@ int types_print_type(const struct dbg_type* type, BOOL details) types_get_info(type, TI_GET_TYPE, &subtype.id); subtype.module = type->module; types_print_type(&subtype, details); - dbg_printf(" %s[]", name); + if (types_get_info(type, TI_GET_COUNT, &count)) + dbg_printf(" %s[%d]", name, count); + else + dbg_printf(" %s[]", name); break; case SymTagEnum: dbg_printf("enum %s", name);

1 0

Eric Pouech : winedbg: Correctly print type for functions without parameters.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 87132a3a6a931d7a5e9aee254b8ec51403f4fd4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=87132a3a6a931d7a5e9aee254… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jun 28 21:00:23 2009 +0200 winedbg: Correctly print type for functions without parameters. --- programs/winedbg/types.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index a13f77f..9c21bd4 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -699,7 +699,8 @@ int types_print_type(const struct dbg_type* type, BOOL details) int i; fcp->Start = 0; - while (count) + if (!count) dbg_printf("void"); + else while (count) { fcp->Count = min(count, 256); if (types_get_info(type, TI_FINDCHILDREN, fcp))

1 0

Eric Pouech : dbghelp: When the CU is compiled with GCC, deal with some GCC extensions.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 7fbcd11db880d97898b7a27580c20a38e1432c19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fbcd11db880d97898b7a2758… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jun 28 14:04:27 2009 +0200 dbghelp: When the CU is compiled with GCC, deal with some GCC extensions. --- dlls/dbghelp/dwarf.c | 4 +++- dlls/dbghelp/dwarf.h | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 82e836f..7843e67 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -781,7 +781,9 @@ compute_location(dwarf2_traverse_context_t* ctx, struct location* loc, } break; default: - FIXME("Unhandled attr op: %x\n", op); + if (op < DW_OP_lo_user) /* as DW_OP_hi_user is 0xFF, we don't need to test against it */ + FIXME("Unhandled attr op: %x\n", op); + /* FIXME else unhandled extension */ return loc_err_internal; } } diff --git a/dlls/dbghelp/dwarf.h b/dlls/dbghelp/dwarf.h index e7a0a7e..a590df2 100644 --- a/dlls/dbghelp/dwarf.h +++ b/dlls/dbghelp/dwarf.h @@ -376,6 +376,18 @@ typedef enum dwarf_operation_e DW_OP_call2 = 0x98, DW_OP_call4 = 0x99, DW_OP_call_ref = 0x9a, + DW_OP_form_tls_address = 0x9b, + DW_OP_call_frame_cfa = 0x9c, + DW_OP_bit_piece = 0x9d, + + /* Implementation defined extensions */ + DW_OP_lo_user = 0xe0, + DW_OP_hi_user = 0xff, + + /* GNU extensions */ + DW_OP_GNU_push_tls_address = 0xe0, + DW_OP_GNU_uninit = 0xf0, + DW_OP_GNU_encoded_addr = 0xf1, } dwarf_operation_t; enum dwarf_calling_convention

1 0

Eric Pouech : dbghelp: Added reference for MSVC 8.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 9c54158958fd76ba1b736a0def02558c1a5352c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c54158958fd76ba1b736a0de… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jun 28 14:04:17 2009 +0200 dbghelp: Added reference for MSVC 8. A+ --- dlls/dbghelp/msc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 99de037..7814570 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2217,7 +2217,8 @@ static void pdb_process_types(const struct msc_debug_info* msc_dbg, case 19950410: /* VC 4.0 */ case 19951122: case 19961031: /* VC 5.0 / 6.0 */ - case 19990903: + case 19990903: /* VC 7.0 */ + case 20040203: /* VC 8.0 */ break; default: ERR("-Unknown type info version %d\n", types.version);

1 0

Henri Verbeet : wined3d: Prevent GL calls from DestroyContext() if we failed to make the GL context current.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 40565211fb70bff4b1622570a6b11edd646c00bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=40565211fb70bff4b1622570a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 29 10:11:23 2009 +0200 wined3d: Prevent GL calls from DestroyContext() if we failed to make the GL context current. This can happen if the window is destroyed before the device is released. --- dlls/wined3d/context.c | 36 ++++++++++++++++++++++-------------- 1 files changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e2bce21..d8cc876 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1158,30 +1158,38 @@ static void RemoveContextFromArray(IWineD3DDeviceImpl *This, WineD3DContext *con *****************************************************************************/ void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) { struct fbo_entry *entry, *entry2; + BOOL has_glctx; TRACE("Destroying ctx %p\n", context); /* The correct GL context needs to be active to cleanup the GL resources below */ - if(pwglGetCurrentContext() != context->glCtx){ - pwglMakeCurrent(context->hdc, context->glCtx); - last_device = NULL; - } + has_glctx = pwglMakeCurrent(context->hdc, context->glCtx); + last_device = NULL; + + if (!has_glctx) WARN("Failed to activate context. Window already destroyed?\n"); ENTER_GL(); LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_list, struct fbo_entry, entry) { + if (!has_glctx) entry->id = 0; context_destroy_fbo_entry(This, context, entry); } - if (context->src_fbo) { - TRACE("Destroy src FBO %d\n", context->src_fbo); - context_destroy_fbo(This, &context->src_fbo); - } - if (context->dst_fbo) { - TRACE("Destroy dst FBO %d\n", context->dst_fbo); - context_destroy_fbo(This, &context->dst_fbo); - } - if(context->dummy_arbfp_prog) { - GL_EXTCALL(glDeleteProgramsARB(1, &context->dummy_arbfp_prog)); + if (has_glctx) + { + if (context->src_fbo) + { + TRACE("Destroy src FBO %d\n", context->src_fbo); + context_destroy_fbo(This, &context->src_fbo); + } + if (context->dst_fbo) + { + TRACE("Destroy dst FBO %d\n", context->dst_fbo); + context_destroy_fbo(This, &context->dst_fbo); + } + if (context->dummy_arbfp_prog) + { + GL_EXTCALL(glDeleteProgramsARB(1, &context->dummy_arbfp_prog)); + } } LEAVE_GL();

1 0

Henri Verbeet : wined3d: Always check the result of wglMakeCurrent().
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: f57967c9838d6610b236a54777aeb8c268d2838b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f57967c9838d6610b236a5477… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 29 10:11:24 2009 +0200 wined3d: Always check the result of wglMakeCurrent(). --- dlls/wined3d/context.c | 11 +++++++++-- dlls/wined3d/directx.c | 7 +++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d8cc876..6be40c7 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1073,7 +1073,10 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar * but enable it for the first context we create, and reenable it on the old context */ if(oldDrawable && oldCtx) { - pwglMakeCurrent(oldDrawable, oldCtx); + if (!pwglMakeCurrent(oldDrawable, oldCtx)) + { + ERR("Failed to make previous GL context %p current.\n", oldCtx); + } } else { last_device = This; } @@ -1201,7 +1204,11 @@ void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) { } /* Cleanup the GL context */ - pwglMakeCurrent(NULL, NULL); + if (!pwglMakeCurrent(NULL, NULL)) + { + ERR("Failed to disable GL context.\n"); + } + if(context->isPBuffer) { GL_EXTCALL(wglReleasePbufferDCARB(context->pbuffer, context->hdc)); GL_EXTCALL(wglDestroyPbufferARB(context->pbuffer)); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2678285..1512a31 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -230,7 +230,10 @@ static void WineD3D_ReleaseFakeGLContext(void) { if (0 == (--wined3d_fake_gl_context_ref) ) { if(!wined3d_fake_gl_context_foreign && glCtx) { TRACE_(d3d_caps)("destroying fake GL context\n"); - pwglMakeCurrent(NULL, NULL); + if (!pwglMakeCurrent(NULL, NULL)) + { + ERR("Failed to disable fake GL context.\n"); + } pwglDeleteContext(glCtx); } if(wined3d_fake_gl_context_hdc) @@ -301,7 +304,7 @@ static BOOL WineD3D_CreateFakeGLContext(void) { /* Make it the current GL context */ if (!pwglMakeCurrent(wined3d_fake_gl_context_hdc, glCtx)) { - WARN_(d3d_caps)("Error setting default context as current for capabilities initialization\n"); + ERR_(d3d_caps)("Failed to make fake GL context current.\n"); goto fail; } }

1 0

Henri Verbeet : d3d: Add a test for releasing the device after destroying the window.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 7d3beb6b7979cb2c7096061518771b18049db1ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d3beb6b7979cb2c709606151… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 29 10:11:25 2009 +0200 d3d: Add a test for releasing the device after destroying the window. --- dlls/d3d8/tests/visual.c | 2 +- dlls/d3d9/tests/visual.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 1850b83..07b8810 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -1348,8 +1348,8 @@ cleanup: ULONG refcount; IDirect3DDevice8_GetCreationParameters(device_ptr, &creation_parameters); + DestroyWindow(creation_parameters.hFocusWindow); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left\n", refcount); - DestroyWindow(creation_parameters.hFocusWindow); } } diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 23258cc..cd362f0 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10498,15 +10498,15 @@ START_TEST(visual) cleanup: if(device_ptr) { - ULONG ref; - D3DPRESENT_PARAMETERS present_parameters; IDirect3DSwapChain9 *swapchain; + ULONG ref; + IDirect3DDevice9_GetSwapChain(device_ptr, 0, &swapchain); IDirect3DSwapChain9_GetPresentParameters(swapchain, &present_parameters); + DestroyWindow(present_parameters.hDeviceWindow); IDirect3DSwapChain9_Release(swapchain); ref = IDirect3DDevice9_Release(device_ptr); - DestroyWindow(present_parameters.hDeviceWindow); ok(ref == 0, "The device was not properly freed: refcount %u\n", ref); } }

1 0

Henri Verbeet : wined3d: Add a WARN to IWineD3DDeviceImpl_SetFrontBackBuffers() about potentially being called without a GL context.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 4075e45d8133f2ab8d4cf4dd4b9f6e15a1928691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4075e45d8133f2ab8d4cf4dd4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 29 10:11:26 2009 +0200 wined3d: Add a WARN to IWineD3DDeviceImpl_SetFrontBackBuffers() about potentially being called without a GL context. --- dlls/wined3d/device.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2200e31..64674c1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6351,6 +6351,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetFrontBackBuffers(IWineD3DDevice *ifa /* What to do about the context here in the case of multithreading? Not sure. * This function is called by IDirect3D7::CreateDevice so in theory its initialization code */ + WARN("No active context?\n"); + ENTER_GL(); if(!Swapchain->backBuffer[0]) { /* GL was told to draw to the front buffer at creation,

1 0

Alexandre Julliard : wrc: Clean up command line parsing for multiple files support.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 683dc30e820a79c5fd59971ad2467b230c8f9228 URL: http://source.winehq.org/git/wine.git/?a=commit;h=683dc30e820a79c5fd59971ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 29 13:12:59 2009 +0200 wrc: Clean up command line parsing for multiple files support. --- tools/wrc/wrc.c | 70 +++++++++++++++++++++++++++++------------------------- 1 files changed, 38 insertions(+), 32 deletions(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 52267ab..61a3734 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -55,7 +55,7 @@ #endif static const char usage[] = - "Usage: wrc [options...] [infile[.rc|.res]] [outfile]\n" + "Usage: wrc [options...] [infile[.rc|.res]]\n" " -D id[=val] Define preprocessor identifier id=val\n" " -E Preprocess only\n" " -F target Ignored for compatibility with windres\n" @@ -174,29 +174,42 @@ int getopt (int argc, char *const *argv, const char *optstring); static void cleanup_files(void); static void segvhandler(int sig); +enum long_options_values +{ + LONG_OPT_NOSTDINC = 1, + LONG_OPT_TMPFILE, + LONG_OPT_NOTMPFILE, + LONG_OPT_PREPROCESSOR, + LONG_OPT_VERSION, + LONG_OPT_DEBUG, + LONG_OPT_ENDIANESS, + LONG_OPT_PEDANTIC, + LONG_OPT_VERIFY_TRANSL +}; + static const char short_options[] = "D:Ef:F:hi:I:J:l:o:O:rU:v"; static const struct option long_options[] = { - { "debug", 1, 0, 6 }, + { "debug", 1, 0, LONG_OPT_DEBUG }, { "define", 1, 0, 'D' }, - { "endianess", 1, 0, 7 }, + { "endianess", 1, 0, LONG_OPT_ENDIANESS }, { "help", 0, 0, 'h' }, { "include-dir", 1, 0, 'I' }, { "input", 1, 0, 'i' }, { "input-format", 1, 0, 'J' }, { "language", 1, 0, 'l' }, - { "no-use-temp-file", 0, 0, 3 }, - { "nostdinc", 0, 0, 1 }, + { "no-use-temp-file", 0, 0, LONG_OPT_NOTMPFILE }, + { "nostdinc", 0, 0, LONG_OPT_NOSTDINC }, { "output", 1, 0, 'o' }, { "output-format", 1, 0, 'O' }, - { "pedantic", 0, 0, 8 }, - { "preprocessor", 1, 0, 4 }, + { "pedantic", 0, 0, LONG_OPT_PEDANTIC }, + { "preprocessor", 1, 0, LONG_OPT_PREPROCESSOR }, { "target", 1, 0, 'F' }, { "undefine", 1, 0, 'U' }, - { "use-temp-file", 0, 0, 2 }, + { "use-temp-file", 0, 0, LONG_OPT_TMPFILE }, { "verbose", 0, 0, 'v' }, - { "verify-translations", 0, 0, 9 }, - { "version", 0, 0, 5 }, + { "verify-translations", 0, 0, LONG_OPT_VERIFY_TRANSL }, + { "version", 0, 0, LONG_OPT_VERSION }, { 0, 0, 0, 0 } }; @@ -301,8 +314,10 @@ int main(int argc,char *argv[]) int opti = 0; int stdinc = 1; int lose = 0; + int nb_files = 0; int i; int cmdlen; + char **files = xmalloc( argc * sizeof(*files) ); signal(SIGSEGV, segvhandler); signal( SIGTERM, exit_on_signal ); @@ -339,27 +354,27 @@ int main(int argc,char *argv[]) { switch(optc) { - case 1: + case LONG_OPT_NOSTDINC: stdinc = 0; break; - case 2: + case LONG_OPT_TMPFILE: if (debuglevel) warning("--use-temp-file option not yet supported, ignored.\n"); break; - case 3: + case LONG_OPT_NOTMPFILE: if (debuglevel) warning("--no-use-temp-file option not yet supported, ignored.\n"); break; - case 4: + case LONG_OPT_PREPROCESSOR: if (strcmp(optarg, "cat") == 0) no_preprocess = 1; else fprintf(stderr, "-P option not yet supported, ignored.\n"); break; - case 5: + case LONG_OPT_VERSION: printf(version_string); exit(0); break; - case 6: + case LONG_OPT_DEBUG: debuglevel = strtol(optarg, NULL, 0); break; - case 7: + case LONG_OPT_ENDIANESS: switch(optarg[0]) { case 'n': @@ -379,11 +394,11 @@ int main(int argc,char *argv[]) lose++; } break; - case 8: + case LONG_OPT_PEDANTIC: pedantic = 1; wpp_set_pedantic(1); break; - case 9: + case LONG_OPT_VERIFY_TRANSL: verify_translations_mode = 1; break; case 'D': @@ -399,8 +414,7 @@ int main(int argc,char *argv[]) printf(usage); exit(0); case 'i': - if (!input_name) input_name = strdup(optarg); - else error("Too many input files.\n"); + files[nb_files++] = optarg; break; case 'I': wpp_add_include_path(optarg); @@ -483,19 +497,11 @@ int main(int argc,char *argv[]) atexit(cleanup_files); - if (input_name) /* specified with -i option */ - { - if(!output_name && !preprocess_only) - { - output_name = dup_basename(input_name, ".rc"); - strcat(output_name, ".res"); - } - if (load_file( input_name, output_name )) exit(1); - } + while (optind < argc) files[nb_files++] = argv[optind++]; - while (optind < argc) + for (i = 0; i < nb_files; i++) { - input_name = argv[optind++]; + input_name = files[i]; if(!output_name && !preprocess_only) { output_name = dup_basename(input_name, ".rc");

1 0

Alexandre Julliard : winegcc: Pass all option flags to winebuild before non-options filenames.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 56a92c25b644f6bb3823388ee4b4c879276a1a0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=56a92c25b644f6bb3823388ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 29 13:13:25 2009 +0200 winegcc: Pass all option flags to winebuild before non-options filenames. --- tools/winegcc/winegcc.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index c2fb4f3..b337630 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -830,18 +830,20 @@ static void build(struct options* opts) for ( j = 0 ; j < opts->winebuild_args->size ; j++ ) strarray_add(spec_args, opts->winebuild_args->base[j]); + /* add resource files */ + for ( j = 0; j < files->size; j++ ) + if (files->base[j][1] == 'r') strarray_add(spec_args, files->base[j]); + + /* add other files */ + strarray_add(spec_args, "--"); for ( j = 0; j < files->size; j++ ) { - const char* name = files->base[j] + 2; switch(files->base[j][1]) { - case 'r': - strarray_add(spec_args, files->base[j]); - break; case 'd': case 'a': case 'o': - strarray_add(spec_args, name); + strarray_add(spec_args, files->base[j] + 2); break; } }

1 0