January 2008 - Wine-Commits

Alexandre Julliard : winex11: Move code around in X11DRV_SetWindowPos to reduce indentation levels.
by Alexandre Julliard Jan. 23, 2008

Jan. 23, 2008

Module: wine Branch: master Commit: c567556dfefc0c75bcab238553b79c883dda0c26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c567556dfefc0c75bcab23855… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 23 12:28:12 2008 +0100 winex11: Move code around in X11DRV_SetWindowPos to reduce indentation levels. --- dlls/winex11.drv/window.c | 6 +- dlls/winex11.drv/winpos.c | 250 ++++++++++++++++++++++----------------------- 2 files changed, 121 insertions(+), 135 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c567556dfefc0c75bcab2…

1 0

Alexandre Julliard : winex11: Add a mapped flag to the window data instead of relying on WS_VISIBLE.
by Alexandre Julliard Jan. 23, 2008

Jan. 23, 2008

Module: wine Branch: master Commit: 9fc4e5f7407b4241233a6962c025e4b6e2889037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fc4e5f7407b4241233a6962c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 23 12:28:32 2008 +0100 winex11: Add a mapped flag to the window data instead of relying on WS_VISIBLE. --- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/winpos.c | 54 +++++++++++++++------------------------------ dlls/winex11.drv/x11drv.h | 3 +- 3 files changed, 21 insertions(+), 38 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index dfaf6b9..015a57b 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -882,7 +882,7 @@ void X11DRV_set_iconic_state( HWND hwnd ) XSetWMHints( display, data->whole_window, data->wm_hints ); } - if (style & WS_VISIBLE) + if (data->mapped) { if (iconic) XIconifyWindow( display, data->whole_window, DefaultScreen(display) ); diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index ecd3104..36cab19 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -144,19 +144,21 @@ void X11DRV_SetWindowStyle( HWND hwnd, DWORD old_style ) if (changed & WS_VISIBLE) { - if (data->whole_window && X11DRV_is_window_rect_mapped( &data->window_rect )) + if (data->whole_window && (new_style & WS_VISIBLE) && + X11DRV_is_window_rect_mapped( &data->window_rect )) { - if (new_style & WS_VISIBLE) + X11DRV_set_wm_hints( display, data ); + if (!data->mapped) { TRACE( "mapping win %p\n", hwnd ); X11DRV_sync_window_style( display, data ); - X11DRV_set_wm_hints( display, data ); wine_tsx11_lock(); XMapWindow( display, data->whole_window ); wine_tsx11_unlock(); + data->mapped = TRUE; } - /* we don't unmap windows, that causes trouble with the window manager */ } + /* we don't unmap windows, that causes trouble with the window manager */ invalidate_dce( hwnd, &data->window_rect ); } @@ -190,6 +192,7 @@ static void update_wm_states( Display *display, struct x11drv_win_data *data, BO XEvent xev; if (!data->managed) return; + if (!data->mapped) return; if (data->whole_rect.left <= 0 && data->whole_rect.right >= screen_width && data->whole_rect.top <= 0 && data->whole_rect.bottom >= screen_height) @@ -351,12 +354,10 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, const RECT *rectWindow, Display *display = thread_display(); struct x11drv_win_data *data; RECT old_window_rect, old_whole_rect, old_client_rect, visible_rect; - DWORD old_style, new_style; + DWORD new_style; if (!(data = X11DRV_get_win_data( hwnd ))) return FALSE; - old_style = GetWindowLongW( hwnd, GWL_STYLE ); - if (!set_server_window_pos( hwnd, insert_after, rectWindow, rectClient, swp_flags, valid_rects, &visible_rect )) return FALSE; @@ -375,12 +376,12 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, const RECT *rectWindow, TRACE( "making win %p/%lx managed\n", hwnd, data->whole_window ); data->managed = TRUE; SetPropA( hwnd, managed_prop, (HANDLE)1 ); - if (old_style & WS_VISIBLE) + if (data->mapped) { wine_tsx11_lock(); XUnmapWindow( display, data->whole_window ); wine_tsx11_unlock(); - old_style &= ~WS_VISIBLE; /* force it to be mapped again below */ + data->mapped = FALSE; } } @@ -451,21 +452,13 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, const RECT *rectWindow, if (!data->whole_window || data->lock_changes) return TRUE; /* nothing more to do */ - if ((old_style & WS_VISIBLE) && !(new_style & WS_VISIBLE)) + if (data->mapped && (!(new_style & WS_VISIBLE) || !X11DRV_is_window_rect_mapped( rectWindow ))) { - /* window got hidden, unmap it */ TRACE( "unmapping win %p\n", hwnd ); wine_tsx11_lock(); XUnmapWindow( display, data->whole_window ); wine_tsx11_unlock(); - } - else if ((new_style & WS_VISIBLE) && !X11DRV_is_window_rect_mapped( rectWindow )) - { - /* resizing to zero size or off screen -> unmap */ - TRACE( "unmapping zero size or off-screen win %p\n", hwnd ); - wine_tsx11_lock(); - XUnmapWindow( display, data->whole_window ); - wine_tsx11_unlock(); + data->mapped = FALSE; } X11DRV_sync_window_position( display, data, swp_flags, &old_client_rect, &old_whole_rect ); @@ -473,33 +466,22 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, const RECT *rectWindow, if ((new_style & WS_VISIBLE) && !(new_style & WS_MINIMIZE) && X11DRV_is_window_rect_mapped( rectWindow )) { - BOOL mapped = FALSE; + BOOL was_mapped = data->mapped; - if (!(old_style & WS_VISIBLE)) - { - /* window got shown, map it */ - TRACE( "mapping win %p\n", hwnd ); - mapped = TRUE; - } - else if ((swp_flags & (SWP_NOSIZE | SWP_NOMOVE)) != (SWP_NOSIZE | SWP_NOMOVE)) - { - /* resizing from zero size to non-zero -> map */ - TRACE( "mapping non zero size or off-screen win %p\n", hwnd ); - mapped = TRUE; - } - - if (mapped || (swp_flags & SWP_FRAMECHANGED)) + if (!data->mapped || (swp_flags & SWP_FRAMECHANGED)) X11DRV_set_wm_hints( display, data ); - if (mapped) + if (!data->mapped) { + TRACE( "mapping win %p\n", hwnd ); X11DRV_sync_window_style( display, data ); wine_tsx11_lock(); XMapWindow( display, data->whole_window ); XFlush( display ); wine_tsx11_unlock(); + data->mapped = TRUE; } - update_wm_states( display, data, mapped ); + update_wm_states( display, data, !was_mapped ); } return TRUE; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8738d3f..5bcd76a 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -672,7 +672,8 @@ struct x11drv_win_data RECT client_rect; /* client area relative to parent */ XIC xic; /* X input context */ XWMHints *wm_hints; /* window manager hints */ - BOOL managed; /* is window managed? */ + BOOL managed : 1; /* is window managed? */ + BOOL mapped : 1; /* is window mapped? (in either normal or iconic state) */ DWORD wm_state; /* bit mask of active x11drv_wm_state values */ struct dce *dce; /* DCE for CS_OWNDC or CS_CLASSDC windows */ unsigned int lock_changes; /* lock count for X11 change requests */

1 0

Alexandre Julliard : winex11: Apply the existing window region (if any) when creating the whole window.
by Alexandre Julliard Jan. 23, 2008

Jan. 23, 2008

Module: wine Branch: master Commit: 395928dfb17a1e73a1d11acbdd27deecd48655d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=395928dfb17a1e73a1d11acbd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 23 16:30:18 2008 +0100 winex11: Apply the existing window region (if any) when creating the whole window. Move X11DRV_SetWindowRgn to window.c. --- dlls/winex11.drv/window.c | 71 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/winpos.c | 56 ----------------------------------- 2 files changed, 71 insertions(+), 56 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 015a57b..fd05cc9 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -32,6 +32,9 @@ #include <X11/Xlib.h> #include <X11/Xresource.h> #include <X11/Xutil.h> +#ifdef HAVE_LIBXSHAPE +#include <X11/extensions/shape.h> +#endif /* HAVE_LIBXSHAPE */ #include "windef.h" #include "winbase.h" @@ -222,6 +225,41 @@ void X11DRV_sync_window_style( Display *display, struct x11drv_win_data *data ) /*********************************************************************** + * sync_window_region + * + * Update the X11 window region. + */ +static void sync_window_region( Display *display, struct x11drv_win_data *data, HRGN hrgn ) +{ +#ifdef HAVE_LIBXSHAPE + if (!data->whole_window) return; + + if (!hrgn) + { + wine_tsx11_lock(); + XShapeCombineMask( display, data->whole_window, ShapeBounding, 0, 0, None, ShapeSet ); + wine_tsx11_unlock(); + } + else + { + RGNDATA *pRegionData = X11DRV_GetRegionData( hrgn, 0 ); + if (pRegionData) + { + wine_tsx11_lock(); + XShapeCombineRectangles( display, data->whole_window, ShapeBounding, + data->window_rect.left - data->whole_rect.left, + data->window_rect.top - data->whole_rect.top, + (XRectangle *)pRegionData->Buffer, + pRegionData->rdh.nCount, ShapeSet, YXBanded ); + wine_tsx11_unlock(); + HeapFree(GetProcessHeap(), 0, pRegionData); + } + } +#endif /* HAVE_LIBXSHAPE */ +} + + +/*********************************************************************** * X11DRV_set_win_format */ BOOL X11DRV_set_win_format( HWND hwnd, XID fbconfig_id ) @@ -1013,6 +1051,7 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat int cx, cy, mask; XSetWindowAttributes attr; XIM xim; + HRGN hrgn; if (!(cx = data->window_rect.right - data->window_rect.left)) cx = 1; if (!(cy = data->window_rect.bottom - data->window_rect.top)) cy = 1; @@ -1051,6 +1090,13 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat X11DRV_set_wm_hints( display, data ); SetPropA( data->hwnd, whole_window_prop, (HANDLE)data->whole_window ); + + /* set the window region */ + if ((hrgn = CreateRectRgn( 0, 0, 0, 0 ))) + { + if (GetWindowRgn( data->hwnd, hrgn ) != ERROR) sync_window_region( display, data, hrgn ); + DeleteObject( hrgn ); + } return data->whole_window; } @@ -1619,3 +1665,28 @@ void X11DRV_SetWindowIcon( HWND hwnd, UINT type, HICON icon ) wine_tsx11_unlock(); } } + + +/*********************************************************************** + * SetWindowRgn (X11DRV.@) + * + * Assign specified region to window (for non-rectangular windows) + */ +int X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) +{ + struct x11drv_win_data *data; + + if ((data = X11DRV_get_win_data( hwnd ))) + { + sync_window_region( thread_display(), data, hrgn ); + invalidate_dce( hwnd, &data->window_rect ); + } + else if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) + { + FIXME( "not supported on other thread window %p\n", hwnd ); + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return FALSE; + } + + return TRUE; +} diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 36cab19..08baa65 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -23,9 +23,6 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> -#ifdef HAVE_LIBXSHAPE -#include <X11/extensions/shape.h> -#endif /* HAVE_LIBXSHAPE */ #include <stdarg.h> #include "windef.h" @@ -1029,59 +1026,6 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) /*********************************************************************** - * SetWindowRgn (X11DRV.@) - * - * Assign specified region to window (for non-rectangular windows) - */ -int X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) -{ - struct x11drv_win_data *data; - - if (!(data = X11DRV_get_win_data( hwnd ))) - { - if (IsWindow( hwnd )) - FIXME( "not supported on other thread window %p\n", hwnd ); - SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return FALSE; - } - -#ifdef HAVE_LIBXSHAPE - if (data->whole_window) - { - Display *display = thread_display(); - - if (!hrgn) - { - wine_tsx11_lock(); - XShapeCombineMask( display, data->whole_window, - ShapeBounding, 0, 0, None, ShapeSet ); - wine_tsx11_unlock(); - } - else - { - RGNDATA *pRegionData = X11DRV_GetRegionData( hrgn, 0 ); - if (pRegionData) - { - wine_tsx11_lock(); - XShapeCombineRectangles( display, data->whole_window, ShapeBounding, - data->window_rect.left - data->whole_rect.left, - data->window_rect.top - data->whole_rect.top, - (XRectangle *)pRegionData->Buffer, - pRegionData->rdh.nCount, - ShapeSet, YXBanded ); - wine_tsx11_unlock(); - HeapFree(GetProcessHeap(), 0, pRegionData); - } - } - } -#endif /* HAVE_LIBXSHAPE */ - - invalidate_dce( hwnd, &data->window_rect ); - return TRUE; -} - - -/*********************************************************************** * draw_moving_frame * * Draw the frame used when moving or resizing window.

1 0

Alexandre Julliard : winex11: Set hints for the existing window text when creating the whole window.
by Alexandre Julliard Jan. 23, 2008

Jan. 23, 2008

Module: wine Branch: master Commit: 3ba20257ceff42c25401e6d8f301479df64f8c93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ba20257ceff42c25401e6d8f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 23 16:32:55 2008 +0100 winex11: Set hints for the existing window text when creating the whole window. --- dlls/winex11.drv/window.c | 91 ++++++++++++++++++++++++--------------------- 1 files changed, 49 insertions(+), 42 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index fd05cc9..1d6a060 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -260,6 +260,49 @@ static void sync_window_region( Display *display, struct x11drv_win_data *data, /*********************************************************************** + * sync_window_text + */ +static void sync_window_text( Display *display, Window win, const WCHAR *text ) +{ + UINT count; + char *buffer, *utf8_buffer; + XTextProperty prop; + + /* allocate new buffer for window text */ + count = WideCharToMultiByte(CP_UNIXCP, 0, text, -1, NULL, 0, NULL, NULL); + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, count ))) return; + WideCharToMultiByte(CP_UNIXCP, 0, text, -1, buffer, count, NULL, NULL); + + count = WideCharToMultiByte(CP_UTF8, 0, text, strlenW(text), NULL, 0, NULL, NULL); + if (!(utf8_buffer = HeapAlloc( GetProcessHeap(), 0, count ))) + { + HeapFree( GetProcessHeap(), 0, buffer ); + return; + } + WideCharToMultiByte(CP_UTF8, 0, text, strlenW(text), utf8_buffer, count, NULL, NULL); + + wine_tsx11_lock(); + if (XmbTextListToTextProperty( display, &buffer, 1, XStdICCTextStyle, &prop ) == Success) + { + XSetWMName( display, win, &prop ); + XSetWMIconName( display, win, &prop ); + XFree( prop.value ); + } + /* + Implements a NET_WM UTF-8 title. It should be without a trailing \0, + according to the standard + ( http://www.pps.jussieu.fr/~jch/software/UTF8_STRING/UTF8_STRING.text ). + */ + XChangeProperty( display, win, x11drv_atom(_NET_WM_NAME), x11drv_atom(UTF8_STRING), + 8, PropModeReplace, (unsigned char *) utf8_buffer, count); + wine_tsx11_unlock(); + + HeapFree( GetProcessHeap(), 0, utf8_buffer ); + HeapFree( GetProcessHeap(), 0, buffer ); +} + + +/*********************************************************************** * X11DRV_set_win_format */ BOOL X11DRV_set_win_format( HWND hwnd, XID fbconfig_id ) @@ -1051,6 +1094,7 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat int cx, cy, mask; XSetWindowAttributes attr; XIM xim; + WCHAR text[1024]; HRGN hrgn; if (!(cx = data->window_rect.right - data->window_rect.left)) cx = 1; @@ -1091,6 +1135,10 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat SetPropA( data->hwnd, whole_window_prop, (HANDLE)data->whole_window ); + /* set the window text */ + if (!InternalGetWindowText( data->hwnd, text, sizeof(text)/sizeof(WCHAR) )) text[0] = 0; + sync_window_text( display, data->whole_window, text ); + /* set the window region */ if ((hrgn = CreateRectRgn( 0, 0, 0, 0 ))) { @@ -1139,51 +1187,10 @@ static void destroy_whole_window( Display *display, struct x11drv_win_data *data void X11DRV_SetWindowText( HWND hwnd, LPCWSTR text ) { Display *display = thread_display(); - UINT count; - char *buffer; - char *utf8_buffer; Window win; - XTextProperty prop; if ((win = X11DRV_get_whole_window( hwnd )) && win != DefaultRootWindow(display)) - { - /* allocate new buffer for window text */ - count = WideCharToMultiByte(CP_UNIXCP, 0, text, -1, NULL, 0, NULL, NULL); - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, count ))) - { - ERR("Not enough memory for window text\n"); - return; - } - WideCharToMultiByte(CP_UNIXCP, 0, text, -1, buffer, count, NULL, NULL); - - count = WideCharToMultiByte(CP_UTF8, 0, text, strlenW(text), NULL, 0, NULL, NULL); - if (!(utf8_buffer = HeapAlloc( GetProcessHeap(), 0, count ))) - { - ERR("Not enough memory for window text in UTF-8\n"); - HeapFree( GetProcessHeap(), 0, buffer ); - return; - } - WideCharToMultiByte(CP_UTF8, 0, text, strlenW(text), utf8_buffer, count, NULL, NULL); - - wine_tsx11_lock(); - if (XmbTextListToTextProperty( display, &buffer, 1, XStdICCTextStyle, &prop ) == Success) - { - XSetWMName( display, win, &prop ); - XSetWMIconName( display, win, &prop ); - XFree( prop.value ); - } - /* - Implements a NET_WM UTF-8 title. It should be without a trailing \0, - according to the standard - ( http://www.pps.jussieu.fr/~jch/software/UTF8_STRING/UTF8_STRING.text ). - */ - XChangeProperty( display, win, x11drv_atom(_NET_WM_NAME), x11drv_atom(UTF8_STRING), - 8, PropModeReplace, (unsigned char *) utf8_buffer, count); - wine_tsx11_unlock(); - - HeapFree( GetProcessHeap(), 0, utf8_buffer ); - HeapFree( GetProcessHeap(), 0, buffer ); - } + sync_window_text( display, win, text ); }

1 0

Alexandre Julliard : winex11: Update the win data rectangles before doing anything else in SetWindowPos.
by Alexandre Julliard Jan. 23, 2008

Jan. 23, 2008

Module: wine Branch: master Commit: bbfbe246815a7e9a51e62bd0c65666b7b8dc0bf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbfbe246815a7e9a51e62bd0c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 23 12:28:01 2008 +0100 winex11: Update the win data rectangles before doing anything else in SetWindowPos. --- dlls/winex11.drv/window.c | 30 ++++-------------- dlls/winex11.drv/winpos.c | 75 ++++++++++++++++++++++++-------------------- dlls/winex11.drv/x11drv.h | 5 ++- 3 files changed, 51 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bbfbe246815a7e9a51e62…

1 0

Francois Gouget : wwn336: Fix EOL spaces and wrap lines to a reasonable length so that later diffs are more meaningful .
by Jeremy Newman Jan. 23, 2008

Jan. 23, 2008

Module: website Branch: master Commit: fabb027dd0429d15924ae6c8e93733d50cf5426a URL: http://source.winehq.org/git/website.git/?a=commit;h=fabb027dd0429d15924ae6… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 18 13:10:56 2008 +0100 wwn336: Fix EOL spaces and wrap lines to a reasonable length so that later diffs are more meaningful. --- wwn/wn20071224_336.xml | 88 ++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 70 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=fabb027dd0429d1592…

1 0

Francois Gouget : wwn338: Fix EOL spaces and wrap lines to a reasonable length so that later diffs are more meaningful .
by Jeremy Newman Jan. 23, 2008

Jan. 23, 2008

Module: website Branch: master Commit: af7c6517f0f20cfe85df2d576f37099a907d774c URL: http://source.winehq.org/git/website.git/?a=commit;h=af7c6517f0f20cfe85df2d… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 23 20:14:02 2008 +0100 wwn338: Fix EOL spaces and wrap lines to a reasonable length so that later diffs are more meaningful. --- wwn/wn20080106_338.xml | 86 ++++++++++++++++++++++++++++++++++++----------- 1 files changed, 66 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=af7c6517f0f20cfe85…

1 0

Francois Gouget : Assorted spelling fixes.
by Jeremy Newman Jan. 23, 2008

Jan. 23, 2008

Module: website Branch: master Commit: 2150589f3baceb21fad4dc63e5ae59ee382c6878 URL: http://source.winehq.org/git/website.git/?a=commit;h=2150589f3baceb21fad4dc… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 23 20:13:27 2008 +0100 Assorted spelling fixes. --- wwn/interviews/interview_5.xml | 2 +- wwn/wn20010513_95.xml | 2 +- wwn/wn20011125_109.xml | 2 +- wwn/wn20011212_110.xml | 2 +- wwn/wn20020530_124.xml | 2 +- wwn/wn20020719_129.xml | 4 ++-- wwn/wn20020824_132.xml | 2 +- wwn/wn20021206_147.xml | 2 +- wwn/wn20030117_153.xml | 2 +- wwn/wn20030124_154.xml | 2 +- wwn/wn20040109_204.xml | 2 +- wwn/wn20040206_209.xml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/wwn/interviews/interview_5.xml b/wwn/interviews/interview_5.xml index 52d9041..9d6f3a4 100644 --- a/wwn/interviews/interview_5.xml +++ b/wwn/interviews/interview_5.xml @@ -119,7 +119,7 @@ Since many years, Wine had an internal debugger. At the times when Wine was a monolithic application (no separated DLLs, all Windows processes running in the same Unix-address space), the internal debugger had a direct access to all the memory (Wine internals, Windows-process -memory). When Wine started to be splitted (wineserver to allow +memory). When Wine started to be split (wineserver to allow interprocess exchange, each (32bit) Windows-process having its own unix-address space), debugger needed some heavy rewriting. Alexandre Julliard wrote most of the Win32 debugging API (generation of debug diff --git a/wwn/wn20010513_95.xml b/wwn/wn20010513_95.xml index 4f1998f..5579d08 100644 --- a/wwn/wn20010513_95.xml +++ b/wwn/wn20010513_95.xml @@ -145,7 +145,7 @@ between the wineserver and the application with various kernel patches. I was reading "Unix Network Programming, volume 2 - IPC" and ran over a "doors" IPC api that is implemented on Solaris and has the lowest latency. According to the book it is ~3 times faster than pipe. -Actual values for Solaris 2.6 in the book are: (in miliseconds) +Actual values for Solaris 2.6 in the book are: (in milliseconds) <ul><code> doors: 121 sysv msgq: 260 diff --git a/wwn/wn20011125_109.xml b/wwn/wn20011125_109.xml index 800b162..41994c5 100644 --- a/wwn/wn20011125_109.xml +++ b/wwn/wn20011125_109.xml @@ -202,7 +202,7 @@ threw out some more ideas: In light of this you could argue that since, I presume, MIDL removes whitespace and commments which is IIRC the only really expression, - since the rest the API defintions are just facts, that the MIDL + since the rest the API definitions are just facts, that the MIDL compiled files just contains facts not any part of the protected expression. diff --git a/wwn/wn20011212_110.xml b/wwn/wn20011212_110.xml index 55fa4b0..c8e18c3 100644 --- a/wwn/wn20011212_110.xml +++ b/wwn/wn20011212_110.xml @@ -615,7 +615,7 @@ It's been a while, but I decided to try again in October. At that time, there was an OLE error, but the only other strange occurance was a 'locking' of the screen on a print preview. -Since then, this 'locking' is the only issue (though I havn't yet +Since then, this 'locking' is the only issue (though I haven't yet attempted to print). The apps I'm trying are my own, basically just a form is called, the user puts in a date range, and a report is run. You can view the report diff --git a/wwn/wn20020530_124.xml b/wwn/wn20020530_124.xml index e164976..4a00156 100644 --- a/wwn/wn20020530_124.xml +++ b/wwn/wn20020530_124.xml @@ -287,7 +287,7 @@ minds. Vincent Beron went on to mention: <quote who="Vincent Beron"> there are a lot (>20000) of lines which have either some spaces/tabs or combination of both after the final ";" (or "," in the case of - function arguments splitted on a couple of lines.) + function arguments split on a couple of lines.) IMHO, it'd be better to remove them (although I admit it's mostly for esthetics reasons). diff --git a/wwn/wn20020719_129.xml b/wwn/wn20020719_129.xml index 8a927e3..7964891 100644 --- a/wwn/wn20020719_129.xml +++ b/wwn/wn20020719_129.xml @@ -264,9 +264,9 @@ on Sparc: <quote who="Shachar Shemesh"> I'll try, but I only have solaris machines at work, and this is far from - my main focus on Wine (I'm working on BiDi, if you remeber correctly + my main focus on Wine (I'm working on BiDi, if you remember correctly ;-). I am only looking into solaris at all because at work we use some - windows compat library for solaris (don't remeber the name, but it + windows compat library for solaris (don't remember the name, but it wasn't mainsoft's) for the GUI part of the product. I am sprinkling the idea to the Unix GUI team here to check Wine out. diff --git a/wwn/wn20020824_132.xml b/wwn/wn20020824_132.xml index 6be4e73..f5de007 100644 --- a/wwn/wn20020824_132.xml +++ b/wwn/wn20020824_132.xml @@ -263,7 +263,7 @@ say which is the right way is to get something working. mandatory BiDi support in Wine, as this means (among mere applying the BiDi algorithm) translating each string printed to UTF-32 and back (unless we can say for sure that no BiDi is going to be required - - havn't found a really good algorithm for that yet, but I'm working on + haven't found a really good algorithm for that yet, but I'm working on it). Not having the proper library on your machine is a pretty good way of indicating that BiDi is not interesting to you (and is, more or less, the way MS tackled the exact same dillema).</quote> diff --git a/wwn/wn20021206_147.xml b/wwn/wn20021206_147.xml index 32baf2a..9a90ea1 100644 --- a/wwn/wn20021206_147.xml +++ b/wwn/wn20021206_147.xml @@ -300,7 +300,7 @@ interested. I currently have a working HTML Help viewer, which seems to work pretty well on everything I've tested so far. It does however need some more work to conform to the way the real HTML Help system works in Windows (eg, I -havn't written an ActiveX control for it yet). +haven't written an ActiveX control for it yet). Currently the HTML Help viewer requires an IWebBrowser interface, and only really works with an Internet Explorer installation - so I don't believe diff --git a/wwn/wn20030117_153.xml b/wwn/wn20030117_153.xml index d070491..1083013 100644 --- a/wwn/wn20030117_153.xml +++ b/wwn/wn20030117_153.xml @@ -212,7 +212,7 @@ some of the work he's been doing: I've been too busy lately (job hunting mostly, although I've also been sick and bedridden lately) to do any more work on it, and I was really waiting for Alexandre to comment on my question about C++ before going any -further... I havn't seen a reply yet tho. +further... I haven't seen a reply yet tho. The current state of my local tree, besides being a mess, is that it has most QT dependencies removed. Currently it uses a lot of QT stub's around diff --git a/wwn/wn20030124_154.xml b/wwn/wn20030124_154.xml index b0786ee..ca50ab3 100644 --- a/wwn/wn20030124_154.xml +++ b/wwn/wn20030124_154.xml @@ -660,7 +660,7 @@ I managed to install IE5.5 using the following procedure: <li> I, personally, made two sessions. One downloading everything, and the other for installing.</li> <li> Install just the basic IE. No Connection wizard or anything else.</li> - <li> When setup finshes (and you get an error in processing the reboot) + <li> When setup finishes (and you get an error in processing the reboot) - wait for all wine instances to exit</li> <li> run wineboot.</li> <li> One of the programs initiated by wineboot fails to run (starts diff --git a/wwn/wn20040109_204.xml b/wwn/wn20040109_204.xml index 8bd255c..3bfaf56 100644 --- a/wwn/wn20040109_204.xml +++ b/wwn/wn20040109_204.xml @@ -134,7 +134,7 @@ instead of kernel32</li> <li> file IO management can be cleanly separated between kernel32 and ntdll (1)</li> <li> files/ directory could be removed (not done in the patch (also nuked include/drive.h and include/file.h)</li> -<li> homogenous drive & device handling (we no longer store those objects +<li> homogeneous drive & device handling (we no longer store those objects in the server). Drive and device are now standard file handles (from a Windows point of view).</li> <li> a few current Wine bugs have been fixed (see the todo_wine removed in diff --git a/wwn/wn20040206_209.xml b/wwn/wn20040206_209.xml index 5a72528..c71efaf 100644 --- a/wwn/wn20040206_209.xml +++ b/wwn/wn20040206_209.xml @@ -780,7 +780,7 @@ win9x, since it did not exist on nt4.</quote> Dimi thought that was odd, <quote who="Dimitrie Paun"> That makes no sense: we get short names on a system (nt4) that -fundamentally had long names. Shoudn't we get long names by +fundamentally had long names. Shouldn't we get long names by default in that case?</quote> Ove went into more detail:

1 0

Francois Gouget : wwn335: Spelling fixes.
by Jeremy Newman Jan. 23, 2008

Jan. 23, 2008

Module: website Branch: master Commit: f29b92376b5610ec51d98719bdcafa47f230856b URL: http://source.winehq.org/git/website.git/?a=commit;h=f29b92376b5610ec51d987… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 23 20:13:16 2008 +0100 wwn335: Spelling fixes. --- wwn/wn20071217_335.xml | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/wwn/wn20071217_335.xml b/wwn/wn20071217_335.xml index f96332d..5b39640 100644 --- a/wwn/wn20071217_335.xml +++ b/wwn/wn20071217_335.xml @@ -155,7 +155,7 @@ the actual conversation! So, a bit of background on these funky acronyms before we dive into the thread itself (Most of the info from -<a href="http://wikipedia.org">wikipedia</a> +<a href="http://wikipedia.org">wikipedia</a>): <quote> <a href="http://en.wikipedia.org/wiki/GLSL">GLSL</a> (OpenGL Shading Language): also known as GLslang, is a high level @@ -176,15 +176,15 @@ in making use of advanced GPU programmability features. </quote> The issue is that writing shaders can often be complicated and difficult. -So GLSL was born, a higher level shading language to hopeuflly make -programming these things easier. HLSL is another lanuage, similar to GLSL, +So GLSL was born, a higher level shading language to hopefully make +programming these things easier. HLSL is another language, similar to GLSL, from Microsoft; and the translation of HLSL to something workable with Linux/BSD etc. will be necessary to continue WineD3D. How this will happen is the subject of this wine devel discussion: <quote> -hlsl2glsl is the good solution for implementing shaders on directX 10. +hlsl2glsl is the right solution for implementing shaders on directX 10. Nevertheless, the hlsl compilation to tokens has to be done for d3d9. On the other hand, if we implement d3dx9_xx, it is likely that the application will be using the compile D3DX9CompileShader to get the @@ -221,7 +221,7 @@ and the most feasible way to implement it I've heard so far would be to embed GLSL code a comment section inside the shader byte code, which would be rather ugly. -And finally, the actual hardware has it's own hardware specific +And finally, the actual hardware has its own hardware specific language for shaders. HLSL or D3D bytecode isn't really any closer to the actual hardware language than GLSL or ARB asm, so it isn't even guaranteed to gain us much. @@ -231,7 +231,7 @@ guaranteed to gain us much. Keep in mind that getting shaders translated into GLSL, which we can then send to the card, is only a small part of the whole dx10 topic. We will need our -own codepath anyway(HLSL -> d3d asm -> GLSL). We have to investigate wether a +own codepath anyway(HLSL -> d3d asm -> GLSL). We have to investigate whether a direct HLSL -> GLSL path will gain us any performance. We can optimize the HLSL -> d3d asm ourselves, and the d3d asm->GLSL->card native code is lossless in theory. If the GLSL compiler is good, then it will recognise the @@ -258,20 +258,20 @@ idea, and immediatly caught my attention: Hello to all. -I have something in mind that I would like to ask to Wine developers. +I have something in mind that I would like to ask Wine developers. Is it possible using a hack/trick or a hidden option to change the -name of wine in the proccess lists? -I mean, Is it possible to list 'wine' proccess as, for example +name of wine in the process lists? +I mean, is it possible to list 'wine' process as, for example 'iexplorer' when I use Internet Explorer under Wine? -Thanks a lot for your work, hope my question find the answer here. +Thanks a lot for your work, hope my question finds the answer here. </quote> -Apparently this had been thought up of before: Stefan Dosinger writes in: +Apparently this had been thought of before: Stefan Dosinger writes in: <quote> -This is done since quite some time. apps are usually called "iexplore.exe", or +This is done since quite some time. Apps are usually called "iexplore.exe", or they have the name of the file that was passed to wine, like C:\Program Files\Internet Explorer\iexplore.exe @@ -280,7 +280,7 @@ outdated version of wine. </quote> -Apparently, this already existed! Alright, so whats the deal? Apparently +Apparently, this already existed! Alright, so what's the deal? Apparently it only works on linux! Poor Gonzalo is on FreeBSD. Stefan writes in with the unfortunate news: @@ -288,10 +288,10 @@ the unfortunate news: Ow, ah, this is a different business. I think we use some Linux-only feature to set the name, and Alexandre told me that at least MacOS doesn't have it. I have no idea if there is a way to change the process name under BSD. If there -is, feel free to implement it and send a patch +is, feel free to implement it and send a patch. </quote> -There are of course ways to do this on FreeBSD, Alex Juillard lets us know +There are of course ways to do this on FreeBSD, Alexandre Julliard lets us know that it may be possible: <quote> @@ -299,14 +299,14 @@ I wouldn't [accept a hack which involves copying the process to /tmp], but on FreeBSD you can use setproctitle() for this. </quote> -Another important point brought up later in this thread, is that its not wise -to killall wineserver or killall explorer.exe. Its much smarter to +Another important point brought up later in this thread, is that it is not wise +to killall wineserver or killall explorer.exe. It's much smarter to "wineserver -k". L Rahyen writes: <quote> wineserver -k - This kills all processes which belongs to current WINE prefix (as + This kills all processes which belong to current WINE prefix (as specified in WINEPREFIX environment variable or ~/.wine otherwise). For me this works in 100% of cases so I see no problem here. @@ -349,7 +349,7 @@ IF this is true, WHY? Rich </quote> -This indeed doesn't seem to make sense; alas we recieve the voice of +This indeed doesn't seem to make sense; alas we receive the voice of reason and policy. Bryan Haskins writes: <quote> It really depends on the case, if a program is entirely superseded by

1 0

Francois Gouget : wwn334: Spelling fixes.
by Jeremy Newman Jan. 23, 2008

Jan. 23, 2008

Module: website Branch: master Commit: 29d4691321b85ecc1ff70de6853c5443081d389e URL: http://source.winehq.org/git/website.git/?a=commit;h=29d4691321b85ecc1ff70d… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 23 20:13:10 2008 +0100 wwn334: Spelling fixes. --- wwn/wn20071210_334.xml | 60 ++++++++++++++++++++++++------------------------ 1 files changed, 30 insertions(+), 30 deletions(-) diff --git a/wwn/wn20071210_334.xml b/wwn/wn20071210_334.xml index e65a51d..ca43aba 100644 --- a/wwn/wn20071210_334.xml +++ b/wwn/wn20071210_334.xml @@ -6,7 +6,7 @@ <author contact="http://www.bluesata.com">Zachary Goldberg</author> <issue num="334" date="12/10/2007" /> <intro> This is the 334 issue of the Wine Weekly News publication. -Its main goal is to introduce the new AppDB Status changer +Its main goal is to introduce the new AppDB Status changer. It also serves to inform you of what's going on around Wine. Wine is an open source implementation of the Windows API on top of X and Unix. Think of it as a Windows compatibility layer. Wine does not require Microsoft @@ -90,7 +90,7 @@ available. You can find more info at <topic>Wine on Linux</topic> As you may have read the <a href="http://www.desktoplinux.com/news/NS8454912761.html">Annual -Linux Desktop Survey Results</a> are in for the year. Theres the usual bit +Linux Desktop Survey Results</a> are in for the year. There's the usual bit about what browser people use and their favorite distribution. However, the folk over at <a href="http://linuxdesktop.com">linuxdesktop.com</a> have also included some interesting information on how people run windows applications @@ -113,9 +113,9 @@ used Cedega, while even less, 5 percent, said they used CrossOver. </quote> -Desktoplinux's Steven Vaughan-Nichols writes in a -<a href="http://www.desktoplinux.com/news/NS9488592005.html">separate -article</a> also highlights how linux users feel about applications: +In a <a href="http://www.desktoplinux.com/news/NS9488592005.html">separate +article</a>, desktoplinux's Steven Vaughan-Nichols also highlights how Linux +users feel about applications: <quote> Given a choice of applications to run on their Linux desktops, most users would prefer to run a native Linux application rather than a Windows @@ -127,7 +127,7 @@ list. Autodesk's AutoCAD was number two. If Linux users can't run a particular application on Linux, and there's no native program that gives them similar functionality, they're almost perfectly divided between three different methods to get them their required program. -These are using WINE, or a software built on WINE, such as Crossover Linux, to +These are using WINE, or a software built on WINE, such as CrossOver Linux, to run the Windows application in Linux; virtualization; and switching to a browser-based application, such as Google Docs. </quote> @@ -150,21 +150,21 @@ The goal of the blog is to post about Wine (and to help people) on any x86 operating system that Wine will run on e.g Linux, BSD, X86 Mac, and even Solaris ... -The goal of the Forum is to to provide a place for people who are +The goal of the Forum is to provide a place for people who are interested in Wine to meet and collaborate about -there favorite applications and games. And to be a source for help and +their favorite applications and games. And to be a source for help and suggestions. </quote> -Tom's blog has done very well thus far; hes quoted to me that he estimates +Tom's blog has done very well thus far; he's quoted to me that he estimates nearly 100,000 hits per month. He is also seeking contributors to his blog. <quote> -I plan to seek other contributors to the blog as well..... I cant own +I plan to seek other contributors to the blog as well..... I can't own every Office app or Game out there -and I currently don't own a Intel Mac. And whats surprising to me is i +and I currently don't own an Intel Mac. And what's surprising to me is I received well over 2500 hits from -people who run Intel Mac's last month, even tho I don't currently post +people who run Intel Macs last month, even tho I don't currently post about Wine on that platform. </quote> <div align="center"> @@ -173,26 +173,26 @@ about Wine on that platform. </section> <section - title="DiB Engine Status" + title="DIB Engine Status" subject="Code" archive="http://www.winehq.org/pipermail/wine-devel/2007-December/060934.html" posts="2" > -<topic>DiB Engine</topic> +<topic>DIB Engine</topic> -The DiB (Device Independent Bitmap) engine is one of the few remaining +The DIB (Device Independent Bitmap) engine is one of the few remaining "large" issues that in general the community believes needs to be implemented. -The only issue with that is that implementing the DiB is actually very -difficult. At present WINE gets around having a DiB engine by translating the +The only issue with that is that implementing the DIB is actually very +difficult. At present WINE gets around having a DIB engine by translating the calls into something X can handle, lets X do the legwork and then translates the results back. This is for the most part an effective solution, however -its known to be inefficient and not without its problems. Alex Juillard has -expressed opinion that implementing a proper DiB engine will likely be done +it's known to be inefficient and not without its problems. Alexandre Julliard has +expressed the opinion that implementing a proper DIB engine will likely be done post 1.0. See <a href="http://wiki.winehq.org/DIBEngine">the wiki page</a> on -DiB for more information. +DIB for more information. In light of all this, Piotr Maceluch writes in to find out the current status -of the DiB Engine. +of the DIB Engine. <quote who="Piotr Maceluch"> Hi, @@ -365,7 +365,7 @@ That means the hlink test has one fewer error. Yay! </quote> -Of course, while the new script is nice, its also git its kinks and things Dan +Of course, while the new script is nice, it also has its kinks and there are things Dan would like to see improved/changed. <quote> @@ -408,8 +408,8 @@ While amusing I do not think this is correct. Steve Edwards writes in to second that opinion. <quote> -Plenty of OEM's change the default IE home page, and we should make it -easy to do so in Wine. I think a edit box in winecfg is the best route +Plenty of OEMs change the default IE home page, and we should make it +easy to do so in Wine. I think an edit box in winecfg is the best route to go with the default option being about:blank or www.winehq.org Thanks @@ -428,7 +428,7 @@ with native, we'd have to move everything from shdocvw.inf to wine.inf (and that's not the way to go IMO). I've added these registries because an app I've been working on expected default search page to be present. Also we should use it in our InternetExplorer and WebBrowser -implementation. We may consider to handle these keys like we do with IE +implementation. We may consider handling these keys like we do with the IE version key. That is, they may be added on iexplore.exe registration. If one wants to install native IE, he has to unregister iexplore.exe first, removing the homepage. Then IE installer will probably set its default @@ -436,11 +436,11 @@ homepage. </quote> Aric refutes: <quote> -Humm, maybe i am confused but (at least the win98 version of ) +Humm, maybe I am confused but (at least the win98 version of) shdocvw.dll implements DllRegisterServer which seems to do a lot of stuff. But Setting the Start Page is not one of them. In my experience installing IE does not actually set a Start Page by default, but instead -the browser seem to handle not having a Start Page by pulling up a +the browser seems to handle not having a Start Page by pulling up a default one. </quote> @@ -460,7 +460,7 @@ typelib, nothing else like coclasses. I will do more testing later today. <topic>Wine</topic> In addition to the monumental task of implementing and replicating native -behavior of the Windows API WINE has to also manage to do it with near-native +behavior of the Windows API, WINE has to also do it with near-native speeds. Phoronix has recently <a href="http://www.phoronix.com/scan.php?page=article&item=938&num=1">Benchmarked</a> a series of different wine versions. Their results are indeed interesting and @@ -494,11 +494,11 @@ They are hit by the stencil test slowness in 3dmark2k3 though, which we resolved as a driver bug on geforce 8 cards, since we couldn't reproduce it elsewhere. -I didn't find any info what card they used, so it is a bit hard to say what +I didn't find any info on the card they used, so it is a bit hard to say what might be wrong. </quote> -Bryan Haskins think's its an 8-Series: +Bryan Haskins thinks it's an 8-Series: <quote> Phoronix often uses the 8 series cards when not testing things like driver

1 0