February 2008 - Wine-Commits

Christian Authmann : explorer: Add meaningful titles to virtual desktop windows.
by Alexandre Julliard Feb. 15, 2008

Feb. 15, 2008

Module: wine Branch: master Commit: 2da848428fd0629618b687f9af6bbd50e6e0be78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2da848428fd0629618b687f9a… Author: Christian Authmann <christian(a)authmann.de> Date: Wed Feb 13 14:43:17 2008 +0100 explorer: Add meaningful titles to virtual desktop windows. --- programs/explorer/desktop.c | 45 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 41 insertions(+), 4 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 224f0de..ddca914 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -19,6 +19,7 @@ */ #include <stdio.h> +#include "wine/unicode.h" #define OEMRESOURCE @@ -143,6 +144,40 @@ static void initialize_display_settings( HWND desktop ) } } +static void set_desktop_window_title( HWND hwnd, const char *name ) +{ + static const WCHAR desktop_nameW[] = {'W','i','n','e',' ','d','e','s','k','t','o','p',0}; + static const WCHAR desktop_name_separatorW[] = {' ', '-', ' ', 0}; + WCHAR *window_titleW = NULL; + int window_title_len; + int name_len; + + if (!name[0]) + { + SetWindowTextW( hwnd, desktop_nameW ); + return; + } + + name_len = MultiByteToWideChar( CP_ACP, 0, name, -1, NULL, 0 ); + window_title_len = name_len * sizeof(WCHAR) + + sizeof(desktop_name_separatorW) + + sizeof(desktop_nameW); + window_titleW = HeapAlloc( GetProcessHeap(), 0, window_title_len ); + if (!window_titleW) + { + SetWindowTextW( hwnd, desktop_nameW ); + return; + } + + MultiByteToWideChar( CP_ACP, 0, name, -1, + window_titleW, name_len ); + strcatW( window_titleW, desktop_name_separatorW ); + strcatW( window_titleW, desktop_nameW ); + + SetWindowTextW( hwnd, window_titleW ); + HeapFree( GetProcessHeap(), 0, window_titleW ); +} + /* main desktop management function */ void manage_desktop( char *arg ) { @@ -152,7 +187,7 @@ void manage_desktop( char *arg ) unsigned int width, height; char *cmdline = NULL; char *p = arg; - static const WCHAR desktop_nameW[] = {'W','i','n','e',' ','d','e','s','k','t','o','p',0}; + const char *name = NULL; /* get the rest of the command line (if any) */ while (*p && !isspace(*p)) p++; @@ -174,11 +209,13 @@ void manage_desktop( char *arg ) width = 800; height = 600; } - xwin = create_desktop( arg, width, height ); + name = arg; + xwin = create_desktop( name, width, height ); } else if (get_default_desktop_size( &width, &height )) { - xwin = create_desktop( "Default", width, height ); + name = "Default"; + xwin = create_desktop( name, width, height ); } if (!xwin) using_root = TRUE; /* using the root window */ @@ -193,7 +230,7 @@ void manage_desktop( char *arg ) { SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); SendMessageW( hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW( 0, MAKEINTRESOURCEW(OIC_WINLOGO))); - SetWindowTextW( hwnd, desktop_nameW ); + if (name) set_desktop_window_title( hwnd, name ); SystemParametersInfoA( SPI_SETDESKPATTERN, -1, NULL, FALSE ); SetDeskWallPaper( (LPSTR)-1 ); initialize_display_settings( hwnd );

1 0

Marcus Meissner : include: Added some defines for EnumDevicesBySemantics.
by Alexandre Julliard Feb. 15, 2008

Feb. 15, 2008

Module: wine Branch: master Commit: 80c2cabab451b749efb768403d68ccddfede71d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80c2cabab451b749efb768403… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Feb 10 19:32:19 2008 +0100 include: Added some defines for EnumDevicesBySemantics. --- include/dinput.h | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/include/dinput.h b/include/dinput.h index eee1fbd..3ee9ab7 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -440,6 +440,19 @@ typedef BOOL (CALLBACK *LPDIENUMDEVICESCALLBACKA)(LPCDIDEVICEINSTANCEA,LPVOID); typedef BOOL (CALLBACK *LPDIENUMDEVICESCALLBACKW)(LPCDIDEVICEINSTANCEW,LPVOID); DECL_WINELIB_TYPE_AW(LPDIENUMDEVICESCALLBACK) +#define DIEDBS_MAPPEDPRI1 0x00000001 +#define DIEDBS_MAPPEDPRI2 0x00000002 +#define DIEDBS_RECENTDEVICE 0x00000010 +#define DIEDBS_NEWDEVICE 0x00000020 + +#define DIEDBSFL_ATTACHEDONLY 0x00000000 +#define DIEDBSFL_THISUSER 0x00000010 +#define DIEDBSFL_FORCEFEEDBACK DIEDFL_FORCEFEEDBACK +#define DIEDBSFL_AVAILABLEDEVICES 0x00001000 +#define DIEDBSFL_MULTIMICEKEYBOARDS 0x00002000 +#define DIEDBSFL_NONGAMINGDEVICES 0x00004000 +#define DIEDBSFL_VALID 0x00007110 + typedef BOOL (CALLBACK *LPDIENUMDEVICESBYSEMANTICSCBA)(LPCDIDEVICEINSTANCEA,LPDIRECTINPUTDEVICE8A,DWORD,DWORD,LPVOID); typedef BOOL (CALLBACK *LPDIENUMDEVICESBYSEMANTICSCBW)(LPCDIDEVICEINSTANCEW,LPDIRECTINPUTDEVICE8W,DWORD,DWORD,LPVOID); DECL_WINELIB_TYPE_AW(LPDIENUMDEVICESBYSEMANTICSCB)

1 0

Kirill K. Smirnov : systray: Better validate icon owner.
by Alexandre Julliard Feb. 15, 2008

Feb. 15, 2008

Module: wine Branch: master Commit: be784ba1c5c084af94735e87b31d1fa0c33d379b URL: http://source.winehq.org/git/wine.git/?a=commit;h=be784ba1c5c084af94735e87b… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Thu Feb 7 15:23:56 2008 +0000 systray: Better validate icon owner. --- programs/explorer/systray.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 28a440f..b01203f 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -439,7 +439,7 @@ static LRESULT WINAPI adaptor_wndproc(HWND window, UINT msg, /* notify the owner hwnd of the message */ WINE_TRACE("relaying 0x%x\n", msg); ret = PostMessage(icon->owner, icon->callback_message, (WPARAM) icon->id, (LPARAM) msg); - if (!ret && (GetLastError() == ERROR_INVALID_HANDLE)) + if (!ret && (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) { WINE_WARN("application window was destroyed without removing " "notification icon, removing automatically\n");

1 0

Kirill K. Smirnov : systray: Correctly handle icon addition/deletion.
by Alexandre Julliard Feb. 15, 2008

Feb. 15, 2008

Module: wine Branch: master Commit: be2911a180236344abc6ad112c91972d7e6a300e URL: http://source.winehq.org/git/wine.git/?a=commit;h=be2911a180236344abc6ad112… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Thu Feb 7 15:23:54 2008 +0000 systray: Correctly handle icon addition/deletion. --- programs/explorer/systray.c | 202 +++++++++++++++++++++++-------------------- 1 files changed, 108 insertions(+), 94 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 8fa7447..28a440f 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -77,80 +77,6 @@ static BOOL hide_systray; /* space around icon (forces icon to center of KDE systray area) */ #define ICON_BORDER 4 -static LRESULT WINAPI adaptor_wndproc(HWND window, UINT msg, - WPARAM wparam, LPARAM lparam) -{ - struct icon *icon = NULL; - BOOL ret; - - WINE_TRACE("hwnd=%p, msg=0x%x\n", window, msg); - - /* set the icon data for the window from the data passed into CreateWindow */ - if (msg == WM_NCCREATE) - SetWindowLongPtrW(window, GWLP_USERDATA, (LPARAM)((const CREATESTRUCT *)lparam)->lpCreateParams); - - icon = (struct icon *) GetWindowLongPtr(window, GWLP_USERDATA); - - switch (msg) - { - case WM_PAINT: - { - RECT rc; - int top; - PAINTSTRUCT ps; - HDC hdc; - - WINE_TRACE("painting\n"); - - hdc = BeginPaint(window, &ps); - GetClientRect(window, &rc); - - /* calculate top so we can deal with arbitrary sized trays */ - top = ((rc.bottom-rc.top)/2) - ((ICON_SIZE)/2); - - DrawIconEx(hdc, (ICON_BORDER/2), top, icon->image, - ICON_SIZE, ICON_SIZE, 0, 0, DI_DEFAULTSIZE|DI_NORMAL); - - EndPaint(window, &ps); - break; - } - - case WM_MOUSEMOVE: - case WM_LBUTTONDOWN: - case WM_LBUTTONUP: - case WM_RBUTTONDOWN: - case WM_RBUTTONUP: - case WM_MBUTTONDOWN: - case WM_MBUTTONUP: - case WM_LBUTTONDBLCLK: - case WM_RBUTTONDBLCLK: - case WM_MBUTTONDBLCLK: - /* notify the owner hwnd of the message */ - WINE_TRACE("relaying 0x%x\n", msg); - ret = PostMessage(icon->owner, icon->callback_message, (WPARAM) icon->id, (LPARAM) msg); - if (!ret && (GetLastError() == ERROR_INVALID_HANDLE)) - { - WINE_WARN("application window was destroyed without removing " - "notification icon, removing automatically\n"); - DestroyWindow(window); - } - break; - - case WM_NCDESTROY: - SetWindowLongPtr(window, GWLP_USERDATA, 0); - - list_remove(&icon->entry); - DestroyIcon(icon->image); - HeapFree(GetProcessHeap(), 0, icon); - break; - - default: - return DefWindowProc(window, msg, wparam, lparam); - } - - return 0; -} - /* Retrieves icon record by owner window and ID */ static struct icon *get_icon(HWND owner, UINT id) @@ -226,12 +152,19 @@ static BOOL display_icon(struct icon *icon, BOOL hide) WINE_TRACE("id=0x%x, hwnd=%p, hide=%d\n", icon->id, icon->owner, hide); - if (icon->hidden == hide || (!icon->hidden) == (!hide)) return TRUE; + /* not a startup case and nothing to do */ + if (icon->window && !icon->hidden == !hide) + return TRUE; + icon->hidden = hide; if (hide) { - DestroyWindow(icon->window); - DestroyWindow(icon->tooltip); + /* At startup icon->hidden == FALSE and icon->window == NULL */ + if (icon->window) + { + DestroyWindow(icon->window); + DestroyWindow(icon->tooltip); + } return TRUE; } @@ -264,7 +197,7 @@ static BOOL display_icon(struct icon *icon, BOOL hide) } /* Modifies an existing icon record */ -static BOOL modify_icon(NOTIFYICONDATAW *nid, BOOL modify_tooltip) +static BOOL modify_icon(NOTIFYICONDATAW *nid) { struct icon *icon; @@ -278,14 +211,11 @@ static BOOL modify_icon(NOTIFYICONDATAW *nid, BOOL modify_tooltip) return FALSE; } - if (nid->uFlags & NIF_STATE) - { - if (nid->dwStateMask & NIS_HIDDEN) - display_icon(icon, !!(nid->dwState & NIS_HIDDEN)); - else - display_icon(icon, FALSE); - } - else + if ((nid->uFlags & NIF_STATE) && (nid->dwStateMask & NIS_HIDDEN)) + display_icon(icon, !!(nid->dwState & NIS_HIDDEN)); + + /* startup case*/ + if ((!icon->window) && (!icon->hidden)) display_icon(icon, FALSE); if (nid->uFlags & NIF_ICON) @@ -333,31 +263,45 @@ static BOOL add_icon(NOTIFYICONDATAW *nid) return FALSE; } + ZeroMemory(icon, sizeof(struct icon)); icon->id = nid->uID; icon->owner = nid->hWnd; - icon->image = NULL; - icon->window = NULL; - icon->hidden = TRUE; list_add_tail(&tray.icons, &icon->entry); - return modify_icon(nid, FALSE); + /* + * Both icon->window and icon->hidden are zero. modify_icon function + * will treat this case as a startup, i.e. icon window will be created if + * NIS_HIDDEN flag is not set. + */ + + return modify_icon(nid); } +/* Deletes tray icon window and icon record */ +static BOOL delete_icon_directly(struct icon *icon) +{ + display_icon(icon, TRUE); + list_remove(&icon->entry); + DestroyIcon(icon->image); + HeapFree(GetProcessHeap(), 0, icon); + return TRUE; +} + +/* Deletes tray icon window and icon structure */ static BOOL delete_icon(const NOTIFYICONDATAW *nid) { struct icon *icon = get_icon(nid->hWnd, nid->uID); WINE_TRACE("id=0x%x, hwnd=%p\n", nid->uID, nid->hWnd); - + if (!icon) { WINE_WARN("invalid tray icon ID specified: %u\n", nid->uID); return FALSE; } - display_icon(icon, TRUE); - return TRUE; + return delete_icon_directly(icon); } static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) @@ -420,7 +364,7 @@ static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) ret = delete_icon(&nid); break; case NIM_MODIFY: - ret = modify_icon(&nid, TRUE); + ret = modify_icon(&nid); break; default: WINE_FIXME("unhandled tray message: %ld\n", cds->dwData); @@ -444,6 +388,76 @@ static LRESULT WINAPI listener_wndproc(HWND window, UINT msg, return DefWindowProc(window, msg, wparam, lparam); } +static LRESULT WINAPI adaptor_wndproc(HWND window, UINT msg, + WPARAM wparam, LPARAM lparam) +{ + struct icon *icon = NULL; + BOOL ret; + + WINE_TRACE("hwnd=%p, msg=0x%x\n", window, msg); + + /* set the icon data for the window from the data passed into CreateWindow */ + if (msg == WM_NCCREATE) + SetWindowLongPtrW(window, GWLP_USERDATA, (LPARAM)((const CREATESTRUCT *)lparam)->lpCreateParams); + + icon = (struct icon *) GetWindowLongPtr(window, GWLP_USERDATA); + + switch (msg) + { + case WM_PAINT: + { + RECT rc; + int top; + PAINTSTRUCT ps; + HDC hdc; + + WINE_TRACE("painting\n"); + + hdc = BeginPaint(window, &ps); + GetClientRect(window, &rc); + + /* calculate top so we can deal with arbitrary sized trays */ + top = ((rc.bottom-rc.top)/2) - ((ICON_SIZE)/2); + + DrawIconEx(hdc, (ICON_BORDER/2), top, icon->image, + ICON_SIZE, ICON_SIZE, 0, 0, DI_DEFAULTSIZE|DI_NORMAL); + + EndPaint(window, &ps); + break; + } + + case WM_MOUSEMOVE: + case WM_LBUTTONDOWN: + case WM_LBUTTONUP: + case WM_RBUTTONDOWN: + case WM_RBUTTONUP: + case WM_MBUTTONDOWN: + case WM_MBUTTONUP: + case WM_LBUTTONDBLCLK: + case WM_RBUTTONDBLCLK: + case WM_MBUTTONDBLCLK: + /* notify the owner hwnd of the message */ + WINE_TRACE("relaying 0x%x\n", msg); + ret = PostMessage(icon->owner, icon->callback_message, (WPARAM) icon->id, (LPARAM) msg); + if (!ret && (GetLastError() == ERROR_INVALID_HANDLE)) + { + WINE_WARN("application window was destroyed without removing " + "notification icon, removing automatically\n"); + delete_icon_directly(icon); + } + break; + + case WM_NCDESTROY: + SetWindowLongPtr(window, GWLP_USERDATA, 0); + break; + + default: + return DefWindowProc(window, msg, wparam, lparam); + } + + return 0; +} + static BOOL is_systray_hidden(void) {

1 0

Royal Chan : gdiplus: draw_polyline never sets status from GenericError to Ok on successful calls .
by Alexandre Julliard Feb. 15, 2008

Feb. 15, 2008

Module: wine Branch: master Commit: c86f2c29ff6fbb7a3437b599b68b04d035f649ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=c86f2c29ff6fbb7a3437b599b… Author: Royal Chan <chanroyal(a)gmail.com> Date: Sun Feb 10 12:40:52 2008 -0800 gdiplus: draw_polyline never sets status from GenericError to Ok on successful calls. --- dlls/gdiplus/graphics.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 684a3b4..aed61c5 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -505,7 +505,8 @@ static GpStatus draw_polyline(GpGraphics *graphics, GpPen *pen, transform_and_round_points(graphics, pti, ptcopy, count); - Polyline(graphics->hdc, pti, count); + if(Polyline(graphics->hdc, pti, count)) + status = Ok; end: GdipFree(pti);

1 0

Kirill K. Smirnov : systray: Avoid modifying non-existent tooltip windows of non-existent icon windows when application updates tip of hidden icon .
by Alexandre Julliard Feb. 15, 2008

Feb. 15, 2008

Module: wine Branch: master Commit: 7515f312f923d3f50f6650dd1fd47fe312057be9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7515f312f923d3f50f6650dd1… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Thu Feb 7 15:23:52 2008 +0000 systray: Avoid modifying non-existent tooltip windows of non-existent icon windows when application updates tip of hidden icon. --- programs/explorer/systray.c | 83 +++++++++++++++++++++++++++---------------- 1 files changed, 52 insertions(+), 31 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 9ddfd4d..8fa7447 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -65,6 +65,7 @@ struct icon UINT id; /* the unique id given by the app */ UINT callback_message; BOOL hidden; /* icon display state */ + WCHAR tiptext[128]; /* Tooltip text. If empty => tooltip disabled */ }; static struct tray tray; @@ -151,8 +152,7 @@ static LRESULT WINAPI adaptor_wndproc(HWND window, UINT msg, } -/* listener code */ - +/* Retrieves icon record by owner window and ID */ static struct icon *get_icon(HWND owner, UINT id) { struct icon *this; @@ -164,31 +164,65 @@ static struct icon *get_icon(HWND owner, UINT id) return NULL; } -static void set_tooltip(struct icon *icon, WCHAR *szTip, BOOL modify) +/* Creates tooltip window for icon. */ +static void create_tooltip(struct icon *icon) { TTTOOLINFOW ti; + static BOOL tooltips_initialized = FALSE; + + /* Register tooltip classes if this is the first icon */ + if (!tooltips_initialized) + { + INITCOMMONCONTROLSEX init_tooltip; + + init_tooltip.dwSize = sizeof(INITCOMMONCONTROLSEX); + init_tooltip.dwICC = ICC_TAB_CLASSES; + + InitCommonControlsEx(&init_tooltip); + tooltips_initialized = TRUE; + } + icon->tooltip = CreateWindowEx(WS_EX_TOPMOST, TOOLTIPS_CLASS, NULL, + WS_POPUP | TTS_ALWAYSTIP, + CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, + icon->window, NULL, NULL, NULL); + + ZeroMemory(&ti, sizeof(ti)); ti.cbSize = sizeof(TTTOOLINFOW); ti.uFlags = TTF_SUBCLASS | TTF_IDISHWND; ti.hwnd = icon->window; - ti.hinst = 0; ti.uId = (UINT_PTR)icon->window; - ti.lpszText = szTip; - ti.lParam = 0; - ti.lpReserved = NULL; + ti.lpszText = icon->tiptext; + SendMessageW(icon->tooltip, TTM_ADDTOOLW, 0, (LPARAM)&ti); +} - if (modify) - SendMessageW(icon->tooltip, TTM_UPDATETIPTEXTW, 0, (LPARAM)&ti); - else - SendMessageW(icon->tooltip, TTM_ADDTOOLW, 0, (LPARAM)&ti); +/* Synchronize tooltip text with tooltip window */ +static void update_tooltip_text(struct icon *icon) +{ + TTTOOLINFOW ti; + + ZeroMemory(&ti, sizeof(ti)); + ti.cbSize = sizeof(TTTOOLINFOW); + ti.uFlags = TTF_SUBCLASS | TTF_IDISHWND; + ti.hwnd = icon->window; + ti.uId = (UINT_PTR)icon->window; + ti.lpszText = icon->tiptext; + + SendMessageW(icon->tooltip, TTM_UPDATETIPTEXTW, 0, (LPARAM)&ti); } +/* + * Sets visibility status of tray icon. Creates/deletes icon window. + * Does not create/delete icon record. + * + * The purpose is similar to ShowWindow function. + */ static BOOL display_icon(struct icon *icon, BOOL hide) { HMODULE x11drv = GetModuleHandleA("winex11.drv"); RECT rect; static const WCHAR adaptor_windowname[] = /* Wine System Tray Adaptor */ {'W','i','n','e',' ','S','y','s','t','e','m',' ','T','r','a','y',' ','A','d','a','p','t','o','r',0}; - static BOOL tooltps_initialized = FALSE; WINE_TRACE("id=0x%x, hwnd=%p, hide=%d\n", icon->id, icon->owner, hide); @@ -224,28 +258,12 @@ static BOOL display_icon(struct icon *icon, BOOL hide) if (!hide_systray) ShowWindow(icon->window, SW_SHOWNA); - /* create icon tooltip */ - - /* Register tooltip classes if this is the first icon */ - if (!tooltps_initialized) - { - INITCOMMONCONTROLSEX init_tooltip; + create_tooltip(icon); - init_tooltip.dwSize = sizeof(INITCOMMONCONTROLSEX); - init_tooltip.dwICC = ICC_TAB_CLASSES; - - InitCommonControlsEx(&init_tooltip); - tooltps_initialized = TRUE; - } - - icon->tooltip = CreateWindowEx(WS_EX_TOPMOST, TOOLTIPS_CLASS, NULL, - WS_POPUP | TTS_ALWAYSTIP, - CW_USEDEFAULT, CW_USEDEFAULT, - CW_USEDEFAULT, CW_USEDEFAULT, - icon->window, NULL, NULL, NULL); return TRUE; } +/* Modifies an existing icon record */ static BOOL modify_icon(NOTIFYICONDATAW *nid, BOOL modify_tooltip) { struct icon *icon; @@ -285,7 +303,9 @@ static BOOL modify_icon(NOTIFYICONDATAW *nid, BOOL modify_tooltip) } if (nid->uFlags & NIF_TIP) { - set_tooltip(icon, nid->szTip, modify_tooltip); + lstrcpynW(icon->tiptext, nid->szTip, sizeof(icon->tiptext)/sizeof(WCHAR)); + if (!icon->hidden) + update_tooltip_text(icon); } if (nid->uFlags & NIF_INFO && nid->cbSize >= NOTIFYICONDATAA_V2_SIZE) { @@ -294,6 +314,7 @@ static BOOL modify_icon(NOTIFYICONDATAW *nid, BOOL modify_tooltip) return TRUE; } +/* Adds a new icon record to the list */ static BOOL add_icon(NOTIFYICONDATAW *nid) { struct icon *icon;

1 0

Andrew Talbot : d3d9: Assign to struct instead of using memcpy.
by Alexandre Julliard Feb. 15, 2008

Feb. 15, 2008

Module: wine Branch: master Commit: 43ed6eae5ae2b35749f7e15e8f186635e03673f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43ed6eae5ae2b35749f7e15e8… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Feb 14 22:02:31 2008 +0000 d3d9: Assign to struct instead of using memcpy. --- dlls/d3d9/vertexdeclaration.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index d26d09d..c6f694a 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -89,7 +89,7 @@ HRESULT vdecl_convert_fvf( if (!elements) return D3DERR_OUTOFVIDEOMEMORY; - memcpy(&elements[size-1], &end_element, sizeof(D3DVERTEXELEMENT9)); + elements[size-1] = end_element; idx = 0; if (has_pos) { if (!has_blend && (fvf & D3DFVF_XYZRHW)) {

1 0

Reece H. Dunn : user32: Improve the combo tests to check when the CBN_SELCHANGE notification is sent .
by Alexandre Julliard Feb. 15, 2008

Feb. 15, 2008

Module: wine Branch: master Commit: d9c2a91f8b0d46570d9a8ca921c343edebadff33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9c2a91f8b0d46570d9a8ca92… Author: Reece H. Dunn <msclrhd(a)gmail.com> Date: Sun Feb 10 19:00:02 2008 +0000 user32: Improve the combo tests to check when the CBN_SELCHANGE notification is sent. --- dlls/user32/tests/combo.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index f7cb467..8f3cd5a 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -162,6 +162,7 @@ static void test_setfont(DWORD style) static LRESULT (CALLBACK *old_parent_proc)(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam); static LPCSTR expected_edit_text; static LPCSTR expected_list_text; +static BOOL selchange_fired; static LRESULT CALLBACK parent_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { @@ -187,6 +188,8 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPAR edit, expected_edit_text); ok(!strcmp(list, expected_list_text), "list: got %s, expected %s\n", list, expected_list_text); + + selchange_fired = TRUE; } break; } @@ -213,17 +216,39 @@ static void test_selection(DWORD style, const char * const text[], idx = SendMessage(hCombo, CB_GETCURSEL, 0, 0); ok(idx == -1, "expected selection -1, got %d\n", idx); + /* keyboard navigation */ + expected_list_text = text[list[0]]; expected_edit_text = text[edit[0]]; + selchange_fired = FALSE; SendMessage(hCombo, WM_KEYDOWN, VK_DOWN, 0); + ok(selchange_fired, "CBN_SELCHANGE not sent!\n"); expected_list_text = text[list[1]]; expected_edit_text = text[edit[1]]; + selchange_fired = FALSE; SendMessage(hCombo, WM_KEYDOWN, VK_DOWN, 0); + ok(selchange_fired, "CBN_SELCHANGE not sent!\n"); expected_list_text = text[list[2]]; expected_edit_text = text[edit[2]]; + selchange_fired = FALSE; SendMessage(hCombo, WM_KEYDOWN, VK_UP, 0); + ok(selchange_fired, "CBN_SELCHANGE not sent!\n"); + + /* programatic navigation */ + + expected_list_text = text[list[3]]; + expected_edit_text = text[edit[3]]; + selchange_fired = FALSE; + SendMessage(hCombo, CB_SETCURSEL, list[3], 0); + ok(!selchange_fired, "CBN_SELCHANGE sent!\n"); + + expected_list_text = text[list[4]]; + expected_edit_text = text[edit[4]]; + selchange_fired = FALSE; + SendMessage(hCombo, CB_SETCURSEL, list[4], 0); + ok(!selchange_fired, "CBN_SELCHANGE sent!\n"); SetWindowLongPtr(hMainWnd, GWLP_WNDPROC, (ULONG_PTR)old_parent_proc); DestroyWindow(hCombo); @@ -232,8 +257,8 @@ static void test_selection(DWORD style, const char * const text[], static void test_CBN_SELCHANGE(void) { static const char * const text[] = { "alpha", "beta", "" }; - static const int sel_1[] = { 2, 0, 1 }; - static const int sel_2[] = { 0, 1, 0 }; + static const int sel_1[] = { 2, 0, 1, 0, 1 }; + static const int sel_2[] = { 0, 1, 0, 0, 1 }; test_selection(CBS_SIMPLE, text, sel_1, sel_2); test_selection(CBS_DROPDOWN, text, sel_1, sel_2);

1 0

Frans Kool : notepad: Added missing LGPL License in Dutch translations.
by Alexandre Julliard Feb. 15, 2008

Feb. 15, 2008

Module: wine Branch: master Commit: 36f464e3f4fd3682ac9f2175c9dc830d40b3361b URL: http://source.winehq.org/git/wine.git/?a=commit;h=36f464e3f4fd3682ac9f2175c… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Thu Feb 14 22:44:18 2008 +0100 notepad: Added missing LGPL License in Dutch translations. --- programs/notepad/Nl.rc | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Nl.rc b/programs/notepad/Nl.rc index 3220bd6..f047d79 100644 --- a/programs/notepad/Nl.rc +++ b/programs/notepad/Nl.rc @@ -119,4 +119,25 @@ STRING_NOTFOUND, "'%s' kan niet worden gevonden." STRING_OUT_OF_MEMORY, "Onvoldoende geheugen. \ \nSluit een of meer applicaties om de hoeveelheid \nbeschikbaar geheugen te vergroten." +IDS_LICENSE_CAPTION, "LICENTIE" +/* Only translated the title, there is no official translation of the LGPL */ +IDS_LICENSE, +"This library is free software; you can redistribute it and/or \ +modify it under the terms of the GNU Lesser General Public \ +License as published by the Free Software Foundation; either \ +version 2.1 of the License, or (at your option) any later version.\n\ +This library is distributed in the hope that it will be useful, \ +but WITHOUT ANY WARRANTY; without even the implied warranty of \ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ +Lesser General Public License for more details.\n\ +You should have received a copy of the GNU Lesser General Public \ +License along with this library; if not, write to the Free Software \ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" + +IDS_WARRANTY_CAPTION, "GEEN GARANTIE" +IDS_WARRANTY, +"This library is distributed in the hope that it will be useful, \ +but WITHOUT ANY WARRANTY; without even the implied warranty of \ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ +Lesser General Public License for more details." }

1 0

Andrew Talbot : dbghelp: Assign to struct instead of using memcpy.
by Alexandre Julliard Feb. 15, 2008

Feb. 15, 2008

Module: wine Branch: master Commit: 6733c6bad0648c48d0878d59e7431d9e3b579ffe URL: http://source.winehq.org/git/wine.git/?a=commit;h=6733c6bad0648c48d0878d59e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Feb 14 22:02:25 2008 +0000 dbghelp: Assign to struct instead of using memcpy. --- dlls/dbghelp/minidump.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 4eec39f..d6b2b25 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -235,7 +235,7 @@ static BOOL fetch_thread_info(struct dump_context* dc, int thd_idx, } else pctx = except->ExceptionPointers->ContextRecord; - memcpy(ctx, pctx, sizeof(*ctx)); + *ctx = *pctx; fetch_thread_stack(dc, tbi.TebBaseAddress, pctx, &mdThd->Stack); } else mdThd->SuspendCount = 0;

1 0