wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

Stefan Dösinger : ddraw: AddViewport holds a reference to the viewport.
by Alexandre Julliard 29 Jan '13

29 Jan '13

Module: wine Branch: master Commit: 0209b0a96cd21cd8d9f0812d0756514555bc2b3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0209b0a96cd21cd8d9f0812d0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 26 13:39:46 2013 +0100 ddraw: AddViewport holds a reference to the viewport. --- dlls/ddraw/device.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index a65df42..ace6a12 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -765,6 +765,7 @@ static HRESULT WINAPI d3d_device3_AddViewport(IDirect3DDevice3 *iface, IDirect3D return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); + IDirect3DViewport3_AddRef(viewport); list_add_head(&device->viewport_list, &vp->entry); /* Viewport must be usable for Clear() after AddViewport, so set active_device here. */ vp->active_device = device; @@ -835,6 +836,8 @@ static HRESULT WINAPI d3d_device3_DeleteViewport(IDirect3DDevice3 *iface, IDirec vp->active_device = NULL; list_remove(&vp->entry); + IDirect3DViewport3_Release(viewport); + wined3d_mutex_unlock(); return D3D_OK;

1 0

Stefan Dösinger : ddraw: Check for NULL pointers in SetCurrentViewport.
by Alexandre Julliard 29 Jan '13

29 Jan '13

Module: wine Branch: master Commit: 351730e2d681e57fb2e32447ebf9bf9f4acedcc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=351730e2d681e57fb2e32447e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 26 13:39:45 2013 +0100 ddraw: Check for NULL pointers in SetCurrentViewport. --- dlls/ddraw/device.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 92828aa..a65df42 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1703,9 +1703,15 @@ static HRESULT WINAPI d3d_device3_SetCurrentViewport(IDirect3DDevice3 *iface, ID TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport3); + if (!vp) + { + WARN("Direct3DViewport3 is NULL, returning DDERR_INVALIDPARAMS\n"); + return DDERR_INVALIDPARAMS; + } + wined3d_mutex_lock(); /* Do nothing if the specified viewport is the same as the current one */ - if (This->current_viewport == vp ) + if (This->current_viewport == vp) { wined3d_mutex_unlock(); return D3D_OK; @@ -1745,7 +1751,8 @@ static HRESULT WINAPI d3d_device2_SetCurrentViewport(IDirect3DDevice2 *iface, ID TRACE("iface %p, viewport %p.\n", iface, viewport); - return d3d_device3_SetCurrentViewport(&device->IDirect3DDevice3_iface, &vp->IDirect3DViewport3_iface); + return d3d_device3_SetCurrentViewport(&device->IDirect3DDevice3_iface, + vp ? &vp->IDirect3DViewport3_iface : NULL); } /*****************************************************************************

1 0

Stefan Dösinger : ddraw: Check for NULL pointers in DeleteViewport.
by Alexandre Julliard 29 Jan '13

29 Jan '13

Module: wine Branch: master Commit: 8e6e420a9d3fe292f019a2f215941ca7836887f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e6e420a9d3fe292f019a2f21… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 26 13:39:44 2013 +0100 ddraw: Check for NULL pointers in DeleteViewport. --- dlls/ddraw/device.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 8b4e1e4..92828aa 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -817,6 +817,12 @@ static HRESULT WINAPI d3d_device3_DeleteViewport(IDirect3DDevice3 *iface, IDirec TRACE("iface %p, viewport %p.\n", iface, viewport); + if (!vp) + { + WARN("NULL viewport, returning DDERR_INVALIDPARAMS\n"); + return DDERR_INVALIDPARAMS; + } + wined3d_mutex_lock(); if (vp->active_device != device) @@ -841,7 +847,8 @@ static HRESULT WINAPI d3d_device2_DeleteViewport(IDirect3DDevice2 *iface, IDirec TRACE("iface %p, viewport %p.\n", iface, viewport); - return d3d_device3_DeleteViewport(&device->IDirect3DDevice3_iface, &vp->IDirect3DViewport3_iface); + return d3d_device3_DeleteViewport(&device->IDirect3DDevice3_iface, + vp ? &vp->IDirect3DViewport3_iface : NULL); } static HRESULT WINAPI d3d_device1_DeleteViewport(IDirect3DDevice *iface, IDirect3DViewport *viewport) @@ -851,7 +858,8 @@ static HRESULT WINAPI d3d_device1_DeleteViewport(IDirect3DDevice *iface, IDirect TRACE("iface %p, viewport %p.\n", iface, viewport); - return d3d_device3_DeleteViewport(&device->IDirect3DDevice3_iface, &vp->IDirect3DViewport3_iface); + return d3d_device3_DeleteViewport(&device->IDirect3DDevice3_iface, + vp ? &vp->IDirect3DViewport3_iface : NULL); } /*****************************************************************************

1 0

Stefan Dösinger : ddraw: Delete viewports when destroying the device.
by Alexandre Julliard 29 Jan '13

29 Jan '13

Module: wine Branch: master Commit: b822c259fd223a9def37b8799730548a38397a60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b822c259fd223a9def37b8799… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 26 13:39:43 2013 +0100 ddraw: Delete viewports when destroying the device. --- dlls/ddraw/device.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index c604c6a..8b4e1e4 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -233,6 +233,7 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface) if (!ref) { DWORD i; + struct list *vp_entry, *vp_entry2; wined3d_mutex_lock(); @@ -304,6 +305,12 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface) ddraw_handle_table_destroy(&This->handle_table); + LIST_FOR_EACH_SAFE(vp_entry, vp_entry2, &This->viewport_list) + { + struct d3d_viewport *vp = LIST_ENTRY(vp_entry, struct d3d_viewport, entry); + IDirect3DDevice3_DeleteViewport(&This->IDirect3DDevice3_iface, &vp->IDirect3DViewport3_iface); + } + TRACE("Releasing target %p.\n", This->target); /* Release the render target. */ if (This->version != 1)

1 0

Stefan Dösinger : ddraw: device:: GetCurrentViewport returns an error if no viewport is set.
by Alexandre Julliard 29 Jan '13

29 Jan '13

Module: wine Branch: master Commit: 9a0b2a510046309708a629acfd51e2ce6be13e08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a0b2a510046309708a629acf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 26 13:39:42 2013 +0100 ddraw: device::GetCurrentViewport returns an error if no viewport is set. --- dlls/ddraw/device.c | 14 ++++++++------ dlls/ddraw/viewport.c | 18 ++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 5d30994..c604c6a 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1758,16 +1758,18 @@ static HRESULT WINAPI d3d_device3_GetCurrentViewport(IDirect3DDevice3 *iface, ID return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - *viewport = &device->current_viewport->IDirect3DViewport3_iface; + if (!device->current_viewport) + { + wined3d_mutex_unlock(); + WARN("No current viewport, returning D3DERR_NOCURRENTVIEWPORT\n"); + return D3DERR_NOCURRENTVIEWPORT; + } - /* AddRef the returned viewport */ - if (*viewport) - IDirect3DViewport3_AddRef(*viewport); + *viewport = &device->current_viewport->IDirect3DViewport3_iface; + IDirect3DViewport3_AddRef(*viewport); TRACE("Returning interface %p.\n", *viewport); - wined3d_mutex_unlock(); - return D3D_OK; } diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 9231c19..f9eddda 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -342,10 +342,10 @@ static HRESULT WINAPI d3d_viewport_SetViewport(IDirect3DViewport3 *iface, D3DVIE This->viewports.vp1.dvMinZ = 0.0; This->viewports.vp1.dvMaxZ = 1.0; - if (This->active_device) { + if (This->active_device) + { IDirect3DDevice3 *d3d_device3 = &This->active_device->IDirect3DDevice3_iface; - IDirect3DDevice3_GetCurrentViewport(d3d_device3, &current_viewport); - if (current_viewport) + if (SUCCEEDED(IDirect3DDevice3_GetCurrentViewport(d3d_device3, &current_viewport))) { if (current_viewport == iface) viewport_activate(This, FALSE); IDirect3DViewport3_Release(current_viewport); @@ -705,8 +705,7 @@ static HRESULT WINAPI d3d_viewport_Clear(IDirect3DViewport3 *iface, hr = IDirect3DDevice7_Clear(&This->active_device->IDirect3DDevice7_iface, rect_count, rects, flags & (D3DCLEAR_ZBUFFER | D3DCLEAR_TARGET), color, 1.0, 0x00000000); - IDirect3DDevice3_GetCurrentViewport(d3d_device3, &current_viewport); - if (current_viewport) + if (SUCCEEDED(IDirect3DDevice3_GetCurrentViewport(d3d_device3, &current_viewport))) { struct d3d_viewport *vp = impl_from_IDirect3DViewport3(current_viewport); viewport_activate(vp, TRUE); @@ -979,10 +978,10 @@ static HRESULT WINAPI d3d_viewport_SetViewport2(IDirect3DViewport3 *iface, D3DVI memset(&(This->viewports.vp2), 0, sizeof(This->viewports.vp2)); memcpy(&(This->viewports.vp2), lpData, lpData->dwSize); - if (This->active_device) { + if (This->active_device) + { IDirect3DDevice3 *d3d_device3 = &This->active_device->IDirect3DDevice3_iface; - IDirect3DDevice3_GetCurrentViewport(d3d_device3, &current_viewport); - if (current_viewport) + if (SUCCEEDED(IDirect3DDevice3_GetCurrentViewport(d3d_device3, &current_viewport))) { if (current_viewport == iface) viewport_activate(This, FALSE); IDirect3DViewport3_Release(current_viewport); @@ -1087,8 +1086,7 @@ static HRESULT WINAPI d3d_viewport_Clear2(IDirect3DViewport3 *iface, DWORD rect_ hr = IDirect3DDevice7_Clear(&viewport->active_device->IDirect3DDevice7_iface, rect_count, rects, flags, color, depth, stencil); - IDirect3DDevice3_GetCurrentViewport(d3d_device3, &current_viewport); - if (current_viewport) + if (SUCCEEDED(IDirect3DDevice3_GetCurrentViewport(d3d_device3, &current_viewport))) { struct d3d_viewport *vp = impl_from_IDirect3DViewport3(current_viewport); viewport_activate(vp, TRUE);

1 0

Hans Leidekker : wbemprox: Return an empty object if the path is NULL or empty.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 07197a19f2843b41b32be2c1d07ba4cc54260a08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07197a19f2843b41b32be2c1d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 28 15:56:40 2013 +0100 wbemprox: Return an empty object if the path is NULL or empty. --- dlls/wbemprox/class.c | 4 ++-- dlls/wbemprox/services.c | 8 +++----- dlls/wbemprox/tests/query.c | 15 ++++++++++++++- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index f47987d..5205515 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -1015,8 +1015,8 @@ HRESULT create_class_object( const WCHAR *name, IEnumWbemClassObject *iter, UINT co->IWbemClassObject_iface.lpVtbl = &class_object_vtbl; co->refs = 1; - co->name = heap_strdupW( name ); - if (!co->name) + if (!name) co->name = NULL; + else if (!(co->name = heap_strdupW( name ))) { heap_free( co ); return E_OUTOFMEMORY; diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 4bcd824..bf202be 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -352,11 +352,9 @@ static HRESULT WINAPI wbem_services_GetObject( if (lFlags) FIXME("unsupported flags 0x%08x\n", lFlags); - if (!strObjectPath) - { - FIXME("no support for creating new classes\n"); - return WBEM_E_FAILED; - } + if (!strObjectPath || !strObjectPath[0]) + return create_class_object( NULL, NULL, 0, NULL, ppObject ); + return get_object( strObjectPath, ppObject ); } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 014bac4..dd3424f 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -146,7 +146,8 @@ static void test_Win32_Service( IWbemServices *services ) static const WCHAR stoppedW[] = {'S','t','o','p','p','e','d',0}; static const WCHAR serviceW[] = {'W','i','n','3','2','_','S','e','r','v','i','c','e','.', 'N','a','m','e','=','"','S','p','o','o','l','e','r','"',0}; - BSTR class = SysAllocString( serviceW ), method; + static const WCHAR emptyW[] = {0}; + BSTR class = SysAllocString( serviceW ), empty = SysAllocString( emptyW ), method; IWbemClassObject *service, *out; VARIANT state, retval; CIMTYPE type; @@ -219,6 +220,18 @@ static void test_Win32_Service( IWbemServices *services ) } VariantClear( &state ); IWbemClassObject_Release( service ); + + service = NULL; + hr = IWbemServices_GetObject( services, NULL, 0, NULL, &service, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (service) IWbemClassObject_Release( service ); + + service = NULL; + hr = IWbemServices_GetObject( services, empty, 0, NULL, &service, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (service) IWbemClassObject_Release( service ); + + SysFreeString( empty ); SysFreeString( class ); }

1 0

Andrew Eikum : wineoss.drv: Set reasonable defaults if driver reports invalid values.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 6da3ce276bd76a5242c8340c50042c95ea74a787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6da3ce276bd76a5242c8340c5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 28 08:52:55 2013 -0600 wineoss.drv: Set reasonable defaults if driver reports invalid values. --- dlls/wineoss.drv/mmdevdrv.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index ea6d452..2c81404 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1307,8 +1307,19 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, return E_FAIL; } - fmt->Format.nChannels = This->ai.max_channels; - fmt->Format.nSamplesPerSec = This->ai.max_rate; + /* some OSS drivers are buggy, so set reasonable defaults if + * the reported values seem wacky */ + fmt->Format.nChannels = max(This->ai.max_channels, This->ai.min_channels); + if(fmt->Format.nChannels == 0 || fmt->Format.nChannels > 8) + fmt->Format.nChannels = 2; + + if(This->ai.max_rate == 0) + fmt->Format.nSamplesPerSec = 44100; + else + fmt->Format.nSamplesPerSec = min(This->ai.max_rate, 44100); + if(fmt->Format.nSamplesPerSec < This->ai.min_rate) + fmt->Format.nSamplesPerSec = This->ai.min_rate; + fmt->dwChannelMask = get_channel_mask(fmt->Format.nChannels); fmt->Format.nBlockAlign = (fmt->Format.wBitsPerSample *

1 0

Detlef Riekenberg : wininet: Don't depend on user settings.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 097dee606eb02acee7421c3ab35f2fa57e036fb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=097dee606eb02acee7421c3ab… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jan 25 17:23:49 2013 +0100 wininet: Don't depend on user settings. --- dlls/wininet/tests/internet.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 3dc2233..bf5723c 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -319,14 +319,14 @@ static void test_max_conns(void) res = InternetQueryOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, &len); ok(res,"Got wrong return value %x\n", res); ok(len == sizeof(val), "got %d\n", len); - ok(val == 2, "got %d\n", val); + trace("INTERNET_OPTION_MAX_CONNS_PER_SERVER: %d\n", val); len = sizeof(val); val = 0xdeadbeef; res = InternetQueryOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER, &val, &len); ok(res,"Got wrong return value %x\n", res); ok(len == sizeof(val), "got %d\n", len); - ok(val == 4, "got %d\n", val); + trace("INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER: %d\n", val); val = 3; res = InternetSetOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, sizeof(val));

1 0

Detlef Riekenberg : wininet: Remove most GetLastError tests for IsDomainLegalCookieDomainW.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 2a66b25e6d97afeffe9a7fb3fbcd106a252f829e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a66b25e6d97afeffe9a7fb3f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jan 25 14:26:20 2013 +0100 wininet: Remove most GetLastError tests for IsDomainLegalCookieDomainW. --- dlls/wininet/tests/internet.c | 50 +---------------------------------------- 1 files changed, 1 insertions(+), 49 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index e9e2239..3dc2233 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -878,7 +878,6 @@ static void InternetTimeToSystemTimeW_test(void) static void test_IsDomainLegalCookieDomainW(void) { BOOL ret; - DWORD error; static const WCHAR empty[] = {0}; static const WCHAR dot[] = {'.',0}; static const WCHAR uk[] = {'u','k',0}; @@ -895,8 +894,7 @@ static void test_IsDomainLegalCookieDomainW(void) SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(NULL, NULL); - error = GetLastError(); - if (!ret && error == ERROR_CALL_NOT_IMPLEMENTED) + if (!ret && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { win_skip("IsDomainLegalCookieDomainW is not implemented\n"); return; @@ -904,82 +902,46 @@ static void test_IsDomainLegalCookieDomainW(void) ok(!ret || broken(ret), /* IE6 */ "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(com, NULL); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(NULL, gmail_com); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(empty, gmail_com); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_NAME || - broken(error == ERROR_INVALID_PARAMETER), /* IE6 */ - "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(com, empty); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_NAME || - broken(error == ERROR_INVALID_PARAMETER), /* IE6 */ - "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(gmail_com, dot); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_NAME || - broken(error == 0xdeadbeef), /* IE6 */ - "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(dot, gmail_com); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_NAME || - broken(error == 0xdeadbeef), /* IE6 */ - "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(com, com); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == 0xdeadbeef, "got %u expected 0xdeadbeef\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(com, dot_com); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_NAME || - broken(error == 0xdeadbeef), /* IE6 */ - "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(dot_com, com); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_NAME || - broken(error == 0xdeadbeef), /* IE6 */ - "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(com, gmail_com); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_SXS_KEY_NOT_FOUND || - error == ERROR_SUCCESS || /* IE8 on W2K3 */ - error == 0xdeadbeef, /* up to IE7 */ - "unexpected error: %u\n", error); ret = pIsDomainLegalCookieDomainW(gmail_com, gmail_com); ok(ret, "IsDomainLegalCookieDomainW failed\n"); @@ -992,13 +954,7 @@ static void test_IsDomainLegalCookieDomainW(void) SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(gmail_co_uk, co_uk); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_SXS_KEY_NOT_FOUND || /* IE8 on XP */ - error == ERROR_FILE_NOT_FOUND || /* IE8 on Vista */ - error == ERROR_SUCCESS || /* IE8 on W2K3 */ - error == 0xdeadbeef, /* up to IE7 */ - "unexpected error: %u\n", error); ret = pIsDomainLegalCookieDomainW(uk, co_uk); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); @@ -1017,11 +973,7 @@ static void test_IsDomainLegalCookieDomainW(void) SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(dot_gmail_com, mail_gmail_com); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_NAME || - broken(error == 0xdeadbeef), /* IE6 */ - "got %u expected ERROR_INVALID_NAME\n", error); ret = pIsDomainLegalCookieDomainW(gmail_com, mail_gmail_com); ok(ret, "IsDomainLegalCookieDomainW failed\n");

1 0

Detlef Riekenberg : wininet: Fix a test failure on w2k.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: e1c2f18ab10d0e7c2852bc1c762fc3fa2e60832a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1c2f18ab10d0e7c2852bc1c7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jan 25 14:26:18 2013 +0100 wininet: Fix a test failure on w2k. --- dlls/wininet/tests/internet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 15a600c..e9e2239 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -436,7 +436,7 @@ static void test_complicated_cookie(void) memset(wbuf, 0xac, sizeof(wbuf)); ret = InternetGetCookieW(testing_example_comW, NULL, wbuf, &len); ok(ret == TRUE,"InternetGetCookieW failed\n"); - ok(len == 19, "len = %u\n", len); + ok(len == 19 || broken(len==18), "len = %u\n", len); ok(lstrlenW(wbuf) == 18, "strlenW(wbuf) = %u\n", lstrlenW(wbuf)); len = 10;

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
74
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 January 2013