September 2010 - Wine-Commits

Juan Lang : ws2_32: Implement WSAIoctl for SIO_ROUTING_INTERFACE_QUERY.
by Alexandre Julliard Sept. 29, 2010

Sept. 29, 2010

Module: wine Branch: master Commit: 9addae9d663ec0cff1e748190c12c4203dbbf5d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9addae9d663ec0cff1e748190… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 28 13:18:12 2010 -0700 ws2_32: Implement WSAIoctl for SIO_ROUTING_INTERFACE_QUERY. --- dlls/ws2_32/socket.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/tests/sock.c | 15 +++------ 2 files changed, 85 insertions(+), 10 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f605d0d..22e6138 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3257,6 +3257,86 @@ INT WINAPI WSAIoctl(SOCKET s, release_sock_fd(s, fd); break; } + case WS_SIO_ROUTING_INTERFACE_QUERY: + { + struct WS_sockaddr *daddr = (struct WS_sockaddr *)lpvInBuffer; + struct WS_sockaddr_in *daddr_in = (struct WS_sockaddr_in *)daddr; + struct WS_sockaddr_in *saddr_in = (struct WS_sockaddr_in *)lpbOutBuffer; + MIB_IPFORWARDROW row; + PMIB_IPADDRTABLE ipAddrTable = NULL; + DWORD size, i, found_index; + + TRACE("-> WS_SIO_ROUTING_INTERFACE_QUERY request\n"); + + if (!lpvInBuffer) + { + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + if (cbInBuffer < sizeof(struct WS_sockaddr)) + { + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + if (!lpbOutBuffer) + { + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + if (!lpcbBytesReturned) + { + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + if (daddr->sa_family != AF_INET) + { + FIXME("unsupported address family %d\n", daddr->sa_family); + WSASetLastError(WSAEAFNOSUPPORT); + return SOCKET_ERROR; + } + if (cbOutBuffer < sizeof(struct WS_sockaddr_in)) + { + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + if (GetBestRoute(daddr_in->sin_addr.S_un.S_addr, 0, &row) != NOERROR) + { + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + if (GetIpAddrTable(NULL, &size, FALSE) != ERROR_INSUFFICIENT_BUFFER) + { + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + ipAddrTable = HeapAlloc(GetProcessHeap(), 0, size); + if (GetIpAddrTable(ipAddrTable, &size, FALSE)) + { + HeapFree(GetProcessHeap(), 0, ipAddrTable); + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + for (i = 0, found_index = ipAddrTable->dwNumEntries; + i < ipAddrTable->dwNumEntries; i++) + { + if (ipAddrTable->table[i].dwIndex == row.dwForwardIfIndex) + found_index = i; + } + if (found_index == ipAddrTable->dwNumEntries) + { + ERR("no matching IP address for interface %d\n", + row.dwForwardIfIndex); + HeapFree(GetProcessHeap(), 0, ipAddrTable); + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + saddr_in->sin_family = AF_INET; + saddr_in->sin_addr.S_un.S_addr = ipAddrTable->table[found_index].dwAddr; + saddr_in->sin_port = 0; + *lpcbBytesReturned = sizeof(struct WS_sockaddr_in); + HeapFree(GetProcessHeap(), 0, ipAddrTable); + return 0; + } case WS_SIO_UDP_CONNRESET: FIXME("WS_SIO_UDP_CONNRESET stub\n"); break; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index abe0934..25bda61 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4290,17 +4290,14 @@ static void test_sioRoutingInterfaceQuery(void) } ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, NULL, 0, NULL, 0, NULL, NULL, NULL); - todo_wine ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, "expected WSAEFAULT, got %d\n", WSAGetLastError()); ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &sin, sizeof(sin), NULL, 0, NULL, NULL, NULL); - todo_wine ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, "expected WSAEFAULT, got %d\n", WSAGetLastError()); ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &sin, sizeof(sin), NULL, 0, &bytesReturned, NULL, NULL); - todo_wine ok(ret == SOCKET_ERROR && (WSAGetLastError() == WSAEFAULT /* Win98 */ || WSAGetLastError() == WSAEINVAL /* NT4 */|| @@ -4310,7 +4307,6 @@ static void test_sioRoutingInterfaceQuery(void) sin.sin_family = AF_INET; ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &sin, sizeof(sin), NULL, 0, &bytesReturned, NULL, NULL); - todo_wine ok(ret == SOCKET_ERROR && (WSAGetLastError() == WSAEFAULT /* Win98 */ || WSAGetLastError() == WSAEINVAL), @@ -4318,24 +4314,23 @@ static void test_sioRoutingInterfaceQuery(void) sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &sin, sizeof(sin), NULL, 0, &bytesReturned, NULL, NULL); - todo_wine ok(ret == SOCKET_ERROR && (WSAGetLastError() == WSAEINVAL /* NT4 */ || WSAGetLastError() == WSAEFAULT), "expected WSAEINVAL or WSAEFAULT, got %d\n", WSAGetLastError()); ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &sin, sizeof(sin), &sout, sizeof(sout), &bytesReturned, NULL, NULL); - todo_wine ok(!ret || broken(WSAGetLastError() == WSAEINVAL /* NT4 */), "WSAIoctl failed: %d\n", WSAGetLastError()); if (!ret) { ok(sout.sin_family == AF_INET, "expected AF_INET, got %d\n", sout.sin_family); - if (sout.sin_family == AF_INET) - ok(sout.sin_addr.s_addr == htonl(INADDR_LOOPBACK), - "expected %08x, got %08x\n", htonl(INADDR_LOOPBACK), - htonl(sout.sin_addr.s_addr)); + /* We expect the source address to be INADDR_LOOPBACK as well, but + * there's no guarantee that a route to the loopback address exists, + * so rather than introduce spurious test failures we do not test the + * source address. + */ } closesocket(sock); }

1 0

Francois Gouget : mscoree: Make find_mono_dll() static.
by Alexandre Julliard Sept. 29, 2010

Sept. 29, 2010

Module: wine Branch: master Commit: 5c046d13d5f47d658cdc0dd2b5b84aa5516f22ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c046d13d5f47d658cdc0dd2b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 28 20:12:44 2010 +0200 mscoree: Make find_mono_dll() static. --- dlls/mscoree/mscoree_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 7cc3887..980bed1 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -41,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); -BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path, int* abi_version) +static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path, int* abi_version) { static const WCHAR mono_dll[] = {'\\','b','i','n','\\','m','o','n','o','.','d','l','l',0}; static const WCHAR libmono_dll[] = {'\\','b','i','n','\\','l','i','b','m','o','n','o','.','d','l','l',0};

1 0

Francois Gouget : winetest: Add the '-i' option so one can specify a test environment description.
by Alexandre Julliard Sept. 29, 2010

Sept. 29, 2010

Module: wine Branch: master Commit: 8f6f35e13be03e57cfecdd796dd82b9919543a3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f6f35e13be03e57cfecdd796… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 28 20:12:10 2010 +0200 winetest: Add the '-i' option so one can specify a test environment description. --- programs/winetest/main.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index a680af3..021ec96 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -48,6 +48,7 @@ struct wine_test }; char *tag = NULL; +char *description = NULL; char *email = NULL; BOOL aborting = FALSE; static struct wine_test *wine_tests; @@ -247,6 +248,8 @@ static void print_version (void) xprintf (" bRunningUnderWine=%d\n", running_under_wine ()); xprintf (" bRunningOnVisibleDesktop=%d\n", running_on_visible_desktop ()); xprintf (" Submitter=%s\n", email ); + if (description) + xprintf (" Description=%s\n", description ); xprintf (" dwMajorVersion=%u\n dwMinorVersion=%u\n" " dwBuildNumber=%u\n PlatformId=%u\n szCSDVersion=%s\n", ver.dwMajorVersion, ver.dwMinorVersion, ver.dwBuildNumber, @@ -1004,6 +1007,7 @@ usage (void) " -d DIR Use DIR as temp directory (default: %%TEMP%%\\wct)\n" " -e preserve the environment\n" " -h print this message and exit\n" +" -i INFO an optional description of the test platform\n" " -m MAIL an email address to enable developers to contact you\n" " -n exclude the specified tests\n" " -p shutdown when the tests are done\n" @@ -1056,6 +1060,13 @@ int main( int argc, char *argv[] ) case '?': usage (); exit (0); + case 'i': + if (!(description = argv[++i])) + { + usage(); + exit( 2 ); + } + break; case 'm': if (!(email = argv[++i])) {

1 0

Francois Gouget : winetest: Add the '-n' option so one can specify a list of tests to exclude.
by Alexandre Julliard Sept. 29, 2010

Sept. 29, 2010

Module: wine Branch: master Commit: 6f5a0a3a81dc3fc67151c6cbf1a99ec09a7db860 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f5a0a3a81dc3fc67151c6cbf… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 28 20:10:46 2010 +0200 winetest: Add the '-n' option so one can specify a list of tests to exclude. --- programs/winetest/main.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 520b49e..a680af3 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -60,6 +60,7 @@ static char build_id[64]; /* filters for running only specific tests */ static char *filters[64]; static unsigned int nb_filters = 0; +static BOOL exclude_tests = FALSE; /* Needed to check for .NET dlls */ static HMODULE hmscoree; @@ -86,17 +87,17 @@ static BOOL test_filtered_out( LPCSTR module, LPCSTR testname ) if (p) *p = 0; len = strlen(dllname); - if (!nb_filters) return FALSE; + if (!nb_filters) return exclude_tests; for (i = 0; i < nb_filters; i++) { if (!strncmp( dllname, filters[i], len )) { - if (!filters[i][len]) return FALSE; + if (!filters[i][len]) return exclude_tests; if (filters[i][len] != ':') continue; - if (!testname || !strcmp( testname, &filters[i][len+1] )) return FALSE; + if (!testname || !strcmp( testname, &filters[i][len+1] )) return exclude_tests; } } - return TRUE; + return !exclude_tests; } static char * get_file_version(char * file_name) @@ -1004,6 +1005,7 @@ usage (void) " -e preserve the environment\n" " -h print this message and exit\n" " -m MAIL an email address to enable developers to contact you\n" +" -n exclude the specified tests\n" " -p shutdown when the tests are done\n" " -q quiet mode, no output at all\n" " -o FILE put report into FILE, do not submit\n" @@ -1061,6 +1063,9 @@ int main( int argc, char *argv[] ) exit( 2 ); } break; + case 'n': + exclude_tests = TRUE; + break; case 'p': poweroff = 1; break;

1 0

Alexandre Julliard : gdi32: Copy a DIB section as a DIB section in BITMAP_CopyBitmap.
by Alexandre Julliard Sept. 29, 2010

Sept. 29, 2010

Module: wine Branch: master Commit: 1914f3ecae2f3197f1ac6ffcc61d041b49ea59d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1914f3ecae2f3197f1ac6ffcc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 28 22:44:36 2010 +0200 gdi32: Copy a DIB section as a DIB section in BITMAP_CopyBitmap. --- dlls/gdi32/bitmap.c | 40 ++++++++++++++++++++++++++++++++-------- 1 files changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index e5a02be..9d05ff5 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -510,17 +510,41 @@ LONG WINAPI SetBitmapBits( */ HBITMAP BITMAP_CopyBitmap(HBITMAP hbitmap) { - HBITMAP res = 0; - BITMAP bm; + HBITMAP res; + DIBSECTION dib; + DWORD size; + + if (!(size = GetObjectW( hbitmap, sizeof(dib), &dib ))) return 0; - if (!GetObjectW( hbitmap, sizeof(bm), &bm )) return 0; - res = CreateBitmapIndirect(&bm); + if (size == sizeof(DIBSECTION)) + { + void *bits; + BITMAPINFO *bi; + HDC dc = CreateCompatibleDC( NULL ); + + if (!dc) return 0; + if (!(bi = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) + { + DeleteDC( dc ); + return 0; + } + bi->bmiHeader = dib.dsBmih; + + /* Get the color table or the color masks */ + GetDIBits( dc, hbitmap, 0, 0, NULL, bi, DIB_RGB_COLORS ); + + res = CreateDIBSection( dc, bi, DIB_RGB_COLORS, &bits, NULL, 0 ); + if (res) SetDIBits( dc, res, 0, dib.dsBm.bmHeight, dib.dsBm.bmBits, bi, DIB_RGB_COLORS ); + HeapFree( GetProcessHeap(), 0, bi ); + DeleteDC( dc ); + return res; + } + res = CreateBitmapIndirect( &dib.dsBm ); if(res) { - char *buf = HeapAlloc( GetProcessHeap(), 0, bm.bmWidthBytes * - bm.bmHeight ); - GetBitmapBits (hbitmap, bm.bmWidthBytes * bm.bmHeight, buf); - SetBitmapBits (res, bm.bmWidthBytes * bm.bmHeight, buf); + char *buf = HeapAlloc( GetProcessHeap(), 0, dib.dsBm.bmWidthBytes * dib.dsBm.bmHeight ); + GetBitmapBits (hbitmap, dib.dsBm.bmWidthBytes * dib.dsBm.bmHeight, buf); + SetBitmapBits (res, dib.dsBm.bmWidthBytes * dib.dsBm.bmHeight, buf); HeapFree( GetProcessHeap(), 0, buf ); } return res;

1 0

Scott Ritchie : Link to Launchpad PPA on download-deb
by Jeremy Newman Sept. 29, 2010

Sept. 29, 2010

Module: website Branch: master Commit: 31dc2556da507be51b3455a16295ed2be8b13803 URL: http://source.winehq.org/git/website.git/?a=commit;h=31dc2556da507be51b3455… Author: Scott Ritchie <scott(a)open-vote.org> Date: Sun Sep 26 03:07:30 2010 -0700 Link to Launchpad PPA on download-deb Scott Ritchie >From 951afaa6cb3944cc6a25a41016ddd58d455fa690 Mon Sep 17 00:00:00 2001 From: Scott Ritchie <scott(a)scott-laptop.(none)> Date: Sun, 26 Sep 2010 03:06:32 -0700 Subject: [lostwages] Add link to Launchpad PPA on download-deb --- templates/en/download/deb.template | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/templates/en/download/deb.template b/templates/en/download/deb.template index a3254df..ea725f1 100644 --- a/templates/en/download/deb.template +++ b/templates/en/download/deb.template @@ -56,3 +56,5 @@ may be useful on Kubuntu, Xubuntu, and other Ubuntu derivatives. Then update APT's package information by running 'sudo apt-get update'. You can now install Wine by typing 'sudo apt-get install wine1.3'. + +If you'd like to browse the PPA manually, you can <a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">visit its Launchpad page</a>.

1 0

Andrew Eikum : ole32: Create a FORMATETC if one is not given in OleCreate.
by Alexandre Julliard Sept. 28, 2010

Sept. 28, 2010

Module: wine Branch: master Commit: 91d91afb7d0f1806b1e79f2d45d9fa62df186048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91d91afb7d0f1806b1e79f2d4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Sep 24 10:53:32 2010 -0500 ole32: Create a FORMATETC if one is not given in OleCreate. --- dlls/ole32/ole2.c | 14 +++++++++++++- dlls/ole32/tests/ole2.c | 25 +++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 84bf174..2b301e4 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2530,7 +2530,19 @@ HRESULT WINAPI OleCreate( if (SUCCEEDED(hres2)) { DWORD dwConnection; - hres = IOleCache_Cache(pOleCache, pFormatEtc, ADVF_PRIMEFIRST, &dwConnection); + FORMATETC *pfe; + if (renderopt == OLERENDER_DRAW && !pFormatEtc) { + pfe = HeapAlloc(GetProcessHeap(), 0, sizeof(FORMATETC)); + pfe->cfFormat = 0; + pfe->ptd = NULL; + pfe->dwAspect = DVASPECT_CONTENT; + pfe->lindex = -1; + pfe->tymed = TYMED_NULL; + }else + pfe = pFormatEtc; + hres = IOleCache_Cache(pOleCache, pfe, ADVF_PRIMEFIRST, &dwConnection); + if (!pFormatEtc && pfe) + HeapFree(GetProcessHeap(), 0, pfe); IOleCache_Release(pOleCache); } } diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 48584a1..3db2cb5 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -53,6 +53,7 @@ struct expected_method }; static const struct expected_method *expected_method_list; +static FORMATETC *g_expected_fetc = NULL; BOOL g_showRunnable = TRUE; BOOL g_isRunning = TRUE; @@ -496,6 +497,22 @@ static HRESULT WINAPI OleObjectCache_Cache ) { CHECK_EXPECTED_METHOD("OleObjectCache_Cache"); + if (g_expected_fetc) { + ok(pformatetc != NULL, "pformatetc should not be NULL\n"); + if (pformatetc) { + ok(pformatetc->cfFormat == g_expected_fetc->cfFormat, + "cfFormat: %x\n", pformatetc->cfFormat); + ok((pformatetc->ptd != NULL) == (g_expected_fetc->ptd != NULL), + "ptd: %p\n", pformatetc->ptd); + ok(pformatetc->dwAspect == g_expected_fetc->dwAspect, + "dwAspect: %x\n", pformatetc->dwAspect); + ok(pformatetc->lindex == g_expected_fetc->lindex, + "lindex: %x\n", pformatetc->lindex); + ok(pformatetc->tymed == g_expected_fetc->tymed, + "tymed: %x\n", pformatetc->tymed); + } + } else + ok(pformatetc == NULL, "pformatetc should be NULL\n"); return S_OK; } @@ -796,6 +813,12 @@ static void test_OleCreate(IStorage *pStorage) { NULL, 0 } }; + g_expected_fetc = &formatetc; + formatetc.cfFormat = 0; + formatetc.ptd = NULL; + formatetc.dwAspect = DVASPECT_CONTENT; + formatetc.lindex = -1; + formatetc.tymed = TYMED_NULL; runnable = &OleObjectRunnable; cache = &OleObjectCache; expected_method_list = methods_olerender_none; @@ -836,6 +859,8 @@ static void test_OleCreate(IStorage *pStorage) IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); + formatetc.cfFormat = 0; + formatetc.tymed = TYMED_NULL; runnable = NULL; expected_method_list = methods_olerender_draw_no_runnable; trace("OleCreate with OLERENDER_DRAW (no IRunnableObject):\n");

1 0

Erich Hoover : user32: Prepare for multi-frame storing of icons and cursors .
by Alexandre Julliard Sept. 28, 2010

Sept. 28, 2010

Module: wine Branch: master Commit: ca7163e4386f576d8fd3b3f0c53b43522da4c437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca7163e4386f576d8fd3b3f0c… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sat Sep 25 21:37:23 2010 -0600 user32: Prepare for multi-frame storing of icons and cursors. --- dlls/user32/cursoricon.c | 65 ++++++++++++++++++++++++--------------------- 1 files changed, 35 insertions(+), 30 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index acae302..043f067 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -110,17 +110,22 @@ static CRITICAL_SECTION IconCrst = { &critsect_debug, -1, 0, 0, 0, 0 }; * User objects management */ -struct cursoricon_object +struct cursoricon_frame { - struct user_object obj; /* object header */ - ULONG_PTR param; /* opaque param used by 16-bit code */ HBITMAP color; /* color bitmap */ HBITMAP alpha; /* pre-multiplied alpha bitmap for 32-bpp icons */ HBITMAP mask; /* mask bitmap (followed by color for 1-bpp icons) */ - BOOL is_icon; /* whether icon or cursor */ - UINT width; - UINT height; - POINT hotspot; +}; + +struct cursoricon_object +{ + struct user_object obj; /* object header */ + ULONG_PTR param; /* opaque param used by 16-bit code */ + BOOL is_icon; /* whether icon or cursor */ + UINT width; + UINT height; + POINT hotspot; + struct cursoricon_frame frame; /* icon frame information */ }; static HICON alloc_icon_handle(void) @@ -128,9 +133,9 @@ static HICON alloc_icon_handle(void) struct cursoricon_object *obj = HeapAlloc( GetProcessHeap(), 0, sizeof(*obj) ); if (!obj) return 0; obj->param = 0; - obj->color = 0; - obj->alpha = 0; - obj->mask = 0; + obj->frame.color = 0; + obj->frame.mask = 0; + obj->frame.alpha = 0; return alloc_user_handle( &obj->obj, USER_ICON ); } @@ -158,9 +163,9 @@ static BOOL free_icon_handle( HICON handle ) else if (obj) { ULONG_PTR param = obj->param; - if (obj->color) DeleteObject( obj->color ); - if (obj->alpha) DeleteObject( obj->alpha ); - DeleteObject( obj->mask ); + if (obj->frame.alpha) DeleteObject( obj->frame.alpha ); + if (obj->frame.color) DeleteObject( obj->frame.color ); + DeleteObject( obj->frame.mask ); HeapFree( GetProcessHeap(), 0, obj ); if (wow_handlers.free_icon_param && param) wow_handlers.free_icon_param( param ); USER_Driver->pDestroyCursorIcon( handle ); @@ -921,13 +926,13 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, { struct cursoricon_object *info = get_icon_ptr( hObj ); - info->color = color; - info->mask = mask; - info->alpha = alpha; info->is_icon = bIcon; info->hotspot = hotspot; info->width = width; info->height = height; + info->frame.color = color; + info->frame.mask = mask; + info->frame.alpha = alpha; release_icon_ptr( hObj, info ); USER_Driver->pCreateCursorIcon( hObj ); } @@ -1532,13 +1537,13 @@ HICON WINAPI CopyIcon( HICON hIcon ) if ((hNew = alloc_icon_handle())) { ptrNew = get_icon_ptr( hNew ); - ptrNew->color = copy_bitmap( ptrOld->color ); - ptrNew->alpha = copy_bitmap( ptrOld->alpha ); - ptrNew->mask = copy_bitmap( ptrOld->mask ); ptrNew->is_icon = ptrOld->is_icon; ptrNew->width = ptrOld->width; ptrNew->height = ptrOld->height; ptrNew->hotspot = ptrOld->hotspot; + ptrNew->frame.mask = copy_bitmap( ptrOld->frame.mask ); + ptrNew->frame.color = copy_bitmap( ptrOld->frame.color ); + ptrNew->frame.alpha = copy_bitmap( ptrOld->frame.alpha ); release_icon_ptr( hNew, ptrNew ); } release_icon_ptr( hIcon, ptrOld ); @@ -1824,8 +1829,8 @@ BOOL WINAPI GetIconInfo(HICON hIcon, PICONINFO iconinfo) iconinfo->fIcon = ptr->is_icon; iconinfo->xHotspot = ptr->hotspot.x; iconinfo->yHotspot = ptr->hotspot.y; - iconinfo->hbmColor = copy_bitmap( ptr->color ); - iconinfo->hbmMask = copy_bitmap( ptr->mask ); + iconinfo->hbmColor = copy_bitmap( ptr->frame.color ); + iconinfo->hbmMask = copy_bitmap( ptr->frame.mask ); release_icon_ptr( hIcon, ptr ); return TRUE; @@ -1935,12 +1940,12 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) { struct cursoricon_object *info = get_icon_ptr( hObj ); - info->color = color; - info->mask = mask; - info->alpha = create_alpha_bitmap( iconinfo->hbmColor, mask, NULL, NULL ); info->is_icon = iconinfo->fIcon; info->width = width; info->height = height; + info->frame.color = color; + info->frame.mask = mask; + info->frame.alpha = create_alpha_bitmap( iconinfo->hbmColor, mask, NULL, NULL ); if (info->is_icon) { info->hotspot.x = width / 2; @@ -2053,7 +2058,7 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, oldFg = SetTextColor( hdc, RGB(0,0,0) ); oldBg = SetBkColor( hdc, RGB(255,255,255) ); - if (ptr->alpha && (flags & DI_IMAGE)) + if (ptr->frame.alpha && (flags & DI_IMAGE)) { BOOL is_mono = FALSE; @@ -2066,7 +2071,7 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, if (!is_mono) { BLENDFUNCTION pixelblend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA }; - SelectObject( hMemDC, ptr->alpha ); + SelectObject( hMemDC, ptr->frame.alpha ); if (GdiAlphaBlend( hdc_dest, x, y, cxWidth, cyWidth, hMemDC, 0, 0, ptr->width, ptr->height, pixelblend )) goto done; } @@ -2074,24 +2079,24 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, if (flags & DI_MASK) { - SelectObject( hMemDC, ptr->mask ); + SelectObject( hMemDC, ptr->frame.mask ); StretchBlt( hdc_dest, x, y, cxWidth, cyWidth, hMemDC, 0, 0, ptr->width, ptr->height, SRCAND ); } if (flags & DI_IMAGE) { - if (ptr->color) + if (ptr->frame.color) { DWORD rop = (flags & DI_MASK) ? SRCINVERT : SRCCOPY; - SelectObject( hMemDC, ptr->color ); + SelectObject( hMemDC, ptr->frame.color ); StretchBlt( hdc_dest, x, y, cxWidth, cyWidth, hMemDC, 0, 0, ptr->width, ptr->height, rop ); } else { DWORD rop = (flags & DI_MASK) ? SRCINVERT : SRCCOPY; - SelectObject( hMemDC, ptr->mask ); + SelectObject( hMemDC, ptr->frame.mask ); StretchBlt( hdc_dest, x, y, cxWidth, cyWidth, hMemDC, 0, ptr->height, ptr->width, ptr->height, rop ); }

1 0

Juan Lang : iphlpapi: Fix inverted logic in mask comparison.
by Alexandre Julliard Sept. 28, 2010

Sept. 28, 2010

Module: wine Branch: master Commit: f6081f935251a927ae9214cf71a3d92250f3553d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6081f935251a927ae9214cf7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 24 18:38:29 2010 -0700 iphlpapi: Fix inverted logic in mask comparison. --- dlls/iphlpapi/iphlpapi_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 079ebff..081de0e 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1065,7 +1065,7 @@ DWORD WINAPI GetBestRoute(DWORD dwDestAddr, DWORD dwSourceAddr, PMIB_IPFORWARDRO DWORD numShifts, mask; for (numShifts = 0, mask = table->table[ndx].dwForwardMask; - mask && !(mask & 1); mask >>= 1, numShifts++) + mask && mask & 1; mask >>= 1, numShifts++) ; if (numShifts > matchedBits) { matchedBits = numShifts;

1 0

Aric Stewart : quartz: Improve video window sizing on first sample.
by Alexandre Julliard Sept. 28, 2010

Sept. 28, 2010

Module: wine Branch: master Commit: e2b3a7f479463f9bf51263910a6d997318946c42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2b3a7f479463f9bf51263910… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Sep 27 11:11:22 2010 -0500 quartz: Improve video window sizing on first sample. Preserve sizes set by the application and defer erasing as it is not needed and can cause deadlock between threads with child video windows. --- dlls/quartz/videorenderer.c | 47 +++++++++++++++++++++++++++--------------- 1 files changed, 30 insertions(+), 17 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index d3ccede..9469427 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -298,23 +298,36 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, if (!This->init) { - DWORD style = GetWindowLongW(This->hWnd, GWL_STYLE); - DWORD style_ex = GetWindowLongW(This->hWnd, GWL_EXSTYLE); - - if (!This->WindowPos.right || !This->WindowPos.bottom) - This->WindowPos = This->SourceRect; - - AdjustWindowRectEx(&This->WindowPos, style, TRUE, style_ex); - - TRACE("WindowPos: %d %d %d %d\n", This->WindowPos.left, This->WindowPos.top, This->WindowPos.right, This->WindowPos.bottom); - SetWindowPos(This->hWnd, NULL, - This->WindowPos.left, - This->WindowPos.top, - This->WindowPos.right - This->WindowPos.left, - This->WindowPos.bottom - This->WindowPos.top, - SWP_NOZORDER|SWP_NOMOVE); - - GetClientRect(This->hWnd, &This->DestRect); + if (!This->WindowPos.right || !This->WindowPos.top) + { + DWORD style = GetWindowLongW(This->hWnd, GWL_STYLE); + DWORD style_ex = GetWindowLongW(This->hWnd, GWL_EXSTYLE); + + if (!This->WindowPos.right) + { + This->WindowPos.left = This->SourceRect.left; + This->WindowPos.right = This->SourceRect.right; + } + if (!This->WindowPos.bottom) + { + This->WindowPos.top = This->SourceRect.top; + This->WindowPos.bottom = This->SourceRect.bottom; + } + + AdjustWindowRectEx(&This->WindowPos, style, TRUE, style_ex); + + TRACE("WindowPos: %d %d %d %d\n", This->WindowPos.left, This->WindowPos.top, This->WindowPos.right, This->WindowPos.bottom); + SetWindowPos(This->hWnd, NULL, + This->WindowPos.left, + This->WindowPos.top, + This->WindowPos.right - This->WindowPos.left, + This->WindowPos.bottom - This->WindowPos.top, + SWP_NOZORDER|SWP_NOMOVE|SWP_DEFERERASE); + + GetClientRect(This->hWnd, &This->DestRect); + } + else + This->DestRect = This->WindowPos; This->init = TRUE; }

1 0