August 2007 - Wine-Commits - list.winehq.org

Alexandre Julliard : winex11: Move setting of the initial wm hints to a separate function.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 7d9739e2b54919f6053565a5c42a655760946103 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d9739e2b54919f6053565a5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 20 14:04:36 2007 +0200 winex11: Move setting of the initial wm hints to a separate function. --- dlls/winex11.drv/window.c | 83 ++++++++++++++++++++++++++------------------ 1 files changed, 49 insertions(+), 34 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 459b8f9..1976c9b 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -461,6 +461,54 @@ static char *get_process_name(void) /*********************************************************************** + * set_initial_wm_hints + * + * Set the window manager hints that don't change over the lifetime of a window. + */ +static void set_initial_wm_hints( Display *display, struct x11drv_win_data *data ) +{ + int i; + Atom protocols[3]; + Atom dndVersion = 4; + XClassHint *class_hints; + char *process_name = get_process_name(); + + wine_tsx11_lock(); + + /* wm protocols */ + i = 0; + protocols[i++] = x11drv_atom(WM_DELETE_WINDOW); + protocols[i++] = x11drv_atom(_NET_WM_PING); + if (use_take_focus) protocols[i++] = x11drv_atom(WM_TAKE_FOCUS); + XChangeProperty( display, data->whole_window, x11drv_atom(WM_PROTOCOLS), + XA_ATOM, 32, PropModeReplace, (unsigned char *)protocols, i ); + + /* class hints */ + if ((class_hints = XAllocClassHint())) + { + static char wine[] = "Wine"; + + class_hints->res_name = process_name; + class_hints->res_class = wine; + XSetClassHint( display, data->whole_window, class_hints ); + XFree( class_hints ); + } + + /* set the WM_CLIENT_MACHINE and WM_LOCALE_NAME properties */ + XSetWMProperties(display, data->whole_window, NULL, NULL, NULL, 0, NULL, NULL, NULL); + /* set the pid. together, these properties are needed so the window manager can kill us if we freeze */ + i = getpid(); + XChangeProperty(display, data->whole_window, x11drv_atom(_NET_WM_PID), + XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&i, 1); + + XChangeProperty( display, data->whole_window, x11drv_atom(XdndAware), + XA_ATOM, 32, PropModeReplace, (unsigned char*)&dndVersion, 1 ); + + wine_tsx11_unlock(); +} + + +/*********************************************************************** * X11DRV_set_wm_hints * * Set the window manager hints for a newly-created window @@ -468,16 +516,11 @@ static char *get_process_name(void) void X11DRV_set_wm_hints( Display *display, struct x11drv_win_data *data ) { Window group_leader; - XClassHint *class_hints; - Atom protocols[3]; Atom window_type; MwmHints mwm_hints; - Atom dndVersion = 4; - int i; DWORD style = GetWindowLongW( data->hwnd, GWL_STYLE ); DWORD ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); HWND owner = GetWindow( data->hwnd, GW_OWNER ); - char *process_name = get_process_name(); if (data->hwnd == GetDesktopWindow()) { @@ -500,35 +543,9 @@ void X11DRV_set_wm_hints( Display *display, struct x11drv_win_data *data ) wine_tsx11_lock(); - /* wm protocols */ - i = 0; - protocols[i++] = x11drv_atom(WM_DELETE_WINDOW); - protocols[i++] = x11drv_atom(_NET_WM_PING); - if (use_take_focus) protocols[i++] = x11drv_atom(WM_TAKE_FOCUS); - XChangeProperty( display, data->whole_window, x11drv_atom(WM_PROTOCOLS), - XA_ATOM, 32, PropModeReplace, (unsigned char *)protocols, i ); - - /* class hints */ - if ((class_hints = XAllocClassHint())) - { - static char wine[] = "Wine"; - - class_hints->res_name = process_name; - class_hints->res_class = wine; - XSetClassHint( display, data->whole_window, class_hints ); - XFree( class_hints ); - } - /* size hints */ set_size_hints( display, data, style ); - /* set the WM_CLIENT_MACHINE and WM_LOCALE_NAME properties */ - XSetWMProperties(display, data->whole_window, NULL, NULL, NULL, 0, NULL, NULL, NULL); - /* set the pid. together, these properties are needed so the window manager can kill us if we freeze */ - i = getpid(); - XChangeProperty(display, data->whole_window, x11drv_atom(_NET_WM_PID), - XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&i, 1); - /* set the WM_WINDOW_TYPE */ window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); if (ex_style & WS_EX_TOOLWINDOW) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_UTILITY); @@ -563,9 +580,6 @@ void X11DRV_set_wm_hints( Display *display, struct x11drv_win_data *data ) x11drv_atom(_MOTIF_WM_HINTS), 32, PropModeReplace, (unsigned char*)&mwm_hints, sizeof(mwm_hints)/sizeof(long) ); - XChangeProperty( display, data->whole_window, x11drv_atom(XdndAware), - XA_ATOM, 32, PropModeReplace, (unsigned char*)&dndVersion, 1 ); - wine_tsx11_unlock(); /* wm hints */ @@ -797,6 +811,7 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat xim = x11drv_thread_data()->xim; if (xim) data->xic = X11DRV_CreateIC( xim, display, data->whole_window ); + set_initial_wm_hints( display, data ); X11DRV_set_wm_hints( display, data ); SetPropA( data->hwnd, whole_window_prop, (HANDLE)data->whole_window );

1 0

Alexandre Julliard : winex11: Don' t set the cursor on the desktop window since it' s managed by another process.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: f3ae5f5215011db6095bc64d5028993cf4e0c5da URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3ae5f5215011db6095bc64d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 20 14:04:53 2007 +0200 winex11: Don't set the cursor on the desktop window since it's managed by another process. --- dlls/winex11.drv/mouse.c | 41 ++++++++++++----------------------------- 1 files changed, 12 insertions(+), 29 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 6ece664..86dad89 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -879,6 +879,7 @@ static Cursor create_cursor( Display *display, CURSORICONINFO *ptr ) */ void X11DRV_SetCursor( CURSORICONINFO *lpCursor ) { + struct x11drv_thread_data *data = x11drv_thread_data(); Cursor cursor; if (lpCursor) @@ -887,40 +888,22 @@ void X11DRV_SetCursor( CURSORICONINFO *lpCursor ) else TRACE("NULL\n"); - if (root_window != DefaultRootWindow(gdi_display)) - { - /* If in desktop mode, set the cursor on the desktop window */ + /* set the same cursor for all top-level windows of the current thread */ - wine_tsx11_lock(); - cursor = create_cursor( gdi_display, lpCursor ); - if (cursor) - { - XDefineCursor( gdi_display, root_window, cursor ); - /* Make the change take effect immediately */ - XFlush(gdi_display); - XFreeCursor( gdi_display, cursor ); - } - wine_tsx11_unlock(); - } - else /* set the same cursor for all top-level windows of the current thread */ + wine_tsx11_lock(); + cursor = create_cursor( data->display, lpCursor ); + if (cursor) { - struct x11drv_thread_data *data = x11drv_thread_data(); - - wine_tsx11_lock(); - cursor = create_cursor( data->display, lpCursor ); - if (cursor) + if (data->cursor) XFreeCursor( data->display, data->cursor ); + data->cursor = cursor; + if (data->cursor_window) { - if (data->cursor) XFreeCursor( data->display, data->cursor ); - data->cursor = cursor; - if (data->cursor_window) - { - XDefineCursor( data->display, data->cursor_window, cursor ); - /* Make the change take effect immediately */ - XFlush( data->display ); - } + XDefineCursor( data->display, data->cursor_window, cursor ); + /* Make the change take effect immediately */ + XFlush( data->display ); } - wine_tsx11_unlock(); } + wine_tsx11_unlock(); } /***********************************************************************

1 0

Paul Vriens : mshtml/htmltextcont: Initialize value (Coverity).
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: c8c69304b765cac211bded1fa026eb6378f90fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8c69304b765cac211bded1fa… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sat Aug 18 15:32:00 2007 +0200 mshtml/htmltextcont: Initialize value (Coverity). --- dlls/mshtml/htmltextcont.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmltextcont.c b/dlls/mshtml/htmltextcont.c index ed079db..e67e668 100644 --- a/dlls/mshtml/htmltextcont.c +++ b/dlls/mshtml/htmltextcont.c @@ -102,7 +102,7 @@ static HRESULT WINAPI HTMLTextContainer_get_scrollHeight(IHTMLTextContainer *ifa { HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); nsIDOMNSHTMLElement *nselem; - PRInt32 height; + PRInt32 height = 0; nsresult nsres; TRACE("(%p)->(%p)\n", This, p);

1 0

Alexandre Julliard : comctl32: Create the manifest directory if needed ( spotted by Dan Kegel).
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 4bac1e959dc6a88192abb11ea2aa9cdee1a79b56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bac1e959dc6a88192abb11ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 20 12:46:37 2007 +0200 comctl32: Create the manifest directory if needed (spotted by Dan Kegel). --- dlls/comctl32/commctrl.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index ea42db8..0f8ad19 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -145,7 +145,8 @@ static const WCHAR strCC32SubclassInfo[] = { static BOOL create_manifest( BOOL install ) { - static const WCHAR dirW[] = {'\\','w','i','n','s','x','s','\\','m','a','n','i','f','e','s','t','s','\\',0}; + static const WCHAR winsxsW[] = {'\\','w','i','n','s','x','s',0}; + static const WCHAR manifestsW[] = {'\\','m','a','n','i','f','e','s','t','s','\\',0}; DWORD len, written; WCHAR *buffer; @@ -154,10 +155,14 @@ static BOOL create_manifest( BOOL install ) len = MultiByteToWideChar( CP_UTF8, 0, manifest_filename, sizeof(manifest_filename), NULL, 0 ); len += GetWindowsDirectoryW( NULL, 0 ); - len = len * sizeof(WCHAR) + sizeof(dirW); - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, len ))) return FALSE; + len += lstrlenW(winsxsW); + len += lstrlenW(manifestsW); + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return FALSE; GetWindowsDirectoryW( buffer, len ); - lstrcatW( buffer, dirW ); + lstrcatW( buffer, winsxsW ); + CreateDirectoryW( buffer, NULL ); + lstrcatW( buffer, manifestsW ); + CreateDirectoryW( buffer, NULL ); MultiByteToWideChar( CP_UTF8, 0, manifest_filename, sizeof(manifest_filename), buffer + lstrlenW(buffer), len ); if (install)

1 0

Marcus Meissner : comdlg32/tests: Handle case where no printer is configured.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: b8a76c60f5d077b25faed581558fdfc5e7a5671a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8a76c60f5d077b25faed5815… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Aug 19 11:34:57 2007 +0200 comdlg32/tests: Handle case where no printer is configured. --- dlls/comdlg32/tests/printdlg.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 4577bb9..7e39dad 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -73,10 +73,16 @@ static void test_PageSetupDlgA(void) pDlg->Flags = PSD_RETURNDEFAULT; SetLastError(0xdeadbeef); res = PageSetupDlgA(pDlg); + trace("after pagesetupdlga res = %d, le %d, ext error 0x%x\n", + res, GetLastError(), CommDlgExtendedError()); ok( res || (CommDlgExtendedError() == PDERR_NODEFAULTPRN), "returned %u with %u and 0x%x (expected '!= 0' or '0' and " "PDERR_NODEFAULTPRN)\n", res, GetLastError(), CommDlgExtendedError()); - + if (!res && (CommDlgExtendedError() == PDERR_NODEFAULTPRN)) { + skip("No printer configured.\n"); + HeapFree(GetProcessHeap(), 0, pDlg); + return; + } ok( pDlg->hDevMode && pDlg->hDevNames, "got %p and %p (expected '!= NULL' for both)\n", pDlg->hDevMode, pDlg->hDevNames);

1 0

Alexander Nicolaysen Sørnes : wordpad: Fix save changes prompt for the open file dialogue.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: b3c369d1ccb8ed69ad8312d442ce31aa83fa48ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3c369d1ccb8ed69ad8312d44… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jul 20 00:04:09 2007 +0200 wordpad: Fix save changes prompt for the open file dialogue. --- programs/wordpad/wordpad.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 34070ed..d51d393 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -330,8 +330,8 @@ static void DialogOpenFile(void) if(GetOpenFileNameW(&ofn)) { - prompt_save_changes(); - DoOpenFile(ofn.lpstrFile); + if(prompt_save_changes()) + DoOpenFile(ofn.lpstrFile); } }

1 0

Alexander Nicolaysen Sørnes : wordpad: Add bullet points button.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 063a6777c2f2364692b4db1345fac8613fed2d21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=063a6777c2f2364692b4db134… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jul 20 21:18:02 2007 +0200 wordpad: Add bullet points button. --- programs/wordpad/rsrc.rc | 50 +++++++++++++++++++++++++------------------ programs/wordpad/wordpad.c | 5 +++- 2 files changed, 33 insertions(+), 22 deletions(-) diff --git a/programs/wordpad/rsrc.rc b/programs/wordpad/rsrc.rc index 89f1485..d53e6f4 100644 --- a/programs/wordpad/rsrc.rc +++ b/programs/wordpad/rsrc.rc @@ -67,9 +67,9 @@ IDB_TOOLBAR BITMAP "toolbar.bmp" /* BINRES formatbar.bmp */ IDB_FORMATBAR BITMAP "formatbar.bmp" /* { - '42 4d 76 03 00 00 00 00 00 00 76 00 00 00 28 00' - '00 00 60 00 00 00 10 00 00 00 01 00 04 00 00 00' - '00 00 00 03 00 00 12 0b 00 00 12 0b 00 00 00 00' + '42 4d f6 03 00 00 00 00 00 00 76 00 00 00 28 00' + '00 00 70 00 00 00 10 00 00 00 01 00 04 00 00 00' + '00 00 80 03 00 00 12 0b 00 00 12 0b 00 00 00 00' '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80' '00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80' '00 00 80 80 80 00 c0 c0 c0 00 00 00 ff 00 00 ff' @@ -78,48 +78,56 @@ IDB_FORMATBAR BITMAP "formatbar.bmp" '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' - '88 88 88 88 88 88 88 88 00 00 00 00 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '00 00 00 00 88 88 88 88 88 88 88 88 88 88 88 88' '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 00' '00 00 00 00 08 88 88 00 00 00 00 00 00 88 88 88' - '80 00 00 00 00 88 88 80 00 00 00 88 88 88 88 88' - '00 00 08 88 88 88 88 88 80 00 00 08 88 88 88 88' - '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' - '88 88 88 88 88 88 88 80 08 88 80 08 88 88 88 88' + '80 00 00 00 00 88 84 44 88 88 88 88 88 88 88 80' + '00 00 00 88 88 88 88 88 00 00 08 88 88 88 88 88' + '80 00 00 08 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 84 44' + '88 00 00 00 00 88 88 80 08 88 80 08 88 88 88 88' '88 08 88 88 88 88 88 88 08 88 88 80 88 88 88 00' '00 00 08 88 88 88 88 88 80 00 00 08 88 88 88 00' - '00 00 00 00 00 88 88 80 08 88 80 08 88 88 88 88' - '88 08 88 88 88 88 88 88 08 88 88 80 88 88 88 88' + '00 00 00 00 00 88 84 44 88 88 88 88 88 88 88 80' + '08 88 80 08 88 88 88 88 88 08 88 88 88 88 88 88' + '08 88 88 80 88 88 88 88 88 88 88 88 88 88 88 88' '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' '88 88 88 88 88 88 88 80 08 88 80 08 88 88 88 88' '88 08 88 88 88 88 88 88 08 88 88 80 88 88 88 00' '00 00 00 00 00 88 88 88 00 00 00 00 88 88 88 88' - '88 00 00 00 00 88 88 80 08 88 80 08 88 88 88 88' - '88 80 88 88 88 88 88 88 08 88 88 80 88 88 88 88' - '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 00 00 00 00 88 88 88 88 88 88 88 88 88 88 80' + '08 88 80 08 88 88 88 88 88 80 88 88 88 88 88 88' + '08 88 88 80 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 84 44' '88 88 88 88 88 88 88 80 00 00 00 88 88 88 88 88' '88 80 88 88 88 88 88 88 08 88 88 80 88 88 88 00' '00 00 00 08 88 88 88 00 00 00 00 00 00 88 88 88' - '88 88 80 00 00 88 88 80 08 88 80 08 88 88 88 88' - '88 80 88 88 88 88 88 88 08 88 88 80 88 88 88 88' - '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 80 00 00 88 84 44 88 00 00 00 00 88 88 80' + '08 88 80 08 88 88 88 88 88 80 88 88 88 88 88 88' + '08 88 88 80 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 84 44' '88 88 88 88 88 88 88 80 08 88 80 08 88 88 88 88' '88 88 08 88 88 88 88 88 08 88 88 80 88 88 88 00' '00 00 00 00 00 88 88 88 00 00 00 00 88 88 88 80' - '00 00 00 00 00 88 88 80 08 88 80 08 88 88 88 88' - '88 88 08 88 88 88 88 88 08 88 88 80 88 88 88 88' + '00 00 00 00 00 88 88 88 88 88 88 88 88 88 88 80' + '08 88 80 08 88 88 88 88 88 88 08 88 88 88 88 88' + '08 88 88 80 88 88 88 88 88 88 88 88 88 88 88 88' '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' '88 88 88 88 88 88 88 80 00 00 00 88 88 88 88 88' '88 00 00 08 88 88 88 88 08 88 88 80 88 88 88 00' '00 00 00 88 88 88 88 88 80 00 00 08 88 88 88 88' - '88 00 00 00 00 88 88 88 88 88 88 88 88 88 88 88' - '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 00 00 00 00 88 84 44 88 88 88 88 88 88 88 88' '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 84 44' + '88 00 00 00 00 88 88 88 88 88 88 88 88 88 88 88' '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 00' '00 00 00 00 00 88 88 00 00 00 00 00 00 88 88 00' - '00 00 00 00 00 88 88 88 88 88 88 88 88 88 88 88' + '00 00 00 00 00 88 84 44 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' '88 88 88 88 88 88' diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index d458e0c..34070ed 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -663,7 +663,7 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) hFormatBarWnd = CreateToolbarEx(hReBarWnd, CCS_NOPARENTALIGN | CCS_NOMOVEY | WS_VISIBLE | TBSTYLE_TOOLTIPS | TBSTYLE_BUTTON, - IDC_FORMATBAR, 6, hInstance, IDB_FORMATBAR, NULL, 0, 16, 16, 16, 16, sizeof(TBBUTTON)); + IDC_FORMATBAR, 7, hInstance, IDB_FORMATBAR, NULL, 0, 16, 16, 16, 16, sizeof(TBBUTTON)); AddButton(hFormatBarWnd, 0, ID_FORMAT_BOLD); AddButton(hFormatBarWnd, 1, ID_FORMAT_ITALIC); @@ -672,6 +672,8 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) AddButton(hFormatBarWnd, 3, ID_ALIGN_LEFT); AddButton(hFormatBarWnd, 4, ID_ALIGN_CENTER); AddButton(hFormatBarWnd, 5, ID_ALIGN_RIGHT); + AddSeparator(hFormatBarWnd); + AddButton(hFormatBarWnd, 6, ID_BULLET); SendMessageW(hFormatBarWnd, TB_AUTOSIZE, 0, 0); @@ -759,6 +761,7 @@ static LRESULT OnUser( HWND hWnd, WPARAM wParam, LPARAM lParam) SendMessageW(hwndFormatBar, TB_CHECKBUTTON, ID_ALIGN_CENTER, (pf.wAlignment == PFA_CENTER)); SendMessageW(hwndFormatBar, TB_CHECKBUTTON, ID_ALIGN_RIGHT, (pf.wAlignment == PFA_RIGHT)); + SendMessageW(hwndFormatBar, TB_CHECKBUTTON, ID_BULLET, (pf.wNumbering & PFN_BULLET)); return 0; }

1 0

Alexander Nicolaysen Sørnes : wordpad: Add bullet points option.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: d4ddb7f3beddb1270a484ac242ac75bb33049914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4ddb7f3beddb1270a484ac24… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jul 20 18:38:08 2007 +0200 wordpad: Add bullet points option. --- programs/wordpad/De.rc | 1 + programs/wordpad/En.rc | 3 ++- programs/wordpad/Fr.rc | 1 + programs/wordpad/Hu.rc | 1 + programs/wordpad/Ko.rc | 1 + programs/wordpad/Nl.rc | 1 + programs/wordpad/No.rc | 1 + programs/wordpad/Pl.rc | 1 + programs/wordpad/Ru.rc | 1 + programs/wordpad/Tr.rc | 1 + programs/wordpad/resource.h | 1 + programs/wordpad/wordpad.c | 26 ++++++++++++++++++++++++++ 12 files changed, 38 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index 266db58..ab8f548 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -67,6 +67,7 @@ BEGIN END POPUP "F&ormat" BEGIN + MENUITEM "&Bullet points" ID_BULLET POPUP "&Hintergrund" BEGIN MENUITEM "&System\tCtrl+1", ID_BACK_1 diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index 208d600..8f1b444 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -67,7 +67,8 @@ BEGIN END POPUP "F&ormat" BEGIN - POPUP "&Background" + MENUITEM "&Bullet points" ID_BULLET + POPUP "Backgroun&d" BEGIN MENUITEM "&System\tCtrl+1", ID_BACK_1 MENUITEM "&PostThat yellowish\tCtrl+2", ID_BACK_2 diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index 1ea4c4f..7944c08 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -67,6 +67,7 @@ BEGIN END POPUP "Forma&t" BEGIN + MENUITEM "&Bullet points" ID_BULLET POPUP "&Fond" BEGIN MENUITEM "&Syst�me\tCtrl+1", ID_BACK_1 diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc index 7b9fa75..63190f4 100644 --- a/programs/wordpad/Hu.rc +++ b/programs/wordpad/Hu.rc @@ -67,6 +67,7 @@ BEGIN END POPUP "F&orm�tum" BEGIN + MENUITEM "&Bullet points" ID_BULLET POPUP "&H�tt�r" BEGIN MENUITEM "&Rendszer\tCtrl+1", ID_BACK_1 diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index d76cf4d..d7b4d73 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -68,6 +68,7 @@ BEGIN END POPUP "��(&O)" BEGIN + MENUITEM "B&ullet points" ID_BULLET POPUP "��(&B)" BEGIN MENUITEM "�ý��(&S)\tCtrl+1", ID_BACK_1 diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index 47f1d16..8e5216c 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -67,6 +67,7 @@ BEGIN END POPUP "&Opmaak" BEGIN + MENUITEM "&Bullet points" ID_BULLET POPUP "&Achtergrond" BEGIN MENUITEM "&Systeem\tCtrl+1", ID_BACK_1 diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index 8f83a74..30a6cfd 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -67,6 +67,7 @@ BEGIN END POPUP "F&ormat" BEGIN + MENUITEM "&Punktmerking" ID_BULLET POPUP "&Bakgrunn" BEGIN MENUITEM "&System\tCtrl+1", ID_BACK_1 diff --git a/programs/wordpad/Pl.rc b/programs/wordpad/Pl.rc index 185c4e6..b772644 100644 --- a/programs/wordpad/Pl.rc +++ b/programs/wordpad/Pl.rc @@ -68,6 +68,7 @@ BEGIN END POPUP "F&ormat" BEGIN + MENUITEM "&Bullet points" ID_BULLET POPUP "&T�o" BEGIN MENUITEM "&System\tCtrl+1", ID_BACK_1 diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc index 1bb5b44..08d3188 100644 --- a/programs/wordpad/Ru.rc +++ b/programs/wordpad/Ru.rc @@ -65,6 +65,7 @@ BEGIN END POPUP "��&��" BEGIN + MENUITEM "B&ullet points" ID_BULLET POPUP "&��" BEGIN MENUITEM "&��\tCtrl+1", ID_BACK_1 diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc index 0fc5f09..cb46298 100644 --- a/programs/wordpad/Tr.rc +++ b/programs/wordpad/Tr.rc @@ -69,6 +69,7 @@ BEGIN END POPUP "&Bi�im" BEGIN + MENUITEM "&Bullet points" ID_BULLET POPUP "&Arkaplan" BEGIN MENUITEM "S&istem\tCtrl+1", ID_BACK_1 diff --git a/programs/wordpad/resource.h b/programs/wordpad/resource.h index 5540a8d..2e24503 100644 --- a/programs/wordpad/resource.h +++ b/programs/wordpad/resource.h @@ -49,6 +49,7 @@ #define ID_EDIT_CUT 1311 #define ID_EDIT_PASTE 1312 #define ID_EDIT_CLEAR 1313 +#define ID_BULLET 1314 #define ID_FORMAT_BOLD 1400 #define ID_FORMAT_ITALIC 1401 diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index a683b8b..d458e0c 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -976,6 +976,30 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) SendMessageW(hwndEditor, EM_REDO, 0, 0); return 0; + case ID_BULLET: + { + PARAFORMAT pf; + + pf.cbSize = sizeof(pf); + pf.dwMask = PFM_NUMBERING; + SendMessageW(hwndEditor, EM_GETPARAFORMAT, 0, (LPARAM)&pf); + + pf.dwMask |= PFM_OFFSET; + + if(pf.wNumbering == PFN_BULLET) + { + pf.wNumbering = 0; + pf.dxOffset = 0; + } else + { + pf.wNumbering = PFN_BULLET; + pf.dxOffset = 720; + } + + SendMessageW(hwndEditor, EM_SETPARAFORMAT, 0, (LPARAM)&pf); + } + break; + case ID_ALIGN_LEFT: case ID_ALIGN_CENTER: case ID_ALIGN_RIGHT: @@ -1062,6 +1086,8 @@ static LRESULT OnInitPopupMenu( HWND hWnd, WPARAM wParam, LPARAM lParam ) MF_CHECKED : MF_UNCHECKED); CheckMenuItem(hMenu, ID_ALIGN_RIGHT, MF_BYCOMMAND|(nAlignment == PFA_RIGHT) ? MF_CHECKED : MF_UNCHECKED); + CheckMenuItem(hMenu, ID_BULLET, MF_BYCOMMAND | ((pf.wNumbering == PFN_BULLET) ? + MF_CHECKED : MF_UNCHECKED)); EnableMenuItem(hMenu, ID_EDIT_UNDO, MF_BYCOMMAND|(SendMessageW(hwndEditor, EM_CANUNDO, 0, 0)) ? MF_ENABLED : MF_GRAYED); EnableMenuItem(hMenu, ID_EDIT_REDO, MF_BYCOMMAND|(SendMessageW(hwndEditor, EM_CANREDO, 0, 0)) ?

1 0

Alexander Nicolaysen Sørnes : wordpad: Fix formatbar for native comctl32/XP.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: c7ca877b127456cae2c26537ddea8115ee89348f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7ca877b127456cae2c26537d… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 18 15:47:01 2007 +0200 wordpad: Fix formatbar for native comctl32/XP. --- programs/wordpad/rsrc.rc | 106 +++++++++++++++++++++++--------------------- programs/wordpad/wordpad.c | 6 +-- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/programs/wordpad/rsrc.rc b/programs/wordpad/rsrc.rc index 85d7434..89f1485 100644 --- a/programs/wordpad/rsrc.rc +++ b/programs/wordpad/rsrc.rc @@ -67,58 +67,62 @@ IDB_TOOLBAR BITMAP "toolbar.bmp" /* BINRES formatbar.bmp */ IDB_FORMATBAR BITMAP "formatbar.bmp" /* { - '42 4d 3e 03 00 00 00 00 00 00 3e 00 00 00 28 00' + '42 4d 76 03 00 00 00 00 00 00 76 00 00 00 28 00' '00 00 60 00 00 00 10 00 00 00 01 00 04 00 00 00' - '00 00 00 03 00 00 12 0b 00 00 12 0b 00 00 02 00' - '00 00 02 00 00 00 c0 c0 c0 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '11 11 11 11 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 11 11 11 11 11 10 00 00 11' - '11 11 11 11 11 00 00 00 01 11 11 11 11 00 00 01' - '11 11 11 00 00 00 00 00 11 11 10 00 00 00 00 00' - '01 11 11 10 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01' - '10 00 01 10 00 00 00 00 00 10 00 00 00 00 00 00' - '10 00 00 01 00 00 00 11 11 11 10 00 00 00 00 00' - '01 11 11 10 00 00 00 11 11 11 11 11 11 00 00 01' - '10 00 01 10 00 00 00 00 00 10 00 00 00 00 00 00' - '10 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01' - '10 00 01 10 00 00 00 00 00 10 00 00 00 00 00 00' - '10 00 00 01 00 00 00 11 11 11 11 11 11 00 00 00' - '11 11 11 11 00 00 00 00 00 11 11 11 11 00 00 01' - '10 00 01 10 00 00 00 00 00 01 00 00 00 00 00 00' - '10 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01' - '11 11 11 00 00 00 00 00 00 01 00 00 00 00 00 00' - '10 00 00 01 00 00 00 11 11 11 11 10 00 00 00 11' - '11 11 11 11 11 00 00 00 00 00 01 11 11 00 00 01' - '10 00 01 10 00 00 00 00 00 01 00 00 00 00 00 00' - '10 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01' - '10 00 01 10 00 00 00 00 00 00 10 00 00 00 00 00' - '10 00 00 01 00 00 00 11 11 11 11 11 11 00 00 00' - '11 11 11 11 00 00 00 01 11 11 11 11 11 00 00 01' - '10 00 01 10 00 00 00 00 00 00 10 00 00 00 00 00' - '10 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01' - '11 11 11 00 00 00 00 00 00 11 11 10 00 00 00 00' - '10 00 00 01 00 00 00 11 11 11 11 00 00 00 00 00' - '01 11 11 10 00 00 00 00 00 11 11 11 11 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 11 11 11 11 11 11 00 00 11' - '11 11 11 11 11 00 00 11 11 11 11 11 11 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 03 00 00 12 0b 00 00 12 0b 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80' + '00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80' + '00 00 80 80 80 00 c0 c0 c0 00 00 00 ff 00 00 ff' + '00 00 00 ff ff 00 ff 00 00 00 ff 00 ff 00 ff ff' + '00 00 ff ff ff 00 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 88 00 00 00 00 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 00' + '00 00 00 00 08 88 88 00 00 00 00 00 00 88 88 88' + '80 00 00 00 00 88 88 80 00 00 00 88 88 88 88 88' + '00 00 08 88 88 88 88 88 80 00 00 08 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 80 08 88 80 08 88 88 88 88' + '88 08 88 88 88 88 88 88 08 88 88 80 88 88 88 00' + '00 00 08 88 88 88 88 88 80 00 00 08 88 88 88 00' + '00 00 00 00 00 88 88 80 08 88 80 08 88 88 88 88' + '88 08 88 88 88 88 88 88 08 88 88 80 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 80 08 88 80 08 88 88 88 88' + '88 08 88 88 88 88 88 88 08 88 88 80 88 88 88 00' + '00 00 00 00 00 88 88 88 00 00 00 00 88 88 88 88' + '88 00 00 00 00 88 88 80 08 88 80 08 88 88 88 88' + '88 80 88 88 88 88 88 88 08 88 88 80 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 80 00 00 00 88 88 88 88 88' + '88 80 88 88 88 88 88 88 08 88 88 80 88 88 88 00' + '00 00 00 08 88 88 88 00 00 00 00 00 00 88 88 88' + '88 88 80 00 00 88 88 80 08 88 80 08 88 88 88 88' + '88 80 88 88 88 88 88 88 08 88 88 80 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 80 08 88 80 08 88 88 88 88' + '88 88 08 88 88 88 88 88 08 88 88 80 88 88 88 00' + '00 00 00 00 00 88 88 88 00 00 00 00 88 88 88 80' + '00 00 00 00 00 88 88 80 08 88 80 08 88 88 88 88' + '88 88 08 88 88 88 88 88 08 88 88 80 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 80 00 00 00 88 88 88 88 88' + '88 00 00 08 88 88 88 88 08 88 88 80 88 88 88 00' + '00 00 00 88 88 88 88 88 80 00 00 08 88 88 88 88' + '88 00 00 00 00 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 00' + '00 00 00 00 00 88 88 00 00 00 00 00 00 88 88 00' + '00 00 00 00 00 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88' } */ /* BINRES wordpad.ico */ diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index c91ad39..34aba59 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -656,11 +656,7 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) hFormatBarWnd = CreateToolbarEx(hReBarWnd, CCS_NOPARENTALIGN | CCS_NOMOVEY | WS_VISIBLE | TBSTYLE_TOOLTIPS | TBSTYLE_BUTTON, - IDC_FORMATBAR, 6, hInstance, IDB_FORMATBAR, NULL, 0, 24, 24, 16, 16, sizeof(TBBUTTON)); - - ab.hInst = HINST_COMMCTRL; - ab.nID = IDB_STD_SMALL_COLOR; - nStdBitmaps = SendMessageW(hFormatBarWnd, TB_ADDBITMAP, 6, (LPARAM)&ab); + IDC_FORMATBAR, 6, hInstance, IDB_FORMATBAR, NULL, 0, 16, 16, 16, 16, sizeof(TBBUTTON)); AddButton(hFormatBarWnd, 0, ID_FORMAT_BOLD); AddButton(hFormatBarWnd, 1, ID_FORMAT_ITALIC);

1 0

Alexander Nicolaysen Sørnes : wordpad: Fix error handling when saving empty files.
by Alexandre Julliard Aug. 20, 2007

Aug. 20, 2007

Module: wine Branch: master Commit: 09161365f98d723f49ac44341e776de4c71c89f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09161365f98d723f49ac44341… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 18 20:47:40 2007 +0200 wordpad: Fix error handling when saving empty files. --- programs/wordpad/wordpad.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 34aba59..a683b8b 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -219,7 +219,14 @@ static void DoSaveFile(LPCWSTR wszSaveFileName) SetFocus(hEditorWnd); if(!ret) - return; + { + GETTEXTLENGTHEX gt; + gt.flags = GTL_DEFAULT; + gt.codepage = 1200; + + if(SendMessageW(hEditorWnd, EM_GETTEXTLENGTHEX, (WPARAM)&gt, 0)) + return; + } lstrcpyW(wszFileName, wszSaveFileName); set_caption(wszFileName);

1 0