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

qingdoa daoo : msvcrt: Fix a TRACE message to avoid buffer overflow.
by Alexandre Julliard 05 Apr '06

05 Apr '06

Module: wine Branch: refs/heads/master Commit: 330978ec9ba0c33af92d0cd3caa91e00d0f6be95 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=330978ec9ba0c33af92d0cd… Author: qingdoa daoo <qingdao33122(a)yahoo.com> Date: Tue Apr 4 18:21:26 2006 -0700 msvcrt: Fix a TRACE message to avoid buffer overflow. --- dlls/msvcrt/environ.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index c59cd75..4b73b48 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -77,7 +77,7 @@ int _putenv(const char *str) char *dst; int ret; - TRACE("%s\n", str); + TRACE("%s\n", debugstr_a(str)); if (!str) return -1;

1 0

Pavel Semerad : dinput: Fixed joystick with POV and JoystickAImpl_SetProperty-proprange.
by Alexandre Julliard 05 Apr '06

05 Apr '06

Module: wine Branch: refs/heads/master Commit: ff8debd2be326099cd4d69b5d593202f62ec2ae8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ff8debd2be326099cd4d69b… Author: Pavel Semerad <semerad(a)sisal.mff.cuni.cz> Date: Tue Apr 4 00:01:50 2006 +0200 dinput: Fixed joystick with POV and JoystickAImpl_SetProperty-proprange. --- dlls/dinput/joystick_linux.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 6c49427..13b8c77 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -862,24 +862,24 @@ static int offset_to_object(JoystickImpl static LONG calculate_pov(JoystickImpl *This, int index) { - if (This->povs[index].lX < 16384) { - if (This->povs[index].lY < 16384) + if (This->povs[index].lX < -16384) { + if (This->povs[index].lY < -16384) This->js.rgdwPOV[index] = 31500; - else if (This->povs[index].lY > 49150) + else if (This->povs[index].lY > 16384) This->js.rgdwPOV[index] = 22500; else This->js.rgdwPOV[index] = 27000; - } else if (This->povs[index].lX > 49150) { - if (This->povs[index].lY < 16384) + } else if (This->povs[index].lX > 16384) { + if (This->povs[index].lY < -16384) This->js.rgdwPOV[index] = 4500; - else if (This->povs[index].lY > 49150) + else if (This->povs[index].lY > 16384) This->js.rgdwPOV[index] = 13500; else This->js.rgdwPOV[index] = 9000; } else { - if (This->povs[index].lY < 16384) + if (This->povs[index].lY < -16384) This->js.rgdwPOV[index] = 0; - else if (This->povs[index].lY > 49150) + else if (This->povs[index].lY > 16384) This->js.rgdwPOV[index] = 18000; else This->js.rgdwPOV[index] = -1; @@ -953,30 +953,30 @@ static void joy_polldev(JoystickImpl *Th case 8: /* FIXME don't go off array */ if (This->axis_map[jse.number + 1] == number) - This->povs[0].lX = value; + This->povs[0].lX = jse.value; else if (This->axis_map[jse.number - 1] == number) - This->povs[0].lY = value; + This->povs[0].lY = jse.value; value = calculate_pov(This, 0); break; case 9: if (This->axis_map[jse.number + 1] == number) - This->povs[1].lX = value; + This->povs[1].lX = jse.value; else if (This->axis_map[jse.number - 1] == number) - This->povs[1].lY = value; + This->povs[1].lY = jse.value; value = calculate_pov(This, 1); break; case 10: if (This->axis_map[jse.number + 1] == number) - This->povs[2].lX = value; + This->povs[2].lX = jse.value; else if (This->axis_map[jse.number - 1] == number) - This->povs[2].lY = value; + This->povs[2].lY = jse.value; value = calculate_pov(This, 2); break; case 11: if (This->axis_map[jse.number + 1] == number) - This->povs[3].lX = value; + This->povs[3].lX = jse.value; else if (This->axis_map[jse.number - 1] == number) - This->povs[3].lY = value; + This->povs[3].lY = jse.value; value = calculate_pov(This, 3); break; }

1 0

Eric Kohl : widl: Implement support for ref pointers to arrays of base types.
by Alexandre Julliard 05 Apr '06

05 Apr '06

Module: wine Branch: refs/heads/master Commit: 83d72a43189a1a51140d6c72b161efb8f9f2a1a0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=83d72a43189a1a51140d6c7… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Wed Apr 5 00:07:03 2006 +0200 widl: Implement support for ref pointers to arrays of base types. --- tools/widl/typegen.c | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 96d42a1..4fc95ed 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -780,6 +780,15 @@ static size_t write_array_tfs(FILE *file int has_length = length_is && (length_is->type != EXPR_VOID); int has_size = (size_is && (size_is->type != EXPR_VOID)) || !array->is_const; size_t start_offset; + int pointer_type = get_attrv(attrs, ATTR_POINTERTYPE); + if (!pointer_type) + pointer_type = RPC_FC_RP; + + print_file(file, 2, "0x%x, 0x00, /* %s */\n", + pointer_type, + pointer_type == RPC_FC_FP ? "FC_FP" : (pointer_type == RPC_FC_UP ? "FC_UP" : "FC_RP")); + print_file(file, 2, "NdrFcShort(0x2),\n"); + *typestring_offset += 4; if (array && NEXT_LINK(array)) /* multi-dimensional array */ { @@ -917,7 +926,7 @@ static size_t write_array_tfs(FILE *file *typestring_offset += 1; } - print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); + print_file(file, 2, "0x%x, /* FIXME: write out conversion data */\n", type->type); print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); *typestring_offset += 2; @@ -1374,13 +1383,15 @@ static unsigned int get_required_buffer_ unsigned int get_required_buffer_size(const var_t *var, unsigned int *alignment) { + expr_t *size_is = get_attrp(var->attrs, ATTR_SIZEIS); + int has_size = (size_is && (size_is->type != EXPR_VOID)); int in_attr = is_attr(var->attrs, ATTR_IN); int out_attr = is_attr(var->attrs, ATTR_OUT); if (!in_attr && !out_attr) in_attr = 1; - if ((!out_attr || in_attr) && !is_attr(var->attrs, ATTR_STRING) && !var->array) + if ((!out_attr || in_attr) && !has_size && !is_attr(var->attrs, ATTR_STRING) && !var->array) { if (var->ptr_level > 0 || (var->ptr_level == 0 && type_has_ref(var->type))) { @@ -1621,7 +1632,7 @@ void write_remoting_arguments(FILE *file } else if (!has_length && has_size) { - if (is_size_needed_for_phase(phase)) + if (is_size_needed_for_phase(phase) && phase != PHASE_FREE) { print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); write_expr(file, size_is ? size_is : var->array, 1); @@ -1645,7 +1656,14 @@ void write_remoting_arguments(FILE *file } } - print_phase_function(file, indent, array_type, phase, var->name, *type_offset); + if (!in_attr && phase == PHASE_FREE) + { + print_file(file, indent, "if (%s)\n", var->name); + indent++; + print_file(file, indent, "_StubMsg.pfnFree(%s);\n", var->name); + } + else if (phase != PHASE_FREE) + print_phase_function(file, indent, array_type, phase, var->name, *type_offset + 4); } else if (var->ptr_level == 0 && is_base_type(type->type)) {

1 0

lostwages/templates/en download.template
by Jeremy Newman 04 Apr '06

04 Apr '06

ChangeSet ID: 23991 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/04/04 16:56:03 Modified files: templates/en : download.template Log message: based on patch from: Kari Hurtta add Wiki link for help on building Wine. Patch: http://cvs.winehq.org/patch.py?id=23991 Old revision New revision Changes Path 1.76 1.77 +2 -0 lostwages/templates/en/download.template Index: lostwages/templates/en/download.template diff -u -p lostwages/templates/en/download.template:1.76 lostwages/templates/en/download.template:1.77 --- lostwages/templates/en/download.template:1.76 4 Apr 2006 21:56: 3 -0000 +++ lostwages/templates/en/download.template 4 Apr 2006 21:56: 3 -0000 @@ -195,6 +195,8 @@ for post-installation instructions.</b>< </table> +<div style="margin: 10px; padding: 5px; border: 1px solid #C0C0C0; background-color: #F0F0F0;"><b>Note:</b> See the <a href="http://wiki.winehq.org/Recommended_Packages">recommended packages</a> for help on configuring and building Wine.</div> + <h1><a name="link2us"></a>Link to Us</h1>

1 0

Alexandre Julliard : x11drv: Avoid redundant flushing of the thread display .
by Alexandre Julliard 04 Apr '06

04 Apr '06

Module: wine Branch: refs/heads/master Commit: 2136f3271589afca4c78c84fe503c0a83433ed45 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2136f3271589afca4c78c84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 4 20:49:53 2006 +0200 x11drv: Avoid redundant flushing of the thread display. --- dlls/x11drv/event.c | 6 +----- dlls/x11drv/winpos.c | 3 --- 2 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/x11drv/event.c b/dlls/x11drv/event.c index 98e40b8..2271cae 100644 --- a/dlls/x11drv/event.c +++ b/dlls/x11drv/event.c @@ -269,6 +269,7 @@ static int process_events( Display *disp handler( hwnd, &event ); wine_tsx11_lock(); } + XFlush( gdi_display ); wine_tsx11_unlock(); if (count) TRACE( "processed %d events\n", count ); return count; @@ -294,11 +295,6 @@ DWORD X11DRV_MsgWaitForMultipleObjectsEx /* check whether only server queue handle was passed in */ if (count < 2) flags &= ~MWMO_WAITALL; - wine_tsx11_lock(); - XFlush( gdi_display ); - XFlush( data->display ); - wine_tsx11_unlock(); - data->process_event_count++; if (process_events( data->display, mask )) ret = count; diff --git a/dlls/x11drv/winpos.c b/dlls/x11drv/winpos.c index 5bf9368..f0fa3b8 100644 --- a/dlls/x11drv/winpos.c +++ b/dlls/x11drv/winpos.c @@ -671,9 +671,6 @@ BOOL X11DRV_set_window_pos( HWND hwnd, H wine_tsx11_unlock(); } } - wine_tsx11_lock(); - XFlush( display ); /* FIXME: should not be necessary */ - wine_tsx11_unlock(); } } WIN_ReleasePtr( win );

1 0

Alexandre Julliard : x11drv: Remove one more XSync call.
by Alexandre Julliard 04 Apr '06

04 Apr '06

Module: wine Branch: refs/heads/master Commit: 57b1ea618fe3f9310c0e3eb53ff439656698e5e8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=57b1ea618fe3f9310c0e3eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 4 20:47:34 2006 +0200 x11drv: Remove one more XSync call. --- dlls/x11drv/window.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/x11drv/window.c b/dlls/x11drv/window.c index a7d1410..4e010e6 100644 --- a/dlls/x11drv/window.c +++ b/dlls/x11drv/window.c @@ -643,7 +643,6 @@ void X11DRV_sync_window_position( Displa data->whole_rect.bottom - data->whole_rect.top, changes.sibling, mask ); wine_tsx11_lock(); - XSync( gdi_display, False ); /* flush graphics operations before moving the window */ if (mask & (CWWidth|CWHeight)) set_size_hints( display, data, style ); XReconfigureWMWindow( display, data->whole_window, DefaultScreen(display), mask, &changes );

1 0

Jan Zerebecki : wined3d: CreateDevice should use the root window.
by Alexandre Julliard 04 Apr '06

04 Apr '06

Module: wine Branch: refs/heads/master Commit: d4fa4f22cbb5912fd40c2b967e9d189ef05d1fb8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d4fa4f22cbb5912fd40c2b9… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Tue Apr 4 17:37:01 2006 +0200 wined3d: CreateDevice should use the root window. --- dlls/wined3d/device.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f355499..24409ea 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1193,7 +1193,11 @@ HRESULT WINAPI IWineD3DDeviceImpl_Create object->win_handle = This->createParms.hFocusWindow; } - object->win = (Window)GetPropA(object->win_handle, "__wine_x11_whole_window" ); + object->win_handle = GetAncestor(object->win_handle, GA_ROOT); + if ( !( object->win = (Window)GetPropA(object->win_handle, "__wine_x11_whole_window") ) ) { + ERR("Can't get drawable (window), HWND:%p doesn't have the property __wine_x11_whole_window\n", object->win_handle); + return D3DERR_NOTAVAILABLE; + } hDc = GetDC(object->win_handle); object->display = get_display(hDc); ReleaseDC(object->win_handle, hDc);

1 0

Jan Zerebecki : wined3d: Output unhandled renderstates with debug_d3drenderstate.
by Alexandre Julliard 04 Apr '06

04 Apr '06

Module: wine Branch: refs/heads/master Commit: 166b6d861d283c36b1791d0e90342598176775b9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=166b6d861d283c36b1791d0… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Tue Apr 4 15:34:28 2006 +0200 wined3d: Output unhandled renderstates with debug_d3drenderstate. --- dlls/wined3d/device.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 03a7ec3..f355499 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3677,6 +3677,14 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen case WINED3DRS_WRAP5 : case WINED3DRS_WRAP6 : case WINED3DRS_WRAP7 : + case WINED3DRS_WRAP8 : + case WINED3DRS_WRAP9 : + case WINED3DRS_WRAP10 : + case WINED3DRS_WRAP11 : + case WINED3DRS_WRAP12 : + case WINED3DRS_WRAP13 : + case WINED3DRS_WRAP14 : + case WINED3DRS_WRAP15 : /** http://www.cosc.brocku.ca/Offerings/3P98/course/lectures/texture/ http://msdn.microsoft.com/archive/default.asp?url=/archive/en-us/directx9_c… @@ -3686,7 +3694,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen so far as I can tell, wrapping and texture-coordinate generate go hand in hand, */ - TRACE("(%p)->(%d,%ld) Texture wraping not yet supported\n",This, State, Value); + TRACE("(%p)->(%s,%ld) Texture wraping not yet supported\n",This, debug_d3drenderstate(State), Value); break; case WINED3DRS_MULTISAMPLEANTIALIAS : { @@ -3760,7 +3768,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen case WINED3DRS_ADAPTIVETESS_W : case WINED3DRS_ENABLEADAPTIVETESSELLATION : { - FIXME("(%p)->(%d,%ld) not handled yet\n", This, State, Value); + FIXME("(%p)->(%s,%ld) not handled yet\n", This, debug_d3drenderstate(State), Value); break; } case WINED3DRS_TWOSIDEDSTENCILMODE : @@ -3882,7 +3890,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen case WINED3DRS_BLENDFACTOR : case WINED3DRS_SRGBWRITEENABLE : { - FIXME("(%p)->(%d,%ld) not handled yet\n", This, State, Value); + FIXME("(%p)->(%s,%ld) not handled yet\n", This, debug_d3drenderstate(State), Value); break; } case WINED3DRS_DEPTHBIAS : @@ -3899,20 +3907,11 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen } break; } - case WINED3DRS_WRAP8 : - case WINED3DRS_WRAP9 : - case WINED3DRS_WRAP10 : - case WINED3DRS_WRAP11 : - case WINED3DRS_WRAP12 : - case WINED3DRS_WRAP13 : - case WINED3DRS_WRAP14 : - case WINED3DRS_WRAP15 : case WINED3DRS_SEPARATEALPHABLENDENABLE : case WINED3DRS_SRCBLENDALPHA : case WINED3DRS_DESTBLENDALPHA : case WINED3DRS_BLENDOPALPHA : - /*Put back later: FIXME("(%p)->(%d,%ld) not handled yet\n", This, State, Value); */ - FIXME("(%p)->(%d,%ld) not handled yet\n", This, State, Value); + FIXME("(%p)->(%s,%ld) not handled yet\n", This, debug_d3drenderstate(State), Value); break; default: FIXME("(%p)->(%d,%ld) unrecognized\n", This, State, Value);

1 0

Jan Zerebecki : wined3d: Add D3DFMT_L16.
by Alexandre Julliard 04 Apr '06

04 Apr '06

Module: wine Branch: refs/heads/master Commit: 10fc9480936c2de291db0ff4f43fe03d6e5cfe2c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=10fc9480936c2de291db0ff… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Tue Apr 4 15:34:46 2006 +0200 wined3d: Add D3DFMT_L16. --- dlls/wined3d/utils.c | 5 +++-- include/d3d9types.h | 1 + include/wine/wined3d_types.h | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e9f6366..ba1eb81 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -35,7 +35,6 @@ const char* debug_d3dformat(WINED3DFORMA FMT_TO_STR(WINED3DFMT_UNKNOWN); FMT_TO_STR(WINED3DFMT_R8G8B8); FMT_TO_STR(WINED3DFMT_A8R8G8B8); - FMT_TO_STR(WINED3DFMT_A8B8G8R8); FMT_TO_STR(WINED3DFMT_X8R8G8B8); FMT_TO_STR(WINED3DFMT_R5G6B5); FMT_TO_STR(WINED3DFMT_X1R5G5B5); @@ -46,6 +45,7 @@ const char* debug_d3dformat(WINED3DFORMA FMT_TO_STR(WINED3DFMT_A8R3G3B2); FMT_TO_STR(WINED3DFMT_X4R4G4B4); FMT_TO_STR(WINED3DFMT_A2B10G10R10); + FMT_TO_STR(WINED3DFMT_A8B8G8R8); FMT_TO_STR(WINED3DFMT_X8B8G8R8); FMT_TO_STR(WINED3DFMT_G16R16); FMT_TO_STR(WINED3DFMT_A2R10G10B10); @@ -76,11 +76,12 @@ const char* debug_d3dformat(WINED3DFORMA FMT_TO_STR(WINED3DFMT_D32); FMT_TO_STR(WINED3DFMT_D15S1); FMT_TO_STR(WINED3DFMT_D24S8); - FMT_TO_STR(WINED3DFMT_D24FS8); FMT_TO_STR(WINED3DFMT_D24X8); FMT_TO_STR(WINED3DFMT_D24X4S4); FMT_TO_STR(WINED3DFMT_D16); + FMT_TO_STR(WINED3DFMT_L16); FMT_TO_STR(WINED3DFMT_D32F_LOCKABLE); + FMT_TO_STR(WINED3DFMT_D24FS8); FMT_TO_STR(WINED3DFMT_VERTEXDATA); FMT_TO_STR(WINED3DFMT_INDEX16); FMT_TO_STR(WINED3DFMT_INDEX32); diff --git a/include/d3d9types.h b/include/d3d9types.h index be3f947..3c4b8a1 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -816,6 +816,7 @@ typedef enum _D3DFORMAT { D3DFMT_D24X8 = 77, D3DFMT_D24X4S4 = 79, D3DFMT_D16 = 80, + D3DFMT_L16 = 81, D3DFMT_D32F_LOCKABLE = 82, D3DFMT_D24FS8 = 83, diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index ed7dd94..9658ebb 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -184,6 +184,7 @@ typedef enum _WINED3DFORMAT { WINED3DFMT_D24X8 = 77, WINED3DFMT_D24X4S4 = 79, WINED3DFMT_D16 = 80, + WINED3DFMT_L16 = 81, WINED3DFMT_D32F_LOCKABLE = 82, WINED3DFMT_D24FS8 = 83,

1 0

Jesse Allen : x11drv: Make UseXVidMode default to yes.
by Alexandre Julliard 04 Apr '06

04 Apr '06

Module: wine Branch: refs/heads/master Commit: 5812eb3afa9ba7c5bd6ef5a527fe1642faed75b5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5812eb3afa9ba7c5bd6ef5a… Author: Jesse Allen <the3dfxdude(a)gmail.com> Date: Tue Apr 4 11:10:02 2006 -0700 x11drv: Make UseXVidMode default to yes. --- dlls/x11drv/x11drv_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/x11drv/x11drv_main.c b/dlls/x11drv/x11drv_main.c index 050ac54..f0269a9 100644 --- a/dlls/x11drv/x11drv_main.c +++ b/dlls/x11drv/x11drv_main.c @@ -74,7 +74,7 @@ Window root_window; DWORD desktop_tid = 0; int dxgrab = 0; int usedga = 0; -int usexvidmode = 0; +int usexvidmode = 1; int usexrandr = 1; int use_xkb = 1; int use_take_focus = 1;

1 0