wine-commits April 2008

wine-commits@winehq.org

4 participants
1278 discussions

ByeongSik Jeon : reg: Add Korean translation.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 651ec32174887a8c3163951412458ded1ef9052d URL: http://source.winehq.org/git/wine.git/?a=commit;h=651ec32174887a8c316395141… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Tue Apr 22 21:43:33 2008 +0900 reg: Add Korean translation. --- programs/reg/Ko.rc | 30 ++++++++++++++++++++++++++++++ programs/reg/rsrc.rc | 1 + 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/programs/reg/Ko.rc b/programs/reg/Ko.rc new file mode 100644 index 0000000..74d3225 --- /dev/null +++ b/programs/reg/Ko.rc @@ -0,0 +1,30 @@ +/* + * REG.EXE - Wine-compatible reg program. + * Korean language support + * + * Copyright 2008 Andrew Riedi + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_USAGE, "��ɾ� ��:\n\nREG [ ADD | DELETE | QUERY ]\nREG command /?\n" + STRING_ADD_USAGE, "REG ADD key_name [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n" + STRING_DELETE_USAGE, "REG DELETE key_name [/v value_name | /ve | /va] [/f]\n" + STRING_QUERY_USAGE, "REG QUERY key_name [/v value_name | /ve] [/s]\n" +} diff --git a/programs/reg/rsrc.rc b/programs/reg/rsrc.rc index 571993b..3589048 100644 --- a/programs/reg/rsrc.rc +++ b/programs/reg/rsrc.rc @@ -23,6 +23,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "En.rc" +#include "Ko.rc" #include "Nl.rc" #include "No.rc" #include "Pl.rc"

1 0

ByeongSik Jeon : start: Update Korean translation.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 4183a1dcaf7b8a95587c0544a0bb716620c4470f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4183a1dcaf7b8a95587c0544a… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Tue Apr 22 21:43:41 2008 +0900 start: Update Korean translation. --- programs/start/Ko.rc | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/programs/start/Ko.rc b/programs/start/Ko.rc index 13b48d0..4b75f45 100644 --- a/programs/start/Ko.rc +++ b/programs/start/Ko.rc @@ -20,9 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT -STRINGTABLE DISCARDABLE LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE { STRING_USAGE, "Ǯ�׸�� Ű�ų� �� Ͽ� ÷��ؼ� ��Ǵ� Ǯ�׸�� \n\ Usage: \n\ @@ -33,7 +33,8 @@ Options: \n\ /M[inimized] Ǯ�׸� �ּ�ȭ ��·� ��. \n\ /MAX[imized] Ǯ�׸� �ִ�ȭ ��·� ��. \n\ /R[estored] Ǯ�׸�� ·� ��۽�Ű�� (�ּ�ȭ�� ƴϰ� �ִ�ȭ�� ƴ�). \n\ -/W[ait] ��۵� Ǯ�׸�� ٸ�, �� ڵ带 ��. \n\ +/W[ait] ��۵� Ǯ�׸�� ٸ�, �� ڵ带 ��. \n\ +/Unix Use a Unix filename and start the file like windows explorer. \n\ /L �� ̼�� \n\ \n\ start.exe version 0.2 Copyright (C) 2003, Dan Kegel \n\ @@ -60,5 +61,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. \n\ See the COPYING.LIB file for license information. \n\ " -STRING_EXECFAIL "Ǯ�׸�� ʾҰų�, �� Ͽ��  Ǯ�׸�� Ǿ�� ʽ��ϴ�.\nShellExecuteEx ��" +STRING_EXECFAIL "��α׷�� ų�, �� Ͽ� �� α׷�� ϴ�.\nShellExecuteEx ��" + +STRING_UNIXFAIL "�� Unix ��ϸ�� DOS ��ϸ�� ٲ� �� ϴ�." }

1 0

Erik de Castro Lopo : include: Fix "warning: cast from pointer to integer of different size".
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: fc9f8dac17282f8f56d1d0fcb2209837dfb304be URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc9f8dac17282f8f56d1d0fcb… Author: Erik de Castro Lopo <mle+win(a)mega-nerd.com> Date: Tue Apr 22 22:24:41 2008 +1000 include: Fix "warning: cast from pointer to integer of different size". --- include/wine/list.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wine/list.h b/include/wine/list.h index b018a1f..b610e5e 100644 --- a/include/wine/list.h +++ b/include/wine/list.h @@ -225,6 +225,6 @@ static inline void list_move_head( struct list *dst, struct list *src ) /* get pointer to object containing list element */ #define LIST_ENTRY(elem, type, field) \ - ((type *)((char *)(elem) - (unsigned int)(&((type *)0)->field))) + ((type *)((char *)(elem) - (unsigned long)(&((type *)0)->field))) #endif /* __WINE_SERVER_LIST_H */

1 0

Alexandre Julliard : localspl: Avoid creating zero-length string values in the registry.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: aa4775ef9458e5988c434a91a5f3aa28f9db3529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa4775ef9458e5988c434a91a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 22 17:05:10 2008 +0200 localspl: Avoid creating zero-length string values in the registry. --- dlls/localspl/localspl_main.c | 36 ++++++++++++++++++++++++++---------- 1 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/localspl/localspl_main.c b/dlls/localspl/localspl_main.c index 8efb7cb..1b828f0 100644 --- a/dlls/localspl/localspl_main.c +++ b/dlls/localspl/localspl_main.c @@ -399,6 +399,7 @@ static BOOL WINAPI fpGetPrinterDriverDirectory(LPWSTR pName, LPWSTR pEnvironment */ static BOOL WINAPI myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCopyFlags, BOOL lazy) { + static const WCHAR emptyW[1]; const printenv_t *env; apd_data_t apd; DRIVER_INFO_8W di; @@ -493,14 +494,20 @@ static BOOL WINAPI myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD d apd_copyfile(di.pConfigFile, &apd); /* settings for level 3 */ - RegSetValueExW(hdrv, help_fileW, 0, REG_SZ, (LPBYTE) di.pHelpFile, - di.pHelpFile ? (lstrlenW(di.pHelpFile)+1)* sizeof(WCHAR) : 0); + if (di.pHelpFile) + RegSetValueExW(hdrv, help_fileW, 0, REG_SZ, (LPBYTE) di.pHelpFile, + (lstrlenW(di.pHelpFile)+1)* sizeof(WCHAR)); + else + RegSetValueExW(hdrv, help_fileW, 0, REG_SZ, (LPBYTE)emptyW, sizeof(emptyW)); apd_copyfile(di.pHelpFile, &apd); ptr = di.pDependentFiles; - RegSetValueExW(hdrv, dependent_filesW, 0, REG_MULTI_SZ, (LPBYTE) di.pDependentFiles, - di.pDependentFiles ? multi_sz_lenW(di.pDependentFiles) : 0); + if (ptr) + RegSetValueExW(hdrv, dependent_filesW, 0, REG_MULTI_SZ, (LPBYTE) di.pDependentFiles, + multi_sz_lenW(di.pDependentFiles)); + else + RegSetValueExW(hdrv, dependent_filesW, 0, REG_MULTI_SZ, (LPBYTE)emptyW, sizeof(emptyW)); while ((ptr != NULL) && (ptr[0])) { if (apd_copyfile(ptr, &apd)) { ptr += lstrlenW(ptr) + 1; @@ -512,15 +519,24 @@ static BOOL WINAPI myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD d } } /* The language-Monitor was already copied by the caller to "%SystemRoot%\system32" */ - RegSetValueExW(hdrv, monitorW, 0, REG_SZ, (LPBYTE) di.pMonitorName, - di.pMonitorName ? (lstrlenW(di.pMonitorName)+1)* sizeof(WCHAR) : 0); + if (di.pMonitorName) + RegSetValueExW(hdrv, monitorW, 0, REG_SZ, (LPBYTE) di.pMonitorName, + (lstrlenW(di.pMonitorName)+1)* sizeof(WCHAR)); + else + RegSetValueExW(hdrv, monitorW, 0, REG_SZ, (LPBYTE)emptyW, sizeof(emptyW)); - RegSetValueExW(hdrv, datatypeW, 0, REG_SZ, (LPBYTE) di.pDefaultDataType, - di.pDefaultDataType ? (lstrlenW(di.pDefaultDataType)+1)* sizeof(WCHAR) : 0); + if (di.pDefaultDataType) + RegSetValueExW(hdrv, datatypeW, 0, REG_SZ, (LPBYTE) di.pDefaultDataType, + (lstrlenW(di.pDefaultDataType)+1)* sizeof(WCHAR)); + else + RegSetValueExW(hdrv, datatypeW, 0, REG_SZ, (LPBYTE)emptyW, sizeof(emptyW)); /* settings for level 4 */ - RegSetValueExW(hdrv, previous_namesW, 0, REG_MULTI_SZ, (LPBYTE) di.pszzPreviousNames, - di.pszzPreviousNames ? multi_sz_lenW(di.pszzPreviousNames) : 0); + if (di.pszzPreviousNames) + RegSetValueExW(hdrv, previous_namesW, 0, REG_MULTI_SZ, (LPBYTE) di.pszzPreviousNames, + multi_sz_lenW(di.pszzPreviousNames)); + else + RegSetValueExW(hdrv, previous_namesW, 0, REG_MULTI_SZ, (LPBYTE)emptyW, sizeof(emptyW)); if (level > 5) TRACE("level %u for Driver %s is incomplete\n", level, debugstr_w(di.pName));

1 0

Alexandre Julliard : msi: Avoid creating zero-length string values in the registry.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 06bf8ea291576ab03be01f11bb0c7466336ff1ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=06bf8ea291576ab03be01f11b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 22 17:05:05 2008 +0200 msi: Avoid creating zero-length string values in the registry. --- dlls/msi/action.c | 6 ++++-- dlls/msi/registry.c | 7 +++++-- dlls/msi/source.c | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 11a4ad7..44fae9d 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2426,7 +2426,7 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) { static const WCHAR szEmpty[] = {0}; value_data = (LPSTR)strdupW(szEmpty); - size = 0; + size = sizeof(szEmpty); type = REG_SZ; } @@ -3772,8 +3772,10 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package) size = strlenW(feature->Feature_Parent)*sizeof(WCHAR); if (!absent) { + static const WCHAR emptyW[] = {0}; + size += sizeof(WCHAR); RegSetValueExW(hukey,feature->Feature,0,REG_SZ, - (LPBYTE)feature->Feature_Parent,size); + (LPBYTE)(feature->Feature_Parent ? feature->Feature_Parent : emptyW),size); } else { diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 74f84f7..b95d5bb 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -381,7 +381,7 @@ DWORD msi_version_str_to_dword(LPCWSTR p) LPWSTR msi_version_dword_to_str(DWORD version) { - const WCHAR fmt[] = { '%','u','.','%','u','.','%','u',0 }; + static const WCHAR fmt[] = { '%','u','.','%','u','.','%','u',0 }; LPWSTR str = msi_alloc(20); sprintfW(str, fmt, (version&0xff000000)>>24, @@ -392,7 +392,10 @@ LPWSTR msi_version_dword_to_str(DWORD version) LONG msi_reg_set_val_str( HKEY hkey, LPCWSTR name, LPCWSTR value ) { - DWORD len = value ? (lstrlenW(value) + 1) * sizeof (WCHAR) : 0; + static const WCHAR emptyW[] = {0}; + DWORD len; + if (!value) value = emptyW; + len = (lstrlenW(value) + 1) * sizeof (WCHAR); return RegSetValueExW( hkey, name, 0, REG_SZ, (const BYTE *)value, len ); } diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 0f9e087..4c38116 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -822,7 +822,7 @@ UINT WINAPI MsiSourceListSetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, } else if (strcmpW(INSTALLPROPERTY_PACKAGENAMEW, szProperty)==0) { - DWORD size = lstrlenW(szValue)*sizeof(WCHAR); + DWORD size = (lstrlenW(szValue) + 1) * sizeof(WCHAR); rc = RegSetValueExW(sourcekey, INSTALLPROPERTY_PACKAGENAMEW, 0, REG_SZ, (const BYTE *)szValue, size); if (rc != ERROR_SUCCESS)

1 0

Alexandre Julliard : winex11: Moved the ConfigureNotify handler to event.c.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 31ed6473bef708a66e29627d523140b10a3d056a URL: http://source.winehq.org/git/wine.git/?a=commit;h=31ed6473bef708a66e29627d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 22 16:56:31 2008 +0200 winex11: Moved the ConfigureNotify handler to event.c. --- dlls/winex11.drv/event.c | 64 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/winpos.c | 63 -------------------------------------------- dlls/winex11.drv/x11drv.h | 1 - 3 files changed, 64 insertions(+), 64 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index adbf585..2cb8cc8 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -77,6 +77,7 @@ static void X11DRV_FocusIn( HWND hwnd, XEvent *event ); static void X11DRV_FocusOut( HWND hwnd, XEvent *event ); static void X11DRV_Expose( HWND hwnd, XEvent *event ); static void X11DRV_MapNotify( HWND hwnd, XEvent *event ); +static void X11DRV_ConfigureNotify( HWND hwnd, XEvent *event ); static void X11DRV_PropertyNotify( HWND hwnd, XEvent *event ); static void X11DRV_ClientMessage( HWND hwnd, XEvent *event ); @@ -731,6 +732,69 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event ) /*********************************************************************** + * X11DRV_ConfigureNotify + */ +void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) +{ + XConfigureEvent *event = &xev->xconfigure; + struct x11drv_win_data *data; + RECT rect; + UINT flags; + int cx, cy, x = event->x, y = event->y; + + if (!hwnd) return; + if (!(data = X11DRV_get_win_data( hwnd ))) return; + if (!data->mapped || data->iconic) return; + + /* Get geometry */ + + if (!event->send_event) /* normal event, need to map coordinates to the root */ + { + Window child; + wine_tsx11_lock(); + XTranslateCoordinates( event->display, data->whole_window, root_window, + 0, 0, &x, &y, &child ); + wine_tsx11_unlock(); + } + rect.left = x; + rect.top = y; + rect.right = x + event->width; + rect.bottom = y + event->height; + OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); + TRACE( "win %p new X rect %d,%d,%dx%d (event %d,%d,%dx%d)\n", + hwnd, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, + event->x, event->y, event->width, event->height ); + X11DRV_X_to_window_rect( data, &rect ); + + x = rect.left; + y = rect.top; + cx = rect.right - rect.left; + cy = rect.bottom - rect.top; + flags = SWP_NOACTIVATE | SWP_NOZORDER; + + /* Compare what has changed */ + + GetWindowRect( hwnd, &rect ); + if (rect.left == x && rect.top == y) flags |= SWP_NOMOVE; + else + TRACE( "%p moving from (%d,%d) to (%d,%d)\n", + hwnd, rect.left, rect.top, x, y ); + + if ((rect.right - rect.left == cx && rect.bottom - rect.top == cy) || + (IsRectEmpty( &rect ) && event->width == 1 && event->height == 1)) + { + if (flags & SWP_NOMOVE) return; /* if nothing changed, don't do anything */ + flags |= SWP_NOSIZE; + } + else + TRACE( "%p resizing from (%dx%d) to (%dx%d)\n", + hwnd, rect.right - rect.left, rect.bottom - rect.top, cx, cy ); + + SetWindowPos( hwnd, 0, x, y, cx, cy, flags ); +} + + +/*********************************************************************** * get_window_wm_state */ int get_window_wm_state( Display *display, struct x11drv_win_data *data ) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 2f7ab13..5348ec6 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -534,66 +534,3 @@ void X11DRV_resize_desktop( unsigned int width, unsigned int height ) EnumWindows( update_windows_on_desktop_resize, (LPARAM)&resize_data ); } - - -/*********************************************************************** - * X11DRV_ConfigureNotify - */ -void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) -{ - XConfigureEvent *event = &xev->xconfigure; - struct x11drv_win_data *data; - RECT rect; - UINT flags; - int cx, cy, x = event->x, y = event->y; - - if (!hwnd) return; - if (!(data = X11DRV_get_win_data( hwnd ))) return; - if (!data->mapped || data->iconic) return; - - /* Get geometry */ - - if (!event->send_event) /* normal event, need to map coordinates to the root */ - { - Window child; - wine_tsx11_lock(); - XTranslateCoordinates( event->display, data->whole_window, root_window, - 0, 0, &x, &y, &child ); - wine_tsx11_unlock(); - } - rect.left = x; - rect.top = y; - rect.right = x + event->width; - rect.bottom = y + event->height; - OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); - TRACE( "win %p new X rect %d,%d,%dx%d (event %d,%d,%dx%d)\n", - hwnd, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, - event->x, event->y, event->width, event->height ); - X11DRV_X_to_window_rect( data, &rect ); - - x = rect.left; - y = rect.top; - cx = rect.right - rect.left; - cy = rect.bottom - rect.top; - flags = SWP_NOACTIVATE | SWP_NOZORDER; - - /* Compare what has changed */ - - GetWindowRect( hwnd, &rect ); - if (rect.left == x && rect.top == y) flags |= SWP_NOMOVE; - else - TRACE( "%p moving from (%d,%d) to (%d,%d)\n", - hwnd, rect.left, rect.top, x, y ); - - if ((rect.right - rect.left == cx && rect.bottom - rect.top == cy) || - (IsRectEmpty( &rect ) && event->width == 1 && event->height == 1)) - { - if (flags & SWP_NOMOVE) return; /* if nothing changed, don't do anything */ - flags |= SWP_NOSIZE; - } - else - TRACE( "%p resizing from (%dx%d) to (%dx%d)\n", - hwnd, rect.right - rect.left, rect.bottom - rect.top, cx, cy ); - - SetWindowPos( hwnd, 0, x, y, cx, cy, flags ); -} diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 450153b..287acbb 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -643,7 +643,6 @@ extern void X11DRV_EnterNotify( HWND hwnd, XEvent *event ); extern void X11DRV_KeyEvent( HWND hwnd, XEvent *event ); extern void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ); extern void X11DRV_DestroyNotify( HWND hwnd, XEvent *event ); -extern void X11DRV_ConfigureNotify( HWND hwnd, XEvent *event ); extern void X11DRV_SelectionRequest( HWND hWnd, XEvent *event ); extern void X11DRV_SelectionClear( HWND hWnd, XEvent *event ); extern void X11DRV_MappingNotify( HWND hWnd, XEvent *event );

1 0

Scott Ritchie : Update download and download-deb for Ubuntu Hardy
by Jeremy Newman 22 Apr '08

22 Apr '08

Module: website Branch: master Commit: 31cb52b1f9b0f3897443fc14a6396b42265bb0f2 URL: http://source.winehq.org/git/website.git/?a=commit;h=31cb52b1f9b0f3897443fc… Author: Scott Ritchie <scott(a)open-vote.org> Date: Tue Apr 22 03:53:44 2008 -0700 Update download and download-deb for Ubuntu Hardy Update download and download-deb pages for Ubuntu Hardy; simplify instructions and remove old versions of Ubuntu not receiving updates. Thanks, Scott Ritchie >From 180d0dd65c9352a157ddad6a5343cf21a405ec3b Mon Sep 17 00:00:00 2001 From: Scott Ritchie <scott(a)scott-desktop.(none)> Date: Tue, 22 Apr 2008 03:49:09 -0700 Subject: Update download and download-deb page for Ubuntu Hardy; simplify instructions. --- templates/en/download-deb.template | 49 ++++++++++++++---------------------- templates/en/download.template | 2 +- 2 files changed, 20 insertions(+), 31 deletions(-) diff --git a/templates/en/download-deb.template b/templates/en/download-deb.template index 2cf6894..0e117c9 100644 --- a/templates/en/download-deb.template +++ b/templates/en/download-deb.template @@ -4,55 +4,44 @@ Wine for Ubuntu, Debian, and Debian-based distributions <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></h1> -Debian and Debian-based distributions, such as Ubuntu, utilize a special tool +Debian and Debian-based distributions such as Ubuntu utilize a special tool for managing packages known as APT. APT is able to automagically install all of the needed dependencies for a software package, as well as keep the package up to date, by scanning what are known as APT repositories. Debian-based -distributions have their own repositories of software, many of which include -Wine, however we keep our own repository of the latest available packages here -for download. +distributions have their own repositories of software that include Wine, +however we keep our own repository of the latest available packages here for +download. -There used to be graphical instructions here, however we have found that the terminal commands are actually simpler to -describe and quicker for the user to input. Because the commands below use sudo, you may have to enter your user +There used to be graphical instructions here, however we have found that the +terminal commands are actually simpler to describe and quicker for the user to +input. Because the commands below use sudo, you may have to enter your user password after hitting enter. <h2>Adding the WineHQ APT Repository:</h2> -First, open a terminal window. Then add the repository's key to your system's -list of trusted APT keys by copy and pasting the following: +First, open a terminal window (Applications->Accessories->Terminal). Then +add the repository's key to your system's list of trusted APT keys by copy and +pasting the following: wget -q http://wine.budgetdedicated.com/apt/387EE263.gpg -O- | sudo apt-key add - Next, add the repository to your system's list of APT sources: -For Ubuntu Gutsy (7.10): -sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/gutsy.list -O /etc/apt/sources.list.d/winehq.list -For Ubuntu Feisty (7.04): -sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/feisty.list -O /etc/apt/sources.list.d/winehq.list -For Ubuntu Edgy (6.10): *64-bit packages not available* -sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/edgy.list -O /etc/apt/sources.list.d/winehq.list -For Ubuntu Dapper (6.06): *64-bit packages not available* -sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/dapper.list -O /etc/apt/sources.list.d/winehq.list +For Ubuntu Hardy (8.04): +sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/hardy.list -O /etc/apt/sources.list.d/winehq.list For Debian Etch (4.0): sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/etch.list -O /etc/apt/sources.list.d/winehq.list -Then, you can install Wine from WineHQ like it were any other package, such as by -using the Synaptic Package Manager under System->Administration. Alternatively, you -can install from the terminal by running 'sudo apt-get update' to update APT's -package information and then 'sudo apt-get install wine'. +Then, you can install Wine by <a href="apt://wine">clicking this link</a>. +Alternatively, you can install by going to Applications->Add/Remove and +searching for Wine. <h2>Upgrading to a new version of Ubuntu</h2> -If you are upgrading the entire system, such as going from Ubuntu 7.04 to 7.10, you will need to -come back to this page and enter the command for the new version above. The built in update manager -will not switch the Wine repository automatically. - -<h2>64-bit Users:</h2> - -If you are using a very old version of Ubuntu where 64 bit packages are not available -and would still like a working Wine package, there is a relatively easy hack that can be -used to install the 32-bit package and have it function normally. See -<a href="http://wiki.winehq.org/UbuntuAMD64">this page on the Wine wiki</a> for more details. +If you are upgrading the entire system, such as going from Ubuntu 7.10 to +8.04, you will need to come back to this page and enter the command for the new +version above. The built in update manager will not switch the Wine repository +automatically. <h2>Older .deb packages</h2> diff --git a/templates/en/download.template b/templates/en/download.template index 8f7dd71..d0bbd9a 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -69,7 +69,7 @@ for post-installation instructions. <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/site/download-deb">Ubuntu</a> - binary and source .debs for Ubuntu Gutsy (7.10), Feisty (7.04), Edgy (6.10), and Dapper (6.06) + binary and source .debs for Ubuntu Hardy (8.04) <td><a href="mailto:scott@open-vote.org">Scott Ritchie</a></td> </tr>

1 0

Dan Kegel : update LGPL url, specify version
by Jeremy Newman 22 Apr '08

22 Apr '08

Module: website Branch: master Commit: 48c9171c52a21a5d09248098baa007343658b2ed URL: http://source.winehq.org/git/website.git/?a=commit;h=48c9171c52a21a5d092480… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Apr 19 08:58:10 2008 -0700 update LGPL url, specify version Somebody on wine-users asked us to clarify this, so: --- templates/en/home_about.template | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/en/home_about.template b/templates/en/home_about.template index aed434a..8af3209 100644 --- a/templates/en/home_about.template +++ b/templates/en/home_about.template @@ -26,5 +26,5 @@ at the <a href="{$root}/site/docs/wineusr-guide/index">User Guide</a>. Wine is free software. The <a href="http://www.winehq.org/site/license"> -licensing terms</a> are the <a href="http://www.gnu.org/copyleft/lesser.html"> -GNU Lesser General Public License</a>. +licensing terms</a> are the <a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html"> +GNU Lesser General Public License version 2.1</a>.

1 0

Rob Shearman : widl: Remove duplicated code in the form of the write_struct_expr function by enhancing write_expr to allow toplevel identifiers to be prefixed by a string , if specified.
by Alexandre Julliard 22 Apr '08

22 Apr '08

Module: wine Branch: master Commit: 1a0d28bf0225ac9a6f3ef4d85d3586d35d1e8699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a0d28bf0225ac9a6f3ef4d85… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 22 11:37:07 2008 +0100 widl: Remove duplicated code in the form of the write_struct_expr function by enhancing write_expr to allow toplevel identifiers to be prefixed by a string, if specified. --- tools/widl/expr.c | 114 ++++++++++++++++++++------------- tools/widl/expr.h | 2 +- tools/widl/header.c | 4 +- tools/widl/proxy.c | 4 +- tools/widl/typegen.c | 172 +++---------------------------------------------- 5 files changed, 84 insertions(+), 212 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a0d28bf0225ac9a6f3ef…

1 0

Rob Shearman : widl: Use expr_resolve_type to get the type of the identifier in write_conf_or_var_desc .
by Alexandre Julliard 22 Apr '08

22 Apr '08

Module: wine Branch: master Commit: 39a1fa672a6ca33505af8ef6db6d3e63414b06c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39a1fa672a6ca33505af8ef6d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 22 11:36:54 2008 +0100 widl: Use expr_resolve_type to get the type of the identifier in write_conf_or_var_desc. Remove the conversion of pointer types into base types as this was only needed due to lack of proper type resolving. --- tools/widl/typegen.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 8a4b8f5..7a5f6f9 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -655,6 +655,8 @@ static size_t write_conf_or_var_desc(FILE *file, const type_t *structure, error("write_conf_or_var_desc: couldn't find variable %s in structure\n", subexpr->u.sval); + correlation_variable = expr_resolve_type(NULL, structure, expr); + offset -= baseoff; correlation_variable_type = correlation_variable->type; @@ -683,15 +685,6 @@ static size_t write_conf_or_var_desc(FILE *file, const type_t *structure, case RPC_FC_ULONG: param_type = RPC_FC_ULONG; break; - case RPC_FC_RP: - case RPC_FC_UP: - case RPC_FC_OP: - case RPC_FC_FP: - if (sizeof(void *) == 4) /* FIXME */ - param_type = RPC_FC_LONG; - else - param_type = RPC_FC_HYPER; - break; default: error("write_conf_or_var_desc: conformance variable type not supported 0x%x\n", correlation_variable_type);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2008