September 2012 - Wine-Commits

Rico Schüller : d3dx9: Use sizeof variable instead of type.
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: 27b7fdf66339b2c638bbf361832577569a4fde71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b7fdf66339b2c638bbf3618… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Sep 4 09:44:51 2012 +0200 d3dx9: Use sizeof variable instead of type. --- dlls/d3dx9_36/math.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index cea4bdf..81c0b65 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -841,16 +841,16 @@ HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, LPD3DXMATRIXSTACK* ppstack) TRACE("flags %#x, ppstack %p\n", flags, ppstack); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXMatrixStackImpl)); - if ( object == NULL ) + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (object == NULL) { - *ppstack = NULL; - return E_OUTOFMEMORY; + *ppstack = NULL; + return E_OUTOFMEMORY; } object->ID3DXMatrixStack_iface.lpVtbl = &ID3DXMatrixStack_Vtbl; object->ref = 1; - object->stack = HeapAlloc(GetProcessHeap(), 0, INITIAL_STACK_SIZE * sizeof(D3DXMATRIX)); + object->stack = HeapAlloc(GetProcessHeap(), 0, INITIAL_STACK_SIZE * sizeof(*object->stack)); if (!object->stack) { HeapFree(GetProcessHeap(), 0, object); @@ -980,7 +980,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_Pop(ID3DXMatrixStack *iface) D3DXMATRIX *new_stack; new_size = This->stack_size / 2; - new_stack = HeapReAlloc(GetProcessHeap(), 0, This->stack, new_size * sizeof(D3DXMATRIX)); + new_stack = HeapReAlloc(GetProcessHeap(), 0, This->stack, new_size * sizeof(*new_stack)); if (new_stack) { This->stack_size = new_size; @@ -1007,7 +1007,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_Push(ID3DXMatrixStack *iface) if (This->stack_size > UINT_MAX / 2) return E_OUTOFMEMORY; new_size = This->stack_size * 2; - new_stack = HeapReAlloc(GetProcessHeap(), 0, This->stack, new_size * sizeof(D3DXMATRIX)); + new_stack = HeapReAlloc(GetProcessHeap(), 0, This->stack, new_size * sizeof(*new_stack)); if (!new_stack) return E_OUTOFMEMORY; This->stack_size = new_size;

1 0

Jason Edmeades : cmd: Fix rmdir error during recursive delete.
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: 94f9e789c94f90dad3d771cdabded15aeeedba8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=94f9e789c94f90dad3d771cda… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Mon Sep 3 22:03:58 2012 +0100 cmd: Fix rmdir error during recursive delete. --- programs/cmd/builtins.c | 4 ++++ programs/cmd/tests/test_builtins.cmd | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index a83947b..c92822b 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1827,6 +1827,10 @@ void WCMD_remove_dir (WCHAR *command) { lpDir.pFrom = thisArg; lpDir.fFlags = FOF_SILENT | FOF_NOCONFIRMATION | FOF_NOERRORUI; lpDir.wFunc = FO_DELETE; + + /* SHFileOperationW needs file list with a double null termination */ + thisArg[lstrlenW(thisArg) + 1] = 0x00; + if (SHFileOperationW(&lpDir)) WCMD_print_error (); } } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 36bc73f..13b53c5 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1163,7 +1163,7 @@ if not exist foo ( ) mkdir foo\bar\baz echo foo > foo\bar\brol -rmdir /s /Q foo +rmdir /s /Q foo 2>&1 if not exist foo ( echo recursive rmdir succeeded ) else (

1 0

Alexandre Julliard : winex11: Store the rectangle of the GL drawable and use it when updating the window size .
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: 514eb695846b45c89c0fc0d56653d187f1840eec URL: http://source.winehq.org/git/wine.git/?a=commit;h=514eb695846b45c89c0fc0d56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 4 15:03:04 2012 +0200 winex11: Store the rectangle of the GL drawable and use it when updating the window size. --- dlls/winex11.drv/opengl.c | 70 ++++++++++++++++++++++++++++---------------- dlls/winex11.drv/window.c | 58 +------------------------------------ dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 46 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=514eb695846b45c89c0fc…

1 0

Alexandre Julliard : winex11: Create the whole window at window creation time.
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: ea07c310ecfee6b301e7af8413760eb446e6f184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea07c310ecfee6b301e7af841… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 4 13:34:15 2012 +0200 winex11: Create the whole window at window creation time. --- dlls/winex11.drv/opengl.c | 3 +-- dlls/winex11.drv/systray.c | 5 +---- dlls/winex11.drv/window.c | 29 ++++++++--------------------- dlls/winex11.drv/x11drv.h | 1 - 4 files changed, 10 insertions(+), 28 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index a2d88a0..b23ec98 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1176,8 +1176,7 @@ BOOL set_win_format( HWND hwnd, XID fbconfig_id ) if (!(format = pixelformat_from_fbconfig_id( fbconfig_id ))) return FALSE; - if (!(data = X11DRV_get_win_data(hwnd)) && - !(data = X11DRV_create_win_data(hwnd))) return FALSE; + if (!(data = X11DRV_get_win_data(hwnd))) return FALSE; gl = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*gl) ); gl->pixel_format = format; diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 7efc63d..f46ea29 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -517,10 +517,7 @@ static void dock_systray_icon( Display *display, struct tray_icon *icon, Window icon->window = CreateWindowW( icon_classname, NULL, WS_CLIPSIBLINGS | WS_POPUP, CW_USEDEFAULT, CW_USEDEFAULT, icon_cx, icon_cy, NULL, NULL, NULL, icon ); - if (!icon->window) return; - - if (!(data = X11DRV_get_win_data( icon->window )) && - !(data = X11DRV_create_win_data( icon->window ))) return; + if (!(data = X11DRV_get_win_data( icon->window ))) return; TRACE( "icon window %p/%lx managed %u\n", data->hwnd, data->whole_window, data->managed ); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7d2d1e2..e5b731c 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -911,12 +911,9 @@ static Window get_owner_whole_window( HWND owner, BOOL force_managed ) if (!owner) return 0; - if (!(data = X11DRV_get_win_data( owner ))) - { - if (!(data = X11DRV_create_win_data( owner ))) - return (Window)GetPropA( owner, whole_window_prop ); - } - else if (!data->managed && force_managed) /* make it managed */ + if (!(data = X11DRV_get_win_data( owner ))) return (Window)GetPropA( owner, whole_window_prop ); + + if (!data->managed && force_managed) /* make it managed */ { SetWindowPos( owner, 0, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOSIZE | SWP_NOMOVE | @@ -1722,7 +1719,8 @@ struct x11drv_win_data *X11DRV_get_win_data( HWND hwnd ) * * Create an X11 data window structure for an existing window. */ -struct x11drv_win_data *X11DRV_create_win_data( HWND hwnd ) +static struct x11drv_win_data *X11DRV_create_win_data( HWND hwnd, const RECT *window_rect, + const RECT *client_rect ) { Display *display; struct x11drv_win_data *data; @@ -1733,16 +1731,11 @@ struct x11drv_win_data *X11DRV_create_win_data( HWND hwnd ) /* don't create win data for HWND_MESSAGE windows */ if (parent != GetDesktopWindow() && !GetAncestor( parent, GA_PARENT )) return NULL; - if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) return NULL; - display = thread_init_display(); if (!(data = alloc_win_data( display, hwnd ))) return NULL; - GetWindowRect( hwnd, &data->window_rect ); - MapWindowPoints( 0, parent, (POINT *)&data->window_rect, 2 ); - data->whole_rect = data->window_rect; - GetClientRect( hwnd, &data->client_rect ); - MapWindowPoints( hwnd, parent, (POINT *)&data->client_rect, 2 ); + data->whole_rect = data->window_rect = *window_rect; + data->client_rect = *client_rect; if (parent == GetDesktopWindow()) { @@ -2076,14 +2069,8 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag const RECT *window_rect, const RECT *client_rect, RECT *visible_rect ) { struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); - DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); - if (!data) - { - /* create the win data if the window is being made visible */ - if (!(style & WS_VISIBLE) && !(swp_flags & SWP_SHOWWINDOW)) return; - if (!(data = X11DRV_create_win_data( hwnd ))) return; - } + if (!data && !(data = X11DRV_create_win_data( hwnd, window_rect, client_rect ))) return; /* check if we need to switch the window to managed */ if (!data->managed && data->whole_window && is_window_managed( hwnd, swp_flags, window_rect )) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index d1db819..eae047a 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -551,7 +551,6 @@ struct x11drv_win_data }; extern struct x11drv_win_data *X11DRV_get_win_data( HWND hwnd ) DECLSPEC_HIDDEN; -extern struct x11drv_win_data *X11DRV_create_win_data( HWND hwnd ) DECLSPEC_HIDDEN; extern Window X11DRV_get_whole_window( HWND hwnd ) DECLSPEC_HIDDEN; extern XIC X11DRV_get_ic( HWND hwnd ) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : wbemprox: Add a function to query the service configuration.
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: bbb823f8c2aa16c56f82ebcdb6813cbf1e91109a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbb823f8c2aa16c56f82ebcdb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 4 13:49:11 2012 +0200 wbemprox: Add a function to query the service configuration. --- dlls/wbemprox/builtin.c | 45 +++++++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 1016ca5..29d7392 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -880,6 +880,25 @@ static const WCHAR *get_service_startmode( DWORD mode ) } } +static QUERY_SERVICE_CONFIGW *query_service_config( SC_HANDLE manager, const WCHAR *name ) +{ + QUERY_SERVICE_CONFIGW *config = NULL; + SC_HANDLE service; + DWORD size; + + if (!(service = OpenServiceW( manager, name, SERVICE_QUERY_CONFIG ))) return NULL; + QueryServiceConfigW( service, NULL, 0, &size ); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) goto done; + if (!(config = heap_alloc( size ))) goto done; + if (QueryServiceConfigW( service, config, size, &size )) goto done; + heap_free( config ); + config = NULL; + +done: + CloseServiceHandle( service ); + return config; +} + static void fill_service( struct table *table ) { struct record_service *rec; @@ -915,27 +934,8 @@ static void fill_service( struct table *table ) for (i = 0; i < count; i++) { QUERY_SERVICE_CONFIGW *config; - SC_HANDLE service; - DWORD startmode; - DWORD size; - - service = OpenServiceW(manager, services[i].lpServiceName, GENERIC_READ); - QueryServiceConfigW(service, NULL, 0, &size); - config = heap_alloc(size); - if (!config) - { - CloseServiceHandle(service); - break; - } - if (QueryServiceConfigW(service, config, size, &size)) - startmode = config->dwStartType; - else - { - ERR("failed to get %s service config data\n", debugstr_w(services[i].lpServiceName)); - startmode = SERVICE_DISABLED; - } - CloseServiceHandle(service); - heap_free(config); + + if (!(config = query_service_config( manager, services[i].lpServiceName ))) continue; status = &services[i].ServiceStatusProcess; rec = (struct record_service *)(table->data + offset); @@ -945,9 +945,10 @@ static void fill_service( struct table *table ) rec->name = heap_strdupW( services[i].lpServiceName ); rec->process_id = status->dwProcessId; rec->servicetype = get_service_type( status->dwServiceType ); - rec->startmode = get_service_startmode( startmode ); + rec->startmode = get_service_startmode( config->dwStartType ); rec->state = get_service_state( status->dwCurrentState ); rec->systemname = heap_strdupW( sysnameW ); + heap_free( config ); offset += sizeof(*rec); num_rows++; }

1 0

Hans Leidekker : wbemprox: Implement Win32_ComputerSystem.DomainRole.
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: 5c074732d5b610467f6d9e939d2c6365f483a282 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c074732d5b610467f6d9e939… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 4 13:49:57 2012 +0200 wbemprox: Implement Win32_ComputerSystem.DomainRole. --- dlls/wbemprox/builtin.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 29d7392..e3a5e6d 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -97,6 +97,8 @@ static const WCHAR prop_directionW[] = {'D','i','r','e','c','t','i','o','n',0}; static const WCHAR prop_displaynameW[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; +static const WCHAR prop_domainroleW[] = + {'D','o','m','a','i','n','R','o','l','e',0}; static const WCHAR prop_drivetypeW[] = {'D','r','i','v','e','T','y','p','e',0}; static const WCHAR prop_filesystemW[] = @@ -199,6 +201,7 @@ static const struct column col_bios[] = static const struct column col_compsys[] = { { prop_descriptionW, CIM_STRING }, + { prop_domainroleW, CIM_UINT16 }, { prop_manufacturerW, CIM_STRING }, { prop_modelW, CIM_STRING }, { prop_numlogicalprocessorsW, CIM_UINT32, VT_I4 }, @@ -339,6 +342,7 @@ struct record_bios struct record_computersystem { const WCHAR *description; + UINT16 domainrole; const WCHAR *manufacturer; const WCHAR *model; UINT32 num_logical_processors; @@ -488,6 +492,7 @@ static void fill_compsys( struct table *table ) rec = (struct record_computersystem *)table->data; rec->description = compsys_descriptionW; + rec->domainrole = 0; /* standalone workstation */ rec->manufacturer = compsys_manufacturerW; rec->model = compsys_modelW; rec->num_logical_processors = get_processor_count();

1 0

Hans Leidekker : wbemprox: Implement IWbemClassObject::GetObjectText.
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: a568d08c5f7ac1ea4abf8559966be0ac1ec4a9d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a568d08c5f7ac1ea4abf85599… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 4 13:49:40 2012 +0200 wbemprox: Implement IWbemClassObject::GetObjectText. --- dlls/wbemprox/class.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 57 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 030aed5..c0a8cd9 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -417,13 +417,68 @@ static HRESULT WINAPI class_object_Clone( return E_NOTIMPL; } +static BSTR get_body_text( const struct table *table, UINT row, UINT *len ) +{ + static const WCHAR fmtW[] = {'\n','\t','%','s',' ','=',' ','%','s',';',0}; + BSTR value, ret; + WCHAR *p; + UINT i; + + *len = 0; + for (i = 0; i < table->num_cols; i++) + { + *len += sizeof(fmtW) / sizeof(fmtW[0]); + *len += strlenW( table->columns[i].name ); + value = get_value_bstr( table, row, i ); + *len += SysStringLen( value ); + SysFreeString( value ); + } + if (!(ret = SysAllocStringLen( NULL, *len ))) return NULL; + p = ret; + for (i = 0; i < table->num_cols; i++) + { + value = get_value_bstr( table, row, i ); + p += sprintfW( p, fmtW, table->columns[i].name, value ); + SysFreeString( value ); + } + return ret; +} + +static BSTR get_object_text( const struct view *view, UINT index ) +{ + static const WCHAR fmtW[] = + {'\n','i','n','s','t','a','n','c','e',' ','o','f',' ','%','s','\n','{','%','s','\n','}',';',0}; + UINT len, len_body, row = view->result[index]; + BSTR ret, body; + + len = sizeof(fmtW) / sizeof(fmtW[0]); + len += strlenW( view->table->name ); + if (!(body = get_body_text( view->table, row, &len_body ))) return NULL; + len += len_body; + + if (!(ret = SysAllocStringLen( NULL, len ))) return NULL; + sprintfW( ret, fmtW, view->table->name, body ); + SysFreeString( body ); + return ret; +} + static HRESULT WINAPI class_object_GetObjectText( IWbemClassObject *iface, LONG lFlags, BSTR *pstrObjectText ) { - FIXME("%p, %08x, %p\n", iface, lFlags, pstrObjectText); - return E_NOTIMPL; + struct class_object *co = impl_from_IWbemClassObject( iface ); + struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter ); + struct view *view = ec->query->view; + BSTR text; + + TRACE("%p, %08x, %p\n", iface, lFlags, pstrObjectText); + + if (lFlags) FIXME("flags %08x not implemented\n", lFlags); + + if (!(text = get_object_text( view, co->index ))) return E_OUTOFMEMORY; + *pstrObjectText = text; + return S_OK; } static HRESULT WINAPI class_object_SpawnDerivedClass(

1 0

Kyle Auble : Redirect acknowledgement links to wiki
by Jeremy Newman Sept. 4, 2012

Sept. 4, 2012

Module: website Branch: master Commit: 6f1d3490367ad1fcbc949b5e6d5bbe2ef69a7c96 URL: http://source.winehq.org/git/website.git/?a=commit;h=6f1d3490367ad1fcbc949b… Author: Kyle Auble <randomidman48(a)yahoo.com> Date: Sun Sep 2 22:33:34 2012 -0700 Redirect acknowledgement links to wiki --- templates/pl/about.template | 2 +- templates/pt/about.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/pl/about.template b/templates/pl/about.template index f8a72f0..2301289 100644 --- a/templates/pl/about.template +++ b/templates/pl/about.template @@ -38,7 +38,7 @@ Julliard kieruje projektem Wine, i można się z nim skontaktować przez e-mail <li><a href="http://wiki.winehq.org/ImportanceOfWine">Dlaczego Wine jest tak ważny</a></li> <li><a href="http://wiki.winehq.org/Debunking_Wine_Myths">Obalanie mitów o Wine</a></li> <li><a href="http://wiki.winehq.org/WineFeatures">Możliwości Wine</a></li> - <li><a href="{$root}/acknowledgement">Dowody uznania</a></li> + <li><a href="http://wiki.winehq.org/DowodyUznania">Dowody uznania</a></li> <li><a href="{$root}/wwn">World Wine News</a></li> <li><a href="{$root}/interview">Wywiady</a></li> </ul> diff --git a/templates/pt/about.template b/templates/pt/about.template index b0ee4de..ef35e2c 100644 --- a/templates/pt/about.template +++ b/templates/pt/about.template @@ -40,7 +40,7 @@ projecto:</p> <li><a href="http://wiki.winehq.org/ImportanceOfWine">Porque é que o Wine é importante</a></li> <li><a href="http://wiki.winehq.org/Debunking_Wine_Myths">Clarificação dos Mitos do Wine</a></li> <li><a href="http://wiki.winehq.org/WineFeatures">Características do Wine</a></li> - <li><a href="{$root}/acknowledgement">Agradecimentos</a></li> + <li><a href="http://wiki.winehq.org/Agradecimentos">Agradecimentos</a></li> <li><a href="{$root}/wwn">World Wine News</a></li> <li><a href="{$root}/interview">Entrevistas</a></li> </ul>

1 0

Kyle Auble : Move Spanish patch guide to wiki
by Jeremy Newman Sept. 4, 2012

Sept. 4, 2012

Module: website Branch: master Commit: f418f863859805a1dba5c57a9bcd29ac8a0e1522 URL: http://source.winehq.org/git/website.git/?a=commit;h=f418f863859805a1dba5c5… Author: Kyle Auble <randomidman48(a)yahoo.com> Date: Sun Sep 2 22:34:04 2012 -0700 Move Spanish patch guide to wiki --- templates/es/sending_patches.template | 119 --------------------------------- 1 files changed, 0 insertions(+), 119 deletions(-) diff --git a/templates/es/sending_patches.template b/templates/es/sending_patches.template deleted file mode 100644 index 38cbb58..0000000 --- a/templates/es/sending_patches.template +++ /dev/null @@ -1,119 +0,0 @@ - - - -<h1>Generando y enviando parches</h1> - -<p><b>Nota</b>: esto es una referencia rápida sobre como enviarnos -parches. Para obtener instrucciones detalladas por favor vea el -capítulo -<a href="{$root}/docs/winedev-guide/codingpractice">Práctica de -codificación</a> en nuestra documentación en linea. -</p> - -<p> Por favor envie los parches a la lista de correo de parches de -Wine, <a href="mailto:wine-patches(a)winehq.org"> -wine-patches(a)winehq.org </a>. -(Tenga en cuenta que si usted no está <a href="{$root}/forums">suscrito</a> -a la lista de correo, los administradores de la lista de correo -deben comprobar primero su envío para asegurarse de que no se trata de spam -antes de que se pueda aceptar el parche. -No habrá ningún intento de aplicar los parches que no aparezcan en el grupo de noticias -o en cualquier otro lugar que no sea el árbol Git) -</p> - -<p> Al presentar parches, por favor: </p> -<ul> - <li>Incluya una entrada del fichero de cambios (ChangeLog) con su - <b>nombre real</b>, dirección de correo electrónico y - una descripción de lo que hace el parche. - - <li>Mantenga el parche pequeño y el punto del cambio claro. - - <li>Envíe un arreglo o grupo de cambios relacionados por parche. - - <li>Genere su parche de nuevo con la versión más reciente de Wine desde el árbol Git WineHQ (véase más adelante). - - <li>Pon a prueba tu parche, y si es posible escribe una prueba que demuestre que es correcto. - - <li>Tenga cuidado de no corromper el parche a través de envolturas de línea. - - <li>Evite innecesariamente cambios de formateo del código. - - <li>No mezcle tabuladores y espacios porque hace que la salida diff sea ilegible, use identación consistente. - - <li>Use C estándar, evite comentarios C++ y declaraciones de variables en línea. - - <li>Lea el diff y asegúrese de que contenga sólo lo que quiere en él. -</ul> - -<p>Los parches aceptados se publicarán en la lista de correo <a href="{$root}/forums">wine-cvs </a>. - -<p>Los parches con problemas evidentes pueden recibir una respuesta en wine-devel. - -<p>Algunos parches no podrán recibir ninguna respuesta. En ese caso, su parche - puede considerarse <i>Obviamente No Correcto</i>, y puede hacer lo siguiente: - -<ul> - <li> Compruebe el parche usted mismo, y piense en lo que se puede hacer para - aclarar el parche (pistas en la lista anterior). - - <li> Escribir un correo electrónico a wine-devel, explicando el parche y solicitud para que sea - examinado por cualquier persona encargada de revisar. - - <li> Pida consejo acerca de su parche en #winehackers. - - <li> A menos que ya existe uno, abra un bug en bugzilla describiendo el - problema que está tratando de resolver (por ejemplo: ./configure falla en Solaris, - etc) y adjuntar su parche. -</ ul> - -<p> - Si el parche no ha recibido una respuesta en 3 días del WineHQ Git confirma - que tu parche tiene una gran oportunidad de estar en esta categoría. - <br/> - Tal vez le resulte difícil el solicitar información, - a fin de reflexionar cuidadosamente sobre los comentarios que recibe. - <br/> - ¡Simplemente no se dé por vencido! -</p> - -<hr> - -<h2>Generación de un parche para WineHQ con Git</h2> - -<p> Es mejor enviar pequeños parches contra el actual árbol utilizando Git. -En primer lugar, asegúrese de que su árbol es hasta la fecha, tal y como -se describe en la página <a href="http://wiki.winehq.org/GitWine">Git</a>. - -<p>Compruebe sus parches en su árbol Git utilizando -<a href="http://www.kernel.org/pub/software/scm/git/docs/git-commit.html">git commit</a>.</p> - -<p> Si va a utilizar -<a href="http://www.kernel.org/pub/software/scm/git/docs/git-imap-send.html">git imap-send</a> -asegúrese de que ha creado las opciones adecuadas en su fichero de -configuración de Git, y a continuación, ejecute:</p> - - <table width="700" border=0 cellpadding=10><tr><td class=black> - <span class=inverse> - git format-patch --stdout --keep-subject --attach origin | git imap-send<br> - </span> - </td></tr> - </table> - -<p>Esto debería subir sus parches en su carpeta de proyectos IMAP, y -le permitirá comprobar y enviarlos. En Mozilla Thunderbird, eso es tan -simple como hacer clic en "Editar Proyecto..." y luego "Enviar" si -tiene configurado el archivo de cabeceras de correo Git correctamente. - -<p>Si usted no puede utilizar IMAP, utilice el siguiente comando para generar parches:</p> - - <table width="700" border=0 cellpadding=10><tr><td class=black> - <span class=inverse> - git format-patch --keep-subject origin<br> - </span> - </td></tr> - </table> - -<p>Esto debería generar una serie de archivos txt, que puede enviar manualmente.</p> - -<p> </p>

1 0

Kyle Auble : Delete moved acknowledgement pages
by Jeremy Newman Sept. 4, 2012

Sept. 4, 2012

Module: website Branch: master Commit: dac02682581cfaf8477aa9dcd5620f21e1f5b534 URL: http://source.winehq.org/git/website.git/?a=commit;h=dac02682581cfaf8477aa9… Author: Kyle Auble <randomidman48(a)yahoo.com> Date: Sun Sep 2 22:33:54 2012 -0700 Delete moved acknowledgement pages --- templates/de/acknowledgement.template | 209 -------------------------------- templates/en/acknowledgement.template | 207 ------------------------------- templates/he/acknowledgement.template | 195 ------------------------------ templates/pl/acknowledgement.template | 206 ------------------------------- templates/pt/acknowledgement.template | 214 --------------------------------- 5 files changed, 0 insertions(+), 1031 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=dac02682581cfaf847…

1 0