September 2010 - Wine-commits

Michael Stefaniuc : user32: Simplify the error handling in BITMAP_Load().
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: 5a2cc9410586b32aacdb9a878686b68d96e941ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a2cc9410586b32aacdb9a878… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 28 22:45:21 2010 +0200 user32: Simplify the error handling in BITMAP_Load(). This fixes a memleak on an error path (Smatch). --- dlls/user32/cursoricon.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 29b9bd2..42bba6d 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2291,7 +2291,7 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, if (bmfh->bfType != 0x4d42 /* 'BM' */) { WARN("Invalid/unsupported bitmap format!\n"); - goto end_close; + goto end; } if (bmfh->bfOffBits) offbits = bmfh->bfOffBits - sizeof(BITMAPFILEHEADER); } @@ -2312,7 +2312,7 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, if (bm_type == -1) { WARN("Invalid bitmap format!\n"); - goto end_close; + goto end; } if(desiredx != 0) @@ -2371,7 +2371,6 @@ end: if (screen_mem_dc) DeleteDC(screen_mem_dc); HeapFree(GetProcessHeap(), 0, scaled_info); HeapFree(GetProcessHeap(), 0, fix_info); -end_close: if (loadflags & LR_LOADFROMFILE) UnmapViewOfFile( ptr ); return hbitmap;

1 0

Michael Stefaniuc : ddraw: Add missing unlock on an error path (Smatch).
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: ef104dc4653af81188edb32371b4eb5b902e2789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef104dc4653af81188edb3237… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 28 22:44:14 2010 +0200 ddraw: Add missing unlock on an error path (Smatch). --- dlls/ddraw/ddraw.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f3ebade..346c7c5 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2947,6 +2947,7 @@ static HRESULT CreateSurface(IDirectDraw7 *iface, if((DDSD->ddsCaps.dwCaps & (DDSCAPS_BACKBUFFER | DDSCAPS_PRIMARYSURFACE)) == (DDSCAPS_BACKBUFFER | DDSCAPS_PRIMARYSURFACE)) { WARN("Application wanted to create back buffer primary surface\n"); + LeaveCriticalSection(&ddraw_cs); return DDERR_INVALIDCAPS; }

1 0

Alexandre Julliard : gdi32: Copy a DIB section as a DIB section in BITMAP_CopyBitmap.
by Alexandre Julliard 29 Sep '10

29 Sep '10

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

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

29 Sep '10

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

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

29 Sep '10

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

Scott Ritchie : Link to Launchpad PPA on download-deb
by Jeremy Newman 29 Sep '10

29 Sep '10

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

Mike Kaplinskiy : ws2_32: Implement SO_UPDATE_ACCEPT_CONTEXT.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: f138a5724d5be3c6e6da88c7dd350c6c1a02ad28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f138a5724d5be3c6e6da88c7d… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Mon Sep 27 22:59:58 2010 -0400 ws2_32: Implement SO_UPDATE_ACCEPT_CONTEXT. --- dlls/ws2_32/socket.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a4380aa..b01b623 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3941,6 +3941,12 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, TRACE("Ignoring SO_UPDATE_CONNECT_CONTEXT, since our sockets are normal\n"); return 0; + /* After a AcceptEx call succeeds, the socket can't be used with half of the + * normal winsock functions on windows. We don't have that problem. */ + case WS_SO_UPDATE_ACCEPT_CONTEXT: + TRACE("Ignoring SO_UPDATE_ACCEPT_CONTEXT, since our sockets are normal\n"); + return 0; + /* SO_OPENTYPE does not require a valid socket handle. */ case WS_SO_OPENTYPE: if (!optlen || optlen < sizeof(int) || !optval)

1 0

Aric Stewart : quartz: Improve video window sizing on first sample.
by Alexandre Julliard 28 Sep '10

28 Sep '10

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

Aric Stewart : mciqtz32: Do not allow MCIQTZ_mciUpdate to interrupt a playing video.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: dc4d607062134fc32fb7f3e433b60e2c306a8f07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc4d607062134fc32fb7f3e43… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Sep 27 13:29:39 2010 -0500 mciqtz32: Do not allow MCIQTZ_mciUpdate to interrupt a playing video. --- dlls/mciqtz32/mciqtz.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index fef27e7..aca7bf4 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -822,6 +822,9 @@ static DWORD MCIQTZ_mciUpdate(UINT wDevID, DWORD dwFlags, LPMCI_DGV_UPDATE_PARMS LONG visible = OATRUE; res = MCIERR_INTERNAL; + IMediaControl_GetState(wma->pmctrl, -1, &state); + if (state == State_Running) + return MCIERR_UNSUPPORTED_FUNCTION; /* If in stopped state, nothing has been drawn to screen * moving to pause, which is needed for the old dib renderer, will result * in a single frame drawn, so hide the window here */

1 0

Juan Lang : ws2_32/tests: Test SIO_ROUTING_INTERFACE_QUERY.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: d06b1d599d344762909c65d5be7cbddb75dd30ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=d06b1d599d344762909c65d5b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 24 17:21:33 2010 -0700 ws2_32/tests: Test SIO_ROUTING_INTERFACE_QUERY. --- dlls/ws2_32/tests/sock.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 87403c6..abe0934 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4274,6 +4274,73 @@ static void test_getpeername(void) closesocket(sock); } +static void test_sioRoutingInterfaceQuery(void) +{ + int ret; + SOCKET sock; + SOCKADDR_IN sin = { 0 }, sout = { 0 }; + DWORD bytesReturned; + + sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP); + ok(sock != INVALID_SOCKET, "Expected socket to return a valid socket\n"); + if (sock == INVALID_SOCKET) + { + skip("Socket creation failed with %d\n", WSAGetLastError()); + return; + } + 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 */|| + WSAGetLastError() == WSAEAFNOSUPPORT), + "expected WSAEFAULT or WSAEINVAL or WSAEAFNOSUPPORT, got %d\n", + WSAGetLastError()); + 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), + "expected WSAEFAULT or WSAEINVAL, got %d\n", WSAGetLastError()); + 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)); + } + closesocket(sock); +} + + /**************** Main program ***************/ START_TEST( sock ) @@ -4331,6 +4398,8 @@ START_TEST( sock ) test_AcceptEx(); test_ConnectEx(); + test_sioRoutingInterfaceQuery(); + /* this is a io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send();

1 0