September 2012 - Wine-commits

Charles Davis : loader: On Mac OS with Clang, don' t use external symbols for the DOS and shared heap segments.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: b51c2ba9f74c18268eedf6597b9c4e914abacd07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b51c2ba9f74c18268eedf6597… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Fri Sep 21 01:51:34 2012 -0600 loader: On Mac OS with Clang, don't use external symbols for the DOS and shared heap segments. --- loader/main.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/loader/main.c b/loader/main.c index edbf4f7..74a8eb8 100644 --- a/loader/main.c +++ b/loader/main.c @@ -43,9 +43,16 @@ #ifdef __APPLE__ +#ifndef __clang__ __asm__(".zerofill WINE_DOS, WINE_DOS, ___wine_dos, 0x40000000"); __asm__(".zerofill WINE_SHAREDHEAP, WINE_SHAREDHEAP, ___wine_shared_heap, 0x03000000"); extern char __wine_dos[0x40000000], __wine_shared_heap[0x03000000]; +#else +__asm__(".zerofill WINE_DOS, WINE_DOS"); +__asm__(".zerofill WINE_SHAREDHEAP, WINE_SHAREDHEAP"); +static char __wine_dos[0x40000000] __attribute__((section("WINE_DOS, WINE_DOS"))); +static char __wine_shared_heap[0x03000000] __attribute__((section("WINE_SHAREDHEAP, WINE_SHAREDHEAP"))); +#endif static const struct wine_preload_info wine_main_preload_info[] = {

1 0

Alexandre Julliard : winex11: Move the support for making the owner window managed to a separate function .
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: d82082c14ffe0aad6a9abd82ebaf425104b7952f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82082c14ffe0aad6a9abd82e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 21 11:31:28 2012 +0200 winex11: Move the support for making the owner window managed to a separate function. --- dlls/winex11.drv/window.c | 111 +++++++++++++++++++++++++------------------- 1 files changed, 63 insertions(+), 48 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 94edb81..d4f3f9b 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -160,15 +160,21 @@ struct has_popup_result BOOL found; }; +static BOOL is_managed( HWND hwnd ) +{ + struct x11drv_win_data *data = get_win_data( hwnd ); + BOOL ret = data && data->managed; + release_win_data( data ); + return ret; +} + static BOOL CALLBACK has_managed_popup( HWND hwnd, LPARAM lparam ) { struct has_popup_result *result = (struct has_popup_result *)lparam; - struct x11drv_win_data *data; if (hwnd == result->hwnd) return FALSE; /* popups are always above owner */ - if (!(data = X11DRV_get_win_data( hwnd ))) return TRUE; if (GetWindow( hwnd, GW_OWNER ) != result->hwnd) return TRUE; - result->found = data->managed; + result->found = is_managed( hwnd ); return !result->found; } @@ -733,6 +739,46 @@ static void set_mwm_hints( Display *display, struct x11drv_win_data *data, DWORD /*********************************************************************** + * set_style_hints + */ +static void set_style_hints( Display *display, struct x11drv_win_data *data, DWORD style, DWORD ex_style ) +{ + Window group_leader = data->whole_window; + HWND owner = GetWindow( data->hwnd, GW_OWNER ); + Window owner_win = X11DRV_get_whole_window( owner ); + Atom window_type; + + if (owner_win) + { + XSetTransientForHint( display, data->whole_window, owner_win ); + group_leader = owner_win; + } + + /* Only use dialog type for owned popups. Metacity allows making fullscreen + * only normal windows, and doesn't handle correctly TRANSIENT_FOR hint for + * dialogs owned by fullscreen windows. + */ + if (((style & WS_POPUP) || (ex_style & WS_EX_DLGMODALFRAME)) && owner) + window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); + else + window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); + + XChangeProperty(display, data->whole_window, x11drv_atom(_NET_WM_WINDOW_TYPE), + XA_ATOM, 32, PropModeReplace, (unsigned char*)&window_type, 1); + + /* wm hints */ + if (data->wm_hints) + { + data->wm_hints->flags |= InputHint | StateHint | WindowGroupHint; + data->wm_hints->input = !use_take_focus && !(style & WS_DISABLED); + data->wm_hints->initial_state = (style & WS_MINIMIZE) ? IconicState : NormalState; + data->wm_hints->window_group = group_leader; + XSetWMHints( display, data->whole_window, data->wm_hints ); + } +} + + +/*********************************************************************** * get_process_name * * get the name of the current process for setting class hints @@ -823,83 +869,50 @@ static void set_initial_wm_hints( HWND hwnd ) /*********************************************************************** - * get_owner_whole_window + * make_owner_managed * - * Retrieve an owner's window, creating it if necessary. + * If the window is managed, make sure its owner window is too. */ -static Window get_owner_whole_window( HWND owner, BOOL force_managed ) +static void make_owner_managed( HWND hwnd ) { - struct x11drv_win_data *data; - - if (!owner) return 0; + HWND owner; - if (!(data = X11DRV_get_win_data( owner ))) return (Window)GetPropA( owner, whole_window_prop ); + if (!(owner = GetWindow( hwnd, GW_OWNER ))) return; + if (is_managed( owner )) return; + if (!is_managed( hwnd )) return; - if (!data->managed && force_managed) /* make it managed */ - { - SetWindowPos( owner, 0, 0, 0, 0, 0, - SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOSIZE | SWP_NOMOVE | - SWP_NOREDRAW | SWP_DEFERERASE | SWP_NOSENDCHANGING | SWP_STATECHANGED ); - } - return data->whole_window; + SetWindowPos( owner, 0, 0, 0, 0, 0, + SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOSIZE | SWP_NOMOVE | + SWP_NOREDRAW | SWP_DEFERERASE | SWP_NOSENDCHANGING | SWP_STATECHANGED ); } /*********************************************************************** * set_wm_hints * - * Set the window manager hints for a newly-created window + * Set all the window manager hints for a window. */ static void set_wm_hints( HWND hwnd ) { Display *display = thread_display(); struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); - Window group_leader = data->whole_window; - Window owner_win = 0; - Atom window_type; DWORD style, ex_style; - HWND owner; if (hwnd == GetDesktopWindow()) { /* force some styles for the desktop to get the correct decorations */ style = WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX; ex_style = WS_EX_APPWINDOW; - owner = 0; } else { style = GetWindowLongW( hwnd, GWL_STYLE ); ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE ); - owner = GetWindow( hwnd, GW_OWNER ); - if ((owner_win = get_owner_whole_window( owner, data->managed ))) group_leader = owner_win; } - if (owner_win) XSetTransientForHint( display, data->whole_window, owner_win ); - - /* size hints */ set_size_hints( display, data, style ); set_mwm_hints( display, data, style, ex_style ); - - /* Only use dialog type for owned popups. Metacity allows making fullscreen - * only normal windows, and doesn't handle correctly TRANSIENT_FOR hint for - * dialogs owned by fullscreen windows. - */ - if (((style & WS_POPUP) || (ex_style & WS_EX_DLGMODALFRAME)) && owner) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); - else window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); - - XChangeProperty(display, data->whole_window, x11drv_atom(_NET_WM_WINDOW_TYPE), - XA_ATOM, 32, PropModeReplace, (unsigned char*)&window_type, 1); - - /* wm hints */ - if (data->wm_hints) - { - data->wm_hints->flags |= InputHint | StateHint | WindowGroupHint; - data->wm_hints->input = !use_take_focus && !(style & WS_DISABLED); - data->wm_hints->initial_state = (style & WS_MINIMIZE) ? IconicState : NormalState; - data->wm_hints->window_group = group_leader; - XSetWMHints( display, data->whole_window, data->wm_hints ); - } + set_style_hints( display, data, style, ex_style ); } @@ -2157,6 +2170,8 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags if ((new_style & WS_VISIBLE) && ((new_style & WS_MINIMIZE) || is_window_rect_mapped( rectWindow ))) { + if (!data->mapped) make_owner_managed( hwnd ); + if (!data->mapped || (swp_flags & (SWP_FRAMECHANGED|SWP_STATECHANGED))) set_wm_hints( hwnd ); if (!data->mapped)

1 0

Alexandre Julliard : winex11: Separate fetching the window icon bits and setting the WM hints.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: 16410ead78e35b74c95f9b5c0fdbba0c9a066271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16410ead78e35b74c95f9b5c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 21 11:52:29 2012 +0200 winex11: Separate fetching the window icon bits and setting the WM hints. --- dlls/winex11.drv/window.c | 109 ++++++++++++++++++++++----------------------- dlls/winex11.drv/x11drv.h | 7 ++- 2 files changed, 57 insertions(+), 59 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index d4f3f9b..d07be48 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -527,7 +527,7 @@ failed: /*********************************************************************** * create_icon_pixmaps */ -static BOOL create_icon_pixmaps( HDC hdc, const ICONINFO *icon, struct x11drv_win_data *data ) +static BOOL create_icon_pixmaps( HDC hdc, const ICONINFO *icon, Pixmap *icon_ret, Pixmap *mask_ret ) { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer; @@ -573,8 +573,8 @@ static BOOL create_icon_pixmaps( HDC hdc, const ICONINFO *icon, struct x11drv_wi bits.ptr = NULL; if (!mask_pixmap) goto failed; - data->icon_pixmap = color_pixmap; - data->icon_mask = mask_pixmap; + *icon_ret = color_pixmap; + *mask_ret = mask_pixmap; return TRUE; failed: @@ -586,18 +586,16 @@ failed: /*********************************************************************** - * set_icon_hints - * - * Set the icon wm hints + * fetch_icon_data */ -static void set_icon_hints( HWND hwnd, HICON icon_big, HICON icon_small ) +static void fetch_icon_data( HWND hwnd, HICON icon_big, HICON icon_small ) { - Display *display = thread_display(); struct x11drv_win_data *data; ICONINFO ii, ii_small; HDC hDC; unsigned int size; unsigned long *bits; + Pixmap icon_pixmap, mask_pixmap; if (!icon_big) { @@ -611,13 +609,6 @@ static void set_icon_hints( HWND hwnd, HICON icon_big, HICON icon_small ) if (!icon_small) icon_small = (HICON)GetClassLongPtrW( hwnd, GCLP_HICONSM ); } - if (!(data = X11DRV_get_win_data( hwnd ))) return; - - if (data->icon_pixmap) XFreePixmap( gdi_display, data->icon_pixmap ); - if (data->icon_mask) XFreePixmap( gdi_display, data->icon_mask ); - data->icon_pixmap = data->icon_mask = 0; - data->wm_hints->flags &= ~(IconPixmapHint | IconMaskHint); - if (!GetIconInfo(icon_big, &ii)) return; hDC = CreateCompatibleDC(0); @@ -642,22 +633,30 @@ static void set_icon_hints( HWND hwnd, HICON icon_big, HICON icon_small ) DeleteObject( ii_small.hbmColor ); DeleteObject( ii_small.hbmMask ); } - if (bits) - XChangeProperty( display, data->whole_window, x11drv_atom(_NET_WM_ICON), - XA_CARDINAL, 32, PropModeReplace, (unsigned char *)bits, size ); - else - XDeleteProperty( display, data->whole_window, x11drv_atom(_NET_WM_ICON) ); - HeapFree( GetProcessHeap(), 0, bits ); - if (create_icon_pixmaps( hDC, &ii, data )) - { - data->wm_hints->icon_pixmap = data->icon_pixmap; - data->wm_hints->icon_mask = data->icon_mask; - data->wm_hints->flags |= IconPixmapHint | IconMaskHint; - } + if (!create_icon_pixmaps( hDC, &ii, &icon_pixmap, &mask_pixmap )) icon_pixmap = mask_pixmap = 0; + DeleteObject( ii.hbmColor ); DeleteObject( ii.hbmMask ); DeleteDC(hDC); + + if ((data = get_win_data( hwnd ))) + { + if (data->icon_pixmap) XFreePixmap( gdi_display, data->icon_pixmap ); + if (data->icon_mask) XFreePixmap( gdi_display, data->icon_mask ); + HeapFree( GetProcessHeap(), 0, data->icon_bits ); + data->icon_pixmap = icon_pixmap; + data->icon_mask = mask_pixmap; + data->icon_bits = bits; + data->icon_size = size; + release_win_data( data ); + } + else + { + if (icon_pixmap) XFreePixmap( gdi_display, icon_pixmap ); + if (mask_pixmap) XFreePixmap( gdi_display, mask_pixmap ); + HeapFree( GetProcessHeap(), 0, bits ); + } } @@ -746,6 +745,7 @@ static void set_style_hints( Display *display, struct x11drv_win_data *data, DWO Window group_leader = data->whole_window; HWND owner = GetWindow( data->hwnd, GW_OWNER ); Window owner_win = X11DRV_get_whole_window( owner ); + XWMHints *wm_hints; Atom window_type; if (owner_win) @@ -766,15 +766,29 @@ static void set_style_hints( Display *display, struct x11drv_win_data *data, DWO XChangeProperty(display, data->whole_window, x11drv_atom(_NET_WM_WINDOW_TYPE), XA_ATOM, 32, PropModeReplace, (unsigned char*)&window_type, 1); - /* wm hints */ - if (data->wm_hints) + if ((wm_hints = XAllocWMHints())) { - data->wm_hints->flags |= InputHint | StateHint | WindowGroupHint; - data->wm_hints->input = !use_take_focus && !(style & WS_DISABLED); - data->wm_hints->initial_state = (style & WS_MINIMIZE) ? IconicState : NormalState; - data->wm_hints->window_group = group_leader; - XSetWMHints( display, data->whole_window, data->wm_hints ); + wm_hints->flags = InputHint | StateHint | WindowGroupHint; + wm_hints->input = !use_take_focus && !(style & WS_DISABLED); + wm_hints->initial_state = (style & WS_MINIMIZE) ? IconicState : NormalState; + wm_hints->window_group = group_leader; + if (data->icon_pixmap) + { + wm_hints->icon_pixmap = data->icon_pixmap; + wm_hints->icon_mask = data->icon_mask; + wm_hints->flags |= IconPixmapHint | IconMaskHint; + } + XSetWMHints( display, data->whole_window, wm_hints ); + XFree( wm_hints ); } + + if (data->icon_bits) + XChangeProperty( display, data->whole_window, x11drv_atom(_NET_WM_ICON), + XA_CARDINAL, 32, PropModeReplace, + (unsigned char *)data->icon_bits, data->icon_size ); + else + XDeleteProperty( display, data->whole_window, x11drv_atom(_NET_WM_ICON) ); + } @@ -858,13 +872,6 @@ static void set_initial_wm_hints( HWND hwnd ) if (user_time_window) XChangeProperty( display, data->whole_window, x11drv_atom(_NET_WM_USER_TIME_WINDOW), XA_WINDOW, 32, PropModeReplace, (unsigned char *)&user_time_window, 1 ); - - data->wm_hints = XAllocWMHints(); - if (data->wm_hints) - { - data->wm_hints->flags = 0; - set_icon_hints( hwnd, 0, 0 ); - } } @@ -1378,6 +1385,7 @@ static Window create_whole_window( HWND hwnd ) if (!data->whole_window) goto done; set_initial_wm_hints( hwnd ); + fetch_icon_data( hwnd, 0, 0 ); set_wm_hints( hwnd ); XSaveContext( display, data->whole_window, winContext, (char *)data->hwnd ); @@ -1444,8 +1452,6 @@ static void destroy_whole_window( Display *display, struct x11drv_win_data *data } /* Outlook stops processing messages after destroying a dialog, so we need an explicit flush */ XFlush( display ); - XFree( data->wm_hints ); - data->wm_hints = NULL; if (data->surface) window_surface_release( data->surface ); data->surface = NULL; RemovePropA( data->hwnd, whole_window_prop ); @@ -1507,6 +1513,7 @@ void CDECL X11DRV_DestroyWindow( HWND hwnd ) if (thread_data->last_xic_hwnd == hwnd) thread_data->last_xic_hwnd = 0; if (data->icon_pixmap) XFreePixmap( gdi_display, data->icon_pixmap ); if (data->icon_mask) XFreePixmap( gdi_display, data->icon_mask ); + HeapFree( GetProcessHeap(), 0, data->icon_bits ); XDeleteContext( gdi_display, (XID)hwnd, win_data_context ); release_win_data( data ); HeapFree( GetProcessHeap(), 0, data ); @@ -2245,26 +2252,16 @@ UINT CDECL X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) * hIcon or hIconSm has changed (or is being initialised for the * first time). Complete the X11 driver-specific initialisation * and set the window hints. - * - * This is not entirely correct, may need to create - * an icon window and set the pixmap as a background */ void CDECL X11DRV_SetWindowIcon( HWND hwnd, UINT type, HICON icon ) { - Display *display = thread_display(); struct x11drv_win_data *data; - if (!(data = X11DRV_get_win_data( hwnd ))) return; if (!data->whole_window) return; - if (!data->managed) return; - - if (data->wm_hints) - { - if (type == ICON_BIG) set_icon_hints( hwnd, icon, 0 ); - else set_icon_hints( hwnd, 0, icon ); - XSetWMHints( display, data->whole_window, data->wm_hints ); - } + if (type == ICON_BIG) fetch_icon_data( hwnd, icon, 0 ); + else fetch_icon_data( hwnd, 0, icon ); + set_wm_hints( hwnd ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 28cbe6a..4f355ad 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -538,7 +538,6 @@ struct x11drv_win_data RECT whole_rect; /* X window rectangle for the whole window relative to parent */ RECT client_rect; /* client area relative to parent */ XIC xic; /* X input context */ - XWMHints *wm_hints; /* window manager hints */ BOOL managed : 1; /* is window managed? */ BOOL mapped : 1; /* is window mapped? (in either normal or iconic state) */ BOOL iconic : 1; /* is window in iconic state? */ @@ -549,8 +548,10 @@ struct x11drv_win_data Window embedder; /* window id of embedder */ unsigned long configure_serial; /* serial number of last configure request */ struct window_surface *surface; - Pixmap icon_pixmap; - Pixmap icon_mask; + Pixmap icon_pixmap; + Pixmap icon_mask; + unsigned long *icon_bits; + unsigned int icon_size; }; extern struct x11drv_win_data *get_win_data( HWND hwnd ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : winex11: Add window data structure locking to the X window creation paths.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: ffa7af171a991df9b6a0cb6bb523bf73c9c9bb24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffa7af171a991df9b6a0cb6bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 21 12:45:35 2012 +0200 winex11: Add window data structure locking to the X window creation paths. --- dlls/winex11.drv/window.c | 93 +++++++++++++++++++++----------------------- 1 files changed, 44 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ffa7af171a991df9b6a0c…

1 0

Alexandre Julliard : winex11: Add window data structure locking to the window region functions.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: 9ac774b88d8c5097f885e117a7b8cd914192a17e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ac774b88d8c5097f885e117a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 21 15:53:48 2012 +0200 winex11: Add window data structure locking to the window region functions. --- dlls/winex11.drv/window.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index abbdb98..5eab698 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2269,9 +2269,10 @@ int CDECL X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { struct x11drv_win_data *data; - if ((data = X11DRV_get_win_data( hwnd ))) + if ((data = get_win_data( hwnd ))) { sync_window_region( thread_display(), data, hrgn ); + release_win_data( data ); } else if (X11DRV_get_whole_window( hwnd )) { @@ -2324,7 +2325,11 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) case WM_X11DRV_SET_WIN_FORMAT: return set_win_format( hwnd, (XID)wp ); case WM_X11DRV_SET_WIN_REGION: - if ((data = X11DRV_get_win_data( hwnd ))) sync_window_region( thread_display(), data, (HRGN)1 ); + if ((data = get_win_data( hwnd ))) + { + sync_window_region( thread_display(), data, (HRGN)1 ); + release_win_data( data ); + } return 0; case WM_X11DRV_RESIZE_DESKTOP: X11DRV_resize_desktop( LOWORD(lp), HIWORD(lp) );

1 0

Alexandre Julliard : winex11: Store the window display connection in the window structure.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: ba926faf919ac5b069363534755d366f868cd07b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba926faf919ac5b0693635347… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 21 16:29:24 2012 +0200 winex11: Store the window display connection in the window structure. --- dlls/winex11.drv/desktop.c | 7 +- dlls/winex11.drv/event.c | 5 +- dlls/winex11.drv/window.c | 177 +++++++++++++++++++++----------------------- dlls/winex11.drv/x11drv.h | 3 +- 4 files changed, 91 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ba926faf919ac5b069363…

1 0

Kyle Auble : Redirect link to wiki
by Jeremy Newman 21 Sep '12

21 Sep '12

Module: bugzilla Branch: master Commit: 04a00bf7e23288e2399658e280bcb424c1c506d6 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=04a00bf7e23288e239965… Author: Kyle Auble <randomidman48(a)yahoo.com> Date: Thu Sep 20 13:19:14 2012 -0700 Redirect link to wiki --- template/en/default/index.html.tmpl | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index 1651941..2384c8e 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -168,8 +168,7 @@ YAHOO.util.Event.onDOMReady(onLoadActions); </li> <li> Read our tips on - <a href="http://www.winehq.org/site/contributing#support">Bug hunting - and support</a>. + <a href="http://wiki.winehq.org/Bugs">Bug hunting and support</a>. </li> <li>Read the <a href="http://wiki.winehq.org/FAQ">FAQ</a> to be

1 0

Kyle Auble : Consolidate donation info
by Jeremy Newman 21 Sep '12

21 Sep '12

Module: website Branch: master Commit: d043baa59ce66ff375fc63226251ce515feaca2c URL: http://source.winehq.org/git/website.git/?a=commit;h=d043baa59ce66ff375fc63… Author: Kyle Auble <randomidman48(a)yahoo.com> Date: Thu Sep 20 13:19:02 2012 -0700 Consolidate donation info The donation info and widgets from the Contributing pages probably belong on the donate pages. --- templates/de/donate.template | 61 +++++++++++++++++-------- templates/en/donate.template | 66 ++++++++++++++++++--------- templates/fr/donate.template | 77 +++++++++++++++++++++++-------- templates/pl/donate.template | 71 +++++++++++++++++++++++----- templates/pt/donate.template | 103 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 306 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=d043baa59ce66ff375…

1 0

Kyle Auble : Redirect Contributing links to wiki
by Jeremy Newman 21 Sep '12

21 Sep '12

Module: website Branch: master Commit: 435e4e71d0ba5655e214a8799d9c848975bf30b9 URL: http://source.winehq.org/git/website.git/?a=commit;h=435e4e71d0ba5655e214a8… Author: Kyle Auble <randomidman48(a)yahoo.com> Date: Thu Sep 20 13:19:08 2012 -0700 Redirect Contributing links to wiki --- templates/de/devel.template | 2 +- templates/en/devel.template | 2 +- templates/he/devel.template | 2 +- templates/pl/devel.template | 2 +- templates/tr/devel.template | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/de/devel.template b/templates/de/devel.template index b0a629f..03f9dcd 100644 --- a/templates/de/devel.template +++ b/templates/de/devel.template @@ -36,7 +36,7 @@ Hilfsmittel, die wir unseren Entwicklern zur Verfügung stellen.</p> <tr bgcolor="#ffffff"> <td> - <a href="{$root}/contributing">Zu Wine beitragen</a> + <a href="http://wiki.winehq.org/WineHelfen">Zu Wine beitragen</a> </td> <td valign="top"> Informationen für beginnende Mitarbeiter. diff --git a/templates/en/devel.template b/templates/en/devel.template index b72130e..eaa0820 100644 --- a/templates/en/devel.template +++ b/templates/en/devel.template @@ -36,7 +36,7 @@ various resources available for our developers.</p> <tr bgcolor="#ffffff"> <td> - <a href="{$root}/contributing">Contributing to Wine</a> + <a href="http://wiki.winehq.org/HelpingWine">Contributing to Wine</a> </td> <td valign="top"> Information for 1st time contributors. diff --git a/templates/he/devel.template b/templates/he/devel.template index 8d3e7f4..a55b2c9 100644 --- a/templates/he/devel.template +++ b/templates/he/devel.template @@ -35,7 +35,7 @@ <tr bgcolor="#ffffff"> <td> - <a href="{$root}/contributing">תרומה ל־Wine</a> + <a href="http://wiki.winehq.org/HelpingWine">תרומה ל־Wine</a> </td> <td valign="top"> מידע לתורמים בפעם הראשונה. diff --git a/templates/pl/devel.template b/templates/pl/devel.template index 1fbd8fe..54dab91 100644 --- a/templates/pl/devel.template +++ b/templates/pl/devel.template @@ -36,7 +36,7 @@ rozmaitych materiałów dostępnych dla programistów Wine.</p> <tr bgcolor="#ffffff"> <td> - <a href="{$root}/contributing">Udzielanie się w Wine</a> + <a href="http://wiki.winehq.org/HelpingWine">Udzielanie się w Wine</a> </td> <td valign="top"> Informacje dla tych, którzy będą się udzielali po raz pierwszy. diff --git a/templates/tr/devel.template b/templates/tr/devel.template index b9705ba..712415e 100644 --- a/templates/tr/devel.template +++ b/templates/tr/devel.template @@ -35,7 +35,7 @@ <tr bgcolor="#ffffff"> <td> - <a href="{$root}/contributing">Contributing to Wine</a> + <a href="http://wiki.winehq.org/HelpingWine">Contributing to Wine</a> </td> <td valign="top"> Information for 1st time contributors.

1 0

Kyle Auble : Move Contributing content to wiki
by Jeremy Newman 21 Sep '12

21 Sep '12

Module: website Branch: master Commit: c2a98b5a4bf4f8fe3ad804d41f07b332f934a2e4 URL: http://source.winehq.org/git/website.git/?a=commit;h=c2a98b5a4bf4f8fe3ad804… Author: Kyle Auble <randomidman48(a)yahoo.com> Date: Thu Sep 20 13:19:22 2012 -0700 Move Contributing content to wiki The Hebrew Contributing page only had a few sentences translated. The other versions have been moved to the wiki. --- templates/de/contributing.template | 402 ------------------------------------ templates/en/contributing.template | 330 ----------------------------- templates/he/contributing.template | 325 ----------------------------- templates/pt/contributing.template | 346 ------------------------------- 4 files changed, 0 insertions(+), 1403 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=c2a98b5a4bf4f8fe3a…

1 0