September 2009 - Wine-commits

Vincent Povirk : gdiplus: Test for the lowest rejected startup version.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: ba09567716b0f743db2e8307d54172ba8f869800 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba09567716b0f743db2e8307d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 4 09:37:36 2009 -0500 gdiplus: Test for the lowest rejected startup version. --- dlls/gdiplus/tests/pen.c | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 59b7cff..707bafc 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -33,21 +33,28 @@ static void test_startup(void) Status status; struct GdiplusStartupInput gdiplusStartupInput; ULONG_PTR gdiplusToken; + int gpversion; - gdiplusStartupInput.GdiplusVersion = 1; gdiplusStartupInput.DebugEventCallback = NULL; gdiplusStartupInput.SuppressBackgroundThread = 0; gdiplusStartupInput.SuppressExternalCodecs = 0; - status = GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); - expect(Ok, status); - GdiplusShutdown(gdiplusToken); - - gdiplusStartupInput.GdiplusVersion = 42; - - status = GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); - expect(UnsupportedGdiplusVersion, status); - GdiplusShutdown(gdiplusToken); + for (gpversion=1; gpversion<256; gpversion++) + { + gdiplusStartupInput.GdiplusVersion = gpversion; + status = GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + ok(status == Ok || status == UnsupportedGdiplusVersion, + "GdiplusStartup returned %x\n", status); + GdiplusShutdown(gdiplusToken); + if (status != Ok) + { + gpversion--; + break; + } + } + + ok(gpversion > 0 && gpversion < 42, "unexpected gdiplus version %i\n", gpversion); + trace("gdiplus version is %i\n", gpversion); status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen);

1 0

Mike Kaplinskiy : ntdll: Remember to set the iosb status if using a worker thread for serial wait.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: 3f232785d3c5c43b636f0f2f38d737987b0c22e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f232785d3c5c43b636f0f2f3… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Thu Sep 3 21:47:32 2009 -0400 ntdll: Remember to set the iosb status if using a worker thread for serial wait. --- dlls/ntdll/serial.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index dfb00e1..2aff6fc 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -851,6 +851,7 @@ typedef struct async_commio { HANDLE hDevice; DWORD* events; + IO_STATUS_BLOCK* iosb; HANDLE hEvent; DWORD evtmask; DWORD mstat; @@ -985,12 +986,13 @@ static DWORD CALLBACK wait_for_event(LPVOID arg) } if (needs_close) close( fd ); } + if (commio->iosb) commio->iosb->u.Status = *commio->events ? STATUS_SUCCESS : STATUS_CANCELLED; if (commio->hEvent) NtSetEvent(commio->hEvent, NULL); RtlFreeHeap(GetProcessHeap(), 0, commio); return 0; } -static NTSTATUS wait_on(HANDLE hDevice, int fd, HANDLE hEvent, DWORD* events) +static NTSTATUS wait_on(HANDLE hDevice, int fd, HANDLE hEvent, PIO_STATUS_BLOCK piosb, DWORD* events) { async_commio* commio; NTSTATUS status; @@ -1003,6 +1005,7 @@ static NTSTATUS wait_on(HANDLE hDevice, int fd, HANDLE hEvent, DWORD* events) commio->hDevice = hDevice; commio->events = events; + commio->iosb = piosb; commio->hEvent = hEvent; get_wait_mask(commio->hDevice, &commio->evtmask); @@ -1301,7 +1304,7 @@ static inline NTSTATUS io_control(HANDLE hDevice, case IOCTL_SERIAL_WAIT_ON_MASK: if (lpOutBuffer && nOutBufferSize == sizeof(DWORD)) { - if (!(status = wait_on(hDevice, fd, hEvent, lpOutBuffer))) + if (!(status = wait_on(hDevice, fd, hEvent, piosb, lpOutBuffer))) sz = sizeof(DWORD); } else

1 0

Hans Leidekker : winhttp: Make tests pass on Win7. Conform to the more recent behavior.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: 6cde75646a808b5eff613c892a832612fc1f0d4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cde75646a808b5eff613c892… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Thu Sep 3 16:30:47 2009 +0200 winhttp: Make tests pass on Win7. Conform to the more recent behavior. --- dlls/winhttp/tests/notification.c | 30 +++++++++++++++--------------- dlls/winhttp/tests/url.c | 22 ++++++++++++---------- dlls/winhttp/url.c | 4 ++-- 3 files changed, 29 insertions(+), 27 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index de8508a..60e1595 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -103,11 +103,11 @@ static const struct notification cache_test[] = { winhttp_send_request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT, 0 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, 0 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, 0 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 0 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1 } + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0, 1 }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 1 }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 0, 1 }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1, 1 }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1, 1 } }; static void setup_test( struct info *info, enum api function, unsigned int line ) @@ -227,11 +227,11 @@ static const struct notification redirect_test[] = { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REQUEST_SENT, 0 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, 0 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, 0 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 0 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1 } + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0, 1 }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 1 }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 0, 1 }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1, 1 }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1, 1 } }; static void test_redirect( void ) @@ -309,11 +309,11 @@ static const struct notification async_test[] = { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, 0, 1 }, { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, 0, 1 }, { winhttp_read_data, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 0 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1 } + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0, 1 }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 1 }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 0, 1 }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1, 1 }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1, 1 } }; static void test_async( void ) diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index b77520d..c1930be 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -144,16 +144,18 @@ static void WinHttpCreateUrl_test( void ) SetLastError( 0xdeadbeef ); ret = WinHttpCreateUrl( &uc, 0, NULL, &len ); ok( !ret, "expected failure\n" ); - ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER got %u\n", GetLastError() ); - ok( len == 57, "expected len 57 got %u\n", len ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER || + GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); /* correct size, NULL url */ fill_url_components( &uc ); SetLastError( 0xdeadbeef ); ret = WinHttpCreateUrl( &uc, 0, NULL, &len ); ok( !ret, "expected failure\n" ); - ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER got %u\n", GetLastError() ); - ok( len == 57, "expected len 57 got %u\n", len ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER || + GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); /* valid components, allocated url, short length */ SetLastError( 0xdeadbeef ); @@ -315,7 +317,7 @@ static void reset_url_components( URL_COMPONENTS *uc ) static void WinHttpCrackUrl_test( void ) { URL_COMPONENTSW uc; - WCHAR scheme[20], user[20], pass[20], host[20], path[40], extra[20]; + WCHAR scheme[20], user[20], pass[20], host[20], path[80], extra[40]; DWORD error; BOOL ret; @@ -499,17 +501,17 @@ static void WinHttpCrackUrl_test( void ) uc.dwHostNameLength = 20; uc.nPort = 0; uc.lpszUrlPath = path; - uc.dwUrlPathLength = 40; + uc.dwUrlPathLength = 80; uc.lpszExtraInfo = extra; - uc.dwExtraInfoLength = 20; + uc.dwExtraInfoLength = 40; path[0] = 0; ret = WinHttpCrackUrl( url8, 0, ICU_DECODE, &uc ); - ok( ret, "WinHttpCrackUrl failed\n" ); + ok( ret, "WinHttpCrackUrl failed %u\n", GetLastError() ); ok( !memcmp( uc.lpszUrlPath + 11, escape, 21 * sizeof(WCHAR) ), "unexpected path\n" ); - ok( uc.dwUrlPathLength == 32, "unexpected path length\n" ); + ok( uc.dwUrlPathLength == 32, "unexpected path length %u\n", uc.dwUrlPathLength ); ok( !memcmp( uc.lpszExtraInfo, escape + 21, 12 * sizeof(WCHAR) ), "unexpected extra info\n" ); - ok( uc.dwExtraInfoLength == 12, "unexpected extra info length\n" ); + ok( uc.dwExtraInfoLength == 12, "unexpected extra info length %u\n", uc.dwExtraInfoLength ); /* Urls with specified port numbers */ /* decoding with buffers */ diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 711987a..49ffc4f 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -368,7 +368,7 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW TRACE("%p, 0x%08x, %p, %p\n", uc, flags, url, required); - if (!uc || uc->dwStructSize != sizeof(URL_COMPONENTS) || !required) + if (!uc || uc->dwStructSize != sizeof(URL_COMPONENTS) || !required || !url) { set_last_error( ERROR_INVALID_PARAMETER ); return FALSE; @@ -376,7 +376,7 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW if (!calc_length( uc, flags, &len )) return FALSE; - if (!url || *required < len) + if (*required < len) { *required = len + 1; set_last_error( ERROR_INSUFFICIENT_BUFFER );

1 0

Hans Leidekker : usp10: Make tests pass on Win7. Conform to the more recent behavior.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: f7a4936fc4a6f4f9a5120579aed9a923582160e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7a4936fc4a6f4f9a5120579a… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Thu Sep 3 14:50:17 2009 +0200 usp10: Make tests pass on Win7. Conform to the more recent behavior. --- dlls/usp10/tests/usp10.c | 32 ++++++++++++++++++++------------ dlls/usp10/usp10.c | 7 +++++-- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 1eefee0..9a4c3c6 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -67,9 +67,10 @@ static void test_ScriptShape(HDC hdc) ok(hr == E_PENDING, "ScriptShape should return E_PENDING not %08x\n", hr); hr = ScriptShape(hdc, &sc, test1, 4, 4, &items[0].a, glyphs, NULL, attrs, &nb); - ok(!hr || - hr == E_INVALIDARG, /* Vista, W2K8 */ - "ScriptShape should return S_OK or E_INVALIDARG, not %08x\n", hr); + ok(broken(hr == S_OK) || + hr == E_INVALIDARG || /* Vista, W2K8 */ + hr == E_FAIL, /* WIN7 */ + "ScriptShape should return E_FAIL or E_INVALIDARG, not %08x\n", hr); ok(items[0].a.fNoGlyphIndex == FALSE, "fNoGlyphIndex TRUE\n"); hr = ScriptShape(hdc, &sc, test1, 4, 4, &items[0].a, glyphs, logclust, attrs, &nb); @@ -83,17 +84,19 @@ static void test_ScriptShape(HDC hdc) ok(hr == E_INVALIDARG, "ScriptPlace should return E_INVALIDARG not %08x\n", hr); hr = ScriptPlace(NULL, &sc, glyphs, 4, attrs, &items[0].a, widths, NULL, NULL); - ok(hr == E_PENDING || - hr == E_INVALIDARG, /* Vista, W2K8 */ - "ScriptPlace should return E_PENDING or E_INVALIDARG, not %08x\n", hr); + ok(broken(hr == E_PENDING) || + hr == E_INVALIDARG || /* Vista, W2K8 */ + hr == E_FAIL, /* WIN7 */ + "ScriptPlace should return E_FAIL or E_INVALIDARG, not %08x\n", hr); hr = ScriptPlace(NULL, &sc, glyphs, 4, attrs, &items[0].a, widths, offset, NULL); ok(hr == E_PENDING, "ScriptPlace should return E_PENDING not %08x\n", hr); hr = ScriptPlace(NULL, &sc, glyphs, 4, attrs, &items[0].a, widths, NULL, abc); - ok(hr == E_PENDING || - hr == E_INVALIDARG, /* Vista, W2K8 */ - "ScriptPlace should return E_PENDING or E_INVALIDARG, not %08x\n", hr); + ok(broken(hr == E_PENDING) || + hr == E_INVALIDARG || /* Vista, W2K8 */ + hr == E_FAIL, /* WIN7 */ + "ScriptPlace should return E_FAIL or E_INVALIDARG, not %08x\n", hr); hr = ScriptPlace(hdc, &sc, glyphs, 4, attrs, &items[0].a, widths, offset, NULL); ok(!hr, "ScriptPlace should return S_OK not %08x\n", hr); @@ -339,14 +342,14 @@ static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) /* Set psc to NULL, to be able to check if a pointer is returned in psc */ psc = NULL; - hr = ScriptGetCMap(NULL, &psc, NULL, 0, 0, NULL); - ok( hr == E_PENDING, "(NULL,&psc,NULL,0,0NULL), expected E_PENDING, " + hr = ScriptGetCMap(NULL, &psc, TestItem1, cInChars, 0, pwOutGlyphs3); + ok( hr == E_PENDING, "(NULL,&psc,NULL,0,0,NULL), expected E_PENDING, " "got %08x\n", hr); ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); /* Set psc to NULL but add hdc, to be able to check if a pointer is returned in psc */ psc = NULL; - hr = ScriptGetCMap(hdc, &psc, NULL, 0, 0, NULL); + hr = ScriptGetCMap(hdc, &psc, TestItem1, cInChars, 0, pwOutGlyphs3); ok( hr == S_OK, "ScriptGetCMap(NULL,&psc,NULL,0,0,NULL), expected S_OK, " "got %08x\n", hr); ok( psc != NULL, "ScritpGetCMap expected psc to be not NULL\n"); @@ -1058,6 +1061,11 @@ static void test_ScriptGetGlyphABCWidth(HDC hdc) ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); hr = ScriptGetGlyphABCWidth(NULL, &sc, 'a', NULL); + ok(broken(hr == E_PENDING) || + hr == E_INVALIDARG, /* WIN7 */ + "expected E_INVALIDARG, got 0x%08x\n", hr); + + hr = ScriptGetGlyphABCWidth(NULL, &sc, 'a', &abc); ok(hr == E_PENDING, "expected E_PENDING, got 0x%08x\n", hr); if (0) { /* crashes on WinXP */ diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 21c74e8..e1c79e6 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1298,6 +1298,7 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, *pcGlyphs = cChars; if ((hr = init_script_cache(hdc, psc)) != S_OK) return hr; + if (!pwLogClust) return E_FAIL; if ((get_cache_pitch_family(psc) & TMPF_TRUETYPE) && !psa->fNoGlyphIndex) { @@ -1329,7 +1330,7 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, psva[i].fReserved = 0; psva[i].fShapeReserved = 0; - if (pwLogClust) pwLogClust[i] = i; + pwLogClust[i] = i; } return S_OK; } @@ -1366,6 +1367,7 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, if (!psva) return E_INVALIDARG; if ((hr = init_script_cache(hdc, psc)) != S_OK) return hr; + if (!pGoffset) return E_FAIL; if (pABC) memset(pABC, 0, sizeof(ABC)); for (i = 0; i < cGlyphs; i++) @@ -1394,7 +1396,7 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, pABC->abcC += abc.abcC; } /* FIXME: set to more reasonable values */ - if (pGoffset) pGoffset[i].du = pGoffset[i].dv = 0; + pGoffset[i].du = pGoffset[i].dv = 0; if (piAdvance) piAdvance[i] = abc.abcA + abc.abcB + abc.abcC; } @@ -1527,6 +1529,7 @@ HRESULT WINAPI ScriptGetGlyphABCWidth(HDC hdc, SCRIPT_CACHE *psc, WORD glyph, AB TRACE("(%p, %p, 0x%04x, %p)\n", hdc, psc, glyph, abc); + if (!abc) return E_INVALIDARG; if ((hr = init_script_cache(hdc, psc)) != S_OK) return hr; if (!get_cache_glyph_widths(psc, glyph, abc))

1 0

Roderick Colenbrander : winex11: Always adjust the color_shifts pointer when SelectBitmap is called.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: 70241904b9efacab9fb6c7d8701b1cfdb86f49f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70241904b9efacab9fb6c7d87… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Sep 3 13:51:44 2009 +0200 winex11: Always adjust the color_shifts pointer when SelectBitmap is called. --- dlls/winex11.drv/bitmap.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index 4d635aa..fee2dbc 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -110,10 +110,6 @@ HBITMAP CDECL X11DRV_SelectBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap ) if (physDev->depth != physBitmap->pixmap_depth) { physDev->depth = physBitmap->pixmap_depth; - if(physDev->depth == 1) - physDev->color_shifts = NULL; - else - physDev->color_shifts = &physBitmap->pixmap_color_shifts; wine_tsx11_lock(); XFreeGC( gdi_display, physDev->gc ); physDev->gc = XCreateGC( gdi_display, physDev->drawable, 0, NULL ); @@ -122,6 +118,12 @@ HBITMAP CDECL X11DRV_SelectBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap ) XFlush( gdi_display ); wine_tsx11_unlock(); } + + if(physDev->depth == 1) + physDev->color_shifts = NULL; + else + physDev->color_shifts = &physBitmap->pixmap_color_shifts; + return hbitmap; }

1 0

Ge van Geldorp : gdiplus/tests: Fix tests on Win7.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: 1e6a80133bc710297860c193eedbf6aadcc19890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e6a80133bc710297860c193e… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Thu Sep 3 11:52:04 2009 +0200 gdiplus/tests: Fix tests on Win7. --- dlls/gdiplus/tests/region.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index b3142ba..efd2115 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -364,7 +364,9 @@ static void test_getregiondata(void) expect_dword(buf + 5, 12); expect_magic((DWORD*)(buf + 6)); expect_dword(buf + 7, 0); - expect_dword(buf + 8, 0x00004000); + /* flags 0x4000 means its a path of shorts instead of FLOAT */ + ok((*(buf + 8) & (~ 0x00004000)) == 0x00000000, + "expected 00000000 got %08x\n", *(buf + 8) & (~ 0x00004000)); status = GdipDeleteRegion(region); expect(Ok, status); @@ -503,7 +505,8 @@ static void test_getregiondata(void) expect_float(buf + 25, 50); expect_float(buf + 26, 70.2); expect_dword(buf + 27, 0x01010100); - expect_dword(buf + 28, 0x00000101); + ok(*(buf + 28) == 0x00000101 || *(buf + 28) == 0x43050101 /* Win 7 */, + "expected 00000101 or 43050101 got %08x\n", *(buf + 28)); status = GdipDeletePath(path); expect(Ok, status);

1 0

Ge van Geldorp : ws2_32/tests: Add acceptable error codes for Win7.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: 1c65c6d6f95ec22dff7d3167b86900436c2dbb75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c65c6d6f95ec22dff7d3167b… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Thu Sep 3 11:53:05 2009 +0200 ws2_32/tests: Add acceptable error codes for Win7. --- dlls/ws2_32/tests/sock.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2127954..3d470c6 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2332,24 +2332,24 @@ static void test_addr_to_print(void) pdst = NULL; pdst = pInetNtop(AF_INET, (void*)&in.s_addr, NULL, sizeof(dst)); ok(pdst == NULL, "The pointer should not be returned (%p)\n", pdst); - ok(WSAGetLastError() == STATUS_INVALID_PARAMETER, - "Should be STATUS_INVALID_PARAMETER not 0x%x\n", WSAGetLastError()); + ok(WSAGetLastError() == STATUS_INVALID_PARAMETER || WSAGetLastError() == WSAEINVAL /* Win7 */, + "Should be STATUS_INVALID_PARAMETER or WSAEINVAL not 0x%x\n", WSAGetLastError()); /* Test zero length passed */ WSASetLastError(0); pdst = NULL; pdst = pInetNtop(AF_INET, (void*)&in.s_addr, dst, 0); ok(pdst == NULL, "The pointer should not be returned (%p)\n", pdst); - ok(WSAGetLastError() == STATUS_INVALID_PARAMETER, - "Should be STATUS_INVALID_PARAMETER not 0x%x\n", WSAGetLastError()); + ok(WSAGetLastError() == STATUS_INVALID_PARAMETER || WSAGetLastError() == WSAEINVAL /* Win7 */, + "Should be STATUS_INVALID_PARAMETER or WSAEINVAL not 0x%x\n", WSAGetLastError()); /* Test length one shorter than the address length */ WSASetLastError(0); pdst = NULL; pdst = pInetNtop(AF_INET, (void*)&in.s_addr, dst, 6); ok(pdst == NULL, "The pointer should not be returned (%p)\n", pdst); - ok(WSAGetLastError() == STATUS_INVALID_PARAMETER, - "Should be STATUS_INVALID_PARAMETER not 0x%x\n", WSAGetLastError()); + ok(WSAGetLastError() == STATUS_INVALID_PARAMETER || WSAGetLastError() == WSAEINVAL /* Win7 */, + "Should be STATUS_INVALID_PARAMETER or WSAEINVAL not 0x%x\n", WSAGetLastError()); /* Test longer length is ok */ WSASetLastError(0); @@ -2385,24 +2385,24 @@ static void test_addr_to_print(void) pdst = NULL; pdst = pInetNtop(AF_INET6, (void*)&in6.s6_addr, NULL, sizeof(dst6)); ok(pdst == NULL, "The pointer should not be returned (%p)\n", pdst); - ok(WSAGetLastError() == STATUS_INVALID_PARAMETER, - "Should be STATUS_INVALID_PARAMETER not 0x%x\n", WSAGetLastError()); + ok(WSAGetLastError() == STATUS_INVALID_PARAMETER || WSAGetLastError() == WSAEINVAL /* Win7 */, + "Should be STATUS_INVALID_PARAMETER or WSAEINVAL not 0x%x\n", WSAGetLastError()); /* Test zero length passed */ WSASetLastError(0); pdst = NULL; pdst = pInetNtop(AF_INET6, (void*)&in6.s6_addr, dst6, 0); ok(pdst == NULL, "The pointer should not be returned (%p)\n", pdst); - ok(WSAGetLastError() == STATUS_INVALID_PARAMETER, - "Should be STATUS_INVALID_PARAMETER not 0x%x\n", WSAGetLastError()); + ok(WSAGetLastError() == STATUS_INVALID_PARAMETER || WSAGetLastError() == WSAEINVAL /* Win7 */, + "Should be STATUS_INVALID_PARAMETER or WSAEINVAL not 0x%x\n", WSAGetLastError()); /* Test length one shorter than the address length */ WSASetLastError(0); pdst = NULL; pdst = pInetNtop(AF_INET6, (void*)&in6.s6_addr, dst6, 16); ok(pdst == NULL, "The pointer should not be returned (%p)\n", pdst); - ok(WSAGetLastError() == STATUS_INVALID_PARAMETER, - "Should be STATUS_INVALID_PARAMETER not 0x%x\n", WSAGetLastError()); + ok(WSAGetLastError() == STATUS_INVALID_PARAMETER || WSAGetLastError() == WSAEINVAL /* Win7 */, + "Should be STATUS_INVALID_PARAMETER or WSAEINVAL not 0x%x\n", WSAGetLastError()); /* Test longer length is ok */ WSASetLastError(0);

1 0

Ge van Geldorp : user32/tests: Skip test on non-US keyboard.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: b5d7025932ca43362bcadd59a42ae2eb78a4eab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5d7025932ca43362bcadd59a… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Thu Sep 3 11:51:44 2009 +0200 user32/tests: Skip test on non-US keyboard. --- dlls/user32/tests/input.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 1d2741e..548a5ad 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -892,6 +892,11 @@ static void test_Input_blackbox(void) HWND window; HHOOK hook; + if (GetKeyboardLayout(0) != (HKL)(ULONG_PTR)0x04090409) + { + win_skip("Skipping Input_blackbox test on non-US keyboard\n"); + return; + } window = CreateWindow("Static", NULL, WS_POPUP|WS_HSCROLL|WS_VSCROLL |WS_VISIBLE, 0, 0, 200, 60, NULL, NULL, NULL, NULL);

1 0

Piotr Caban : jscript: Fix 'object expected' error number.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: 782dea35f832b55b023f1ade92d37c62a7e4a9d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=782dea35f832b55b023f1ade9… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Sep 3 10:43:27 2009 +0200 jscript: Fix 'object expected' error number. --- dlls/jscript/resource.h | 2 +- dlls/jscript/tests/api.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index c3e58cb..2749bd6 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -30,7 +30,7 @@ #define IDS_NOT_FUNC 0x138A #define IDS_NOT_DATE 0x138E #define IDS_NOT_NUM 0x1389 -#define IDS_OBJECT_EXPECTED 0x128F +#define IDS_OBJECT_EXPECTED 0x138F #define IDS_ILLEGAL_ASSIGN 0x1390 #define IDS_UNDEFINED 0x1391 #define IDS_NOT_BOOL 0x1392 diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 136db61..42d0683 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1492,7 +1492,7 @@ exception_test(function() {eval("for(i=0;i<10")}, "SyntaxError", -2146827284); exception_test(function() {eval("while(")}, "SyntaxError", -2146827286); exception_test(function() {eval("if(")}, "SyntaxError", -2146827286); exception_test(function() {eval("'unterminated")}, "SyntaxError", -2146827273); -exception_test(function() {eval("nonexistingfunc()")}, "TypeError", -2146823537); +exception_test(function() {eval("nonexistingfunc()")}, "TypeError", -2146823281); function testObjectInherit(obj, constr, ts, tls, vo) { ok(obj instanceof Object, "obj is not instance of Object");

1 0

Frédéric Delanoy : jscript: Update French translation.
by Alexandre Julliard 08 Sep '09

08 Sep '09

Module: wine Branch: master Commit: 90d2c259618014044060edbfa44787ac14199fce URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d2c259618014044060edbfa… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 2 22:25:37 2009 +0200 jscript: Update French translation. --- dlls/jscript/jscript_Fr.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Fr.rc b/dlls/jscript/jscript_Fr.rc index 4554fb0..6206055 100644 --- a/dlls/jscript/jscript_Fr.rc +++ b/dlls/jscript/jscript_Fr.rc @@ -39,6 +39,7 @@ STRINGTABLE DISCARDABLE IDS_NOT_FUNC "Fonction attendue" IDS_NOT_DATE "« [objet] » n'est pas un objet de type date" IDS_NOT_NUM "Nombre attendu" + IDS_OBJECT_EXPECTED "Objet attendu" IDS_ILLEGAL_ASSIGN "Affectation illégale" IDS_UNDEFINED "« | » n'est pas défini" IDS_NOT_BOOL "Booléen attendu"

1 0