wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Henri Verbeet : ddraw/tests: Check some more return values (LLVM/Clang).
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: c45609f15c18dd0102ee1d6637010e8ab19c1ce3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c45609f15c18dd0102ee1d663… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 16 10:38:40 2009 +0200 ddraw/tests: Check some more return values (LLVM/Clang). --- dlls/ddraw/tests/d3d.c | 5 +++++ dlls/ddraw/tests/dsurface.c | 1 + dlls/ddraw/tests/visual.c | 2 ++ 3 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index d9b1c72..9104147 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -961,6 +961,7 @@ static BOOL D3D1_createObjects(void) ddsd.dwWidth = 256; ddsd.dwHeight = 256; hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &Surface1, NULL); + ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface returned %#x.\n", hr); if (!Surface1) { skip("DDSCAPS_3DDEVICE surface not available\n"); return FALSE; @@ -1388,6 +1389,7 @@ static void Direct3D1Test(void) vp_data.dvScaleX = 1; vp_data.dvScaleY = 1; hr = IDirect3DViewport_SetViewport(Viewport, &vp_data); + ok(SUCCEEDED(hr), "IDirect3DViewport_SetViewport returned %#x.\n", hr); i = 12345; hr = IDirect3DViewport_TransformVertices(Viewport, sizeof(offscreentest) / sizeof(offscreentest[0]), &transformdata, D3DTRANSFORM_CLIPPED, @@ -1397,6 +1399,7 @@ static void Direct3D1Test(void) vp_data.dwWidth = 256; vp_data.dwHeight = 256; hr = IDirect3DViewport_SetViewport(Viewport, &vp_data); + ok(SUCCEEDED(hr), "IDirect3DViewport_SetViewport returned %#x.\n", hr); i = 12345; hr = IDirect3DViewport_TransformVertices(Viewport, sizeof(offscreentest) / sizeof(offscreentest[0]), &transformdata, D3DTRANSFORM_CLIPPED, @@ -2598,10 +2601,12 @@ static void DeviceLoadTest(void) memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); ddsd.dwSize = sizeof(ddsd); hr = IDirectDrawSurface7_GetSurfaceDesc(texture_levels[0][i1], &ddsd); + ok(SUCCEEDED(hr), "IDirectDrawSurface7_GetSurfaceDesc returned %#x.\n", hr); memset(&ddsd2, 0, sizeof(DDSURFACEDESC2)); ddsd2.dwSize = sizeof(ddsd2); hr = IDirectDrawSurface7_GetSurfaceDesc(texture_levels[1][i], &ddsd2); + ok(SUCCEEDED(hr), "IDirectDrawSurface7_GetSurfaceDesc returned %#x.\n", hr); if (ddsd.dwWidth == ddsd2.dwWidth && ddsd.dwHeight == ddsd2.dwHeight) { diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 1feab9b..44be603 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2433,6 +2433,7 @@ static void PrivateDataTest(void) ref2 = getref((IUnknown *) lpDD); ok(ref2 == ref + 1, "Object reference is %d, expected %d\n", ref2, ref + 1); hr = IDirectDrawSurface7_FreePrivateData(surface7, &IID_IDirectDrawSurface7); + ok(SUCCEEDED(hr), "IDirectDrawSurface7_FreePrivateData returned %#x.\n", hr); ref2 = getref((IUnknown *) lpDD); ok(ref2 == ref, "Object reference is %d, expected %d\n", ref2, ref); diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 450d231..ac70b31 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -615,10 +615,12 @@ static void offscreen_test(IDirect3DDevice7 *device) out: hr = IDirect3DDevice7_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice7_SetTexture returned %#x.\n", hr); /* restore things */ if(backbuffer) { hr = IDirect3DDevice7_SetRenderTarget(device, backbuffer, 0); + ok(SUCCEEDED(hr), "IDirect3DDevice7_SetRenderTarget returned %#x.\n", hr); IDirectDrawSurface7_Release(backbuffer); } if(offscreen) {

1 0

Henri Verbeet : d3d8: Get rid of some unused variables in IDirect3DDevice8Impl_CopyRects() (LLVM /Clang).
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: f4005c371f5b9601ff04f8f5ff8651b60b618332 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4005c371f5b9601ff04f8f5f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 16 10:38:39 2009 +0200 d3d8: Get rid of some unused variables in IDirect3DDevice8Impl_CopyRects() (LLVM/Clang). --- dlls/d3d8/device.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 7993fac..1dcf98b 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -882,9 +882,6 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(LPDIRECT3DDEVICE8 iface, ID HRESULT hr = WINED3D_OK; WINED3DFORMAT srcFormat, destFormat; - UINT srcWidth, destWidth; - UINT srcHeight, destHeight; - UINT srcSize; WINED3DSURFACE_DESC winedesc; TRACE("(%p) pSrcSur=%p, pSourceRects=%p, cRects=%d, pDstSur=%p, pDestPtsArr=%p\n", iface, @@ -896,14 +893,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(LPDIRECT3DDEVICE8 iface, ID wined3d_mutex_lock(); IWineD3DSurface_GetDesc(Source->wineD3DSurface, &winedesc); srcFormat = winedesc.format; - srcWidth = winedesc.width; - srcHeight = winedesc.height; - srcSize = winedesc.size; IWineD3DSurface_GetDesc(Dest->wineD3DSurface, &winedesc); destFormat = winedesc.format; - destWidth = winedesc.width; - destHeight = winedesc.height; /* Check that the source and destination formats match */ if (srcFormat != destFormat && WINED3DFMT_UNKNOWN != destFormat) { @@ -913,7 +905,6 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(LPDIRECT3DDEVICE8 iface, ID } else if (WINED3DFMT_UNKNOWN == destFormat) { TRACE("(%p) : Converting destination surface from WINED3DFMT_UNKNOWN to the source format\n", iface); IWineD3DSurface_SetFormat(Dest->wineD3DSurface, srcFormat); - destFormat = srcFormat; } /* Quick if complete copy ... */

1 0

Jeff Zaroyko : d3dxof: Remove unused variable.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: 8846f8ac301ec43267035ced95d81aedc9ddb39a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8846f8ac301ec43267035ced9… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Fri Oct 16 20:36:48 2009 +1100 d3dxof: Remove unused variable. --- dlls/d3dxof/parsing.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 4a0ecaa..dc7b473 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1020,7 +1020,6 @@ static BOOL parse_object_members_list(parse_buffer * buf) DWORD token; int i; xtemplate* pt = buf->pxt[buf->level]; - DWORD last_dword = 0; for (i = 0; i < pt->nb_members; i++) { @@ -1092,7 +1091,6 @@ static BOOL parse_object_members_list(parse_buffer * buf) if (token == TOKEN_INTEGER) { get_TOKEN(buf); - last_dword = *(DWORD*)buf->value; TRACE("%s = %d\n", pt->members[i].name, *(DWORD*)buf->value); /* Assume larger size */ if (!check_buffer(buf, 4))

1 0

Ken Thomases : winmm/tests: Don' t complain for Wine drivers that allow multiple wave-out opens.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: 8b086d6050704c4722f7700c9ed64f597133468a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b086d6050704c4722f7700c9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Oct 16 04:10:09 2009 -0500 winmm/tests: Don't complain for Wine drivers that allow multiple wave-out opens. --- dlls/winmm/tests/wave.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 3e3afbd..98a16f5 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -59,12 +59,16 @@ static void test_multiple_waveopens(void) } ret = waveOutOpen(&handle2, 0, &wfx, 0, 0, 0); - /* In windows this is most likely allowed, in wine an application can use the waveout - * interface, but so can directsound.. this causes problems if directsound goes active + /* Modern Windows allows for wave-out devices to be opened multiple times. + * Some Wine audio drivers allow that and some don't. To avoid false alarms + * for those that do, don't "todo_wine ok(...)" on success. */ - todo_wine ok(ret == MMSYSERR_NOERROR || broken(ret == MMSYSERR_ALLOCATED), /* winME */ - "waveOutOpen returns: %x\n", ret); - if (ret == MMSYSERR_NOERROR) + if (ret != MMSYSERR_NOERROR) + { + todo_wine ok(ret == MMSYSERR_NOERROR || broken(ret == MMSYSERR_ALLOCATED), /* winME */ + "second waveOutOpen returns: %x\n", ret); + } + else waveOutClose(handle2); waveOutClose(handle1);

1 0

Ken Thomases : winecoreaudio: Quiet a noisy FIXME.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: f639c4df54079272951cd916dc8e880dd28e8f76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f639c4df54079272951cd916d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 15 19:19:20 2009 -0500 winecoreaudio: Quiet a noisy FIXME. --- dlls/winecoreaudio.drv/audiounit.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index f69b03d..bef882b 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -133,7 +133,9 @@ int AudioUnit_InitializeWithStreamDescription(AudioUnit au, AudioStreamBasicDesc int AudioUnit_SetVolume(AudioUnit au, float left, float right) { OSStatus err = noErr; - FIXME("independent left/right volume not implemented (%f, %f)\n", left, right); + static int once; + + if (!once++) FIXME("independent left/right volume not implemented (%f, %f)\n", left, right); err = AudioUnitSetParameter(au, kHALOutputParam_Volume, kAudioUnitParameterFlag_Output, 0, left, 0); @@ -148,7 +150,9 @@ int AudioUnit_SetVolume(AudioUnit au, float left, float right) int AudioUnit_GetVolume(AudioUnit au, float *left, float *right) { OSStatus err = noErr; - FIXME("independent left/right volume not implemented\n"); + static int once; + + if (!once++) FIXME("independent left/right volume not implemented\n"); err = AudioUnitGetParameter(au, kHALOutputParam_Volume, kAudioUnitParameterFlag_Output, 0, left); if (err != noErr)

1 0

Andrew Eikum : mshtml: Implement IHTMLLocation::get_hostname.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: fc3808e55351229d56ee1acdda82f5e6fdcca148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc3808e55351229d56ee1acdd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 15 16:17:39 2009 -0500 mshtml: Implement IHTMLLocation::get_hostname. --- dlls/mshtml/htmllocation.c | 20 ++++++++++++++++++-- dlls/mshtml/tests/htmllocation.c | 12 ++++++------ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index badf111..e21ec76 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -274,12 +274,28 @@ static HRESULT WINAPI HTMLLocation_put_hostname(IHTMLLocation *iface, BSTR v) static HRESULT WINAPI HTMLLocation_get_hostname(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); + URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW)}; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); if(!p) return E_POINTER; - return E_NOTIMPL; + url.dwHostNameLength = 1; + hres = get_url_components(This, &url); + if(FAILED(hres)) + return hres; + + if(!url.dwHostNameLength){ + *p = NULL; + return S_OK; + } + + *p = SysAllocStringLen(url.lpszHostName, url.dwHostNameLength); + if(!*p) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI HTMLLocation_put_port(IHTMLLocation *iface, BSTR v) diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index aaf8ecf..8cd7e1d 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -59,7 +59,7 @@ static const struct location_test http_test = { "http://www.winehq.org/?search#hash", FALSE, "http:", TRUE, "www.winehq.org:80", TRUE, - "www.winehq.org", FALSE, + "www.winehq.org", TRUE, "80", TRUE, "", FALSE, "?search", FALSE, @@ -73,7 +73,7 @@ static const struct location_test http_file_test = { "http://www.winehq.org/file?search#hash", TRUE, "http:", TRUE, "www.winehq.org:80", TRUE, - "www.winehq.org", FALSE, + "www.winehq.org", TRUE, "80", TRUE, "file", FALSE, "?search", FALSE, @@ -87,7 +87,7 @@ static const struct location_test ftp_test = { "ftp://ftp.winehq.org/", TRUE, "ftp:", TRUE, "ftp.winehq.org:21", TRUE, - "ftp.winehq.org", FALSE, + "ftp.winehq.org", TRUE, "21", TRUE, "", FALSE, NULL, FALSE, @@ -101,7 +101,7 @@ static const struct location_test ftp_file_test = { "ftp://ftp.winehq.org/file", TRUE, "ftp:", TRUE, "ftp.winehq.org:21", TRUE, - "ftp.winehq.org", FALSE, + "ftp.winehq.org", TRUE, "21", TRUE, "file", FALSE, NULL, FALSE, @@ -115,7 +115,7 @@ static const struct location_test file_test = { "file:///C:/windows/win.ini", FALSE, "file:", TRUE, NULL, TRUE, - NULL, FALSE, + NULL, TRUE, "", TRUE, "C:\\windows\\win.ini", TRUE, NULL, FALSE, @@ -219,7 +219,7 @@ static void test_hostname(IHTMLLocation *loc, const struct location_test *test) test->name, E_POINTER, hres); hres = IHTMLLocation_get_hostname(loc, &str); - todo_wine ok(hres == S_OK, "%s: get_hostname failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: get_hostname failed: 0x%08x\n", test->name, hres); if(hres == S_OK){ if(test->hostname_ok) ok(str_eq_wa(str, test->hostname),

1 0

Andrew Eikum : mshtml: Implement IHTMLLocation::get_host.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: 7cb9fe1064f68629cc41901d49a169629d532756 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cb9fe1064f68629cc41901d4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 15 16:17:28 2009 -0500 mshtml: Implement IHTMLLocation::get_host. --- dlls/mshtml/htmllocation.c | 32 ++++++++++++++++++++++++++++++-- dlls/mshtml/tests/htmllocation.c | 12 ++++++------ 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index e991cf3..badf111 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -228,12 +228,40 @@ static HRESULT WINAPI HTMLLocation_put_host(IHTMLLocation *iface, BSTR v) static HRESULT WINAPI HTMLLocation_get_host(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); + URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW)}; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); if(!p) return E_POINTER; - return E_NOTIMPL; + url.dwHostNameLength = 1; + hres = get_url_components(This, &url); + if(FAILED(hres)) + return hres; + + if(!url.dwHostNameLength){ + *p = NULL; + return S_OK; + } + + if(url.nPort) { + /* <hostname>:<port> */ + const WCHAR format[] = {'%','d',0}; + DWORD len = url.dwHostNameLength + 1 + 5 + 1; + WCHAR buf[len]; + + memcpy(buf, url.lpszHostName, url.dwHostNameLength * sizeof(WCHAR)); + buf[url.dwHostNameLength] = ':'; + snprintfW(buf + url.dwHostNameLength + 1, 6, format, url.nPort); + *p = SysAllocString(buf); + }else + *p = SysAllocStringLen(url.lpszHostName, url.dwHostNameLength); + + if(!*p) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI HTMLLocation_put_hostname(IHTMLLocation *iface, BSTR v) diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index 57b6bcf..aaf8ecf 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -58,7 +58,7 @@ static const struct location_test http_test = { http_url, "http://www.winehq.org/?search#hash", FALSE, "http:", TRUE, - "www.winehq.org:80", FALSE, + "www.winehq.org:80", TRUE, "www.winehq.org", FALSE, "80", TRUE, "", FALSE, @@ -72,7 +72,7 @@ static const struct location_test http_file_test = { http_file_url, "http://www.winehq.org/file?search#hash", TRUE, "http:", TRUE, - "www.winehq.org:80", FALSE, + "www.winehq.org:80", TRUE, "www.winehq.org", FALSE, "80", TRUE, "file", FALSE, @@ -86,7 +86,7 @@ static const struct location_test ftp_test = { ftp_url, "ftp://ftp.winehq.org/", TRUE, "ftp:", TRUE, - "ftp.winehq.org:21", FALSE, + "ftp.winehq.org:21", TRUE, "ftp.winehq.org", FALSE, "21", TRUE, "", FALSE, @@ -100,7 +100,7 @@ static const struct location_test ftp_file_test = { ftp_file_url, "ftp://ftp.winehq.org/file", TRUE, "ftp:", TRUE, - "ftp.winehq.org:21", FALSE, + "ftp.winehq.org:21", TRUE, "ftp.winehq.org", FALSE, "21", TRUE, "file", FALSE, @@ -114,7 +114,7 @@ static const struct location_test file_test = { file_url, "file:///C:/windows/win.ini", FALSE, "file:", TRUE, - NULL, FALSE, + NULL, TRUE, NULL, FALSE, "", TRUE, "C:\\windows\\win.ini", TRUE, @@ -195,7 +195,7 @@ static void test_host(IHTMLLocation *loc, const struct location_test *test) test->name, E_POINTER, hres); hres = IHTMLLocation_get_host(loc, &str); - todo_wine ok(hres == S_OK, "%s: get_host failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: get_host failed: 0x%08x\n", test->name, hres); if(hres == S_OK){ if(test->host_ok) ok(str_eq_wa(str, test->host),

1 0

Andrew Eikum : mshtml: Implement IHTMLLocation::get_protocol.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: c9adc4149c2dabfeac8b7068cf48d003d51905c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9adc4149c2dabfeac8b7068c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 15 16:17:17 2009 -0500 mshtml: Implement IHTMLLocation::get_protocol. --- dlls/mshtml/htmllocation.c | 23 +++++++++++++++++++++-- dlls/mshtml/tests/htmllocation.c | 12 ++++++------ 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index e86cee6..e991cf3 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -191,12 +191,31 @@ static HRESULT WINAPI HTMLLocation_put_protocol(IHTMLLocation *iface, BSTR v) static HRESULT WINAPI HTMLLocation_get_protocol(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); + URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW)}; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); if(!p) return E_POINTER; - return E_NOTIMPL; + url.dwSchemeLength = 1; + hres = get_url_components(This, &url); + if(FAILED(hres)) + return hres; + + if(!url.dwSchemeLength) { + FIXME("Unexpected blank protocol\n"); + return E_NOTIMPL; + }else { + WCHAR buf[url.dwSchemeLength + 1]; + memcpy(buf, url.lpszScheme, url.dwSchemeLength * sizeof(WCHAR)); + buf[url.dwSchemeLength] = ':'; + *p = SysAllocStringLen(buf, url.dwSchemeLength + 1); + } + if(!*p) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI HTMLLocation_put_host(IHTMLLocation *iface, BSTR v) diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index e271f00..57b6bcf 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -57,7 +57,7 @@ static const struct location_test http_test = { "HTTP", http_url, "http://www.winehq.org/?search#hash", FALSE, - "http:", FALSE, + "http:", TRUE, "www.winehq.org:80", FALSE, "www.winehq.org", FALSE, "80", TRUE, @@ -71,7 +71,7 @@ static const struct location_test http_file_test = { "HTTP with file", http_file_url, "http://www.winehq.org/file?search#hash", TRUE, - "http:", FALSE, + "http:", TRUE, "www.winehq.org:80", FALSE, "www.winehq.org", FALSE, "80", TRUE, @@ -85,7 +85,7 @@ static const struct location_test ftp_test = { "FTP", ftp_url, "ftp://ftp.winehq.org/", TRUE, - "ftp:", FALSE, + "ftp:", TRUE, "ftp.winehq.org:21", FALSE, "ftp.winehq.org", FALSE, "21", TRUE, @@ -99,7 +99,7 @@ static const struct location_test ftp_file_test = { "FTP with file", ftp_file_url, "ftp://ftp.winehq.org/file", TRUE, - "ftp:", FALSE, + "ftp:", TRUE, "ftp.winehq.org:21", FALSE, "ftp.winehq.org", FALSE, "21", TRUE, @@ -113,7 +113,7 @@ static const struct location_test file_test = { "FILE", file_url, "file:///C:/windows/win.ini", FALSE, - "file:", FALSE, + "file:", TRUE, NULL, FALSE, NULL, FALSE, "", TRUE, @@ -171,7 +171,7 @@ static void test_protocol(IHTMLLocation *loc, const struct location_test *test) test->name, E_POINTER, hres); hres = IHTMLLocation_get_protocol(loc, &str); - todo_wine ok(hres == S_OK, "%s: get_protocol failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: get_protocol failed: 0x%08x\n", test->name, hres); if(hres == S_OK){ if(test->protocol_ok) ok(str_eq_wa(str, test->protocol),

1 0

Detlef Riekenberg : d3d8/tests: Mark a failure of GetLightEnable on Win9x as broken().
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: 7189c58f2f9a988c970760a097b3001ddcebcece URL: http://source.winehq.org/git/wine.git/?a=commit;h=7189c58f2f9a988c970760a09… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Oct 15 21:14:18 2009 +0200 d3d8/tests: Mark a failure of GetLightEnable on Win9x as broken(). --- dlls/d3d8/tests/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a869e79..2a6a10e 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1248,7 +1248,9 @@ static void test_lights(void) broken(hr == D3DERR_INVALIDCALL), /* Some Win9x and WinME */ "Enabling one light more than supported returned %08x\n", hr); hr = IDirect3DDevice8_GetLightEnable(device, i + 1, &enabled); - ok(hr == D3D_OK, "GetLightEnable on light %u failed with %08x\n", i + 1, hr); + ok(hr == D3D_OK || + broken(hr == D3DERR_INVALIDCALL), /* Some Win9x and WinME */ + "GetLightEnable on light %u failed with %08x\n", i + 1, hr); ok(enabled, "Light %d is %s\n", i + 1, enabled ? "enabled" : "disabled"); hr = IDirect3DDevice8_LightEnable(device, i + 1, FALSE); ok(hr == D3D_OK, "Disabling the additional returned %08x\n", hr);

1 0

Nikolay Sivov : include: Use unicode neutral SendMessage for DateTime and Monthcal macros.
by Alexandre Julliard 16 Oct '09

16 Oct '09

Module: wine Branch: master Commit: dd96319deee704d6d1922697d009000899cf5c3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd96319deee704d6d1922697d… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 15 20:58:16 2009 +0400 include: Use unicode neutral SendMessage for DateTime and Monthcal macros. --- include/commctrl.h | 64 ++++++++++++++++++++++++++-------------------------- 1 files changed, 32 insertions(+), 32 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index f2ea3ae..b8ebe94 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -4739,51 +4739,51 @@ typedef struct tagNMDAYSTATE /* macros */ #define MonthCal_GetCurSel(hmc, pst) \ - (BOOL)SNDMSGA(hmc, MCM_GETCURSEL, 0, (LPARAM)(pst)) + (BOOL)SNDMSG(hmc, MCM_GETCURSEL, 0, (LPARAM)(pst)) #define MonthCal_SetCurSel(hmc, pst) \ - (BOOL)SNDMSGA(hmc, MCM_SETCURSEL, 0, (LPARAM)(pst)) + (BOOL)SNDMSG(hmc, MCM_SETCURSEL, 0, (LPARAM)(pst)) #define MonthCal_GetMaxSelCount(hmc) \ - (DWORD)SNDMSGA(hmc, MCM_GETMAXSELCOUNT, 0, 0L) + (DWORD)SNDMSG(hmc, MCM_GETMAXSELCOUNT, 0, 0L) #define MonthCal_SetMaxSelCount(hmc, n) \ - (BOOL)SNDMSGA(hmc, MCM_SETMAXSELCOUNT, (WPARAM)(n), 0L) + (BOOL)SNDMSG(hmc, MCM_SETMAXSELCOUNT, (WPARAM)(n), 0L) #define MonthCal_GetSelRange(hmc, rgst) \ - SNDMSGA(hmc, MCM_GETSELRANGE, 0, (LPARAM) (rgst)) + SNDMSG(hmc, MCM_GETSELRANGE, 0, (LPARAM) (rgst)) #define MonthCal_SetSelRange(hmc, rgst) \ - SNDMSGA(hmc, MCM_SETSELRANGE, 0, (LPARAM) (rgst)) + SNDMSG(hmc, MCM_SETSELRANGE, 0, (LPARAM) (rgst)) #define MonthCal_GetMonthRange(hmc, gmr, rgst) \ - (DWORD)SNDMSGA(hmc, MCM_GETMONTHRANGE, (WPARAM)(gmr), (LPARAM)(rgst)) + (DWORD)SNDMSG(hmc, MCM_GETMONTHRANGE, (WPARAM)(gmr), (LPARAM)(rgst)) #define MonthCal_SetDayState(hmc, cbds, rgds) \ - SNDMSGA(hmc, MCM_SETDAYSTATE, (WPARAM)(cbds), (LPARAM)(rgds)) + SNDMSG(hmc, MCM_SETDAYSTATE, (WPARAM)(cbds), (LPARAM)(rgds)) #define MonthCal_GetMinReqRect(hmc, prc) \ - SNDMSGA(hmc, MCM_GETMINREQRECT, 0, (LPARAM)(prc)) + SNDMSG(hmc, MCM_GETMINREQRECT, 0, (LPARAM)(prc)) #define MonthCal_SetColor(hmc, iColor, clr)\ - SNDMSGA(hmc, MCM_SETCOLOR, iColor, clr) + SNDMSG(hmc, MCM_SETCOLOR, iColor, clr) #define MonthCal_GetColor(hmc, iColor) \ - SNDMSGA(hmc, MCM_SETCOLOR, iColor, 0) + SNDMSG(hmc, MCM_SETCOLOR, iColor, 0) #define MonthCal_GetToday(hmc, pst)\ - (BOOL)SNDMSGA(hmc, MCM_GETTODAY, 0, (LPARAM)pst) + (BOOL)SNDMSG(hmc, MCM_GETTODAY, 0, (LPARAM)pst) #define MonthCal_SetToday(hmc, pst)\ - SNDMSGA(hmc, MCM_SETTODAY, 0, (LPARAM)pst) + SNDMSG(hmc, MCM_SETTODAY, 0, (LPARAM)pst) #define MonthCal_HitTest(hmc, pinfo) \ - SNDMSGA(hmc, MCM_HITTEST, 0, (LPARAM)(PMCHITTESTINFO)pinfo) + SNDMSG(hmc, MCM_HITTEST, 0, (LPARAM)(PMCHITTESTINFO)pinfo) #define MonthCal_SetFirstDayOfWeek(hmc, iDay) \ - SNDMSGA(hmc, MCM_SETFIRSTDAYOFWEEK, 0, iDay) + SNDMSG(hmc, MCM_SETFIRSTDAYOFWEEK, 0, iDay) #define MonthCal_GetFirstDayOfWeek(hmc) \ - (DWORD)SNDMSGA(hmc, MCM_GETFIRSTDAYOFWEEK, 0, 0) + (DWORD)SNDMSG(hmc, MCM_GETFIRSTDAYOFWEEK, 0, 0) #define MonthCal_GetRange(hmc, rgst) \ - (DWORD)SNDMSGA(hmc, MCM_GETRANGE, 0, (LPARAM)(rgst)) + (DWORD)SNDMSG(hmc, MCM_GETRANGE, 0, (LPARAM)(rgst)) #define MonthCal_SetRange(hmc, gd, rgst) \ - (BOOL)SNDMSGA(hmc, MCM_SETRANGE, (WPARAM)(gd), (LPARAM)(rgst)) + (BOOL)SNDMSG(hmc, MCM_SETRANGE, (WPARAM)(gd), (LPARAM)(rgst)) #define MonthCal_GetMonthDelta(hmc) \ - (int)SNDMSGA(hmc, MCM_GETMONTHDELTA, 0, 0) + (int)SNDMSG(hmc, MCM_GETMONTHDELTA, 0, 0) #define MonthCal_SetMonthDelta(hmc, n) \ - (int)SNDMSGA(hmc, MCM_SETMONTHDELTA, n, 0) + (int)SNDMSG(hmc, MCM_SETMONTHDELTA, n, 0) #define MonthCal_GetMaxTodayWidth(hmc) \ - (DWORD)SNDMSGA(hmc, MCM_GETMAXTODAYWIDTH, 0, 0) + (DWORD)SNDMSG(hmc, MCM_GETMAXTODAYWIDTH, 0, 0) #define MonthCal_SetUnicodeFormat(hwnd, fUnicode) \ - (BOOL)SNDMSGA((hwnd), MCM_SETUNICODEFORMAT, (WPARAM)(fUnicode), 0) + (BOOL)SNDMSG((hwnd), MCM_SETUNICODEFORMAT, (WPARAM)(fUnicode), 0) #define MonthCal_GetUnicodeFormat(hwnd) \ - (BOOL)SNDMSGA((hwnd), MCM_GETUNICODEFORMAT, 0, 0) + (BOOL)SNDMSG((hwnd), MCM_GETUNICODEFORMAT, 0, 0) /************************************************************************** @@ -4943,28 +4943,28 @@ DECL_WINELIB_TYPE_AW(LPNMDATETIMEFORMATQUERY) #define DateTime_GetSystemtime(hdp, pst) \ - (DWORD)SNDMSGA (hdp, DTM_GETSYSTEMTIME , 0, (LPARAM)(pst)) + (DWORD)SNDMSG (hdp, DTM_GETSYSTEMTIME , 0, (LPARAM)(pst)) #define DateTime_SetSystemtime(hdp, gd, pst) \ - (BOOL)SNDMSGA (hdp, DTM_SETSYSTEMTIME, (LPARAM)(gd), (LPARAM)(pst)) + (BOOL)SNDMSG (hdp, DTM_SETSYSTEMTIME, (LPARAM)(gd), (LPARAM)(pst)) #define DateTime_GetRange(hdp, rgst) \ - (DWORD)SNDMSGA (hdp, DTM_GETRANGE, 0, (LPARAM)(rgst)) + (DWORD)SNDMSG (hdp, DTM_GETRANGE, 0, (LPARAM)(rgst)) #define DateTime_SetRange(hdp, gd, rgst) \ - (BOOL)SNDMSGA (hdp, DTM_SETRANGE, (WPARAM)(gd), (LPARAM)(rgst)) + (BOOL)SNDMSG (hdp, DTM_SETRANGE, (WPARAM)(gd), (LPARAM)(rgst)) #define DateTime_SetFormatA(hdp, sz) \ (BOOL)SNDMSGA (hdp, DTM_SETFORMATA, 0, (LPARAM)(sz)) #define DateTime_SetFormatW(hdp, sz) \ (BOOL)SNDMSGW (hdp, DTM_SETFORMATW, 0, (LPARAM)(sz)) #define DateTime_SetFormat WINELIB_NAME_AW(DateTime_SetFormat) #define DateTime_GetMonthCalColor(hdp, iColor) \ - SNDMSGA (hdp, DTM_GETMCCOLOR, iColor, 0) + SNDMSG (hdp, DTM_GETMCCOLOR, iColor, 0) #define DateTime_SetMonthCalColor(hdp, iColor, clr) \ - SNDMSGA (hdp, DTM_SETMCCOLOR, iColor, clr) + SNDMSG (hdp, DTM_SETMCCOLOR, iColor, clr) #define DateTime_GetMonthCal(hdp) \ - (HWND) SNDMSGA (hdp, DTM_GETMONTHCAL, 0, 0) + (HWND) SNDMSG (hdp, DTM_GETMONTHCAL, 0, 0) #define DateTime_SetMonthCalFont(hdp, hfont, fRedraw) \ - SNDMSGA (hdp, DTM_SETMCFONT, (WPARAM)hfont, (LPARAM)fRedraw) + SNDMSG (hdp, DTM_SETMCFONT, (WPARAM)hfont, (LPARAM)fRedraw) #define DateTime_GetMonthCalFont(hdp) \ - SNDMSGA (hdp, DTM_GETMCFONT, 0, 0) + SNDMSG (hdp, DTM_GETMCFONT, 0, 0) #define DA_LAST (0x7fffffff) #define DPA_APPEND (0x7fffffff)

1 0

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 October 2009