May 2014 - Wine-Devel - list.winehq.org

Re: wininet: Fix InternetGetConnectedStateEx[A|W] (try 2, resend)
by Alexandre Julliard May 9, 2014

May 9, 2014

Bruno Jesus <00cpxxx(a)gmail.com> writes: > @@ -1241,8 +1250,9 @@ BOOL WINAPI InternetGetConnectedStateExA(LPDWORD lpdwStatus, LPSTR lpszConnectio > dwReserved); > if (rc && lpwszConnectionName) > { > - WideCharToMultiByte(CP_ACP,0,lpwszConnectionName,-1,lpszConnectionName, > - dwNameLen, NULL, NULL); > + if (WideCharToMultiByte(CP_ACP,0,lpwszConnectionName,-1,lpszConnectionName, > + dwNameLen, NULL, NULL) == 0) > + *lpszConnectionName = '\0'; That doesn't seem to match what the W function does, and I don't see any tests for that case. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: comctl32: Tooltip AddTool needs to support TTTOOLINFOW_V3_SIZE
by Alexandre Julliard May 9, 2014

May 9, 2014

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > @@ -1037,8 +1037,9 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW) > infoPtr->hwndSelf, ti->hwnd, ti->uId, > (ti->uFlags & TTF_IDISHWND) ? " TTF_IDISHWND" : ""); > > - if (ti->cbSize >= TTTOOLINFOW_V2_SIZE && !ti->lpszText && isW) > - return FALSE; > + if ((ti->cbSize > TTTOOLINFOW_V2_SIZE && > + ti->cbSize != TTTOOLINFOW_V3_SIZE) && !ti->lpszText && isW) > + return FALSE; This doesn't make any sense. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: ced401: add initial support
by Nikolay Sivov May 9, 2014

May 9, 2014

What does it have to do with Wine? Is it really some dll that Windows provides? > +/* > + * Use1432.dll > + * > + * Generated from/home/schloegl/.wine-1.7.17/drive_c/1401/utils/Use1432.dll by winedump. > + * > + * DO NOT SUBMIT GENERATED DLLS FOR INCLUSION INTO WINE! > + * > + */

3 3

Re: [PATCH 1/2] mshtml: Added IDispatchEx support to HTMLStyleSheetRulesCollection object.
by Marvin May 9, 2014

May 9, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=6935 Your paranoid android. === w2000pro (32 bit dom) === dom.c:6245: Test failed: unexpected guid {3050f2e5-98b5-11cf-bb82-00aa00bdce0b}

1 0

Re: [PATCH 2/2] oleacc: Add Client_accHitTest implementation
by Piotr Caban May 9, 2014

May 9, 2014

On 05/09/14 10:54, Piotr Caban wrote: > --- > dlls/oleacc/client.c | 22 +++++++++++++++++++-- > dlls/oleacc/tests/main.c | 50 > +++++++++++++++++++++++++++++++++++++++++++++--- > 2 files changed, 67 insertions(+), 5 deletions(-) > This patch is wrong. I'll send a fixed version.

1 0

Can I play with the Notepad code?
by Susan Cragin May 9, 2014

May 9, 2014

Hi. I want to make Notepad remember which encoding scheme you last used. Right now it defaults to ANSI Latin when opening a new file, and saves it that way too, unless you are careful. And, if I can, I want to make the following changes: (1) use ALT-Windows-key to move lines up and down. (2) use CTL-Windows-key to move paragraphs up and down. Lines and paragraphs are defined as follows: So this is a line of text. And this is line 2 of text. And this is line three of text. But they are all part of Paragraph 1. Paragraph 2 starts after a blank line is inserted. Sort of like Emacs. I've found the source code. I'm looking at where to put things. I can do it in lisp, and I've got help for C. http://source.winehq.org/source/programs/notepad/ Can I can I can I? It's going to take me a while, so don't hold your collective breath. Susan

3 2

Re: ws2_32: Return the correct error if SO_REUSEADDR is set in bind error
by Marvin May 9, 2014

May 9, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=6923 Your paranoid android. === w2008s64 (64 bit sock) === sock: unhandled exception c0000005 at 000007FEFFD49CD9

1 0

Re: [PATCH] gdi32: Report unsubstituted font face names. (try 4)
by Marvin May 8, 2014

May 8, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=6914 Your paranoid android. === w2000pro (32 bit font) === font.c:4756: Test failed: expected MS Shell Dlg got Microsoft Sans Serif font.c:4765: Test failed: expected MS Shell Dlg 2 got Tahoma Bold === wxppro (32 bit font) === font.c:4756: Test failed: expected MS Shell Dlg got Microsoft Sans Serif font.c:4765: Test failed: expected MS Shell Dlg 2 got Tahoma Bold === w2008s64 (32 bit font) === font.c:4756: Test failed: expected MS Shell Dlg got Microsoft Sans Serif font.c:4765: Test failed: expected MS Shell Dlg 2 got Tahoma === w8 (32 bit font) === font.c:4756: Test failed: expected MS Shell Dlg got Microsoft Sans Serif font.c:4765: Test failed: expected MS Shell Dlg 2 got Tahoma === w2008s64 (64 bit font) === font.c:4756: Test failed: expected MS Shell Dlg got Microsoft Sans Serif font.c:4765: Test failed: expected MS Shell Dlg 2 got Tahoma

3 2

Re: [PATCH] gdi32: Report unsubstituted font face names. (try 3)
by Alex Henrie May 8, 2014

May 8, 2014

2014-05-08 2:28 GMT-06:00 Alexandre Julliard <julliard(a)winehq.org>: > Please add tests for the full name too. I thought I did: @@ -6031,6 +6042,8 @@ START_TEST(font) * I'd like to avoid them in this test. */ test_EnumFontFamilies("Arial Black", ANSI_CHARSET); + test_EnumFontFamilies("MS Shell Dlg", ANSI_CHARSET); + test_EnumFontFamilies("MS Shell Dlg 2", ANSI_CHARSET); test_EnumFontFamilies("Symbol", SYMBOL_CHARSET); if (is_truetype_font_installed("Arial Black") && (is_truetype_font_installed("Symbol") || is_truetype_font_installed("Wingdings"))) Is there a better way to test the full name? -Alex

2 1

Re: [PATCH] user32: Don't depend on HMENU being valid for popup menus
by Ken Thomases May 8, 2014

May 8, 2014

On May 6, 2014, at 9:28 AM, Andrew Eikum wrote: > +static HMENU MENU_GetHandle(POPUPMENU *menu) > +{ > + return menu ? menu->obj.handle : NULL; > +} Now that DestroyMenu() really destroys the handle, any use of the handle and thus this function has to be examined very carefully. The menu pointer may be valid and menu->obj.handle may have a value, but that value may no longer be a valid handle. > menuchar = SendMessageW( hwndOwner, WM_MENUCHAR, > - MAKEWPARAM( key, menu->wFlags ), (LPARAM)hmenu ); > + MAKEWPARAM( key, menu->wFlags ), (LPARAM)MENU_GetHandle(menu) ); So, here we're passing the menu handle in the WM_MENUCHAR message. If the menu has been destroyed, that's an invalid handle. We probably need tests to verify that that's what happens on Windows. That is, maybe it passes NULL. Or maybe the handle is still valid somehow. (The existing destroyed-submenu tests suggest that the handle isn't valid anymore, but maybe magic happens.) > - drawItem.hwndItem = (HWND)hmenu; > + drawItem.hwndItem = (HWND)MENU_GetHandle(menu); > - dis.hwndItem = (HWND)hmenu; > + dis.hwndItem = (HWND)MENU_GetHandle(menu); Same for the WM_DRAWITEM message. > @@ -1845,7 +1840,7 @@ static BOOL MENU_InitPopup( HWND hwndOwner, HMENU hmenu, UINT flags ) > menu->hWnd = CreateWindowExW( ex_style, (LPCWSTR)POPUPMENU_CLASS_ATOM, NULL, > WS_POPUP, 0, 0, 0, 0, > hwndOwner, 0, (HINSTANCE)GetWindowLongPtrW(hwndOwner, GWLP_HINSTANCE), > - (LPVOID)hmenu ); > + (LPVOID)MENU_GetHandle(menu) ); This one is interesting. This is a value that's just forwarded through to the WM_CREATE message via the lpCreateParams field of the CREATESTRUCTW pointed to by the lparam. It's then stored in the window extra space using SetWindowLongPtrW(). It's then looked up elsewhere in the window proc. Some cases in the window proc try to use the handle, which will fail if it's been destroyed. I think you can pass the menu pointer here instead of the menu handle. Likewise, I think you can store the menu pointer into the window extra space. You'd have to change the size of the extra space defined in the MENU_builtin_class struct. And you'd need to change all uses of Set/GetWindowLongPtrW() on the menu's window with 0 index. MENU_DrawPopupMenu() would need to be changed to take a menu pointer instead of a handle. A couple of those uses are for the MM_SETMENUHANDLE and MM_GETMENUHANDLE messages. I believe those are obsolete Wine-internal messages. They can probably be completely removed. For the MN_GETHMENU message, you can return MENU_GetHandle(GetWindowLongPtrW(hwnd, 0)), although, again, it would be good to test what Windows does for a destroyed-but-still-alive menu. The stored value is also used in GetMenuBarInfo(), so you'd want to rework that. > @@ -2023,18 +2018,17 @@ static void MENU_SelectItem( HWND hwndOwner, HMENU hmenu, UINT wIndex, > SendMessageW( hwndOwner, WM_MENUSELECT, MAKEWPARAM(pos, > ip->fType | ip->fState | > - (ptm->wFlags & MF_SYSMENU)), (LPARAM)topmenu); > + (topmenu->wFlags & MF_SYSMENU)), (LPARAM)topmenu); Here you missed a case. The lparam should be the menu handle, but topmenu is now a menu pointer. It might be good to also review all remaining uses of MENU_GetMenu(). Again, I think it should be possible to confine uses of menu handles just to the interfacing with client code. So, uses of MENU_GetMenu() at other places indicates that you're relying on the handle being valid. For example, the call to GetSubMenu() in MENU_FindItemByKey() or the calls to EnableMenuItem() in MENU_InitSysMenuPopup(). Unfortunately, that may involve creating a lot of helper functions. I didn't review further than this. Sorry that my suggestions are creating so much work. If you haven't already done so, you should probably get input from others (i.e. Alexandre) to see if my suggestions make sense. -Ken

2 3