August 2015 - Wine-Commits - list.winehq.org

Nikolay Sivov : dwrite: Use aliased outline threshold for GDI target.
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

Module: wine Branch: master Commit: 433b7c04c7f6544212217334faf735c8b8e07a18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=433b7c04c7f6544212217334f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 13 18:56:38 2015 +0300 dwrite: Use aliased outline threshold for GDI target. --- dlls/dwrite/gdiinterop.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index da4fc5f..6f96656 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -308,6 +308,7 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac IDWriteGlyphRunAnalysis *analysis; DWRITE_RENDERING_MODE rendermode; DWRITE_TEXTURE_TYPE texturetype; + IDWriteFontFace1 *fontface1; RECT target, bounds; HRESULT hr; @@ -319,8 +320,17 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac if (!This->dib.ptr) return S_OK; - hr = IDWriteFontFace_GetRecommendedRenderingMode(run->fontFace, run->fontEmSize, - This->ppdip, measuring_mode, params, &rendermode); + hr = IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace1, (void**)&fontface1); + if (hr == S_OK) { + hr = IDWriteFontFace1_GetRecommendedRenderingMode(fontface1, run->fontEmSize, This->ppdip * 96.0f, + This->ppdip * 96.0f, NULL, run->isSideways, DWRITE_OUTLINE_THRESHOLD_ALIASED, measuring_mode, + &rendermode); + IDWriteFontFace1_Release(fontface1); + } + else + hr = IDWriteFontFace_GetRecommendedRenderingMode(run->fontFace, run->fontEmSize, + This->ppdip, measuring_mode, params, &rendermode); + if (FAILED(hr)) return hr;

1 0

Alexandre Julliard : secur32: Avoid ssize_t type that causes printf format warnings.
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

Module: wine Branch: master Commit: 52e68a7823aff32a399e265c47140491882b7498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52e68a7823aff32a399e265c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 17 15:34:20 2015 +0900 secur32: Avoid ssize_t type that causes printf format warnings. --- dlls/secur32/schannel_gnutls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index d2c64fc..95c9bda 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -402,7 +402,7 @@ SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer, SIZE_T *length) { gnutls_session_t s = (gnutls_session_t)session; - ssize_t ret, total = 0; + SSIZE_T ret, total = 0; for (;;) { @@ -410,7 +410,7 @@ SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer, if (ret >= 0) { total += ret; - TRACE( "sent %d now %d/%ld\n", ret, total, *length ); + TRACE( "sent %ld now %ld/%ld\n", ret, total, *length ); if (total == *length) return SEC_E_OK; } else if (ret == GNUTLS_E_AGAIN)

1 0

André Hentschel : vcomp/tests: Make float test i386 only.
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

Module: wine Branch: master Commit: 15495d19ef2645043f41567397c7d593efc859a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15495d19ef2645043f4156739… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 9 14:07:09 2015 +0200 vcomp/tests: Make float test i386 only. amd64 and arm don't pass floats on the stack --- dlls/vcomp/tests/vcomp.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 7bfddc2..32a8619 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -419,6 +419,7 @@ static void CDECL fork_uintptr_cb(UINT_PTR a, UINT_PTR b, UINT_PTR c, UINT_PTR d ok(e == 5, "expected e == 5, got %p\n", (void *)e); } +#ifdef __i386__ static void CDECL fork_float_cb(float a, float b, float c, float d, float e) { ok(1.4999 < a && a < 1.5001, "expected a == 1.5, got %f\n", a); @@ -427,6 +428,7 @@ static void CDECL fork_float_cb(float a, float b, float c, float d, float e) ok(4.4999 < d && d < 4.5001, "expected d == 4.5, got %f\n", d); ok(5.4999 < e && e < 5.5001, "expected e == 5.5, got %f\n", e); } +#endif static void test_vcomp_fork(void) { @@ -453,13 +455,14 @@ static void test_vcomp_fork(void) p_vcomp_fork(TRUE, 5, fork_uintptr_cb, (UINT_PTR)1, (UINT_PTR)(MAXUINT_PTR - 2), (UINT_PTR)3, (UINT_PTR)(MAXUINT_PTR - 4), (UINT_PTR)5); - if (sizeof(int) < sizeof(void *)) - skip("skipping float test on x86_64\n"); - else +#ifdef __i386__ { void (CDECL *func)(BOOL, int, void *, float, float, float, float, float) = (void *)p_vcomp_fork; func(TRUE, 5, fork_float_cb, 1.5f, 2.5f, 3.5f, 4.5f, 5.5f); } +#else + skip("skipping float test on non-x86\n"); +#endif pomp_set_num_threads(max_threads); }

1 0

André Hentschel : ntdll/tests: Add ARM64 support for map protection tests.
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

Module: wine Branch: master Commit: c4cd981a61d2dfc20053051b284bd8d3ed1512b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4cd981a61d2dfc20053051b2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 9 20:10:37 2015 +0200 ntdll/tests: Add ARM64 support for map protection tests. --- dlls/ntdll/tests/info.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 4111be4..83fdd53 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1442,6 +1442,8 @@ static void test_mapprotection(void) *(unsigned char*)addr = 0xc3; /* lret ... in both i386 and x86_64 */ #elif defined(__arm__) *(unsigned long*)addr = 0xe12fff1e; /* bx lr */ +#elif defined(__aarch64__) + *(unsigned long*)addr = 0xd65f03c0; /* ret */ #else ok(0, "Add a return opcode for your architecture or expect a crash in this test\n"); #endif

1 0

Sebastian Lackner : server: Avoid leaking uninitialized stack memory to applications.
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

Module: wine Branch: master Commit: a8c6fe39af1e47c26e125ff5b3ff0c4ed71bea73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8c6fe39af1e47c26e125ff5b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Aug 16 08:00:13 2015 +0200 server: Avoid leaking uninitialized stack memory to applications. Without the memset() there is a risk of leaking uninitialized stack memory in the get_next_device_request wineserver call. --- server/device.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/server/device.c b/server/device.c index 812bce3..9ef587c 100644 --- a/server/device.c +++ b/server/device.c @@ -384,6 +384,7 @@ static struct object *device_open_file( struct object *obj, unsigned int access, struct irp_call *irp; irp_params_t params; + memset( &params, 0, sizeof(params) ); params.create.major = IRP_MJ_CREATE; params.create.access = access; params.create.sharing = sharing; @@ -422,6 +423,7 @@ static int device_file_close_handle( struct object *obj, struct process *process struct irp_call *irp; irp_params_t params; + memset( &params, 0, sizeof(params) ); params.close.major = IRP_MJ_CLOSE; params.close.file = file->user_ptr; @@ -516,6 +518,7 @@ static obj_handle_t device_file_read( struct fd *fd, const async_data_t *async_d obj_handle_t handle; irp_params_t params; + memset( &params, 0, sizeof(params) ); params.read.major = IRP_MJ_READ; params.read.key = 0; params.read.pos = pos; @@ -537,6 +540,7 @@ static obj_handle_t device_file_write( struct fd *fd, const async_data_t *async_ obj_handle_t handle; irp_params_t params; + memset( &params, 0, sizeof(params) ); params.write.major = IRP_MJ_WRITE; params.write.key = 0; params.write.pos = pos; @@ -557,6 +561,7 @@ static obj_handle_t device_file_flush( struct fd *fd, const async_data_t *async_ obj_handle_t handle; irp_params_t params; + memset( &params, 0, sizeof(params) ); params.flush.major = IRP_MJ_FLUSH_BUFFERS; params.flush.file = file->user_ptr; @@ -576,6 +581,7 @@ static obj_handle_t device_file_ioctl( struct fd *fd, ioctl_code_t code, const a obj_handle_t handle; irp_params_t params; + memset( &params, 0, sizeof(params) ); params.ioctl.major = IRP_MJ_DEVICE_CONTROL; params.ioctl.code = code; params.ioctl.file = file->user_ptr;

1 0

Iván Matellanes : msvcirt: Implement filebuf::setbuf.
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

Module: wine Branch: master Commit: 28c61981ad7acc005177ae91ebcdac3c112fbfd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28c61981ad7acc005177ae91e… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Aug 10 20:09:07 2015 +0200 msvcirt: Implement filebuf::setbuf. --- dlls/msvcirt/msvcirt.c | 12 ++++++++++-- dlls/msvcirt/tests/msvcirt.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 83184a0..17525cf 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1001,8 +1001,16 @@ streampos __thiscall filebuf_seekoff(filebuf *this, streamoff offset, ios_seek_d DEFINE_THISCALL_WRAPPER(filebuf_setbuf, 12) streambuf* __thiscall filebuf_setbuf(filebuf *this, char *buffer, int length) { - FIXME("(%p %p %d) stub\n", this, buffer, length); - return NULL; + streambuf *ret; + + TRACE("(%p %p %d)\n", this, buffer, length); + if (this->base.base != NULL) + return NULL; + + streambuf_lock(&this->base); + ret = streambuf_setbuf(&this->base, buffer, length); + streambuf_unlock(&this->base); + return ret; } /* ?setmode(a)filebuf@@QAEHH(a)Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 5a58dfd..559bee0 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -158,6 +158,7 @@ static filebuf* (*__thiscall p_filebuf_attach)(filebuf*, filedesc); static filebuf* (*__thiscall p_filebuf_open)(filebuf*, const char*, ios_open_mode, int); static filebuf* (*__thiscall p_filebuf_close)(filebuf*); static int (*__thiscall p_filebuf_setmode)(filebuf*, int); +static streambuf* (*__thiscall p_filebuf_setbuf)(filebuf*, char*, int); /* ios */ static ios* (*__thiscall p_ios_copy_ctor)(ios*, const ios*); @@ -297,6 +298,7 @@ static BOOL init(void) SET(p_filebuf_open, "?open(a)filebuf@@QEAAPEAV1(a)PEBDHH@Z"); SET(p_filebuf_close, "?close(a)filebuf@@QEAAPEAV1(a)XZ"); SET(p_filebuf_setmode, "?setmode(a)filebuf@@QEAAHH(a)Z"); + SET(p_filebuf_setbuf, "?setbuf(a)filebuf@@UEAAPEAVstreambuf@@PEADH(a)Z"); SET(p_ios_copy_ctor, "??0ios@@IEAA(a)AEBV0@@Z"); SET(p_ios_ctor, "??0ios@@IEAA(a)XZ"); @@ -356,6 +358,7 @@ static BOOL init(void) SET(p_filebuf_open, "?open(a)filebuf@@QAEPAV1(a)PBDHH@Z"); SET(p_filebuf_close, "?close(a)filebuf@@QAEPAV1(a)XZ"); SET(p_filebuf_setmode, "?setmode(a)filebuf@@QAEHH(a)Z"); + SET(p_filebuf_setbuf, "?setbuf(a)filebuf@@UAEPAVstreambuf@@PADH(a)Z"); SET(p_ios_copy_ctor, "??0ios@@IAE(a)ABV0@@Z"); SET(p_ios_ctor, "??0ios@@IAE(a)XZ"); @@ -997,6 +1000,33 @@ static void test_filebuf(void) ok(thread != NULL, "CreateThread failed\n"); WaitForSingleObject(lock_arg.lock, INFINITE); + /* setbuf */ + fb1.base.do_lock = 0; + pret = (filebuf*) call_func3(p_filebuf_setbuf, &fb1, read_buffer, 16); + ok(pret == &fb1, "wrong return, expected %p got %p\n", &fb1, pret); + ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + ok(fb1.base.base == read_buffer, "wrong buffer, expected %p got %p\n", read_buffer, fb1.base.base); + ok(fb1.base.pbase == NULL, "wrong put area, expected %p got %p\n", NULL, fb1.base.pbase); + fb1.base.pbase = fb1.base.pptr = fb1.base.base; + fb1.base.epptr = fb1.base.ebuf; + fb1.base.do_lock = -1; + pret = (filebuf*) call_func3(p_filebuf_setbuf, &fb1, read_buffer, 16); + ok(pret == NULL, "wrong return, expected %p got %p\n", NULL, pret); + ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + ok(fb1.base.base == read_buffer, "wrong buffer, expected %p got %p\n", read_buffer, fb1.base.base); + ok(fb1.base.pbase == read_buffer, "wrong put area, expected %p got %p\n", read_buffer, fb1.base.pbase); + fb1.base.base = fb1.base.ebuf = NULL; + fb1.base.do_lock = 0; + pret = (filebuf*) call_func3(p_filebuf_setbuf, &fb1, read_buffer, 0); + ok(pret == &fb1, "wrong return, expected %p got %p\n", &fb1, pret); + ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + ok(fb1.base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fb1.base.unbuffered); + ok(fb1.base.base == NULL, "wrong buffer, expected %p got %p\n", NULL, fb1.base.base); + ok(fb1.base.pbase == read_buffer, "wrong put area, expected %p got %p\n", read_buffer, fb1.base.pbase); + fb1.base.pbase = fb1.base.pptr = fb1.base.epptr = NULL; + fb1.base.unbuffered = 0; + fb1.base.do_lock = -1; + /* attach */ pret = (filebuf*) call_func2(p_filebuf_attach, &fb1, 2); ok(pret == NULL, "wrong return, expected %p got %p\n", NULL, pret);

1 0

Carlo Bramini : msvcrt: Call SetFilePointer() with correct parameters.
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

Module: wine Branch: master Commit: 9b495caacfd072f730780d0041b0a1e48a96c574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b495caacfd072f730780d004… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Sun Aug 16 12:46:38 2015 +0200 msvcrt: Call SetFilePointer() with correct parameters. --- dlls/msvcrt/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 68d4d54..75fd9cc 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1309,7 +1309,7 @@ int CDECL MSVCRT__locking(int fd, int mode, LONG nbytes) (mode==MSVCRT__LK_NBRLCK)?"_LK_NBRLCK": "UNKNOWN"); - if ((cur_locn = SetFilePointer(info->handle, 0L, NULL, SEEK_CUR)) == INVALID_SET_FILE_POINTER) + if ((cur_locn = SetFilePointer(info->handle, 0L, NULL, FILE_CURRENT)) == INVALID_SET_FILE_POINTER) { release_ioinfo(info); FIXME ("Seek failed\n");

1 0

Vincent Povirk : shell32: Fix getting parent shell folder when it' s the desktop folder.
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

Module: wine Branch: master Commit: 8657547d9e5b410a5b07dcab68ab73c158ecc22e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8657547d9e5b410a5b07dcab6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 14 14:55:20 2015 -0500 shell32: Fix getting parent shell folder when it's the desktop folder. BindToObject fails in this case. --- dlls/shell32/shellitem.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 853325c..f64c2d0 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -143,8 +143,15 @@ static HRESULT ShellItem_get_parent_shellfolder(ShellItem *This, IShellFolder ** ret = SHGetDesktopFolder(&desktop); if (SUCCEEDED(ret)) { - ret = IShellFolder_BindToObject(desktop, parent_pidl, NULL, &IID_IShellFolder, (void**)ppsf); - IShellFolder_Release(desktop); + if (_ILIsDesktop(parent_pidl)) + { + *ppsf = desktop; + } + else + { + ret = IShellFolder_BindToObject(desktop, parent_pidl, NULL, &IID_IShellFolder, (void**)ppsf); + IShellFolder_Release(desktop); + } } ILFree(parent_pidl); }

1 0

Alistair Leslie-Hughes : d3dcompiler: Add D3DCompileFromFile, D3DCompile2 stubs.
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

Module: wine Branch: master Commit: 1a0fc895f1f0fd393acb6e76dbd8702196458154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a0fc895f1f0fd393acb6e76d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jul 23 19:09:32 2015 +1000 d3dcompiler: Add D3DCompileFromFile, D3DCompile2 stubs. --- dlls/d3dcompiler_43/compiler.c | 9 +++++++++ dlls/d3dcompiler_46/d3dcompiler_46.spec | 2 +- dlls/d3dcompiler_47/d3dcompiler_47.spec | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 114b4c1..5dce856 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -763,3 +763,12 @@ HRESULT WINAPI D3DDisassemble(const void *data, SIZE_T size, UINT flags, const c data, size, flags, comments, disassembly); return E_NOTIMPL; } + +HRESULT WINAPI D3DCompileFromFile(const WCHAR *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *includes, + const char *entrypoint, const char *target, UINT flags1, UINT flags2, ID3DBlob **code, ID3DBlob **errors) +{ + FIXME("filename %s, defines %p, includes %p, entrypoint %s, target %s, flags1 %x, flags2 %x, code %p, errors %p\n", + debugstr_w(filename), defines, includes, debugstr_a(entrypoint), debugstr_a(target), flags1, flags2, code, errors); + + return E_NOTIMPL; +} diff --git a/dlls/d3dcompiler_46/d3dcompiler_46.spec b/dlls/d3dcompiler_46/d3dcompiler_46.spec index 5811b40..e36a8c0 100644 --- a/dlls/d3dcompiler_46/d3dcompiler_46.spec +++ b/dlls/d3dcompiler_46/d3dcompiler_46.spec @@ -1,7 +1,7 @@ @ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) @ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) @ stub D3DCompile2 -@ stub D3DCompileFromFile +@ stdcall D3DCompileFromFile(wstr ptr ptr str str long long ptr ptr) @ stub D3DCompressShaders @ stdcall D3DCreateBlob(long ptr) @ stub D3DDecompressShaders diff --git a/dlls/d3dcompiler_47/d3dcompiler_47.spec b/dlls/d3dcompiler_47/d3dcompiler_47.spec index 40ad977..a0df93e 100644 --- a/dlls/d3dcompiler_47/d3dcompiler_47.spec +++ b/dlls/d3dcompiler_47/d3dcompiler_47.spec @@ -1,7 +1,7 @@ @ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) @ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) @ stub D3DCompile2 -@ stub D3DCompileFromFile +@ stdcall D3DCompileFromFile(wstr ptr ptr str str long long ptr ptr) @ stub D3DCompressShaders @ stdcall D3DCreateBlob(long ptr) @ stub D3DCreateFunctionLinkingGraph

1 0

Hans Leidekker : wbemprox: Fix evaluation of LIKE queries.
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

Module: wine Branch: master Commit: 725c7aec8c3596fa8d183c7b341d1dbadecc91f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=725c7aec8c3596fa8d183c7b3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 14 14:58:13 2015 +0200 wbemprox: Fix evaluation of LIKE queries. --- dlls/wbemprox/query.c | 6 +++--- dlls/wbemprox/tests/query.c | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 6f66603..f01155a 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -63,10 +63,10 @@ static BOOL eval_like( const WCHAR *lstr, const WCHAR *rstr ) { while (*q == '%') q++; if (!*q) return TRUE; - while (*p && toupperW( p[1] ) != toupperW( q[1] )) p++; - if (!*p) return TRUE; + while (*p && *q && toupperW( *p ) == toupperW( *q )) { p++; q++; }; + if (!*p && !*q) return TRUE; } - if (toupperW( *p++ ) != toupperW( *q++ )) return FALSE; + if (*q != '%' && toupperW( *p++ ) != toupperW( *q++ )) return FALSE; } return TRUE; } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index b46ff52..09c8734 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -98,7 +98,11 @@ static void test_select( IWbemServices *services ) '\"','\\','\\','\\','\\','.','\\','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0','\"',0}; static const WCHAR query9[] = {'S','E','L','E','C','T','\n','a','\r','F','R','O','M','\t','b',0}; - static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7, query8, query9 }; + static const WCHAR query10[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'P','r','o','c','e','s','s',' ','W','H','E','R','E',' ','C','a','p','t','i','o','n',' ', + 'L','I','K','E',' ','"','%','f','i','r','e','f','o','x','.','e','x','e','"',0}; + static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7, query8, query9, query10 }; HRESULT hr; IEnumWbemClassObject *result; BSTR wql = SysAllocString( wqlW );

1 0