wine-commits May 2015

wine-commits@winehq.org

2 participants
428 discussions

Alex Henrie : user32: Fall back to downscaling the big icon for ICON_SMALL2.
by Alexandre Julliard 14 May '15

14 May '15

Module: wine Branch: master Commit: 5c48752784ae69326a8532780b05f03975de0ead URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c48752784ae69326a8532780… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu May 14 01:37:57 2015 -0600 user32: Fall back to downscaling the big icon for ICON_SMALL2. --- dlls/user32/defwnd.c | 24 +++++++++++++++++++++++- dlls/user32/tests/win.c | 15 ++++++--------- dlls/user32/win.c | 2 ++ dlls/user32/win.h | 1 + 4 files changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index fa6b0fa..68d9480 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -605,10 +605,32 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa { case ICON_SMALL: ret = wndPtr->hIconSmall; + if (ret && !lParam && wndPtr->hIcon) + { + wndPtr->hIconSmall2 = CopyImage( wndPtr->hIcon, IMAGE_ICON, + GetSystemMetrics( SM_CXSMICON ), + GetSystemMetrics( SM_CYSMICON ), 0 ); + } + else if (lParam && wndPtr->hIconSmall2) + { + DestroyIcon( wndPtr->hIconSmall2 ); + wndPtr->hIconSmall2 = NULL; + } wndPtr->hIconSmall = (HICON)lParam; break; case ICON_BIG: ret = wndPtr->hIcon; + if (wndPtr->hIconSmall2) + { + DestroyIcon( wndPtr->hIconSmall2 ); + wndPtr->hIconSmall2 = NULL; + } + if (lParam && !wndPtr->hIconSmall) + { + wndPtr->hIconSmall2 = CopyImage( (HICON)lParam, IMAGE_ICON, + GetSystemMetrics( SM_CXSMICON ), + GetSystemMetrics( SM_CYSMICON ), 0 ); + } wndPtr->hIcon = (HICON)lParam; break; default: @@ -639,7 +661,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa ret = wndPtr->hIcon; break; case ICON_SMALL2: - ret = wndPtr->hIconSmall; + ret = wndPtr->hIconSmall ? wndPtr->hIconSmall : wndPtr->hIconSmall2; break; default: ret = 0; diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index a547eee..689f0a2 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2007,23 +2007,20 @@ static void test_icons(void) res = (HICON)SendMessageA( hwnd, WM_GETICON, ICON_SMALL, 0 ); ok( res == 0, "wrong small icon %p/0\n", res ); - /* this test is XP specific */ - /*res = (HICON)SendMessageA( hwnd, WM_GETICON, ICON_SMALL2, 0 ); - ok( res != 0, "wrong small icon %p\n", res );*/ + res = (HICON)SendMessageA( hwnd, WM_GETICON, ICON_SMALL2, 0 ); + ok( (res && res != small_icon && res != icon2) || broken(!res), "wrong small2 icon %p\n", res ); res = (HICON)SendMessageA( hwnd, WM_SETICON, ICON_SMALL, (LPARAM)icon ); ok( res == 0, "wrong previous small icon %p/0\n", res ); res = (HICON)SendMessageA( hwnd, WM_GETICON, ICON_SMALL, 0 ); ok( res == icon, "wrong small icon after set %p/%p\n", res, icon ); - /* this test is XP specific */ - /*res = (HICON)SendMessageA( hwnd, WM_GETICON, ICON_SMALL2, 0 ); - ok( res == icon, "wrong small icon after set %p/%p\n", res, icon );*/ + res = (HICON)SendMessageA( hwnd, WM_GETICON, ICON_SMALL2, 0 ); + ok( res == icon || broken(!res), "wrong small2 icon after set %p/%p\n", res, icon ); res = (HICON)SendMessageA( hwnd, WM_SETICON, ICON_SMALL, (LPARAM)small_icon ); ok( res == icon, "wrong previous small icon %p/%p\n", res, icon ); res = (HICON)SendMessageA( hwnd, WM_GETICON, ICON_SMALL, 0 ); ok( res == small_icon, "wrong small icon after set %p/%p\n", res, small_icon ); - /* this test is XP specific */ - /*res = (HICON)SendMessageA( hwnd, WM_GETICON, ICON_SMALL2, 0 ); - ok( res == small_icon, "wrong small icon after set %p/%p\n", res, small_icon );*/ + res = (HICON)SendMessageA( hwnd, WM_GETICON, ICON_SMALL2, 0 ); + ok( res == small_icon || broken(!res), "wrong small2 icon after set %p/%p\n", res, small_icon ); /* make sure the big icon hasn't changed */ res = (HICON)SendMessageA( hwnd, WM_GETICON, ICON_BIG, 0 ); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 8ff3ebd..7090cb0 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -978,6 +978,7 @@ LRESULT WIN_DestroyWindow( HWND hwnd ) wndPtr->text = NULL; HeapFree( GetProcessHeap(), 0, wndPtr->pScroll ); wndPtr->pScroll = NULL; + DestroyIcon( wndPtr->hIconSmall2 ); surface = wndPtr->surface; wndPtr->surface = NULL; WIN_ReleasePtr( wndPtr ); @@ -1468,6 +1469,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, wndPtr->userdata = 0; wndPtr->hIcon = 0; wndPtr->hIconSmall = 0; + wndPtr->hIconSmall2 = 0; wndPtr->hSysMenu = 0; wndPtr->min_pos.x = wndPtr->min_pos.y = -1; diff --git a/dlls/user32/win.h b/dlls/user32/win.h index a182778..8da9c24 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -60,6 +60,7 @@ typedef struct tagWND HMENU hSysMenu; /* window's copy of System Menu */ HICON hIcon; /* window's icon */ HICON hIconSmall; /* window's small icon */ + HICON hIconSmall2; /* window's secondary small icon, derived from hIcon */ struct window_surface *surface; /* Window surface if any */ struct tagDIALOGINFO *dlgInfo;/* Dialog additional info (dialogs only) */ int pixel_format; /* Pixel format set by the graphics driver */

1 0

Alex Henrie : user32: Simplify GCLP_HICON and GCLP_HICONSM boolean logic.
by Alexandre Julliard 14 May '15

14 May '15

Module: wine Branch: master Commit: 0768a62f2c909bef8e27961b01f20c0510c6652c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0768a62f2c909bef8e27961b0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu May 14 01:37:56 2015 -0600 user32: Simplify GCLP_HICON and GCLP_HICONSM boolean logic. --- dlls/user32/class.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index bc1e623..0b3582e 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -977,7 +977,7 @@ static ULONG_PTR CLASS_SetClassLong( HWND hwnd, INT offset, LONG_PTR newval, break; case GCLP_HICON: retval = (ULONG_PTR)class->hIcon; - if (retval && class->hIconSmIntern) + if (class->hIconSmIntern) { DestroyIcon(class->hIconSmIntern); class->hIconSmIntern = NULL; @@ -990,12 +990,11 @@ static ULONG_PTR CLASS_SetClassLong( HWND hwnd, INT offset, LONG_PTR newval, break; case GCLP_HICONSM: retval = (ULONG_PTR)class->hIconSm; - if (retval && !newval) - class->hIconSmIntern = class->hIcon ? CopyImage( class->hIcon, IMAGE_ICON, - GetSystemMetrics( SM_CXSMICON ), - GetSystemMetrics( SM_CYSMICON ), - LR_COPYFROMRESOURCE ) : NULL; - else if (!retval && newval && class->hIconSmIntern) + if (retval && !newval && class->hIcon) + class->hIconSmIntern = CopyImage( class->hIcon, IMAGE_ICON, + GetSystemMetrics( SM_CXSMICON ), GetSystemMetrics( SM_CYSMICON ), + LR_COPYFROMRESOURCE ); + else if (newval && class->hIconSmIntern) { DestroyIcon(class->hIconSmIntern); class->hIconSmIntern = NULL;

1 0

Alex Henrie : user32: Free internal icon when freeing the rest of the window class.
by Alexandre Julliard 14 May '15

14 May '15

Module: wine Branch: master Commit: 2a94355c910431749acc34f7065cdbd5823bd51a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a94355c910431749acc34f70… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu May 14 01:37:55 2015 -0600 user32: Free internal icon when freeing the rest of the window class. --- dlls/user32/class.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 2c94367..bc1e623 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -292,6 +292,7 @@ static void CLASS_FreeClass( CLASS *classPtr ) list_remove( &classPtr->entry ); if (classPtr->hbrBackground > (HBRUSH)(COLOR_GRADIENTINACTIVECAPTION + 1)) DeleteObject( classPtr->hbrBackground ); + DestroyIcon( classPtr->hIconSmIntern ); HeapFree( GetProcessHeap(), 0, classPtr->menuName ); HeapFree( GetProcessHeap(), 0, classPtr ); USER_Unlock();

1 0

Alexandre Julliard : jscript: Avoid UINT32_MAX.
by Alexandre Julliard 14 May '15

14 May '15

Module: wine Branch: master Commit: f324ae7f09abc49dbd808cda3676af5991eb17d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f324ae7f09abc49dbd808cda3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 14 17:15:14 2015 +0900 jscript: Avoid UINT32_MAX. --- dlls/jscript/string.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 73de517..582a289 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -26,8 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); -#define UINT32_MAX 0xffffffff - typedef struct { jsdisp_t dispex; jsstr_t *str; @@ -1136,7 +1134,7 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi match_state_t match_result, *match_ptr = &match_result; DWORD length, i, match_len = 0; const WCHAR *ptr, *ptr2, *str, *match_str = NULL; - unsigned limit = UINT32_MAX; + unsigned limit = ~0u; jsdisp_t *array, *regexp = NULL; jsstr_t *jsstr, *match_jsstr, *tmp_str; HRESULT hres;

1 0

Nikolay Sivov : oledlg: Forward OleUIAddVerbMenuA to OleUIAddVerbMenuW.
by Alexandre Julliard 14 May '15

14 May '15

Module: wine Branch: master Commit: d93781f29bb346f04f8489ae208b1ffe540fe9c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d93781f29bb346f04f8489ae2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 14 10:44:42 2015 +0300 oledlg: Forward OleUIAddVerbMenuA to OleUIAddVerbMenuW. --- dlls/oledlg/oledlg_main.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/oledlg/oledlg_main.c b/dlls/oledlg/oledlg_main.c index f3f91fb..32b92a1 100644 --- a/dlls/oledlg/oledlg_main.c +++ b/dlls/oledlg/oledlg_main.c @@ -98,18 +98,28 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) /*********************************************************************** * OleUIAddVerbMenuA (OLEDLG.1) */ -BOOL WINAPI OleUIAddVerbMenuA( - LPOLEOBJECT lpOleObj, LPCSTR lpszShortType, - HMENU hMenu, UINT uPos, UINT uIDVerbMin, UINT uIDVerbMax, - BOOL bAddConvert, UINT idConvert, HMENU *lphMenu) +BOOL WINAPI OleUIAddVerbMenuA(IOleObject *object, LPCSTR shorttype, + HMENU hMenu, UINT uPos, UINT uIDVerbMin, UINT uIDVerbMax, + BOOL addConvert, UINT idConvert, HMENU *lphMenu) { - FIXME("(%p, %s, %p, %d, %d, %d, %d, %d, %p): stub\n", - lpOleObj, debugstr_a(lpszShortType), - hMenu, uPos, uIDVerbMin, uIDVerbMax, - bAddConvert, idConvert, lphMenu - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + WCHAR *shorttypeW = NULL; + BOOL ret; + + TRACE("(%p, %s, %p, %d, %d, %d, %d, %d, %p)\n", object, debugstr_a(shorttype), + hMenu, uPos, uIDVerbMin, uIDVerbMax, addConvert, idConvert, lphMenu); + + if (shorttype) + { + INT len = MultiByteToWideChar(CP_ACP, 0, shorttype, -1, NULL, 0); + shorttypeW = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + if (shorttypeW) + MultiByteToWideChar(CP_ACP, 0, shorttype, -1, shorttypeW, len); + } + + ret = OleUIAddVerbMenuW(object, shorttypeW, hMenu, uPos, uIDVerbMin, uIDVerbMax, + addConvert, idConvert, lphMenu); + HeapFree(GetProcessHeap(), 0, shorttypeW); + return ret; } /***********************************************************************

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 14 May '15

14 May '15

Module: wine Branch: master Commit: 461deb7322623bd0bfe693f9821468a33e19a9ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=461deb7322623bd0bfe693f98… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu May 14 09:14:48 2015 +0300 po: Update Finnish translation. --- po/fi.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/fi.po b/po/fi.po index 42d737f..8cbc624 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8555,10 +8555,8 @@ msgid "Duplex:" msgstr "Kaksipuolinen:" #: wineps.rc:50 -#, fuzzy -#| msgid "&Setup" msgid "Setup" -msgstr "&Asetukset" +msgstr "Asetukset" #: wininet.rc:42 wininet.rc:62 msgid "Realm"

1 0

Thomas Faber : advapi32/tests: Add tests for RegQueryInfoKey.
by Alexandre Julliard 14 May '15

14 May '15

Module: wine Branch: master Commit: b8bcec140c0bf2fb631cc0565d668603156973f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8bcec140c0bf2fb631cc0565… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Wed May 13 10:52:51 2015 -0400 advapi32/tests: Add tests for RegQueryInfoKey. --- dlls/advapi32/tests/registry.c | 216 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 216 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8bcec140c0bf2fb631cc…

1 0

Bruno Jesus : ws2_32: Trace connect() success.
by Alexandre Julliard 14 May '15

14 May '15

Module: wine Branch: master Commit: 898abba880ddc767b236fd79c72135186f22144d URL: http://source.winehq.org/git/wine.git/?a=commit;h=898abba880ddc767b236fd79c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed May 13 22:08:41 2015 -0300 ws2_32: Trace connect() success. --- dlls/ws2_32/socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ac81d24..de391c9 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3049,6 +3049,7 @@ connect_success: _enable_event(SOCKET2HANDLE(s), FD_CONNECT|FD_READ|FD_WRITE, FD_WINE_CONNECTED|FD_READ|FD_WRITE, FD_CONNECT|FD_WINE_LISTENING); + TRACE("\tconnected %04lx\n", s); return 0; }

1 0

Bruno Jesus : ws2_32/tests: Fix a couple of wrong traces.
by Alexandre Julliard 14 May '15

14 May '15

Module: wine Branch: master Commit: 3c16babcce417b4d699f541e4b05a308afb5e871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c16babcce417b4d699f541e4… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed May 13 22:03:53 2015 -0300 ws2_32/tests: Fix a couple of wrong traces. --- dlls/ws2_32/tests/sock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d67a47d..6d328e6 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3819,7 +3819,7 @@ static void test_select(void) FD_SET_ALL(fdRead); SetLastError(0xdeadbeef); ret = select(0, &readfds, NULL, &exceptfds, &select_timeout); - ok(ret == SOCKET_ERROR, "expected 1, got %d\n", ret); + ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); todo_wine ok(GetLastError() == WSAENOTSOCK, "expected 10038, got %d\n", GetLastError()); /* descriptor sets are unchanged */ @@ -3847,7 +3847,7 @@ todo_wine SetLastError(0xdeadbeef); ret = select(0, NULL, NULL, &exceptfds, &select_timeout); todo_wine - ok(ret == SOCKET_ERROR, "expected 1, got %d\n", ret); + ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); todo_wine ok(GetLastError() == WSAENOTSOCK, "expected 10038, got %d\n", GetLastError()); WaitForSingleObject (thread_handle, 1000);

1 0

Bruno Jesus : iphlpapi: Set MIB_IPADDR_PRIMARY as wType for GetIpAddrTable entries.
by Alexandre Julliard 14 May '15

14 May '15

Module: wine Branch: master Commit: 084bcaa76b4e8c02b5dbc2f9f400d25271067874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=084bcaa76b4e8c02b5dbc2f9f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed May 13 22:02:24 2015 -0300 iphlpapi: Set MIB_IPADDR_PRIMARY as wType for GetIpAddrTable entries. --- dlls/iphlpapi/ifenum.c | 6 +++++- dlls/iphlpapi/tests/iphlpapi.c | 9 +++++++++ include/ipmib.h | 7 +++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index a12450e..3070ae5 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -807,7 +807,11 @@ static DWORD getIPAddrRowByName(PMIB_IPADDRROW ipAddrRow, const char *ifName, /* FIXME: hardcoded reasm size, not sure where to get it */ ipAddrRow->dwReasmSize = 65535; ipAddrRow->unused1 = 0; - ipAddrRow->wType = 0; + /* wType is a bit field composed of MIB_IPADDR_* flags. Windows <= XP seems + * to like returning undocumented values 0x20 + 0x02 but for our current + * needs returning MIB_IPADDR_PRIMARY is enough. + */ + ipAddrRow->wType = MIB_IPADDR_PRIMARY; return ret; } diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 58fb843..847ba49 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -226,7 +226,16 @@ static void testGetIpAddrTable(void) "GetIpAddrTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && buf->dwNumEntries) + { + int i; testGetIfEntry(buf->table[0].dwIndex); + for (i = 0; i < buf->dwNumEntries; i++) + { + ok (buf->table[i].wType != 0, "Test[%d]: expected wType > 0\n", i); + trace("Entry[%d]: addr %s, dwIndex %u, wType 0x%x\n", i, + ntoa(buf->table[i].dwAddr), buf->table[i].dwIndex, buf->table[i].wType); + } + } HeapFree(GetProcessHeap(), 0, buf); } } diff --git a/include/ipmib.h b/include/ipmib.h index 65576be..d85ee5a 100644 --- a/include/ipmib.h +++ b/include/ipmib.h @@ -21,6 +21,13 @@ #include <ifmib.h> #include <nldef.h> +/* Flags used in the wType field from MIB_IPADDRROW */ + +#define MIB_IPADDR_PRIMARY 0x0001 +#define MIB_IPADDR_DYNAMIC 0x0004 +#define MIB_IPADDR_DISCONNECTED 0x0008 +#define MIB_IPADDR_DELETED 0x0040 +#define MIB_IPADDR_TRANSIENT 0x0080 /* IPADDR table */

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2015