April 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : Release 1.3.18.
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: 41dfdb28c79dd2c6fc1530713b65d28862ee02d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41dfdb28c79dd2c6fc1530713… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 15 19:34:28 2011 +0200 Release 1.3.18. --- ANNOUNCE | 906 +++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 466 insertions(+), 460 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=41dfdb28c79dd2c6fc153…

1 0

Dmitry Timoshkov : ole32: Replace a spurious FIXME by a TRACE.
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: 30b6b53adfabaef7c7b1829c63274ae85ba97544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30b6b53adfabaef7c7b1829c6… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Apr 15 17:44:43 2011 +0900 ole32: Replace a spurious FIXME by a TRACE. --- dlls/ole32/memlockbytes.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/memlockbytes.c b/dlls/ole32/memlockbytes.c index 57acf37..87bbfcb 100644 --- a/dlls/ole32/memlockbytes.c +++ b/dlls/ole32/memlockbytes.c @@ -165,7 +165,7 @@ HRESULT WINAPI GetHGlobalFromILockBytes(ILockBytes* plkbyt, HGLOBAL* phglobal) ERR("Cannot ILockBytes_Stat, %x\n",hres); return hres; } - FIXME("cbSize is %d\n",stbuf.cbSize.u.LowPart); + TRACE("cbSize is %s\n", wine_dbgstr_longlong(stbuf.cbSize.QuadPart)); *phglobal = GlobalAlloc( GMEM_MOVEABLE|GMEM_SHARE, stbuf.cbSize.u.LowPart); if (!*phglobal) return E_INVALIDARG;

1 0

Jörg Höhle : user32: Added message names for winmm.
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: 5d7e6b75063d7b832ed82dc2859ec806758379aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d7e6b75063d7b832ed82dc28… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Mar 17 01:19:57 2011 +0100 user32: Added message names for winmm. --- dlls/user32/spy.c | 41 ++++++++++++++++++++++++----------------- 1 files changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 26bd741..e2c5a2e 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -686,28 +686,35 @@ static const char * const MessageTypeNames[SPY_MAX_MSGNUM + 1] = "MM_JOY2BUTTONDOWN", "MM_JOY1BUTTONUP", "MM_JOY2BUTTONUP", - "MM_MCINOTIFY", + "MM_MCINOTIFY", /* 0x03B9 */ NULL, - "MM_WOM_OPEN", - "MM_WOM_CLOSE", - "MM_WOM_DONE", - "MM_WIM_OPEN", - "MM_WIM_CLOSE", + "MM_WOM_OPEN", /* 0x03BB */ + "MM_WOM_CLOSE", /* 0x03BC */ + "MM_WOM_DONE", /* 0x03BD */ + "MM_WIM_OPEN", /* 0x03BE */ + "MM_WIM_CLOSE", /* 0x03BF */ /* 0x03c0 */ - "MM_WIM_DATA", - "MM_MIM_OPEN", - "MM_MIM_CLOSE", - "MM_MIM_DATA", - "MM_MIM_LONGDATA", - "MM_MIM_ERROR", - "MM_MIM_LONGERROR", - "MM_MOM_OPEN", - "MM_MOM_CLOSE", - "MM_MOM_DONE", + "MM_WIM_DATA", /* 0x03C0 */ + "MM_MIM_OPEN", /* 0x03C1 */ + "MM_MIM_CLOSE", /* 0x03C2 */ + "MM_MIM_DATA", /* 0x03C3 */ + "MM_MIM_LONGDATA", /* 0x03C4 */ + "MM_MIM_ERROR", /* 0x03C5 */ + "MM_MIM_LONGERROR", /* 0x03C6 */ + "MM_MOM_OPEN", /* 0x03C7 */ + "MM_MOM_CLOSE", /* 0x03C8 */ + "MM_MOM_DONE", /* 0x03C9 */ + "MM_MOM_POSITIONCB", /* 0x03CA */ + "MM_MCISIGNAL", /* 0x03CB */ + "MM_MIM_MOREDATA", /* 0x03CC */ + NULL, NULL, NULL, + + /* 0x03d0 */ + "MM_MIXM_LINE_CHANGE", + "MM_MIXM_CONTROL_CHANGE", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 0x03e0 */ "WM_DDE_INITIATE", /* 0x3E0 */

1 0

Huw Davies : gdi32: Keep track of the combined clip region.
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: f33bbbfdd7f56701e91e96945f27b258fe73c6d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f33bbbfdd7f56701e91e96945… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 13 14:57:44 2011 +0100 gdi32: Keep track of the combined clip region. --- dlls/gdi32/dibdrv/dc.c | 18 +++++++++++++++++- dlls/gdi32/gdi_private.h | 1 + 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index e5048d4..9e97177 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -32,7 +32,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dib); */ static BOOL CDECL dibdrv_DeleteDC( PHYSDEV dev ) { + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); TRACE("(%p)\n", dev); + DeleteObject(pdev->clip); return 0; } @@ -129,6 +131,7 @@ static HBITMAP CDECL dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) if (!bmp) return 0; assert(bmp->dib); + pdev->clip = CreateRectRgn(0, 0, 0, 0); pdev->defer = 0; if(!init_dib(&pdev->dib, &bmp->dib->dsBmih, bmp->dib->dsBitfields, bmp->dib->dsBm.bmBits)) @@ -140,6 +143,19 @@ static HBITMAP CDECL dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) } /*********************************************************************** + * dibdrv_SetDeviceClipping + */ +static void CDECL dibdrv_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) +{ + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetDeviceClipping ); + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + TRACE("(%p, %p, %p)\n", dev, vis_rgn, clip_rgn); + + CombineRgn( pdev->clip, vis_rgn, clip_rgn, clip_rgn ? RGN_AND : RGN_COPY ); + return next->funcs->pSetDeviceClipping( next, vis_rgn, clip_rgn); +} + +/*********************************************************************** * dibdrv_SetROP2 */ static INT CDECL dibdrv_SetROP2( PHYSDEV dev, INT rop ) @@ -245,7 +261,7 @@ const DC_FUNCTIONS dib_driver = NULL, /* pSetDIBColorTable */ NULL, /* pSetDIBits */ NULL, /* pSetDIBitsToDevice */ - NULL, /* pSetDeviceClipping */ + dibdrv_SetDeviceClipping, /* pSetDeviceClipping */ NULL, /* pSetDeviceGammaRamp */ NULL, /* pSetLayout */ NULL, /* pSetMapMode */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 91f4acb..e126aa1 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -97,6 +97,7 @@ typedef struct dibdrv_physdev struct gdi_physdev dev; dib_info dib; + HRGN clip; DWORD defer; /* pen */

1 0

Huw Davies : gdi32: Add clipping for horizontal and vertical solid lines.
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: 1372692fe76e50fd72709f829144f44a3c465432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1372692fe76e50fd72709f829… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 15 13:14:34 2011 +0100 gdi32: Add clipping for horizontal and vertical solid lines. --- dlls/gdi32/dibdrv/objects.c | 93 +++++++++++++++++++++++++++++++----------- dlls/gdi32/gdi_private.h | 13 ++++++ dlls/gdi32/region.c | 21 ++++++--- dlls/gdi32/tests/dib.c | 60 +++++++++++++++++++++++++++ 4 files changed, 155 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1372692fe76e50fd72709…

1 0

Alexandre Julliard : server: Inherit the process affinity from the parent process.
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: 4fd8bab99ef4e0f33cb3e3539de5b0e85fc0560f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fd8bab99ef4e0f33cb3e3539… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 14 19:57:52 2011 +0200 server: Inherit the process affinity from the parent process. --- server/process.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/server/process.c b/server/process.c index a3aa586..d868d21 100644 --- a/server/process.c +++ b/server/process.c @@ -320,7 +320,6 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit process->exit_code = STILL_ACTIVE; process->running_threads = 0; process->priority = PROCESS_PRIOCLASS_NORMAL; - process->affinity = ~0; process->suspend = 0; process->is_system = 0; process->create_flags = 0; @@ -355,6 +354,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit { process->handles = alloc_handle_table( process, 0 ); process->token = token_create_admin(); + process->affinity = ~0; } else { @@ -365,6 +365,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit /* Note: for security reasons, starting a new process does not attempt * to use the current impersonation token for the new process */ process->token = token_duplicate( parent->token, TRUE, 0 ); + process->affinity = parent->affinity; } if (!process->handles || !process->token) goto error;

1 0

Alexandre Julliard : server: Retrieve the Unix thread affinity for the initial thread.
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: 500d77245c578acf89328cce36a4d5284d75b524 URL: http://source.winehq.org/git/wine.git/?a=commit;h=500d77245c578acf89328cce3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 14 20:18:02 2011 +0200 server: Retrieve the Unix thread affinity for the initial thread. --- server/thread.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/server/thread.c b/server/thread.c index 05e4121..983ba2d 100644 --- a/server/thread.c +++ b/server/thread.c @@ -190,7 +190,6 @@ static inline void init_thread_structure( struct thread *thread ) thread->state = RUNNING; thread->exit_code = 0; thread->priority = 0; - thread->affinity = ~0; thread->suspend = 0; thread->desktop_users = 0; thread->token = NULL; @@ -432,6 +431,24 @@ int set_thread_affinity( struct thread *thread, affinity_t affinity ) return ret; } +affinity_t get_thread_affinity( struct thread *thread ) +{ + affinity_t mask = 0; +#ifdef HAVE_SCHED_SETAFFINITY + if (thread->unix_tid != -1) + { + cpu_set_t set; + unsigned int i; + + if (!sched_getaffinity( thread->unix_tid, sizeof(set), &set )) + for (i = 0; i < 8 * sizeof(mask); i++) + if (CPU_ISSET( i, &set )) mask |= 1 << i; + } +#endif + if (!mask) mask = ~0; + return mask; +} + #define THREAD_PRIORITY_REALTIME_HIGHEST 6 #define THREAD_PRIORITY_REALTIME_LOWEST -7 @@ -1157,6 +1174,10 @@ DECL_HANDLER(init_thread) process->peb = req->entry; process->cpu = req->cpu; reply->info_size = init_process( current ); + if (!process->parent) + process->affinity = current->affinity = get_thread_affinity( current ); + else + set_thread_affinity( current, current->affinity ); } else { @@ -1169,9 +1190,9 @@ DECL_HANDLER(init_thread) process->unix_pid = -1; /* can happen with linuxthreads */ if (current->suspend + process->suspend > 0) stop_thread( current ); generate_debug_event( current, CREATE_THREAD_DEBUG_EVENT, &req->entry ); + set_thread_affinity( current, current->affinity ); } debug_level = max( debug_level, req->debug_level ); - set_thread_affinity( current, current->affinity ); reply->pid = get_process_id( process ); reply->tid = get_thread_id( current );

1 0

Eric Pouech : dbghelp: Added some missing defines to dwarf.h.
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: 18f539ac2e444118e128c0a0bb0acc4c1e972e11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18f539ac2e444118e128c0a0b… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Apr 14 21:27:49 2011 +0200 dbghelp: Added some missing defines to dwarf.h. --- dlls/dbghelp/dwarf.h | 69 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 66 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.h b/dlls/dbghelp/dwarf.h index f0557be..0605da3 100644 --- a/dlls/dbghelp/dwarf.h +++ b/dlls/dbghelp/dwarf.h @@ -78,11 +78,25 @@ typedef enum dwarf_tag_e DW_TAG_partial_unit = 0x3c, DW_TAG_imported_unit = 0x3d, DW_TAG_mutable_type = 0x3e, + /** Dwarf3f new values */ + DW_TAG_condition = 0x3f, + DW_TAG_shared_type = 0x40, + /** Dwarf4 new values */ + DW_TAG_type_unit = 0x41, + DW_TAG_rvalue_reference_type = 0x42, + DW_TAG_template_alias = 0x43, /** extensions */ DW_TAG_MIPS_loop = 0x4081, DW_TAG_format_label = 0x4101, DW_TAG_function_template = 0x4102, - DW_TAG_class_template = 0x4103 + DW_TAG_class_template = 0x4103, + DW_TAG_GNU_BINCL = 0x4104, + DW_TAG_GNU_EINCL = 0x4105, + DW_TAG_GNU_template_template_param = 0x4106, + DW_TAG_GNU_template_parameter_pack = 0x4107, + DW_TAG_GNU_formal_parameter_pack = 0x4108, + DW_TAG_GNU_call_site = 0x4109, + DW_TAG_GNU_call_site_parameter = 0x410a, } dwarf_tag_t; typedef enum dwarf_attribute_e @@ -153,6 +167,7 @@ typedef enum dwarf_attribute_e DW_AT_allocated = 0x4e, DW_AT_associated = 0x4f, DW_AT_data_location = 0x50, + DW_AT_byte_stride = 0x51, DW_AT_stride = 0x51, DW_AT_entry_pc = 0x52, DW_AT_use_UTF8 = 0x53, @@ -163,6 +178,28 @@ typedef enum dwarf_attribute_e DW_AT_call_file = 0x58, DW_AT_call_line = 0x59, DW_AT_description = 0x5a, + /** Dwarf3 new values */ + DW_AT_binary_scale = 0x5b, + DW_AT_decimal_scale = 0x5c, + DW_AT_small = 0x5d, + DW_AT_decimal_sign = 0x5e, + DW_AT_digit_count = 0x5f, + DW_AT_picture_string = 0x60, + DW_AT_mutable = 0x61, + DW_AT_threads_scaled = 0x62, + DW_AT_explicit = 0x63, + DW_AT_object_pointer = 0x64, + DW_AT_endianity = 0x65, + DW_AT_elemental = 0x66, + DW_AT_pure = 0x67, + DW_AT_recursive = 0x68, + /** Dwarf4 new values */ + DW_AT_signature = 0x69, + DW_AT_main_subprogram = 0x6a, + DW_AT_data_bit_offset = 0x6b, + DW_AT_const_expr = 0x6c, + DW_AT_enum_class = 0x6d, + DW_AT_linkage_name = 0x6e, /* extensions */ DW_AT_MIPS_fde = 0x2001, DW_AT_MIPS_loop_begin = 0x2002, @@ -180,7 +217,26 @@ typedef enum dwarf_attribute_e DW_AT_mac_info = 0x2103, DW_AT_src_coords = 0x2104, DW_AT_body_begin = 0x2105, - DW_AT_body_end = 0x2106 + DW_AT_body_end = 0x2106, + DW_AT_GNU_vector = 0x2107, + DW_AT_GNU_guarded_by = 0x2108, + DW_AT_GNU_pt_guarded_by = 0x2109, + DW_AT_GNU_guarded = 0x210a, + DW_AT_GNU_pt_guarded = 0x210b, + DW_AT_GNU_locks_excluded = 0x210c, + DW_AT_GNU_exclusive_locks_required = 0x210d, + DW_AT_GNU_shared_locks_required = 0x210e, + DW_AT_GNU_odr_signature = 0x210f, + DW_AT_GNU_template_name = 0x2110, + DW_AT_GNU_call_site_value = 0x2111, + DW_AT_GNU_call_site_data_value = 0x2112, + DW_AT_GNU_call_site_target = 0x2113, + DW_AT_GNU_call_site_target_clobbered = 0x2114, + DW_AT_GNU_tail_call = 0x2115, + DW_AT_GNU_all_tail_call_sites = 0x2116, + DW_AT_GNU_all_call_sites = 0x2117, + DW_AT_GNU_all_source_call_sites = 0x2118, + } dwarf_attribute_t; typedef enum dwarf_form_e @@ -205,7 +261,12 @@ typedef enum dwarf_form_e DW_FORM_ref4 = 0x13, DW_FORM_ref8 = 0x14, DW_FORM_ref_udata = 0x15, - DW_FORM_indirect = 0x16 + DW_FORM_indirect = 0x16, + /** Dwarf4 new values */ + DW_FORM_sec_offset = 0x17, + DW_FORM_exprloc = 0x18, + DW_FORM_flag_present = 0x19, + DW_FORM_ref_sig8 = 0x20, } dwarf_form_t; /** type encoding */ @@ -391,6 +452,8 @@ typedef enum dwarf_operation_e DW_OP_GNU_push_tls_address = 0xe0, DW_OP_GNU_uninit = 0xf0, DW_OP_GNU_encoded_addr = 0xf1, + DW_OP_GNU_implicit_pointer = 0xf2, + DW_OP_GNU_entry_value = 0xf3, } dwarf_operation_t; enum dwarf_calling_convention

1 0

Eric Pouech : dbghelp: Silence DW_TAG_GNU_call_site objects.
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: 44c52c16fde45e8188b0f1afa7701e750a736ba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44c52c16fde45e8188b0f1afa… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Apr 14 21:27:59 2011 +0200 dbghelp: Silence DW_TAG_GNU_call_site objects. --- dlls/dbghelp/dwarf.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 103bdbf..e0f1a90 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1751,6 +1751,9 @@ static void dwarf2_parse_inlined_subroutine(dwarf2_subprogram_t* subpgm, case DW_TAG_label: dwarf2_parse_subprogram_label(subpgm, child); break; + case DW_TAG_GNU_call_site: + /* this isn't properly supported by dbghelp interface. skip it for now */ + break; default: FIXME("Unhandled Tag type 0x%lx at %s, for %s\n", child->abbrev->tag, dwarf2_debug_ctx(subpgm->ctx), @@ -1808,9 +1811,12 @@ static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, * Skip it for now */ break; - case DW_TAG_imported_module: - /* C++ stuff to be silenced (for now) */ - break; + case DW_TAG_imported_module: + /* C++ stuff to be silenced (for now) */ + break; + case DW_TAG_GNU_call_site: + /* this isn't properly supported by dbghelp interface. skip it for now */ + break; case DW_TAG_label: dwarf2_parse_subprogram_label(subpgm, child); break; @@ -1939,6 +1945,7 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, case DW_TAG_unspecified_parameters: case DW_TAG_template_type_param: case DW_TAG_template_value_param: + case DW_TAG_GNU_call_site: /* FIXME: no support in dbghelp's internals so far */ break; default:

1 0

Henri Verbeet : wined3d: Remove COM from the volume implementation.
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: 2c450571e5c1d8d636c1b0a0751e44eba13c5250 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c450571e5c1d8d636c1b0a07… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 14 22:41:47 2011 +0200 wined3d: Remove COM from the volume implementation. --- dlls/d3d10core/device.c | 2 +- dlls/d3d10core/texture.c | 4 +- dlls/d3d8/d3d8_private.h | 12 +-- dlls/d3d8/device.c | 6 +- dlls/d3d8/volume.c | 18 ++-- dlls/d3d9/d3d9_private.h | 12 +-- dlls/d3d9/device.c | 6 +- dlls/d3d9/volume.c | 28 ++---- dlls/ddraw/ddraw.c | 2 +- dlls/wined3d/device.c | 12 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volume.c | 221 +++++++++++++++++----------------------- dlls/wined3d/wined3d.spec | 13 +++ dlls/wined3d/wined3d_private.h | 10 +- include/wine/wined3d.idl | 42 ++++---- 15 files changed, 171 insertions(+), 219 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c450571e5c1d8d636c1b…

1 0