September 2012 - Wine-commits

Rico Schüller : d3dx9: Use float functions in D3DXQuaternionSlerp().
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: ce319e9d53374e94e544d958f4e490aa9dc4e104 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce319e9d53374e94e544d958f… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 26 13:57:01 2012 +0200 d3dx9: Use float functions in D3DXQuaternionSlerp(). --- dlls/d3dx9_36/math.c | 37 ++++++++++++++++++++----------------- 1 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 1e80e2e..7599a0a 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1435,32 +1435,35 @@ D3DXQUATERNION* WINAPI D3DXQuaternionRotationYawPitchRoll(D3DXQUATERNION *pout, return pout; } -D3DXQUATERNION* WINAPI D3DXQuaternionSlerp(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, FLOAT t) +D3DXQUATERNION * WINAPI D3DXQuaternionSlerp(D3DXQUATERNION *out, const D3DXQUATERNION *q1, + const D3DXQUATERNION *q2, FLOAT t) { - FLOAT dot, epsilon, temp, theta, u; + FLOAT dot, temp; - TRACE("(%p, %p, %p, %f)\n", pout, pq1, pq2, t); + TRACE("out %p, q1 %p, q2 %p, t %f\n", out, q1, q2, t); - epsilon = 1.0f; temp = 1.0f - t; - u = t; - dot = D3DXQuaternionDot(pq1, pq2); - if ( dot < 0.0f ) + dot = D3DXQuaternionDot(q1, q2); + if (dot < 0.0f) { - epsilon = -1.0f; + t = -t; dot = -dot; } - if( 1.0f - dot > 0.001f ) + + if (1.0f - dot > 0.001f) { - theta = acos(dot); - temp = sin(theta * temp) / sin(theta); - u = sin(theta * u) / sin(theta); + FLOAT theta = acosf(dot); + + temp = sinf(theta * temp) / sinf(theta); + t = sinf(theta * t) / sinf(theta); } - pout->x = temp * pq1->x + epsilon * u * pq2->x; - pout->y = temp * pq1->y + epsilon * u * pq2->y; - pout->z = temp * pq1->z + epsilon * u * pq2->z; - pout->w = temp * pq1->w + epsilon * u * pq2->w; - return pout; + + out->x = temp * q1->x + t * q2->x; + out->y = temp * q1->y + t * q2->y; + out->z = temp * q1->z + t * q2->z; + out->w = temp * q1->w + t * q2->w; + + return out; } D3DXQUATERNION* WINAPI D3DXQuaternionSquad(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, CONST D3DXQUATERNION *pq3, CONST D3DXQUATERNION *pq4, FLOAT t)

1 0

Rico Schüller : d3dx9: Use float functions in D3DXQuaternionRotationYawPitchRoll().
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 7d75ad8230e182fe4c6724aed20b6a9302d7fa54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d75ad8230e182fe4c6724aed… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 26 13:57:05 2012 +0200 d3dx9: Use float functions in D3DXQuaternionRotationYawPitchRoll(). --- dlls/d3dx9_36/math.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 7599a0a..3f0e8e4 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1424,15 +1424,25 @@ D3DXQUATERNION* WINAPI D3DXQuaternionRotationMatrix(D3DXQUATERNION *pout, CONST return pout; } -D3DXQUATERNION* WINAPI D3DXQuaternionRotationYawPitchRoll(D3DXQUATERNION *pout, FLOAT yaw, FLOAT pitch, FLOAT roll) +D3DXQUATERNION * WINAPI D3DXQuaternionRotationYawPitchRoll(D3DXQUATERNION *out, FLOAT yaw, FLOAT pitch, FLOAT roll) { - TRACE("(%p, %f, %f, %f)\n", pout, yaw, pitch, roll); + FLOAT syaw, cyaw, spitch, cpitch, sroll, croll; - pout->x = sin( yaw / 2.0f) * cos(pitch / 2.0f) * sin(roll / 2.0f) + cos(yaw / 2.0f) * sin(pitch / 2.0f) * cos(roll / 2.0f); - pout->y = sin( yaw / 2.0f) * cos(pitch / 2.0f) * cos(roll / 2.0f) - cos(yaw / 2.0f) * sin(pitch / 2.0f) * sin(roll / 2.0f); - pout->z = cos(yaw / 2.0f) * cos(pitch / 2.0f) * sin(roll / 2.0f) - sin( yaw / 2.0f) * sin(pitch / 2.0f) * cos(roll / 2.0f); - pout->w = cos( yaw / 2.0f) * cos(pitch / 2.0f) * cos(roll / 2.0f) + sin(yaw / 2.0f) * sin(pitch / 2.0f) * sin(roll / 2.0f); - return pout; + TRACE("out %p, yaw %f, pitch %f, roll %f\n", out, yaw, pitch, roll); + + syaw = sinf(yaw / 2.0f); + cyaw = cosf(yaw / 2.0f); + spitch = sinf(pitch / 2.0f); + cpitch = cosf(pitch / 2.0f); + sroll = sinf(roll / 2.0f); + croll = cosf(roll / 2.0f); + + out->x = syaw * cpitch * sroll + cyaw * spitch * croll; + out->y = syaw * cpitch * croll - cyaw * spitch * sroll; + out->z = cyaw * cpitch * sroll - syaw * spitch * croll; + out->w = cyaw * cpitch * croll + syaw * spitch * sroll; + + return out; } D3DXQUATERNION * WINAPI D3DXQuaternionSlerp(D3DXQUATERNION *out, const D3DXQUATERNION *q1,

1 0

Rico Schüller : d3dx9: Use float functions in D3DXQuaternionRotationAxis().
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: db8df8bc7c5e03427f07a596125dec4c52d638be URL: http://source.winehq.org/git/wine.git/?a=commit;h=db8df8bc7c5e03427f07a5961… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 26 13:57:11 2012 +0200 d3dx9: Use float functions in D3DXQuaternionRotationAxis(). --- dlls/d3dx9_36/math.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 3f0e8e4..c6fa19a 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1357,18 +1357,20 @@ D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQ return pout; } -D3DXQUATERNION* WINAPI D3DXQuaternionRotationAxis(D3DXQUATERNION *pout, CONST D3DXVECTOR3 *pv, FLOAT angle) +D3DXQUATERNION * WINAPI D3DXQuaternionRotationAxis(D3DXQUATERNION *out, const D3DXVECTOR3 *v, FLOAT angle) { D3DXVECTOR3 temp; - TRACE("(%p, %p, %f)\n", pout, pv, angle); + TRACE("out %p, v %p, angle %f\n", out, v, angle); - D3DXVec3Normalize(&temp, pv); - pout->x = sin( angle / 2.0f ) * temp.x; - pout->y = sin( angle / 2.0f ) * temp.y; - pout->z = sin( angle / 2.0f ) * temp.z; - pout->w = cos( angle / 2.0f ); - return pout; + D3DXVec3Normalize(&temp, v); + + out->x = sinf(angle / 2.0f) * temp.x; + out->y = sinf(angle / 2.0f) * temp.y; + out->z = sinf(angle / 2.0f) * temp.z; + out->w = cosf(angle / 2.0f); + + return out; } D3DXQUATERNION* WINAPI D3DXQuaternionRotationMatrix(D3DXQUATERNION *pout, CONST D3DXMATRIX *pm)

1 0

Rico Schüller : d3dx9: Avoid variable assignment in D3DXQuaternionNormalize().
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 5accb12c1298a81a59e7d19080543ebf75635aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=5accb12c1298a81a59e7d1908… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 26 13:57:21 2012 +0200 d3dx9: Avoid variable assignment in D3DXQuaternionNormalize(). --- dlls/d3dx9_36/math.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index c6fa19a..9be3011 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1338,23 +1338,20 @@ D3DXQUATERNION* WINAPI D3DXQuaternionMultiply(D3DXQUATERNION *pout, CONST D3DXQU return pout; } -D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq) +D3DXQUATERNION * WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *out, const D3DXQUATERNION *q) { - D3DXQUATERNION out; FLOAT norm; - TRACE("(%p, %p)\n", pout, pq); - - norm = D3DXQuaternionLength(pq); + TRACE("out %p, q %p\n", out, q); - out.x = pq->x / norm; - out.y = pq->y / norm; - out.z = pq->z / norm; - out.w = pq->w / norm; + norm = D3DXQuaternionLength(q); - *pout=out; + out->x = q->x / norm; + out->y = q->y / norm; + out->z = q->z / norm; + out->w = q->w / norm; - return pout; + return out; } D3DXQUATERNION * WINAPI D3DXQuaternionRotationAxis(D3DXQUATERNION *out, const D3DXVECTOR3 *v, FLOAT angle)

1 0

Michael Stefaniuc : dsound: Don' t bother shrinking the secondary buffer list.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 4e06eead8f446f0167e6c92f0cc09f943122a7cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e06eead8f446f0167e6c92f0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 25 23:23:31 2012 +0200 dsound: Don't bother shrinking the secondary buffer list. --- dlls/dsound/dsound.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index a7a6f13..666f29f 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #include <stdarg.h> #include <stdio.h> @@ -1090,22 +1091,21 @@ HRESULT DirectSoundDevice_RemoveBuffer( RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE); - for (i = 0; i < device->nrofbuffers; i++) - if (device->buffers[i] == pDSB) - break; - - if (i < device->nrofbuffers) { - /* Put the last buffer of the list in the (now empty) position */ - device->buffers[i] = device->buffers[device->nrofbuffers - 1]; - device->nrofbuffers--; - device->buffers = HeapReAlloc(GetProcessHeap(),0,device->buffers,sizeof(LPDIRECTSOUNDBUFFER8)*device->nrofbuffers); - TRACE("buffer count is now %d\n", device->nrofbuffers); - } - - if (device->nrofbuffers == 0) { - HeapFree(GetProcessHeap(),0,device->buffers); + if (device->nrofbuffers == 1) { + assert(device->buffers[0] == pDSB); + HeapFree(GetProcessHeap(), 0, device->buffers); device->buffers = NULL; + } else { + for (i = 0; i < device->nrofbuffers; i++) { + if (device->buffers[i] == pDSB) { + /* Put the last buffer of the list in the (now empty) position */ + device->buffers[i] = device->buffers[device->nrofbuffers - 1]; + break; + } + } } + device->nrofbuffers--; + TRACE("buffer count is now %d\n", device->nrofbuffers); RtlReleaseResource(&(device->buffer_list_lock));

1 0

Michael Stefaniuc : dsound: DirectSoundDevice_RemoveBuffer() cannot fail.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: cea6329483260e866a7f2c2b64bb997534c83057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cea6329483260e866a7f2c2b6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 25 23:25:45 2012 +0200 dsound: DirectSoundDevice_RemoveBuffer() cannot fail. --- dlls/dsound/dsound.c | 7 +------ dlls/dsound/dsound_private.h | 4 +--- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 666f29f..e5b0e3c 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1080,12 +1080,9 @@ HRESULT DirectSoundDevice_AddBuffer( * Remove secondary buffer from buffer list. * Gets exclusive access to buffer for writing. */ -HRESULT DirectSoundDevice_RemoveBuffer( - DirectSoundDevice * device, - IDirectSoundBufferImpl * pDSB) +void DirectSoundDevice_RemoveBuffer(DirectSoundDevice * device, IDirectSoundBufferImpl * pDSB) { int i; - HRESULT hr = DS_OK; TRACE("(%p, %p)\n", device, pDSB); @@ -1108,6 +1105,4 @@ HRESULT DirectSoundDevice_RemoveBuffer( TRACE("buffer count is now %d\n", device->nrofbuffers); RtlReleaseResource(&(device->buffer_list_lock)); - - return hr; } diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index d5fb415..247f229 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -118,9 +118,7 @@ HRESULT DirectSoundDevice_Initialize( HRESULT DirectSoundDevice_AddBuffer( DirectSoundDevice * device, IDirectSoundBufferImpl * pDSB) DECLSPEC_HIDDEN; -HRESULT DirectSoundDevice_RemoveBuffer( - DirectSoundDevice * device, - IDirectSoundBufferImpl * pDSB) DECLSPEC_HIDDEN; +void DirectSoundDevice_RemoveBuffer(DirectSoundDevice * device, IDirectSoundBufferImpl * pDSB) DECLSPEC_HIDDEN; HRESULT DirectSoundDevice_CreateSoundBuffer( DirectSoundDevice * device, LPCDSBUFFERDESC dsbd,

1 0

Detlef Riekenberg : d3dx9_36/tests: Fix copy & paste error in ok messages.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: a695062447ef35d7a78bcb209178362c6f149e3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a695062447ef35d7a78bcb209… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Sep 25 23:35:00 2012 +0200 d3dx9_36/tests: Fix copy & paste error in ok messages. --- dlls/d3dx9_36/tests/texture.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 06e69e2..3c2cd95 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1314,9 +1314,9 @@ static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device) hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); ok(hr == D3D_OK, "IDirect3DTexture9_GetLevelDesc returned %#x, expected %#x\n", hr, D3D_OK); ok(desc.Width == 4, "Width is %u, expected 4\n", desc.Width); - ok(desc.Height == 4, "Width is %u, expected 4\n", desc.Height); + ok(desc.Height == 4, "Height is %u, expected 4\n", desc.Height); hr = IDirect3DTexture9_LockRect(texture, 0, &lock_rect, NULL, D3DLOCK_READONLY); - ok(hr == D3D_OK, "IDirect3DTexture9_LockTexture returned %#x, expected %#x\n", hr, D3D_OK); + ok(hr == D3D_OK, "IDirect3DTexture9_LockRect returned %#x, expected %#x\n", hr, D3D_OK); if (SUCCEEDED(hr)) { for (i = 0; i < 16; i++)

1 0

Vincent Povirk : windowscodecs: Use WINCODEC_ERR_UNSUPPORTEDOPERATION in GetColorContexts stubs.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 6f4dba586aae7a9fea7359732bd7e9c4b0e82b93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f4dba586aae7a9fea7359732… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 25 16:34:59 2012 -0500 windowscodecs: Use WINCODEC_ERR_UNSUPPORTEDOPERATION in GetColorContexts stubs. --- dlls/windowscodecs/pngformat.c | 4 ++-- dlls/windowscodecs/tiffformat.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index d0977b4..686f9c6 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -625,7 +625,7 @@ static HRESULT WINAPI PngDecoder_GetColorContexts(IWICBitmapDecoder *iface, UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { FIXME("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); - return E_NOTIMPL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI PngDecoder_GetThumbnail(IWICBitmapDecoder *iface, @@ -845,7 +845,7 @@ static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *i UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { FIXME("(%p,%u,%p,%p): stub\n", iface, cCount, ppIColorContexts, pcActualCount); - return E_NOTIMPL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI PngDecoder_Frame_GetThumbnail(IWICBitmapFrameDecode *iface, diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 05b6aba..cf93540 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -649,7 +649,7 @@ static HRESULT WINAPI TiffDecoder_GetColorContexts(IWICBitmapDecoder *iface, UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { FIXME("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); - return E_NOTIMPL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI TiffDecoder_GetThumbnail(IWICBitmapDecoder *iface, @@ -1099,7 +1099,7 @@ static HRESULT WINAPI TiffFrameDecode_GetColorContexts(IWICBitmapFrameDecode *if UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { FIXME("(%p,%u,%p,%p): stub\n", iface, cCount, ppIColorContexts, pcActualCount); - return E_NOTIMPL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI TiffFrameDecode_GetThumbnail(IWICBitmapFrameDecode *iface,

1 0

Dmitry Timoshkov : windowscodecs: Use appropriate helper to release GIF decoder.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 7fcf7e831cf2927e130ce2683b3c298f43ab5cf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fcf7e831cf2927e130ce2683… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 26 10:56:56 2012 +0900 windowscodecs: Use appropriate helper to release GIF decoder. --- dlls/windowscodecs/gifformat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 78371b0..4fa10e0 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -661,7 +661,7 @@ static ULONG WINAPI GifFrameDecode_Release(IWICBitmapFrameDecode *iface) if (ref == 0) { - IUnknown_Release((IUnknown*)This->parent); + IWICBitmapDecoder_Release(&This->parent->IWICBitmapDecoder_iface); HeapFree(GetProcessHeap(), 0, This); }

1 0

Francois Gouget : shlwapi: UrlIs()'s check for the 'file:' protocol is case insensitive.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 7c42bfe107cb79418e6540825eb9176b7d78021c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c42bfe107cb79418e6540825… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 26 04:20:00 2012 +0200 shlwapi: UrlIs()'s check for the 'file:' protocol is case insensitive. --- dlls/shlwapi/tests/url.c | 3 ++- dlls/shlwapi/url.c | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index b24a277..6cef9d6 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -450,7 +450,8 @@ static const struct { { "file://e:/b/c", FALSE, TRUE }, { "http:partial", FALSE, FALSE }, { "mailto://www.winehq.org/test.html", TRUE, FALSE }, - { "file:partial", FALSE, TRUE } + { "file:partial", FALSE, TRUE }, + { "File:partial", FALSE, TRUE }, }; /* ########################### */ diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index f483db3..70a0b87 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -1864,7 +1864,8 @@ BOOL WINAPI UrlIsA(LPCSTR pszUrl, URLIS Urlis) return FALSE; case URLIS_FILEURL: - return !StrCmpNA("file:", pszUrl, 5); + return (CompareStringA(LOCALE_INVARIANT, NORM_IGNORECASE, pszUrl, 5, + "file:", 5) == CSTR_EQUAL); case URLIS_DIRECTORY: last = pszUrl + strlen(pszUrl) - 1; @@ -1889,7 +1890,7 @@ BOOL WINAPI UrlIsA(LPCSTR pszUrl, URLIS Urlis) */ BOOL WINAPI UrlIsW(LPCWSTR pszUrl, URLIS Urlis) { - static const WCHAR stemp[] = { 'f','i','l','e',':',0 }; + static const WCHAR file_colon[] = { 'f','i','l','e',':',0 }; PARSEDURLW base; DWORD res1; LPCWSTR last; @@ -1917,7 +1918,8 @@ BOOL WINAPI UrlIsW(LPCWSTR pszUrl, URLIS Urlis) return FALSE; case URLIS_FILEURL: - return !strncmpW(stemp, pszUrl, 5); + return (CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pszUrl, 5, + file_colon, 5) == CSTR_EQUAL); case URLIS_DIRECTORY: last = pszUrl + strlenW(pszUrl) - 1;

1 0